svn commit: r204428 - in user/jmallett/octeon: contrib/gcc/config/mips gnu/usr.bin/binutils/ld share/mk

[Juli Mallett]

Author: jmallett
Date: Sat Feb 27 19:43:14 2010
New Revision: 204428
URL: http://svn.freebsd.org/changeset/base/204428

Log:
  o) Add ABI-related defines used by libgcc to determine things like float size,
     fixing libgcc build for n32.
  o) Default to n32, hackishly.

Modified:
  user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
  user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
  user/jmallett/octeon/share/mk/bsd.cpu.mk

Modified: user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
==============================================================================
--- user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Sat Feb 27 19:02:21 2010	(r204427)
+++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Sat Feb 27 19:43:14 2010	(r204428)
@@ -170,14 +170,21 @@ Boston, MA 02110-1301, USA.  */
 								\
       if (mips_abi == ABI_EABI)					\
 	builtin_define ("__mips_eabi");				\
-      else if (mips_abi == ABI_N32)				\
+      else if (mips_abi == ABI_N32) {				\
+        builtin_define ("_ABIN32=2");				\
+        builtin_define ("_MIPS_SIM=_ABIN32");			\
 	builtin_define ("__mips_n32");				\
-      else if (mips_abi == ABI_64)				\
+      } else if (mips_abi == ABI_64) {				\
+        builtin_define ("_ABI64=3");				\
+        builtin_define ("_MIPS_SIM=_ABI64");			\
 	builtin_define ("__mips_n64");				\
-      else if (mips_abi == ABI_O64)				\
+      } else if (mips_abi == ABI_O64)				\
 	builtin_define ("__mips_o64");				\
-      else							\
+      else {							\
+        builtin_define ("_ABIO32=1");				\
+        builtin_define ("_MIPS_SIM=_ABIO32");			\
 	builtin_define ("__mips_o32");				\
+      }								\
 								\
       if (TARGET_ABICALLS)					\
 	builtin_define ("__ABICALLS__");			\

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Sat Feb 27 19:02:21 2010	(r204427)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Sat Feb 27 19:43:14 2010	(r204428)
@@ -5,9 +5,9 @@
 # of mipsel and mips.
 _sz?=32
 .if defined(TARGET_BIG_ENDIAN)
-NATIVE_EMULATION=elf${_sz}btsmip_fbsd
+NATIVE_EMULATION=elf${_sz}btsmipn32_fbsd
 .else
-NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
+NATIVE_EMULATION=elf${_sz}ltsmipn32_fbsd
 .endif
 
 MIPS_ABIS+=elf32btsmip_fbsd elf32ltsmip_fbsd

Modified: user/jmallett/octeon/share/mk/bsd.cpu.mk
==============================================================================
--- user/jmallett/octeon/share/mk/bsd.cpu.mk	Sat Feb 27 19:02:21 2010	(r204427)
+++ user/jmallett/octeon/share/mk/bsd.cpu.mk	Sat Feb 27 19:43:14 2010	(r204428)
@@ -208,6 +208,8 @@ LD += -EB
 CFLAGS += -EL
 LD += -EL
 . endif
+# XXX What if 64-bit?  Need TARGET_ABI?
+CFLAGS += -mabi=n32
 CFLAGS += -msoft-float -G0 -mno-dsp -mabicalls
 .endif