about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-06-18 00:30:44 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-06-18 00:30:44 +0000
commitc411604296b4e8c0d678addd03bfda024d652a2e (patch)
treeef62f0befc4f5427517078a7747ef5455f0dc21e
parente55a9b256d53c7fc5145e3e4d338d3741b23e232 (diff)
downloadglibc-c411604296b4e8c0d678addd03bfda024d652a2e.tar.gz
glibc-c411604296b4e8c0d678addd03bfda024d652a2e.tar.xz
glibc-c411604296b4e8c0d678addd03bfda024d652a2e.zip
Wrap test-fpucw.c for ARM.
-rw-r--r--ports/ChangeLog.arm6
-rw-r--r--ports/sysdeps/arm/fpu_control.h2
-rw-r--r--ports/sysdeps/arm/test-fpucw.c5
3 files changed, 12 insertions, 1 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 00f37892cd..c7e22cc0d1 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-06-18  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/arm/fpu_control.h [!_LIBC && __SOFTFP__]: Change
+	condition to [!(_LIBC && !_LIBC_TEST) && __SOFTFP__].
+	* sysdeps/arm/test-fpucw.c: New file.
+
 2013-06-17  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14907]
diff --git a/ports/sysdeps/arm/fpu_control.h b/ports/sysdeps/arm/fpu_control.h
index 2fee79fa88..3ceb58b2fc 100644
--- a/ports/sysdeps/arm/fpu_control.h
+++ b/ports/sysdeps/arm/fpu_control.h
@@ -19,7 +19,7 @@
 #ifndef _FPU_CONTROL_H
 #define _FPU_CONTROL_H
 
-#if !defined(_LIBC) && defined(__SOFTFP__)
+#if !(defined(_LIBC) && !defined(_LIBC_TEST)) && defined(__SOFTFP__)
 
 #define _FPU_RESERVED 0xffffffff
 #define _FPU_DEFAULT  0x00000000
diff --git a/ports/sysdeps/arm/test-fpucw.c b/ports/sysdeps/arm/test-fpucw.c
new file mode 100644
index 0000000000..9fc721c7f4
--- /dev/null
+++ b/ports/sysdeps/arm/test-fpucw.c
@@ -0,0 +1,5 @@
+/* Defining _LIBC_TEST stops fpu_control.h from defining the
+   hard-float versions of macros (for use with dynamic VFP detection)
+   when compiling for soft-float.  */
+#define _LIBC_TEST
+#include <math/test-fpucw.c>