mirror of
https://github.com/gcc-mirror/gcc.git
synced 2024-11-21 13:40:47 +00:00
libcpp: configure: drop unused Valgrind detection
When top-level configure has either --enable-checking=valgrind or --enable-valgrind-annotations, we want to activate a couple of workarounds in libcpp. They do not use anything from the Valgrind API, so just delete all detection. libcpp/ChangeLog: * config.in: Regenerate. * configure: Regenerate. * configure.ac (ENABLE_VALGRIND_CHECKING): Delete. (ENABLE_VALGRIND_ANNOTATIONS): Rename to ENABLE_VALGRIND_WORKAROUNDS. Delete Valgrind header checks. * lex.cc (new_buff): Adjust for renaming. (_cpp_free_buff): Ditto.
This commit is contained in:
Alexander Monakov
parent
3eb9cae6d3
commit
ab78426ae7
@ -24,12 +24,9 @@
|
||||
language is requested. */
|
||||
#undef ENABLE_NLS
|
||||
|
||||
/* Define to get calls to the valgrind runtime enabled. */
|
||||
#undef ENABLE_VALGRIND_ANNOTATIONS
|
||||
|
||||
/* Define if you want to workaround valgrind (a memory checker) warnings about
|
||||
possible memory leaks because of libcpp use of interior pointers. */
|
||||
#undef ENABLE_VALGRIND_CHECKING
|
||||
/* Define if you want to workaround Valgrind warnings about possible memory
|
||||
leaks because of libcpp use of interior pointers. */
|
||||
#undef ENABLE_VALGRIND_WORKAROUNDS
|
||||
|
||||
/* Define to 1 if you have `alloca', as a function or macro. */
|
||||
#undef HAVE_ALLOCA
|
||||
@ -201,9 +198,6 @@
|
||||
/* Define to 1 if you have the <locale.h> header file. */
|
||||
#undef HAVE_LOCALE_H
|
||||
|
||||
/* Define if valgrind's memcheck.h header is installed. */
|
||||
#undef HAVE_MEMCHECK_H
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
@ -252,9 +246,6 @@
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define if valgrind's valgrind/memcheck.h header is installed. */
|
||||
#undef HAVE_VALGRIND_MEMCHECK_H
|
||||
|
||||
/* Define as const if the declaration of iconv() needs const. */
|
||||
#undef ICONV_CONST
|
||||
|
||||
|
||||
70
libcpp/configure
vendored
70
libcpp/configure
vendored
@ -9116,12 +9116,6 @@ $as_echo "#define ENABLE_ASSERT_CHECKING 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test x$ac_valgrind_checking != x ; then
|
||||
|
||||
$as_echo "#define ENABLE_VALGRIND_CHECKING 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --enable-canonical-system-headers was given.
|
||||
if test "${enable_canonical_system_headers+set}" = set; then :
|
||||
enableval=$enable_canonical_system_headers;
|
||||
@ -9405,62 +9399,6 @@ case x$enable_languages in
|
||||
esac
|
||||
|
||||
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valgrind_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_valgrind_h" = xyes; then :
|
||||
have_valgrind_h=yes
|
||||
else
|
||||
have_valgrind_h=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# It is certainly possible that there's valgrind but no valgrind.h.
|
||||
# GCC relies on making annotations so we must have both.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND_DISCARD in <valgrind/memcheck.h>" >&5
|
||||
$as_echo_n "checking for VALGRIND_DISCARD in <valgrind/memcheck.h>... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <valgrind/memcheck.h>
|
||||
#ifndef VALGRIND_DISCARD
|
||||
#error VALGRIND_DISCARD not defined
|
||||
#endif
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
gcc_cv_header_valgrind_memcheck_h=yes
|
||||
else
|
||||
gcc_cv_header_valgrind_memcheck_h=no
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_valgrind_memcheck_h" >&5
|
||||
$as_echo "$gcc_cv_header_valgrind_memcheck_h" >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND_DISCARD in <memcheck.h>" >&5
|
||||
$as_echo_n "checking for VALGRIND_DISCARD in <memcheck.h>... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <memcheck.h>
|
||||
#ifndef VALGRIND_DISCARD
|
||||
#error VALGRIND_DISCARD not defined
|
||||
#endif
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
gcc_cv_header_memcheck_h=yes
|
||||
else
|
||||
gcc_cv_header_memcheck_h=no
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_memcheck_h" >&5
|
||||
$as_echo "$gcc_cv_header_memcheck_h" >&6; }
|
||||
if test $gcc_cv_header_valgrind_memcheck_h = yes; then
|
||||
|
||||
$as_echo "#define HAVE_VALGRIND_MEMCHECK_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
if test $gcc_cv_header_memcheck_h = yes; then
|
||||
|
||||
$as_echo "#define HAVE_MEMCHECK_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
# Check whether --enable-valgrind-annotations was given.
|
||||
if test "${enable_valgrind_annotations+set}" = set; then :
|
||||
enableval=$enable_valgrind_annotations;
|
||||
@ -9470,14 +9408,8 @@ fi
|
||||
|
||||
if test x$enable_valgrind_annotations != xno \
|
||||
|| test x$ac_valgrind_checking != x; then
|
||||
if (test $have_valgrind_h = no \
|
||||
&& test $gcc_cv_header_memcheck_h = no \
|
||||
&& test $gcc_cv_header_valgrind_memcheck_h = no); then
|
||||
as_fn_error $? "*** valgrind annotations requested, but" "$LINENO" 5
|
||||
as_fn_error $? "*** Can't find valgrind/memcheck.h, memcheck.h or valgrind.h" "$LINENO" 5
|
||||
fi
|
||||
|
||||
$as_echo "#define ENABLE_VALGRIND_ANNOTATIONS 1" >>confdefs.h
|
||||
$as_echo "#define ENABLE_VALGRIND_WORKAROUNDS 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@ -185,12 +185,6 @@ if test x$ac_assert_checking != x ; then
|
||||
[Define if you want assertions enabled. This is a cheap check.])
|
||||
fi
|
||||
|
||||
if test x$ac_valgrind_checking != x ; then
|
||||
AC_DEFINE(ENABLE_VALGRIND_CHECKING, 1,
|
||||
[Define if you want to workaround valgrind (a memory checker) warnings about
|
||||
possible memory leaks because of libcpp use of interior pointers.])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(canonical-system-headers,
|
||||
[ --enable-canonical-system-headers
|
||||
enable or disable system headers canonicalization],
|
||||
@ -241,54 +235,15 @@ case x$enable_languages in
|
||||
esac
|
||||
AC_SUBST(CET_HOST_FLAGS)
|
||||
|
||||
dnl # This check AC_REQUIREs various stuff, so it *must not* be inside
|
||||
dnl # an if statement. This was the source of very frustrating bugs
|
||||
dnl # in converting to autoconf 2.5x!
|
||||
AC_CHECK_HEADER(valgrind.h, have_valgrind_h=yes, have_valgrind_h=no)
|
||||
|
||||
# It is certainly possible that there's valgrind but no valgrind.h.
|
||||
# GCC relies on making annotations so we must have both.
|
||||
AC_MSG_CHECKING(for VALGRIND_DISCARD in <valgrind/memcheck.h>)
|
||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE(
|
||||
[[#include <valgrind/memcheck.h>
|
||||
#ifndef VALGRIND_DISCARD
|
||||
#error VALGRIND_DISCARD not defined
|
||||
#endif]])],
|
||||
[gcc_cv_header_valgrind_memcheck_h=yes],
|
||||
[gcc_cv_header_valgrind_memcheck_h=no])
|
||||
AC_MSG_RESULT($gcc_cv_header_valgrind_memcheck_h)
|
||||
AC_MSG_CHECKING(for VALGRIND_DISCARD in <memcheck.h>)
|
||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE(
|
||||
[[#include <memcheck.h>
|
||||
#ifndef VALGRIND_DISCARD
|
||||
#error VALGRIND_DISCARD not defined
|
||||
#endif]])],
|
||||
[gcc_cv_header_memcheck_h=yes],
|
||||
[gcc_cv_header_memcheck_h=no])
|
||||
AC_MSG_RESULT($gcc_cv_header_memcheck_h)
|
||||
if test $gcc_cv_header_valgrind_memcheck_h = yes; then
|
||||
AC_DEFINE(HAVE_VALGRIND_MEMCHECK_H, 1,
|
||||
[Define if valgrind's valgrind/memcheck.h header is installed.])
|
||||
fi
|
||||
if test $gcc_cv_header_memcheck_h = yes; then
|
||||
AC_DEFINE(HAVE_MEMCHECK_H, 1,
|
||||
[Define if valgrind's memcheck.h header is installed.])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(valgrind-annotations,
|
||||
[AS_HELP_STRING([--enable-valgrind-annotations],
|
||||
[enable valgrind runtime interaction])], [],
|
||||
[enable_valgrind_annotations=no])
|
||||
if test x$enable_valgrind_annotations != xno \
|
||||
|| test x$ac_valgrind_checking != x; then
|
||||
if (test $have_valgrind_h = no \
|
||||
&& test $gcc_cv_header_memcheck_h = no \
|
||||
&& test $gcc_cv_header_valgrind_memcheck_h = no); then
|
||||
AC_MSG_ERROR([*** valgrind annotations requested, but])
|
||||
AC_MSG_ERROR([*** Can't find valgrind/memcheck.h, memcheck.h or valgrind.h])
|
||||
fi
|
||||
AC_DEFINE(ENABLE_VALGRIND_ANNOTATIONS, 1,
|
||||
[Define to get calls to the valgrind runtime enabled.])
|
||||
AC_DEFINE(ENABLE_VALGRIND_WORKAROUNDS, 1,
|
||||
[Define if you want to workaround Valgrind warnings about
|
||||
possible memory leaks because of libcpp use of interior pointers.])
|
||||
fi
|
||||
|
||||
# Output.
|
||||
|
||||
@ -4762,7 +4762,7 @@ new_buff (size_t len)
|
||||
len = MIN_BUFF_SIZE;
|
||||
len = CPP_ALIGN (len);
|
||||
|
||||
#ifdef ENABLE_VALGRIND_ANNOTATIONS
|
||||
#ifdef ENABLE_VALGRIND_WORKAROUNDS
|
||||
/* Valgrind warns about uses of interior pointers, so put _cpp_buff
|
||||
struct first. */
|
||||
size_t slen = CPP_ALIGN2 (sizeof (_cpp_buff), 2 * DEFAULT_ALIGNMENT);
|
||||
@ -4859,7 +4859,7 @@ _cpp_free_buff (_cpp_buff *buff)
|
||||
for (; buff; buff = next)
|
||||
{
|
||||
next = buff->next;
|
||||
#ifdef ENABLE_VALGRIND_ANNOTATIONS
|
||||
#ifdef ENABLE_VALGRIND_WORKAROUNDS
|
||||
free (buff);
|
||||
#else
|
||||
free (buff->base);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user