Fix math/test-fpucw-*.c for sysdeps test-fpucw.c overrides.

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).

	* math/test-fpucw-ieee.c: Use <> in #include of test-fpucw.c.
	* math/test-fpucw-static.c: Likewise.
This commit is contained in:
Joseph Myers 2014-01-16 05:30:52 +00:00
parent 5d29ccce66
commit 94d0cea0ad
3 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2014-01-16 Joseph Myers <joseph@codesourcery.com>
* math/test-fpucw-ieee.c: Use <> in #include of test-fpucw.c.
* math/test-fpucw-static.c: Likewise.
2013-01-16 Siddhesh Poyarekar <siddhesh@redhat.com> 2013-01-16 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #16453] [BZ #16453]

View File

@ -21,7 +21,7 @@
# define FPU_CONTROL _FPU_IEEE # define FPU_CONTROL _FPU_IEEE
#endif #endif
#include "test-fpucw.c" #include <test-fpucw.c>
/* Preempt the library's definition of `__fpu_control'. */ /* Preempt the library's definition of `__fpu_control'. */
fpu_control_t __fpu_control = FPU_CONTROL; fpu_control_t __fpu_control = FPU_CONTROL;

View File

@ -1 +1 @@
#include "test-fpucw.c" #include <test-fpucw.c>