about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--math/Makefile9
-rw-r--r--math/test-math-inline.h1
3 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f6ad6de519..68ca50508f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2017-02-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2017-02-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/libm-test-support.c: New file.  Content from
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