summaryrefslogtreecommitdiff
path: root/libsanitizer/configure
diff options
context:
space:
mode:
authorWei Mi <wmi@google.com>2012-11-22 22:03:11 +0000
committerWei Mi <wmi@gcc.gnu.org>2012-11-22 22:03:11 +0000
commitcd0be65c262d477ac094fc1038824f766d976999 (patch)
treef83ad11b95452b47f813e942d24914f31a50394e /libsanitizer/configure
parent32b4b7f53e341be663438f69fd6cb2f909427188 (diff)
tsan: New directory.
libsanitizer/ * tsan: New directory. Import tsan runtime from llvm. * configure.ac: Add 64 bits tsan build. * Makefile.am: Likewise. * configure: Regenerated. * Makefile.in: Likewise. From-SVN: r193737
Diffstat (limited to 'libsanitizer/configure')
-rwxr-xr-xlibsanitizer/configure35
1 files changed, 33 insertions, 2 deletions
diff --git a/libsanitizer/configure b/libsanitizer/configure
index e3b3928f2c0..519b1db8932 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -604,6 +604,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+MULTISUBDIR32_FALSE
+MULTISUBDIR32_TRUE
enable_static
enable_shared
CXXCPP
@@ -10898,7 +10900,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10901 "configure"
+#line 10903 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11004,7 +11006,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11007 "configure"
+#line 11009 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14266,6 +14268,14 @@ if test "${multilib}" = "yes"; then
else
multilib_arg=
fi
+ if test "x$with_multisubdir" = "x32"; then
+ MULTISUBDIR32_TRUE=
+ MULTISUBDIR32_FALSE='#'
+else
+ MULTISUBDIR32_TRUE='#'
+ MULTISUBDIR32_FALSE=
+fi
+
ac_config_files="$ac_config_files Makefile"
@@ -14273,6 +14283,11 @@ ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files interception/Makefile sanitizer_common/Makefile asan/Makefile"
+if test "x$with_multisubdir" != "x32"; then
+ ac_config_files="$ac_config_files tsan/Makefile"
+
+fi
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -14434,6 +14449,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${MULTISUBDIR32_TRUE}" && test -z "${MULTISUBDIR32_FALSE}"; then
+ as_fn_error "conditional \"MULTISUBDIR32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
@@ -15388,6 +15407,7 @@ do
"interception/Makefile") CONFIG_FILES="$CONFIG_FILES interception/Makefile" ;;
"sanitizer_common/Makefile") CONFIG_FILES="$CONFIG_FILES sanitizer_common/Makefile" ;;
"asan/Makefile") CONFIG_FILES="$CONFIG_FILES asan/Makefile" ;;
+ "tsan/Makefile") CONFIG_FILES="$CONFIG_FILES tsan/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -16752,6 +16772,17 @@ _EOF
. ${multi_basedir}/config-ml.in
{ ml_norecursion=; unset ml_norecursion;}
;;
+ "tsan/Makefile":F) cat > vpsed$$ << \_EOF
+s!`test -f '$<' || echo '$(srcdir)/'`!!
+_EOF
+ sed -f vpsed$$ $ac_file > tmp$$
+ mv tmp$$ $ac_file
+ rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ ml_norecursion=yes
+ . ${multi_basedir}/config-ml.in
+ { ml_norecursion=; unset ml_norecursion;}
+ ;;
esac
done # for ac_tag