From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1472) id 9D9423858D37; Sat, 19 Nov 2022 11:20:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D9423858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668856802; bh=XjVmnpEol3aVcM+DMLWqgQ0eaDwjkXtSHeSPZqWflqQ=; h=From:To:Subject:Date:From; b=bxiEwI86NL2DPVKcOdmMwYvToHZYlf78HPwMOsEw2OC12WtjsAAoHG/xMWfQI+guq TpFRVJuJdzAWo7fF299Qt8K5CuSJ7fJ5EQ+2xviT29vBlUbW+NOjNNltGjow6HUFR9 MRLpTGDIAwGUPQQuNtP7iS8DNcsNy4N3e0w6hDBI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Bernhard Reutner-Fischer To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4165] libcpp: Add missing config for --enable-valgrind-annotations [PR107691] X-Act-Checkin: gcc X-Git-Author: Bernhard Reutner-Fischer X-Git-Refname: refs/heads/master X-Git-Oldrev: 0a62889c7a155f8ed971860d68870dc9c46bb004 X-Git-Newrev: 5a6c698ea31f587151a2fa4a982c8cc43bd9cc45 Message-Id: <20221119112002.9D9423858D37@sourceware.org> Date: Sat, 19 Nov 2022 11:20:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5a6c698ea31f587151a2fa4a982c8cc43bd9cc45 commit r13-4165-g5a6c698ea31f587151a2fa4a982c8cc43bd9cc45 Author: Bernhard Reutner-Fischer Date: Thu Nov 17 21:40:53 2022 +0100 libcpp: Add missing config for --enable-valgrind-annotations [PR107691] r7-912 copied (parts of) the valgrind annotation checks from gcc to libcpp. The above copies the missing pieces to libcpp to diagnose when libcpp is configured with --enable-valgrind-annotations but valgrind is not installed. libcpp/ChangeLog: PR preprocessor/107691 * configure.ac: Add valgrind header checks. * configure: Regenerate. Diff: --- libcpp/configure | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ libcpp/configure.ac | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/libcpp/configure b/libcpp/configure index 75145390215..e9937cde330 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -7835,6 +7835,62 @@ 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 " >&5 +$as_echo_n "checking for VALGRIND_DISCARD in ... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#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 " >&5 +$as_echo_n "checking for VALGRIND_DISCARD in ... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#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; @@ -7847,6 +7903,7 @@ if test x$enable_valgrind_annotations != xno \ 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 diff --git a/libcpp/configure.ac b/libcpp/configure.ac index 9b6042518e5..89ac99b04bd 100644 --- a/libcpp/configure.ac +++ b/libcpp/configure.ac @@ -226,6 +226,40 @@ 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 ) +AC_PREPROC_IFELSE([AC_LANG_SOURCE( + [[#include +#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 ) +AC_PREPROC_IFELSE([AC_LANG_SOURCE( + [[#include +#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])], [], @@ -235,6 +269,7 @@ if test x$enable_valgrind_annotations != xno \ 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,