diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2014-01-13 19:36:17 +0000 |
|---|---|---|
| committer | H.J. Lu <hongjiu.lu@intel.com> | 2014-01-13 19:36:17 +0000 |
| commit | a012188b94b69b295e15e28126bfb47569667eb3 (patch) | |
| tree | 7f7dab92531fa0f82d6ff464245f082d879c2f86 /libitm | |
| parent | 7242a55f70713f8e7cc6b3a8485a3c838aa7a290 (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@206587 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 7 | ||||
| -rw-r--r-- | libitm/Makefile.am | 6 | ||||
| -rw-r--r-- | libitm/Makefile.in | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 8a2c7ddf2b8..f3c8d127791 100644 --- 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 e754ccc7704..1dce82d62f1 100644 --- 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 f44fd70b946..6c4d2537f57 100644 --- 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) |