This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch roland/arm-vfp created. glibc-2.16-ports-merge-252-g4fa36b3


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, roland/arm-vfp has been created
        at  4fa36b3dcd4af068387b8d37d334bcf273aee9e5 (commit)

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4fa36b3dcd4af068387b8d37d334bcf273aee9e5

commit 4fa36b3dcd4af068387b8d37d334bcf273aee9e5
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Aug 22 13:17:05 2012 -0700

    Test [__VFP_FP__] in place of [!__SOFTFP__].

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 4acc473..6800f18 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2012-08-22  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/arm/setjmp.S: Test [__VFP_FP__] in place of [!__SOFTFP__].
+	* sysdeps/arm/__longjmp.S: Likewise.
+	* sysdeps/arm/arm-features.h: Likewise.
+
 2012-08-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/arm/kernel-features.h
diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S
index b3c2860..b6a29f4 100644
--- a/ports/sysdeps/arm/__longjmp.S
+++ b/ports/sysdeps/arm/__longjmp.S
@@ -47,7 +47,7 @@ ENTRY (__longjmp)
 	cfi_restore (sp)
 	cfi_restore (lr)
 
-#if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__
+#if !defined ARM_ASSUME_NO_IWMMXT || !defined __VFP_FP__
 # define NEED_HWCAP 1
 #endif
 
@@ -72,7 +72,7 @@ ENTRY (__longjmp)
 # endif
 #endif
 
-#ifdef __SOFTFP__
+#ifndef __VFP_FP__
 	tst	a2, #HWCAP_ARM_VFP
 	beq	.Lno_vfp
 #endif
diff --git a/ports/sysdeps/arm/arm-features.h b/ports/sysdeps/arm/arm-features.h
index 41befb5..6b32507 100644
--- a/ports/sysdeps/arm/arm-features.h
+++ b/ports/sysdeps/arm/arm-features.h
@@ -24,7 +24,7 @@
    hardware is present.  We'll then redefine it to a constant if we
    know at compile time that we can assume VFP.  */
 
-#ifndef __SOFTFP__
+#ifdef __VFP_FP__
 /* The compiler is generating VFP instructions, so we're already
    assuming the hardware exists.  */
 # undef ARM_HAVE_VFP
diff --git a/ports/sysdeps/arm/setjmp.S b/ports/sysdeps/arm/setjmp.S
index dbd59dd..57556af 100644
--- a/ports/sysdeps/arm/setjmp.S
+++ b/ports/sysdeps/arm/setjmp.S
@@ -29,7 +29,7 @@ ENTRY (__sigsetjmp)
 	/* Save registers */
 	stmia	ip!, {v1-v6, sl, fp, sp, lr}
 
-#if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__
+#if !defined ARM_ASSUME_NO_IWMMXT || !defined __VFP_FP__
 # define NEED_HWCAP 1
 #endif
 
@@ -55,7 +55,7 @@ ENTRY (__sigsetjmp)
 # endif
 #endif
 
-#ifdef __SOFTFP__
+#ifndef __VFP_FP__
 	tst	a3, #HWCAP_ARM_VFP
 	beq	.Lno_vfp
 #endif

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]