From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id 685733852C66; Fri, 18 Nov 2022 08:41:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 685733852C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x22a.google.com with SMTP id u11so5918929ljk.6; Fri, 18 Nov 2022 00:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Z3MEExYkWI8KujxuxHbebwZZjI3jFaMPPfzySMdOVEc=; b=AaImLKw7yJR175WkWPOd391wxf5VtvVsdeMQi96HTnErhKECF7AEplCucH6IW8v3T3 E5SLngHJBL2j6CJEBPm6p6Smg/SNx3vyut2mNGZ7VUnPrrfXvZ/5OqI43M3lEWdVbJiC hZSSkd234l+sr7JOIjjYcYwSsaGc4EbeR1WuDOarPXlAhupic7WpYaWewb9n5gyTo++H HH7a1aoqaFemZOqy5tBLF7+Wg7oS+Hy54zhKmHFJNVWPveS+RP9pep6UEjmeEdBMGepw /f7TFo5w0Y+99EC3307OsVYE28SULMBvh7X0TIj+RtgbMcCz5vy85sgVv30eewHAJRYc cg0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Z3MEExYkWI8KujxuxHbebwZZjI3jFaMPPfzySMdOVEc=; b=vIEszMCVdpj4n4JonFjEEiuSTdaBMmpNOj3m5cqtZsYy/bnoiDibi5tikwEsh6s33l iZG9xY5CO4QapAghFeR/VHi9Qrs0jHtNSOFE7NpHw61CRkhwyup9EcN6H9mxMDIdHLCX GrsOnnWJs/E/mLaPohkf2yk/Kv+5RPAFFc/RJGDxGNZBig1CRCU/+05fXmyvnx8wQFB+ BJ2ogmMIRJIwOUMpF66Y5b0Q/y0dpSbmTrHg5hH8WqkfSldlOpnEuzjZh9r0lc9mtmqe VuBYIK0g+DphQyC/182ikc+ckeR3buQ8uY9Z+bIYCgk5LYHNz6XmUi0R5L0N8aZMLaLQ kC9Q== X-Gm-Message-State: ANoB5pnccLp9UPxsdtnLDXIQ3TrdBBCEAEGPAJoGnRXIx+i3VB/z1Fji Q/67eEc/ojcJg/f1qwkVVigfXhEUZf9VSCKdYphSWN0V X-Google-Smtp-Source: AA0mqf7/sBYsk1siTXYy/Q6FTRw4u+Fx/I/aOlwLgbZhjD+zKHLQGXWtP2kSX6cuBCGeOyXG1SGRt8pVJOBhyNNGpcM= X-Received: by 2002:a05:651c:337:b0:277:7714:3fca with SMTP id b23-20020a05651c033700b0027777143fcamr2090571ljp.529.1668760891801; Fri, 18 Nov 2022 00:41:31 -0800 (PST) MIME-Version: 1.0 References: <20221117210259.154569-1-aldot@gcc.gnu.org> In-Reply-To: <20221117210259.154569-1-aldot@gcc.gnu.org> From: Richard Biener Date: Fri, 18 Nov 2022 09:41:18 +0100 Message-ID: Subject: Re: [PATCH] libcpp: Add missing config for --enable-valgrind-annotations [PR107691] To: Bernhard Reutner-Fischer Cc: gcc-patches@gcc.gnu.org, Bernhard Reutner-Fischer Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Nov 17, 2022 at 10:04 PM Bernhard Reutner-Fischer via Gcc-patches wrote: > > --- > ceb17928e5d1d5 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. > > Tested with --enable-valgrind-annotations without valgrind installed > where it fixes errors thrown by test(1). And once with valgrind > installed. > Ok for trunk? OK. > libcpp/ChangeLog: > > PR preprocessor/107691 > * configure.ac: Add valgrind header checks. > * configure: Regenerate. > --- > libcpp/configure.ac | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > 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, > -- > 2.38.1 >