diff options
author | Marek Polacek <mpolacek@gcc.gnu.org> | 2013-08-30 16:12:58 +0000 |
---|---|---|
committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2013-08-30 16:12:58 +0000 |
commit | de5a5fa1395db2cb5da4d0593fef40ec22378576 (patch) | |
tree | 23d42aa647cb7a2de96792b724ecaaddee3423fa /libsanitizer/configure | |
parent | f07f30cfb5efe0806dedaea03b56c574da1b372c (diff) | |
download | gcc-de5a5fa1395db2cb5da4d0593fef40ec22378576.zip gcc-de5a5fa1395db2cb5da4d0593fef40ec22378576.tar.gz gcc-de5a5fa1395db2cb5da4d0593fef40ec22378576.tar.bz2 |
Merge ubsan into trunk.
From-SVN: r202113
Diffstat (limited to 'libsanitizer/configure')
-rwxr-xr-x | libsanitizer/configure | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libsanitizer/configure b/libsanitizer/configure index 19a1037..2cad869 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -14543,7 +14543,7 @@ fi ac_config_files="$ac_config_files Makefile" -ac_config_files="$ac_config_files interception/Makefile sanitizer_common/Makefile asan/Makefile" +ac_config_files="$ac_config_files interception/Makefile sanitizer_common/Makefile asan/Makefile ubsan/Makefile" if test "x$TSAN_SUPPORTED" = "xyes"; then @@ -15674,6 +15674,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" ;; + "ubsan/Makefile") CONFIG_FILES="$CONFIG_FILES ubsan/Makefile" ;; "tsan/Makefile") CONFIG_FILES="$CONFIG_FILES tsan/Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -17039,6 +17040,17 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; + "ubsan/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;} + ;; "tsan/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF |