Commit 9cb5411c by H.J. Lu

Set gcc_version in tsan/Makefile.am

	PR sanitizer/55450
	* tsan/Makefile.am (gcc_version): New.
	* tsan/Makefile.in: Regenerated.

From-SVN: r193767
parent a1b98cc1
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> 2012-11-23 Kostya Serebryany <kcc@google.com>
* merge.sh: Support tsan, support added/removed files. * merge.sh: Support tsan, support added/removed files.
* tsan/Makefile.am: Remove tsan_printf.cc. * tsan/Makefile.am: Remove tsan_printf.cc.
* tsan/Makefile.in: Regenerated. * tsan/Makefile.in: Regenerated.
* other files: Merge from upstream r168514. * other files: Merge from upstream r168514.
2012-11-23 Kostya Serebryany <kcc@google.com> 2012-11-23 Kostya Serebryany <kcc@google.com>
* merge.sh: New file. * merge.sh: New file.
2012-11-23 Jakub Jelinek <jakub@redhat.com> 2012-11-23 Jakub Jelinek <jakub@redhat.com>
...@@ -32,7 +38,7 @@ ...@@ -32,7 +38,7 @@
2012-11-21 Kostya Serebryany <kcc@google.com> 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> 2012-11-20 Konstantin Serebryany <konstantin.s.serebryany@gmail.com>
......
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include 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 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 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 ACLOCAL_AMFLAGS = -I m4
......
...@@ -84,8 +84,7 @@ am__objects_1 = tsan_clock.lo tsan_interface_atomic.lo tsan_mutex.lo \ ...@@ -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_rtl.lo tsan_stat.lo tsan_sync.lo tsan_interceptors.lo \
tsan_md5.lo tsan_platform_mac.lo tsan_rtl_mutex.lo \ tsan_md5.lo tsan_platform_mac.lo tsan_rtl_mutex.lo \
tsan_suppressions.lo tsan_interface_ann.lo tsan_mman.lo \ tsan_suppressions.lo tsan_interface_ann.lo tsan_mman.lo \
tsan_rtl_report.lo \ tsan_rtl_report.lo tsan_symbolize_addr2line_linux.lo
tsan_symbolize_addr2line_linux.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) \
...@@ -238,6 +237,9 @@ top_build_prefix = @top_build_prefix@ ...@@ -238,6 +237,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include 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 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 ACLOCAL_AMFLAGS = -I m4
toolexeclib_LTLIBRARIES = libtsan.la toolexeclib_LTLIBRARIES = libtsan.la
......
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