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

[Juli Mallett]

Author: jmallett
Date: Fri Mar  5 06:06:20 2010
New Revision: 204752
URL: http://svn.freebsd.org/changeset/base/204752

Log:
  Remove N32-related things that prevent building O32 world.  Commits to come to
  add support for setting the default ABI.

Modified:
  user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h
  user/jmallett/octeon/gnu/lib/libgcc/Makefile
  user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
  user/jmallett/octeon/lib/libc/Makefile
  user/jmallett/octeon/lib/libc/mips/Makefile.inc
  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	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/contrib/gcc/config/mips/freebsd.h	Fri Mar  5 06:06:20 2010	(r204752)
@@ -307,7 +307,6 @@ Boston, MA 02110-1301, USA.  */
 #undef  LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX "."
 
-#if 0
 /* Currently we don't support 128bit long doubles, so for now we force
    n32 to be 64bit.  */
 #undef	LONG_DOUBLE_TYPE_SIZE
@@ -317,7 +316,6 @@ Boston, MA 02110-1301, USA.  */
 #undef	LIBGCC2_LONG_DOUBLE_TYPE_SIZE
 #define	LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64
 #endif
-#endif
 
 /************************[  Debugger stuff  ]*********************************/
 

Modified: user/jmallett/octeon/gnu/lib/libgcc/Makefile
==============================================================================
--- user/jmallett/octeon/gnu/lib/libgcc/Makefile	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/gnu/lib/libgcc/Makefile	Fri Mar  5 06:06:20 2010	(r204752)
@@ -90,11 +90,6 @@ TPBIT_FUNCS = _pack_tf _unpack_tf _addsu
     _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \
     _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf
 
-.if ${TARGET_ARCH} == "mips"
-FPBIT_FUNCS += _sf_to_tf
-DPBIT_FUNCS += _df_to_tf
-.endif
-
 # These might cause a divide overflow trap and so are compiled with
 # unwinder info.
 LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
@@ -121,8 +116,7 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns
 .endif
 
 .if ${TARGET_ARCH} == "mips"
-CFLAGS+=	-D__LDBL_MANT_DIG__=113
-#LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
+LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
 .endif
 
 .if ${TARGET_ARCH} == "ia64"
@@ -189,7 +183,7 @@ OBJ_GRPS =	STD DIV
 #
 # Floating point emulation functions
 #
-.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \
+.if ${TARGET_ARCH} == "armNOT_YET" || \
     ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
 
 FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
@@ -201,14 +195,6 @@ DPBIT_CFILE =	config/fp-bit.c
 OBJ_GRPS +=	FPBIT DPBIT
 .endif
 
-.if ${TARGET_ARCH} == "mips"
-TPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DTFLOAT
-
-TPBIT_CFILE =	config/fp-bit.c
-
-OBJ_GRPS +=	TPBIT
-.endif
-
 #-----------------------------------------------------------------------
 #
 # Generic build rules for object groups defined above

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips	Fri Mar  5 06:06:20 2010	(r204752)
@@ -5,9 +5,9 @@
 # of mipsel and mips.
 _sz?=32
 .if defined(TARGET_BIG_ENDIAN)
-NATIVE_EMULATION=elf${_sz}btsmipn32_fbsd
+NATIVE_EMULATION=elf${_sz}btsmip_fbsd
 .else
-NATIVE_EMULATION=elf${_sz}ltsmipn32_fbsd
+NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
 .endif
 
 MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \

Modified: user/jmallett/octeon/lib/libc/Makefile
==============================================================================
--- user/jmallett/octeon/lib/libc/Makefile	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/lib/libc/Makefile	Fri Mar  5 06:06:20 2010	(r204752)
@@ -65,7 +65,8 @@ NOASM=
 .include "${.CURDIR}/rpc/Makefile.inc"
 .include "${.CURDIR}/uuid/Makefile.inc"
 .include "${.CURDIR}/xdr/Makefile.inc"
-.if ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_ARCH} == "arm" || \
+    ${MACHINE_ARCH} == "mips"
 .include "${.CURDIR}/softfloat/Makefile.inc"
 .endif
 .if ${MK_NIS} != "no"

Modified: user/jmallett/octeon/lib/libc/mips/Makefile.inc
==============================================================================
--- user/jmallett/octeon/lib/libc/mips/Makefile.inc	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/lib/libc/mips/Makefile.inc	Fri Mar  5 06:06:20 2010	(r204752)
@@ -1,5 +1,9 @@
 #	$NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $
 # $FreeBSD$
 
+SOFTFLOAT_BITS=32
+
+CFLAGS+=-DSOFTFLOAT
+
 MDSRCS+= machdep_ldisd.c
 SYM_MAPS+= ${.CURDIR}/mips/Symbol.map

Modified: user/jmallett/octeon/share/mk/bsd.cpu.mk
==============================================================================
--- user/jmallett/octeon/share/mk/bsd.cpu.mk	Fri Mar  5 05:01:07 2010	(r204751)
+++ user/jmallett/octeon/share/mk/bsd.cpu.mk	Fri Mar  5 06:06:20 2010	(r204752)
@@ -208,7 +208,6 @@ LD += -EB
 CFLAGS += -EL
 LD += -EL
 . endif
-CFLAGS += -mabi=n32
 CFLAGS += -G0
 .endif