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 f506fd289cfda51c9f2d4f15ab90bfa3c8b9e0e0..8fb2105bf85729c31bb8263ee06366db28bc8286 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-24  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       * sysdeps/ieee754/dbl-64/Makefile: Don't override CFLAGS.
+
 2017-08-23  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/fpu/libm-test-ulps: Regenerated.

diff --git a/sysdeps/ieee754/dbl-64/Makefile b/sysdeps/ieee754/dbl-64/Makefile
index 5557c75b4581a27c6a6818c7d3c6463f5de43635..c965982fa50f790761f9b02f91cb9d8a89adf590 100644 (file)
--- 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