* lib/target-supports.exp (check_effective_target_fgnu_tm): New

[pf3gnuchains/gcc-fork.git] / libitm / Makefile.am

diff --git a/libitm/Makefile.am b/libitm/Makefile.am
index 7df807e..e754ccc 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
@@ -54,15 +54,17 @@ libitm_version_info = -version-info $(libtool_VERSION)
 # want or need libstdc++.
 libitm_la_DEPENDENCIES = $(libitm_version_dep)
 libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS)
-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) \
-        -no-undefined
+libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script)
 
 libitm_la_SOURCES = \
        aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc barrier.cc beginend.cc \
        clone.cc eh_cpp.cc local.cc \
        query.cc retry.cc rwlock.cc useraction.cc util.cc \
-       sjlj.S tls.cc method-serial.cc method-gl.cc
+       sjlj.S tls.cc method-serial.cc method-gl.cc method-ml.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