diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2016-11-09 16:58:17 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@ispras.ru> | 2016-11-09 16:58:17 +0300 |
| commit | 333610c1ceadf0febb112e8f9a3f405d25a0345a (patch) | |
| tree | 29ee0b1fc30f8a28e916e1c06f982933a73f4f2b /libsanitizer/tsan/Makefile.am | |
| parent | 16ca0e4e4bc093bfb2c08b167ce1f2116e37758b (diff) | |
| parent | 421721dfaaddd54b376a5ac48e15ce6c7704bde3 (diff) | |
| download | gcc-333610c1ceadf0febb112e8f9a3f405d25a0345a.tar.gz | |
Merge remote-tracking branch 'origin/trunk' into gomp-nvptx-branch-merge-trunkamonakov/gomp-nvptx
Diffstat (limited to 'libsanitizer/tsan/Makefile.am')
| -rw-r--r-- | libsanitizer/tsan/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am index 9833de20bd8..7a0c2971143 100644 --- a/libsanitizer/tsan/Makefile.am +++ b/libsanitizer/tsan/Makefile.am @@ -10,13 +10,16 @@ AM_CXXFLAGS += -std=gnu++11 ACLOCAL_AMFLAGS = -I m4 toolexeclib_LTLIBRARIES = libtsan.la +nodist_toolexeclib_HEADERS = libtsan_preinit.o tsan_files = \ tsan_clock.cc \ + tsan_debugging.cc \ tsan_fd.cc \ tsan_flags.cc \ tsan_ignoreset.cc \ tsan_interceptors.cc \ + tsan_interceptors_mac.cc \ tsan_interface_ann.cc \ tsan_interface_atomic.cc \ tsan_interface.cc \ @@ -35,6 +38,7 @@ tsan_files = \ tsan_report.cc \ tsan_rtl.cc \ tsan_rtl_mutex.cc \ + tsan_rtl_proc.cc \ tsan_rtl_report.cc \ tsan_rtl_thread.cc \ tsan_stack_trace.cc \ @@ -44,7 +48,7 @@ tsan_files = \ tsan_sync.cc libtsan_la_SOURCES = $(tsan_files) -EXTRA_libtsan_la_SOURCES = tsan_rtl_amd64.S tsan_rtl_aarch64.S +EXTRA_libtsan_la_SOURCES = tsan_rtl_amd64.S tsan_rtl_aarch64.S tsan_rtl_mips64.S tsan_rtl_ppc64.S libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(TSAN_TARGET_DEPENDENT_OBJECTS) libtsan_la_DEPENDENCIES = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(TSAN_TARGET_DEPENDENT_OBJECTS) if LIBBACKTRACE_SUPPORTED @@ -54,6 +58,9 @@ endif libtsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS) libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libtsan) +libtsan_preinit.o: tsan_preinit.o + cp $< $@ + # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. |