diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-11-23 01:31:54 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-11-23 01:31:54 +0100 |
| commit | 64548f3b797617cde14f01874e56c498fe7b5a48 (patch) | |
| tree | 339414cc4c7cfeb18efd639d3d7dc3f403afa560 /libsanitizer/configure.ac | |
| parent | 8e5038ffa42bc77bce5fa30eb11e5c94fdb0fc74 (diff) | |
| download | gcc-64548f3b797617cde14f01874e56c498fe7b5a48.tar.gz | |
Makefile.am (AM_CXXFLAGS): Remove -Wno-variadic-macros.
* tsan/Makefile.am (AM_CXXFLAGS): Remove -Wno-variadic-macros.
* Makefile.am (SUBDIRS): Guard tsan addition with TSAN_SUPPORTED
automake conditional instead of !MULTISUBDIR32.
* configure.tgt: Set TSAN_SUPPORTED=yes for x86_64/i686-linux
for 64-bit multilib.
* configure.ac: Check for void * size, source in configure.tgt,
define TSAN_SUPPORTED conditional instead of MULTILIBDIR32.
* configure: Regenerated.
* Makefile.in: Regenerated.
* tsan/Makefile.in: Regenerated.
From-SVN: r193741
Diffstat (limited to 'libsanitizer/configure.ac')
| -rw-r--r-- | libsanitizer/configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac index 0f9e185aa2a..45183db609f 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -67,12 +67,18 @@ AM_PROG_LIBTOOL AC_SUBST(enable_shared) AC_SUBST(enable_static) +AC_CHECK_SIZEOF([void *]) + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else multilib_arg= fi -AM_CONDITIONAL(MULTISUBDIR32, [test "x$with_multisubdir" = "x32"]) + +# Get target configury. +unset TSAN_SUPPORTED +. ${srcdir}/configure.tgt +AM_CONDITIONAL(TSAN_SUPPORTED, [test "x$TSAN_SUPPORTED" = "xyes"]) AC_CONFIG_FILES([Makefile]) @@ -89,7 +95,7 @@ _EOF AS_UNSET([ml_norecursion]) ]) -if test "x$with_multisubdir" != "x32"; then +if test "x$TSAN_SUPPORTED" = "xyes"; then AC_CONFIG_FILES(AC_FOREACH([DIR], [tsan], [DIR/Makefile ]), [cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! |