Clear hardware capabilities on libitm.so with Sun ld

[gcc.git] / libitm / Makefile.am

diff --git a/libitm/Makefile.am b/libitm/Makefile.am
index 26e1ebc632cc6b2905c8fd6b6bce5551830faa51..f1c351c21d5864ff17b2aea9c171307241e6a624 100644 (file)
--- a/libitm/Makefile.am
+++ b/libitm/Makefile.am
@@ -18,10 +18,10 @@ vpath % $(strip $(search_path))
 
 AM_CPPFLAGS = $(addprefix -I, $(search_path))
 AM_CFLAGS = $(XCFLAGS)
-AM_CXXFLAGS = -std=gnu++0x -funwind-tables -fno-exceptions -fno-rtti \
-       $(XCFLAGS) $(abi_version)
+AM_CXXFLAGS = $(XCFLAGS) -std=gnu++0x -funwind-tables -fno-exceptions \
+       -fno-rtti $(abi_version)
 AM_CCASFLAGS = $(XCFLAGS)
-AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS)
+AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) $(HWCAP_LDFLAGS)
 
 toolexeclib_LTLIBRARIES = libitm.la
 nodist_toolexeclib_HEADERS = libitm.spec
@@ -62,6 +62,9 @@ libitm_la_SOURCES = \
        query.cc retry.cc rwlock.cc useraction.cc util.cc \
        sjlj.S tls.cc method-serial.cc method-gl.cc
 
+if ARCH_ARM
+libitm_la_SOURCES += hwcap.cc
+endif
 if ARCH_X86
 libitm_la_SOURCES += x86_sse.cc x86_avx.cc
 x86_sse.lo : XCFLAGS += -msse