On Wed, Dec 25, 2013 at 12:41 PM, H.J. Lu <hjl.to...@gmail.com> wrote: > Hi, > > In libitm, x86_sse.cc must be compiled with -msse and x86_avx.cc must > be compiled with -mavx. We need to make sure that -msse/-mavx is > appended at the end of compiler options. This patch appends -msse/-mavx > to CXXFLAGS, instead of appending them to XCFLAGS. Tested with > CXXFLAGS="-g -O2 -mno-avx". OK for trunk and release branches? > > Thanks. > > > H.J. > --- > diff --git a/libitm/ChangeLog b/libitm/ChangeLog > index e6dc646..35c64ee 100644 > --- a/libitm/ChangeLog > +++ b/libitm/ChangeLog > @@ -1,3 +1,10 @@ > +2013-12-25 H.J. Lu <hongjiu...@intel.com> > + > + PR libitm/53113 > + * Makefile.am (x86_sse.lo): Append -msse to CXXFLAGS. > + (x86_avx.lo): Append -mavx to CXXFLAGS. > + * Makefile.in: Regenerate. > + > 2013-11-14 Ulrich Weigand <ulrich.weig...@de.ibm.com> > > * config/powerpc/sjlj.S [__powerpc64__ && _CALL_ELF == 2]: > diff --git a/libitm/Makefile.am b/libitm/Makefile.am > index e754ccc..1dce82d 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 f44fd70..6c4d253 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) >
Hi Richard, Torvald, Can you take a look at this patch? Thanks. -- H.J.
