This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Fix math/test-fpucw-*.c for sysdeps test-fpucw.c overrides
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Wed, 15 Jan 2014 19:35:39 +0000
- Subject: Fix math/test-fpucw-*.c for sysdeps test-fpucw.c overrides
- Authentication-results: sourceware.org; auth=none
ARM has an override of the test math/test-fpucw.c, to disable (for
soft-float testing) definitions of hard-float macros in fpu_control.h
that the header normally defines not only when building for
hard-float, but also when building for soft-float with _LIBC defined
so that libc code can dynamically test whether VFP hardware is
present. (_LIBC is defined when building tests, although ideally it
wouldn't be.)
The override doesn't work for the derived tests test-fpucw-*.c because
they use #include "" instead of <> to include test-fpucw.c, so always
get the math/ version instead of the ARM sysdeps override. This patch
changes them to use <> so the sysdeps override is effective.
(test-fpucw-ieee-static.c doesn't need a change because it includes
test-fpucw-ieee.c, which isn't itself being overridden, which in turn
includes test-fpucw.c with a #include changed by this patch.)
Tested for ARM (big-endian soft-float, non-VFP hardware).
2014-01-15 Joseph Myers <joseph@codesourcery.com>
* math/test-fpucw-ieee.c: Use <> in #include of test-fpucw.c.
* math/test-fpucw-static.c: Likewise.
diff --git a/math/test-fpucw-ieee.c b/math/test-fpucw-ieee.c
index b003526..b01d1c5 100644
--- a/math/test-fpucw-ieee.c
+++ b/math/test-fpucw-ieee.c
@@ -21,7 +21,7 @@
# define FPU_CONTROL _FPU_IEEE
#endif
-#include "test-fpucw.c"
+#include <test-fpucw.c>
/* Preempt the library's definition of `__fpu_control'. */
fpu_control_t __fpu_control = FPU_CONTROL;
diff --git a/math/test-fpucw-static.c b/math/test-fpucw-static.c
index bc1cfa8..74ec0cf 100644
--- a/math/test-fpucw-static.c
+++ b/math/test-fpucw-static.c
@@ -1 +1 @@
-#include "test-fpucw.c"
+#include <test-fpucw.c>
--
Joseph S. Myers
joseph@codesourcery.com