From owner-svn-src-all@FreeBSD.ORG Sun May 31 02:03:41 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AD5D106564A; Sun, 31 May 2009 02:03:41 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC6FE8FC25; Sun, 31 May 2009 02:03:40 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V23evC026210; Sun, 31 May 2009 02:03:40 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4V23ekr026206; Sun, 31 May 2009 02:03:40 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200905310203.n4V23ekr026206@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 31 May 2009 02:03:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193145 - in head/lib: libc/arm libc/arm/gen libstand X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2009 02:03:41 -0000 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