about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2017-08-24 15:56:11 +0100
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2017-08-24 15:56:11 +0100
commit8aa48656bb00074f3f422d805f15d07d786970ba (patch)
tree97ed08fe35775fc71576115374a2fb82dd5f2267
parentfcaaca412fecb6097c902acd1260f585819b8b7e (diff)
downloadglibc-8aa48656bb00074f3f422d805f15d07d786970ba.tar.gz
glibc-8aa48656bb00074f3f422d805f15d07d786970ba.tar.xz
glibc-8aa48656bb00074f3f422d805f15d07d786970ba.zip
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.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/ieee754/dbl-64/Makefile6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f506fd289c..8fb2105bf8 100644
--- 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 5557c75b45..c965982fa5 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