This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.17-824-gc411604
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Jun 2013 00:31:04 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-824-gc411604
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, master has been updated
via c411604296b4e8c0d678addd03bfda024d652a2e (commit)
from e55a9b256d53c7fc5145e3e4d338d3741b23e232 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c411604296b4e8c0d678addd03bfda024d652a2e
commit c411604296b4e8c0d678addd03bfda024d652a2e
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Jun 18 00:30:44 2013 +0000
Wrap test-fpucw.c for ARM.
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 00f3789..c7e22cc 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 2fee79f..3ceb58b 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 0000000..9fc721c
--- /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>
-----------------------------------------------------------------------
Summary of changes:
ports/ChangeLog.arm | 6 ++++++
ports/sysdeps/arm/fpu_control.h | 2 +-
ports/sysdeps/arm/test-fpucw.c | 5 +++++
3 files changed, 12 insertions(+), 1 deletions(-)
create mode 100644 ports/sysdeps/arm/test-fpucw.c
hooks/post-receive
--
GNU C Library master sources