svn commit: r193145 - in head/lib: libc/arm libc/arm/gen libstand

[Marcel Moolenaar]

Author: marcel
Date: Sun May 31 02:03:40 2009
New Revision: 193145
URL: http://svn.freebsd.org/changeset/base/193145

Log:
  Use GCC's __SOFTFP__ to test whether we're being compiled
  with softfloat or not. Now -msoft-float can be overridden
  more easily.

Modified:
  head/lib/libc/arm/Makefile.inc
  head/lib/libc/arm/gen/_setjmp.S
  head/lib/libc/arm/gen/setjmp.S
  head/lib/libstand/Makefile

Modified: head/lib/libc/arm/Makefile.inc
==============================================================================
--- head/lib/libc/arm/Makefile.inc	Sun May 31 01:56:06 2009	(r193144)
+++ head/lib/libc/arm/Makefile.inc	Sun May 31 02:03:40 2009	(r193145)
@@ -5,8 +5,6 @@
 
 SOFTFLOAT_BITS=32
 
-CFLAGS+=-DSOFTFLOAT
-
 # Long double is just double precision.
 MDSRCS+=machdep_ldisd.c
 SYM_MAPS+=${.CURDIR}/arm/Symbol.map

Modified: head/lib/libc/arm/gen/_setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/_setjmp.S	Sun May 31 01:56:06 2009	(r193144)
+++ head/lib/libc/arm/gen/_setjmp.S	Sun May 31 02:03:40 2009	(r193145)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 ENTRY(_setjmp)
 	ldr	r1, .L_setjmp_magic
 	str	r1, [r0], #4
-#ifdef SOFTFLOAT
+#ifdef __SOFTFP__
 	add	r0, r0, #52
 #else
 	/* Store fp registers */
@@ -59,7 +59,7 @@ ENTRY(_setjmp)
 	/* Store fpsr */
 	rfs	r1
 	str	r1, [r0], #0x0004
-#endif	/* SOFTFLOAT */
+#endif	/* __SOFTFP__ */
 	/* Store integer registers */
         stmia	r0, {r4-r14}
 
@@ -76,7 +76,7 @@ ENTRY(_longjmp)
 	teq	r2, r3
 	bne	botch
 
-#ifdef SOFTFLOAT
+#ifdef __SOFTFP__
 	add	r0, r0, #52
 #else
 	/* Restore fp registers */
@@ -84,7 +84,7 @@ ENTRY(_longjmp)
 	/* Restore fpsr */
 	ldr	r4, [r0], #0x0004
 	wfs	r4
-#endif	/* SOFTFLOAT */
+#endif	/* __SOFTFP__ */
        	/* Restore integer registers */
         ldmia	r0, {r4-r14}
 

Modified: head/lib/libc/arm/gen/setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/setjmp.S	Sun May 31 01:56:06 2009	(r193144)
+++ head/lib/libc/arm/gen/setjmp.S	Sun May 31 02:03:40 2009	(r193145)
@@ -58,7 +58,7 @@ ENTRY(setjmp)
 	ldr	r1, .Lsetjmp_magic
 	str	r1, [r0], #4
 
-#ifdef SOFTFLOAT
+#ifdef __SOFTFP__
 	add	r0, r0, #52
 #else
 	/* Store fp registers */
@@ -66,7 +66,7 @@ ENTRY(setjmp)
 	/* Store fpsr */
 	rfs	r1
 	str	r1, [r0], #0x0004
-#endif	/*SOFTFLOAT*/
+#endif	/* __SOFTFP__ */
 	/* Store integer registers */
         stmia	r0, {r4-r14}
         mov	r0, #0x00000000
@@ -98,7 +98,7 @@ ENTRY(__longjmp)
 	ldmfd	sp!, {r0, r1, r14} 
 
 	add	r0, r0, #4
-#ifdef SOFTFLOAT
+#ifdef __SOFTFP__
 	add	r0, r0, #52
 #else
 	/* Restore fp registers */
@@ -106,7 +106,7 @@ ENTRY(__longjmp)
 	/* Restore FPSR */
 	ldr	r4, [r0], #0x0004
 	wfs	r4
-#endif	/* SOFTFLOAT */
+#endif	/* __SOFTFP__ */
 	/* Restore integer registers */
         ldmia	r0, {r4-r14}
 

Modified: head/lib/libstand/Makefile
==============================================================================
--- head/lib/libstand/Makefile	Sun May 31 01:56:06 2009	(r193144)
+++ head/lib/libstand/Makefile	Sun May 31 02:03:40 2009	(r193145)
@@ -35,7 +35,7 @@ CFLAGS+=	-msoft-float -D_STANDALONE
 CFLAGS+=	-m32 -I.
 .endif
 .if ${MACHINE_ARCH} == "arm"
-CFLAGS+=	-msoft-float -DSOFTFLOAT -D_STANDALONE
+CFLAGS+=	-msoft-float -D_STANDALONE
 .endif
 
 # standalone components and stuff we have modified locally