From 94d0cea0ad2c225019736c2f18e1280eae50fa6c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 16 Jan 2014 05:30:52 +0000 Subject: 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. --- math/test-fpucw-static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'math/test-fpucw-static.c') 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 -- cgit 1.4.1