Skip to content

R
riscv-gcc-1
Commit b0edd457 by Venkataramanan Kumar Committed by Venkataramanan Kumar
Options

Conditionally include target specific files while building TSAN 2015-01-25... 

Conditionally include target specific files while building TSAN
2015-01-25  Venkataramanan Kumar  <venkataramanan.kumar@linaro.org>

        * configure.ac (TSAN_TARGET_DEPENDENT_OBJECTS): Define.
        * configure: Regenerate.
        * tsan/Makefile.am (EXTRA_libtsan_la_SOURCES): Define.
        (libtsan_la_DEPENDENCIES): Likewise.
        * Makefile.in: Regenerate.
        * asan/Makefile.in: Regenerate.
        * interception/Makefile.in: Regenerate.
        * libbacktrace/Makefile.in: Regenerate.
        * lsan/Makefile.in: Regenerate.
        * sanitizer_common/Makefile.in: Regenerate.
        * tsan/Makefile.in: Regenerate.
        * ubsan/Makefile.in: Regenerate.

From-SVN: r220034
parent 8f000887
Showing with 56 additions and 16 deletions
libsanitizer/ChangeLog
2015-01-25 Venkataramanan Kumar <venkataramanan.kumar@linaro.org>
* configure.ac (TSAN_TARGET_DEPENDENT_OBJECTS): Define.
* configure: Regenerate.
* tsan/Makefile.am (EXTRA_libtsan_la_SOURCES): Define.
(libtsan_la_DEPENDENCIES): Likewise.
* Makefile.in: Regenerate.
* asan/Makefile.in: Regenerate.
* interception/Makefile.in: Regenerate.
* libbacktrace/Makefile.in: Regenerate.
* lsan/Makefile.in: Regenerate.
* sanitizer_common/Makefile.in: Regenerate.
* tsan/Makefile.in: Regenerate.
* ubsan/Makefile.in: Regenerate.
2015-01-22 Jakub Jelinek <jakub@redhat.com> 2015-01-22 Jakub Jelinek <jakub@redhat.com>
* tsan/tsan_rtl.h: Cherry pick upstream r226829. * tsan/tsan_rtl.h: Cherry pick upstream r226829.
......
libsanitizer/Makefile.in
...@@ -185,6 +185,7 @@ SED = @SED@ ...@@ -185,6 +185,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
libsanitizer/asan/Makefile.in
...@@ -194,6 +194,7 @@ SED = @SED@ ...@@ -194,6 +194,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
libsanitizer/configure
...@@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE ...@@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
LIBOBJS LIBOBJS
TSAN_TARGET_DEPENDENT_OBJECTS
LIBBACKTRACE_SUPPORTED_FALSE LIBBACKTRACE_SUPPORTED_FALSE
LIBBACKTRACE_SUPPORTED_TRUE LIBBACKTRACE_SUPPORTED_TRUE
BACKTRACE_SUPPORTS_THREADS BACKTRACE_SUPPORTS_THREADS
...@@ -12019,7 +12020,7 @@ else ...@@ -12019,7 +12020,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12022 "configure" #line 12023 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -12125,7 +12126,7 @@ else ...@@ -12125,7 +12126,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 12128 "configure" #line 12129 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -16362,6 +16363,12 @@ if test "x$TSAN_SUPPORTED" = "xyes"; then ...@@ -16362,6 +16363,12 @@ if test "x$TSAN_SUPPORTED" = "xyes"; then
fi fi
case "${target}" in
x86_64-*-linux-*) TSAN_TARGET_DEPENDENT_OBJECTS='tsan_rtl_amd64.lo' ;;
*) TSAN_TARGET_DEPENDENT_OBJECTS='' ;;
esac
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure # tests run on this system so they can be shared between configure
......
libsanitizer/configure.ac
...@@ -346,4 +346,10 @@ _EOF ...@@ -346,4 +346,10 @@ _EOF
]) ])
fi fi
case "${target}" in
x86_64-*-linux-*) TSAN_TARGET_DEPENDENT_OBJECTS='tsan_rtl_amd64.lo' ;;
*) TSAN_TARGET_DEPENDENT_OBJECTS='' ;;
esac
AC_SUBST([TSAN_TARGET_DEPENDENT_OBJECTS])
AC_OUTPUT AC_OUTPUT
libsanitizer/interception/Makefile.in
...@@ -150,6 +150,7 @@ SED = @SED@ ...@@ -150,6 +150,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
libsanitizer/libbacktrace/Makefile.in
...@@ -192,6 +192,7 @@ SED = @SED@ ...@@ -192,6 +192,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
libsanitizer/lsan/Makefile.in
...@@ -185,6 +185,7 @@ SED = @SED@ ...@@ -185,6 +185,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
libsanitizer/sanitizer_common/Makefile.in
...@@ -178,6 +178,7 @@ SED = @SED@ ...@@ -178,6 +178,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
libsanitizer/tsan/Makefile.am
...@@ -37,13 +37,15 @@ tsan_files = \ ...@@ -37,13 +37,15 @@ tsan_files = \
tsan_stat.cc \ tsan_stat.cc \
tsan_suppressions.cc \ tsan_suppressions.cc \
tsan_symbolize.cc \ tsan_symbolize.cc \
tsan_sync.cc \ tsan_sync.cc
tsan_rtl_amd64.S
libtsan_la_SOURCES = $(tsan_files) libtsan_la_SOURCES = $(tsan_files)
libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la EXTRA_libtsan_la_SOURCES = tsan_rtl_amd64.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 if LIBBACKTRACE_SUPPORTED
libtsan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la libtsan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la
libtsan_la_DEPENDENCIES +=$(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la
endif endif
libtsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS) libtsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS)
libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libtsan) libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libtsan)
......
libsanitizer/tsan/Makefile.in
...@@ -36,6 +36,7 @@ build_triplet = @build@ ...@@ -36,6 +36,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
@LIBBACKTRACE_SUPPORTED_TRUE@am__append_1 = $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la @LIBBACKTRACE_SUPPORTED_TRUE@am__append_1 = $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la
@LIBBACKTRACE_SUPPORTED_TRUE@am__append_2 = $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la
subdir = tsan subdir = tsan
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
...@@ -80,10 +81,6 @@ am__base_list = \ ...@@ -80,10 +81,6 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(toolexeclibdir)" am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
LTLIBRARIES = $(toolexeclib_LTLIBRARIES) LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
libtsan_la_DEPENDENCIES = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \
$(top_builddir)/interception/libinterception.la \
$(am__append_1) $(am__DEPENDENCIES_1)
am__objects_1 = tsan_clock.lo tsan_fd.lo tsan_flags.lo \ am__objects_1 = tsan_clock.lo tsan_fd.lo tsan_flags.lo \
tsan_ignoreset.lo tsan_interceptors.lo tsan_interface_ann.lo \ tsan_ignoreset.lo tsan_interceptors.lo tsan_interface_ann.lo \
tsan_interface_atomic.lo tsan_interface.lo \ tsan_interface_atomic.lo tsan_interface.lo \
...@@ -92,7 +89,7 @@ am__objects_1 = tsan_clock.lo tsan_fd.lo tsan_flags.lo \ ...@@ -92,7 +89,7 @@ am__objects_1 = tsan_clock.lo tsan_fd.lo tsan_flags.lo \
tsan_platform_windows.lo tsan_report.lo tsan_rtl.lo \ tsan_platform_windows.lo tsan_report.lo tsan_rtl.lo \
tsan_rtl_mutex.lo tsan_rtl_report.lo tsan_rtl_thread.lo \ tsan_rtl_mutex.lo tsan_rtl_report.lo tsan_rtl_thread.lo \
tsan_stack_trace.lo tsan_stat.lo tsan_suppressions.lo \ tsan_stack_trace.lo tsan_stat.lo tsan_suppressions.lo \
tsan_symbolize.lo tsan_sync.lo tsan_rtl_amd64.lo tsan_symbolize.lo tsan_sync.lo
am_libtsan_la_OBJECTS = $(am__objects_1) am_libtsan_la_OBJECTS = $(am__objects_1)
libtsan_la_OBJECTS = $(am_libtsan_la_OBJECTS) libtsan_la_OBJECTS = $(am_libtsan_la_OBJECTS)
libtsan_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ libtsan_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
...@@ -125,7 +122,7 @@ CCLD = $(CC) ...@@ -125,7 +122,7 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
SOURCES = $(libtsan_la_SOURCES) SOURCES = $(libtsan_la_SOURCES) $(EXTRA_libtsan_la_SOURCES)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
...@@ -201,6 +198,7 @@ SED = @SED@ ...@@ -201,6 +198,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
...@@ -306,14 +304,19 @@ tsan_files = \ ...@@ -306,14 +304,19 @@ tsan_files = \
tsan_stat.cc \ tsan_stat.cc \
tsan_suppressions.cc \ tsan_suppressions.cc \
tsan_symbolize.cc \ tsan_symbolize.cc \
tsan_sync.cc \ tsan_sync.cc
tsan_rtl_amd64.S
libtsan_la_SOURCES = $(tsan_files) libtsan_la_SOURCES = $(tsan_files)
EXTRA_libtsan_la_SOURCES = tsan_rtl_amd64.S
libtsan_la_LIBADD = \ libtsan_la_LIBADD = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \
$(top_builddir)/interception/libinterception.la \ $(top_builddir)/interception/libinterception.la \
$(am__append_1) $(LIBSTDCXX_RAW_CXX_LDFLAGS) $(TSAN_TARGET_DEPENDENT_OBJECTS) $(am__append_1) \
$(LIBSTDCXX_RAW_CXX_LDFLAGS)
libtsan_la_DEPENDENCIES = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \
$(top_builddir)/interception/libinterception.la \
$(TSAN_TARGET_DEPENDENT_OBJECTS) $(am__append_2)
libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libtsan) libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libtsan)
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS
......
libsanitizer/ubsan/Makefile.in
...@@ -181,6 +181,7 @@ SED = @SED@ ...@@ -181,6 +181,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
TSAN_TARGET_DEPENDENT_OBJECTS = @TSAN_TARGET_DEPENDENT_OBJECTS@
VERSION = @VERSION@ VERSION = @VERSION@
VIEW_FILE = @VIEW_FILE@ VIEW_FILE = @VIEW_FILE@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment