svn commit: r204988 - user/jmallett/octeon/gnu/usr.bin/cc

[Juli Mallett]

Author: jmallett
Date: Wed Mar 10 22:33:59 2010
New Revision: 204988
URL: http://svn.freebsd.org/changeset/base/204988

Log:
  Pass on TARGET_CPUTYPE as a string rather than trying to parse it.

Modified:
  user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc

Modified: user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc	Wed Mar 10 22:33:32 2010	(r204987)
+++ user/jmallett/octeon/gnu/usr.bin/cc/Makefile.inc	Wed Mar 10 22:33:59 2010	(r204988)
@@ -44,32 +44,15 @@ MIPS_ABI_DEFAULT=ABI_64
 .endif
 .endif
 
+MIPS_ABI_DEFAULT?=ABI_32
+CFLAGS += -DMIPS_ABI_DEFAULT=${MIPS_ABI_DEFAULT}
+
 # GCC by default takes the ISA from the ABI's requirements.  If world is built
 # with a superior ISA, since we lack multilib, we have to set the right
 # default ISA to be able to link against what's in /usr/lib.  Terrible stuff.
 .if defined(TARGET_CPUTYPE)
-.if ${TARGET_CPUTYPE} == "mips1"
-MIPS_ISA_DEFAULT=1
-.elif ${TARGET_CPUTYPE} == "mips2"
-MIPS_ISA_DEFAULT=2
-.elif ${TARGET_CPUTYPE} == "mips3"
-MIPS_ISA_DEFAULT=3
-.elif ${TARGET_CPUTYPE} == "mips4"
-MIPS_ISA_DEFAULT=4
-.elif ${TARGET_CPUTYPE} == "mips32"
-MIPS_ISA_DEFAULT=32
-.elif ${TARGET_CPUTYPE} == "mips32r2"
-MIPS_ISA_DEFAULT=32r2
-.elif ${TARGET_CPUTYPE} == "mips64"
-MIPS_ISA_DEFAULT=64
-.else
-# Let's hope from-abi is good enough.
+CFLAGS += -DMIPS_CPU_STRING_DEFAULT=\"${TARGET_CPUTYPE}\"
 .endif
-CFLAGS += -DMIPS_ISA_DEFAULT=${MIPS_ISA_DEFAULT}
-.endif
-
-MIPS_ABI_DEFAULT?=ABI_32
-CFLAGS += -DMIPS_ABI_DEFAULT=${MIPS_ABI_DEFAULT}
 .endif
 
 .if defined(WANT_FORCE_OPTIMIZATION_DOWNGRADE)