diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-01-16 05:30:52 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-01-16 05:30:52 +0000 |
| commit | 94d0cea0ad2c225019736c2f18e1280eae50fa6c (patch) | |
| tree | 57f94544b88d94da2f93ef33873fd7a1c09a83dd | |
| parent | 5d29ccce66cc903fd9aa6e8f74c6be4dbc03d1f5 (diff) | |
| download | glibc-94d0cea0ad2c225019736c2f18e1280eae50fa6c.tar.gz glibc-94d0cea0ad2c225019736c2f18e1280eae50fa6c.tar.xz glibc-94d0cea0ad2c225019736c2f18e1280eae50fa6c.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | math/test-fpucw-ieee.c | 2 | ||||
| -rw-r--r-- | math/test-fpucw-static.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a61bfde918..69d89744ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> [BZ #16453] diff --git a/math/test-fpucw-ieee.c b/math/test-fpucw-ieee.c index b0035263ff..b01d1c5d69 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 bc1cfa8ce5..74ec0cf29b 100644 --- a/math/test-fpucw-static.c +++ b/math/test-fpucw-static.c @@ -1 +1 @@ -#include "test-fpucw.c" +#include <test-fpucw.c> |