diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-02-09 17:32:48 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-02-09 17:32:48 +0000 |
| commit | 9b40563c8b43c122ecbc428349e85cffc9dde94b (patch) | |
| tree | 6a86d481d6b7168ffb76bcb970c9402075125d38 /math | |
| parent | 3b2f60328eb4a9f9d776ee63931a3538eafe596a (diff) | |
| download | glibc-9b40563c8b43c122ecbc428349e85cffc9dde94b.tar.gz glibc-9b40563c8b43c122ecbc428349e85cffc9dde94b.tar.xz glibc-9b40563c8b43c122ecbc428349e85cffc9dde94b.zip | |
Move -U__LIBC_INTERNAL_MATH_INLINES to test-math-inline.h.
The libm tests of inline functions undefine __NO_MATH_INLINES (from math-CPPFLAGS) in test-math-inline.h, but __LIBC_INTERNAL_MATH_INLINES via -U options in the makefile. This is an odd inconsistency between the handling of the two macros. It also depends on the ordering (in compilation commands) of the various variables providing compiler options (which I think is why it's using CPPFLAGS-*.c instead of CFLAGS-*.c). This patch moves the undefine to test-math-inline.h, so improving consistency and eliminating the dependency on the order in which variables go in the compilation commands. The CPPFLAGS-*.c variables are renamed to CFLAGS-*.c, matching those for the non-inline libm function tests. By moving the -U option to the header file, this should ensure that ordering issues don't arise with a subsequent move of the options to these tests to target-specific CFLAGS += ... variable settings (for when tests for each function are build separately and so compilation options need setting for many more makefile targets, for which target-specific variable settings seem to be the most convenient form to generate with iterators). Tested for x86_64. * math/test-math-inline.h (__LIBC_INTERNAL_MATH_INLINES): Undefine macro. * math/Makefile (CPPFLAGS-test-ifloat.c): Rename to ... (CFLAGS-test-ifloat.c): ... this. Remove -U__LIBC_INTERNAL_MATH_INLINES. * math/Makefile (CPPFLAGS-test-idouble.c): Rename to ... (CFLAGS-test-idouble.c): ... this. Remove -U__LIBC_INTERNAL_MATH_INLINES. * math/Makefile (CPPFLAGS-test-ildouble.c): Rename to ... (CFLAGS-test-ildouble.c): ... this. Remove -U__LIBC_INTERNAL_MATH_INLINES.
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 9 | ||||
| -rw-r--r-- | math/test-math-inline.h | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/math/Makefile b/math/Makefile index e5e4412886..5d93b4fa4c 100644 --- a/math/Makefile +++ b/math/Makefile @@ -309,12 +309,9 @@ CFLAGS-test-tgmath-ret.c = -fno-builtin CFLAGS-test-powl.c = -fno-builtin CFLAGS-test-snan.c = -fsignaling-nans -CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES \ - $(libm-test-fast-math-cflags) -CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES \ - $(libm-test-fast-math-cflags) -CPPFLAGS-test-ildouble.c = -U__LIBC_INTERNAL_MATH_INLINES \ - $(libm-test-fast-math-cflags) +CFLAGS-test-ifloat.c = $(libm-test-fast-math-cflags) +CFLAGS-test-idouble.c = $(libm-test-fast-math-cflags) +CFLAGS-test-ildouble.c = $(libm-test-fast-math-cflags) CFLAGS-test-signgam-finite.c = -ffinite-math-only CFLAGS-test-signgam-finite-c99.c = -ffinite-math-only -std=c99 diff --git a/math/test-math-inline.h b/math/test-math-inline.h index faf91c595a..2a29f3ce07 100644 --- a/math/test-math-inline.h +++ b/math/test-math-inline.h @@ -21,6 +21,7 @@ #define TEST_ERRNO 0 #define TEST_EXCEPTIONS 0 +#undef __LIBC_INTERNAL_MATH_INLINES #ifdef __NO_MATH_INLINES # undef __NO_MATH_INLINES #endif |