diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-23 21:14:05 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-23 21:14:05 +0000 |
| commit | 66ee291faa52558caedbc214d662b7b7742eca7e (patch) | |
| tree | 4174bc7ed1d7d206f96b296846302894273a31e3 /libsanitizer | |
| parent | 193418b74e4bd38a22629ebdd5ab404bf81d10c0 (diff) | |
| download | gcc-66ee291faa52558caedbc214d662b7b7742eca7e.tar.gz | |
Set gcc_version in tsan/Makefile.am
PR sanitizer/55450
* tsan/Makefile.am (gcc_version): New.
* tsan/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193767 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 12 | ||||
| -rw-r--r-- | libsanitizer/tsan/Makefile.am | 3 | ||||
| -rw-r--r-- | libsanitizer/tsan/Makefile.in | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 0c7e4b753f4..2c7c289a702 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,12 +1,18 @@ +2012-11-23 H.J. Lu <hongjiu.lu@intel.com> + + PR sanitizer/55450 + * tsan/Makefile.am (gcc_version): New. + * tsan/Makefile.in: Regenerated. + 2012-11-23 Kostya Serebryany <kcc@google.com> - + * merge.sh: Support tsan, support added/removed files. * tsan/Makefile.am: Remove tsan_printf.cc. * tsan/Makefile.in: Regenerated. * other files: Merge from upstream r168514. 2012-11-23 Kostya Serebryany <kcc@google.com> - + * merge.sh: New file. 2012-11-23 Jakub Jelinek <jakub@redhat.com> @@ -32,7 +38,7 @@ 2012-11-21 Kostya Serebryany <kcc@google.com> - * README.gcc: Extend the README.gcc with mode details. + * README.gcc: Extend the README.gcc with mode details. 2012-11-20 Konstantin Serebryany <konstantin.s.serebryany@gmail.com> diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am index c4fbad9b74d..a3919863ee7 100644 --- a/libsanitizer/tsan/Makefile.am +++ b/libsanitizer/tsan/Makefile.am @@ -1,5 +1,8 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include +# May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros ACLOCAL_AMFLAGS = -I m4 diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in index b919969cf47..23550e597a8 100644 --- a/libsanitizer/tsan/Makefile.in +++ b/libsanitizer/tsan/Makefile.in @@ -84,8 +84,7 @@ am__objects_1 = tsan_clock.lo tsan_interface_atomic.lo tsan_mutex.lo \ tsan_rtl.lo tsan_stat.lo tsan_sync.lo tsan_interceptors.lo \ tsan_md5.lo tsan_platform_mac.lo tsan_rtl_mutex.lo \ tsan_suppressions.lo tsan_interface_ann.lo tsan_mman.lo \ - tsan_rtl_report.lo \ - tsan_symbolize_addr2line_linux.lo + tsan_rtl_report.lo tsan_symbolize_addr2line_linux.lo am_libtsan_la_OBJECTS = $(am__objects_1) libtsan_la_OBJECTS = $(am_libtsan_la_OBJECTS) libtsan_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -238,6 +237,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include + +# May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros ACLOCAL_AMFLAGS = -I m4 toolexeclib_LTLIBRARIES = libtsan.la |