mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-27 05:44:15 +08:00
Revert 2015-11-09 sanitizer/obstack configury
The 2015-11-23 sanitizer merge from upstream lost the changes from
f6528435 to sanitizer_common/sanitizer_common_interceptors.inc, which
made use of _OBSTACK_SIZE_T. So the configury changes to define
_OBSTACK_SIZE_T don't do anything. This wasn't such a bad thing
anyway.. The configure test wrongly adds -I${srcdir}/../include,
effectively resulting in a test of libiberty/obstack rather than libc
obstack support, and it's the latter that asan and tsan need to work
with.
So, remove the useless configure test. Upstream santizer project has
been made aware of the problem if glibc obstack support is ever
updated. Bootsrapped etc. x86_64-linux and committed as obvious.
Revert 2015-11-09 Alan Modra <amodra@gmail.com>
* configure.ac: Don't substitute OBSTACK_DEFS.
* asan/Makefile.am: Remove OBSTACK_DEFS from DEFS.
* tsan/Makefile.am: Likewise.
* configure: Regenerate.
* Makefile.in: Regenerate.
* asan/Makefile.in: Regenerate.
* interception/Makefile.in: Regenerate.
* libbacktrace/Makefile.in: Regenerate.
* lsan/Makefile.in: Regenerate.
* sanitizer_common/Makefile.in: Regenerate.
* tsan/Makefile.in: Regenerate.
* ubsan/Makefile.in: Regenerate.
From-SVN: r238701
This commit is contained in:
Alan Modra
Alan Modra
parent
7bfd96b7a6
commit
aa00995cd7
@ -1,3 +1,19 @@
|
||||
2016-07-23 Alan Modra <amodra@gmail.com>
|
||||
|
||||
Revert 2015-11-09 Alan Modra <amodra@gmail.com>
|
||||
* configure.ac: Don't substitute OBSTACK_DEFS.
|
||||
* asan/Makefile.am: Remove OBSTACK_DEFS from DEFS.
|
||||
* tsan/Makefile.am: Likewise.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in: Regenerate.
|
||||
* asan/Makefile.in: Regenerate.
|
||||
* interception/Makefile.in: Regenerate.
|
||||
* libbacktrace/Makefile.in: Regenerate.
|
||||
* lsan/Makefile.in: Regenerate.
|
||||
* sanitizer_common/Makefile.in: Regenerate.
|
||||
* tsan/Makefile.in: Regenerate.
|
||||
* ubsan/Makefile.in: Regenerate.
|
||||
|
||||
2016-05-17 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR sanitizer/71160
|
||||
|
||||
@ -198,7 +198,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -3,7 +3,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
|
||||
# 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 -DASAN_HAS_EXCEPTIONS=1 -DASAN_NEEDS_SEGV=1 -DCAN_SANITIZE_UB=0 @OBSTACK_DEFS@
|
||||
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 -DASAN_NEEDS_SEGV=1 -DCAN_SANITIZE_UB=0
|
||||
if USING_MAC_INTERPOSE
|
||||
DEFS += -DMAC_INTERPOSE_FUNCTIONS -DMISSING_BLOCKS_SUPPORT
|
||||
endif
|
||||
|
||||
@ -173,7 +173,7 @@ CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS \
|
||||
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \
|
||||
-DASAN_HAS_EXCEPTIONS=1 -DASAN_NEEDS_SEGV=1 \
|
||||
-DCAN_SANITIZE_UB=0 @OBSTACK_DEFS@ $(am__append_1)
|
||||
-DCAN_SANITIZE_UB=0 $(am__append_1)
|
||||
DEPDIR = @DEPDIR@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
DUMPBIN = @DUMPBIN@
|
||||
@ -207,7 +207,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
38
libsanitizer/configure
vendored
38
libsanitizer/configure
vendored
@ -607,7 +607,6 @@ LIBOBJS
|
||||
TSAN_TARGET_DEPENDENT_OBJECTS
|
||||
LIBBACKTRACE_SUPPORTED_FALSE
|
||||
LIBBACKTRACE_SUPPORTED_TRUE
|
||||
OBSTACK_DEFS
|
||||
RPC_DEFS
|
||||
BACKTRACE_SUPPORTS_THREADS
|
||||
BACKTRACE_USES_MALLOC
|
||||
@ -12028,7 +12027,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12031 "configure"
|
||||
#line 12030 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12134,7 +12133,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12137 "configure"
|
||||
#line 12136 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -16474,39 +16473,6 @@ fi
|
||||
RPC_DEFS=$rpc_defs
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking obstack params" >&5
|
||||
$as_echo_n "checking obstack params... " >&6; }
|
||||
if test "${libsanitizer_cv_sys_obstack+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
save_cppflags=$CPPFLAGS
|
||||
CPPFLAGS="-I${srcdir}/../include -o conftest.iii $CPPFLAGS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include "obstack.h"
|
||||
#ifdef _OBSTACK_SIZE_T
|
||||
_OBSTACK_SIZE_T
|
||||
#else
|
||||
int
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
libsanitizer_cv_sys_obstack=`sed -e '/^#/d;/^[ ]*$/d' conftest.iii | sed -e '$!d;s/size_t/SIZE_T/'`
|
||||
else
|
||||
libsanitizer_cv_sys_obstack=int
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
CPPFLAGS=$save_cppflags
|
||||
rm -f conftest.iii
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libsanitizer_cv_sys_obstack" >&5
|
||||
$as_echo "$libsanitizer_cv_sys_obstack" >&6; }
|
||||
OBSTACK_DEFS=-D_OBSTACK_SIZE_T=\"$libsanitizer_cv_sys_obstack\"
|
||||
|
||||
|
||||
if test "x${BACKTRACE_SUPPORTED}x${BACKTRACE_USES_MALLOC}" = "x1x0"; then
|
||||
LIBBACKTRACE_SUPPORTED_TRUE=
|
||||
LIBBACKTRACE_SUPPORTED_FALSE='#'
|
||||
|
||||
@ -339,30 +339,6 @@ fi
|
||||
|
||||
AC_SUBST([RPC_DEFS], [$rpc_defs])
|
||||
|
||||
dnl If this file is processed by autoconf-2.67 or later then the CPPFLAGS
|
||||
dnl "-o conftest.iii" can disappear, conftest.iii be replaced with
|
||||
dnl conftest.i in the sed command line, and the rm deleted.
|
||||
dnl Not all cpp's accept -o, and gcc -E does not accept a second file
|
||||
dnl argument as the output file.
|
||||
AC_CACHE_CHECK([obstack params],
|
||||
[libsanitizer_cv_sys_obstack],
|
||||
[save_cppflags=$CPPFLAGS
|
||||
CPPFLAGS="-I${srcdir}/../include -o conftest.iii $CPPFLAGS"
|
||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE([
|
||||
#include "obstack.h"
|
||||
#ifdef _OBSTACK_SIZE_T
|
||||
_OBSTACK_SIZE_T
|
||||
#else
|
||||
int
|
||||
#endif
|
||||
])],
|
||||
[libsanitizer_cv_sys_obstack=`sed -e '/^#/d;/^[ ]*$/d' conftest.iii | sed -e '$!d;s/size_t/SIZE_T/'`],
|
||||
[libsanitizer_cv_sys_obstack=int])
|
||||
CPPFLAGS=$save_cppflags
|
||||
rm -f conftest.iii
|
||||
])
|
||||
AC_SUBST([OBSTACK_DEFS], [-D_OBSTACK_SIZE_T=\"$libsanitizer_cv_sys_obstack\"])
|
||||
|
||||
AM_CONDITIONAL(LIBBACKTRACE_SUPPORTED,
|
||||
[test "x${BACKTRACE_SUPPORTED}x${BACKTRACE_USES_MALLOC}" = "x1x0"])
|
||||
|
||||
|
||||
@ -157,7 +157,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -199,7 +199,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -198,7 +198,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -186,7 +186,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -3,7 +3,7 @@ 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 -DCAN_SANITIZE_UB=0 @OBSTACK_DEFS@
|
||||
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DCAN_SANITIZE_UB=0
|
||||
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
|
||||
AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
|
||||
AM_CXXFLAGS += -std=gnu++11
|
||||
|
||||
@ -179,7 +179,7 @@ CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DCAN_SANITIZE_UB=0 @OBSTACK_DEFS@
|
||||
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DCAN_SANITIZE_UB=0
|
||||
DEPDIR = @DEPDIR@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
DUMPBIN = @DUMPBIN@
|
||||
@ -213,7 +213,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
@ -196,7 +196,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OBSTACK_DEFS = @OBSTACK_DEFS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user