From: Szabolcs Nagy Date: Thu, 24 Aug 2017 14:56:11 +0000 (+0100) Subject: Fix CFLAGS override in sysdeps/ieee754/dbl-64 X-Git-Tag: glibc-2.27~1080 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aa48656bb00074f3f422d805f15d07d786970ba;p=thirdparty%2Fglibc.git Fix CFLAGS override in sysdeps/ieee754/dbl-64 Use += instead of = to avoid overriding target specific CFLAGS settings. Ideally the settings in target Makefiles would have precedence, but the Makefile inclusion order does not allow that, with this fix at least the target settings are not dropped. --- diff --git a/ChangeLog b/ChangeLog index f506fd289cf..8fb2105bf85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-08-24 Szabolcs Nagy + + * sysdeps/ieee754/dbl-64/Makefile: Don't override CFLAGS. + 2017-08-23 H.J. Lu * sysdeps/x86_64/fpu/libm-test-ulps: Regenerated. diff --git a/sysdeps/ieee754/dbl-64/Makefile b/sysdeps/ieee754/dbl-64/Makefile index 5557c75b458..c965982fa50 100644 --- a/sysdeps/ieee754/dbl-64/Makefile +++ b/sysdeps/ieee754/dbl-64/Makefile @@ -1,6 +1,6 @@ ifeq ($(subdir),math) # branred depends on precise IEEE double rounding -CFLAGS-branred.c = $(config-cflags-nofma) -CFLAGS-e_sqrt.c = $(config-cflags-nofma) -CFLAGS-e_pow.c = $(config-cflags-nofma) +CFLAGS-branred.c += $(config-cflags-nofma) +CFLAGS-e_sqrt.c += $(config-cflags-nofma) +CFLAGS-e_pow.c += $(config-cflags-nofma) endif