This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

CPPFLAGS in math/Makefile


This patch makes sure that the -D/-U options come out in the right order.
Otherwise -U__LIBC_INTERNAL_MATH_INLINES occurs before
-D__LIBC_INTERNAL_MATH_INLINES, and the latter wins.  This happened to
work with older versions of gcc where -U always wins regardless of its
position on the command line.

Andreas.

2001-07-23  Andreas Schwab  <schwab@suse.de>

	* math/Makefile (CPPFLAGS-test-ifloat.c, CPPFLAGS-test-idouble.c,
	CPPFLAGS-test-ildoubl.c): Renamed from CFLAGS-*.
	(math-CPPFLAGS): Set this instead of CPPFLAGS.

Index: Makefile
===================================================================
RCS file: /cvs/glibc/libc/math/Makefile,v
retrieving revision 1.107
diff -u -a -u -r1.107 Makefile
--- Makefile	2001/07/06 04:55:35	1.107
+++ Makefile	2001/07/23 08:45:03
@@ -121,10 +121,10 @@
 CFLAGS-test-float.c = -fno-inline -ffloat-store
 CFLAGS-test-double.c = -fno-inline -ffloat-store
 CFLAGS-test-ldouble.c = -fno-inline -ffloat-store
-CFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
-CFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
-CFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
 CFLAGS-test-tgmath.c = -fno-builtin
+CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
+CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
+CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
 
 distribute += libm-test.inc gen-libm-test.pl README.libm-test
 
@@ -145,7 +145,7 @@
 
 # We don't want the fdlibm code to use the inline math functions,
 # only the fdlibm code.
-CPPFLAGS += -D__NO_MATH_INLINES -D__LIBC_INTERNAL_MATH_INLINES
+math-CPPFLAGS += -D__NO_MATH_INLINES -D__LIBC_INTERNAL_MATH_INLINES
 
 ifneq ($(long-double-fcts),yes)
 # The `double' and `long double' types are the same on this machine.
@@ -153,7 +153,7 @@
 # to define aliases for the `FUNCl' names.  To avoid type conflicts in
 # defining those aliases, tell <math.h> to declare the `FUNCl' names with
 # `double' instead of `long double'.
-CPPFLAGS += -DNO_LONG_DOUBLE -D_Mlong_double_=double
+math-CPPFLAGS += -DNO_LONG_DOUBLE -D_Mlong_double_=double
 endif
 
 # The fdlibm code generates a lot of these warnings but is otherwise clean.

-- 
Andreas Schwab                                  "And now for something
SuSE Labs                                        completely different."
Andreas.Schwab@suse.de
SuSE GmbH, Schanzäckerstr. 10, D-90443 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]