Make sure that -msse/-mavx are appended at the end

	PR libitm/53113
	* Makefile.am (x86_sse.lo): Append -msse to CXXFLAGS.
	(x86_avx.lo): Append -mavx to CXXFLAGS.
	* Makefile.in: Regenerate.

From-SVN: r206587

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 8a2c7ddf2b8e57558ab42063e3a78fb2cb448213..f3c8d1277913439b2cd2e3f2d1806f77bd997d48 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR libitm/53113
+       * Makefile.am (x86_sse.lo): Append -msse to CXXFLAGS.
+       (x86_avx.lo): Append -mavx to CXXFLAGS.
+       * Makefile.in: Regenerate.
+
 2014-01-02  Richard Sandiford  <rdsandiford@googlemail.com>
 
        Update copyright years

diff --git a/libitm/Makefile.am b/libitm/Makefile.am
index e754ccc770469442ac6cbecc34eaacbe9ec87482..1dce82d62f13c4c4fe156cd32199d820ce7fa691 100644 (file)
--- a/libitm/Makefile.am
+++ b/libitm/Makefile.am
@@ -67,10 +67,12 @@ libitm_la_SOURCES += hwcap.cc
 endif
 if ARCH_X86
 libitm_la_SOURCES += x86_sse.cc x86_avx.cc
-x86_sse.lo : XCFLAGS += -msse
+# Make sure -msse is appended at the end.
+x86_sse.lo : override CXXFLAGS += -msse
 endif
 if ARCH_X86_AVX
-x86_avx.lo : XCFLAGS += -mavx
+# Make sure -mavx is appended at the end.
+x86_avx.lo : override CXXFLAGS += -mavx
 endif
 
 if ARCH_FUTEX

diff --git a/libitm/Makefile.in b/libitm/Makefile.in
index f44fd70b946e5aacea6efc86947c5cf962c5fa07..6c4d2537f5771302fdec498757fe0abc9b648732 100644 (file)
--- a/libitm/Makefile.in
+++ b/libitm/Makefile.in
@@ -1050,8 +1050,10 @@ vpath % $(strip $(search_path))
 @LIBITM_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBITM_BUILD_VERSIONED_SHLIB_TRUE@      `echo $(libitm_la_LIBADD) | \
 @LIBITM_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBITM_BUILD_VERSIONED_SHLIB_TRUE@         sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
 @LIBITM_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBITM_BUILD_VERSIONED_SHLIB_TRUE@      > $@ || (rm -f $@ ; exit 1)
-@ARCH_X86_TRUE@x86_sse.lo : XCFLAGS += -msse
-@ARCH_X86_AVX_TRUE@x86_avx.lo : XCFLAGS += -mavx
+# Make sure -msse is appended at the end.
+@ARCH_X86_TRUE@x86_sse.lo : override CXXFLAGS += -msse
+# Make sure -mavx is appended at the end.
+@ARCH_X86_AVX_TRUE@x86_avx.lo : override CXXFLAGS += -mavx
 
 all-local: $(STAMP_GENINSRC)