From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id 1831B3858000 for ; Fri, 24 Nov 2023 08:11:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1831B3858000 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1831B3858000 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::136 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700813476; cv=none; b=KmoR6E69YhSi4nVg9bSG3FmAHikaZoI556hczgUizC3gn3E4CGcPREsHGYydpEaQnFW2gaVgOfqb6b6Ec0d8Z9vcan/FhZcbZoYZjKKvuSoQkStJdAGS2i9kiC8WKREl88/cy0RGgyNQbZrkimw9MhOyrmY0T2OBKjkPZhqgElU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700813476; c=relaxed/simple; bh=UYzd5X6SLjwLPLQdxYdcINREPNl5kZmM7Sikkxkg978=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=YhU+Ug7hE9ezYwLgvL3ZJqmwHo7T+w+55X65uLXWmeKAzfs3KBa2ClP7uWtGfCOX831IVugvaBq72583pL0jVEzKbBEW41eTKByyGL6yJfE/CHlooqOrG2/2KVyV5SsDWnbaaW/qdKPB/JqvzPS3otWlbFZ0bziqnqyjiYtFan8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-50a6ff9881fso2446645e87.1 for ; Fri, 24 Nov 2023 00:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700813472; x=1701418272; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=AwNaiE+tt1B8YrL/kwXexUtgYQ8LzcNwPJUzpeU5iao=; b=jZCuQeoS8O23DeW9a/wu5eWfMfFDf1C4+DqkzAXnextRYH/1lGsjBLQm7IKdSkMP+7 J9B79P7yxPxbEGx28sWC5PdAc/5F/IrxscyhH0aDwiG1Vlo3iOOqHp2B8Qhjll0B54Jd ZpkscBYU/BtXAlYcfD1azqJa+NKMgQ2zkC/+2LMsYFFta2i9FyyoaK4yJeWDCeQ4Osqp i7jeRJwnEtW5fkD3x3zb6G1t3C3qpT9M8+mqYdEs7z+Mpv1ZIl0Pub1nZ/wniaI0go9K Q/xUBPc+98PiOOT54jSUq+BoQ/t43aGRwhga0stDFHOzp2H+xQ/MOFP2Nmi1uOyPAZeU 1Syg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700813472; x=1701418272; h=content-transfer-encoding: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=AwNaiE+tt1B8YrL/kwXexUtgYQ8LzcNwPJUzpeU5iao=; b=RusMGhA41Ool5xcr8EOw89/OKNlrpz9ZC8oWTIqwUdRBtvKtcfL+A0uFxtzvdNil8c 22VPs/ZaE76HQBB4/D+CAewJed29PtvqX/DN9CBefv4ecl0K65NwlNiPcYYp7Y2T0Kil fGZzQmC6mu31udiyyDuEHvBcDWy6uxlsNpa4sx70pxyu6Nu64zDMXVcptNdI0DUrXFQg 13TwP5lCjru9YYyWrmfuFriXpr/ylYgN3S+uT6XzY313P9SMby26EcnWR+dN/bMfIRdQ ZL6/GlhNX/mPLgKi+NAVTNx6HmSdTZ/KJqTfBuI2/QHbmL9WbATKVyRWdkCvlJhMsvg5 3mVw== X-Gm-Message-State: AOJu0YyaoWNDDmRev7URLBPGl5pd3S9TUUkEzBmCWebAaHhXlfp665iY k+qFB0K1ojrgeA9cS/p0yy+eS8EdoM1UwXikSDE= X-Google-Smtp-Source: AGHT+IFMySG7VZW3mIaOxTwEfu+JAbPdsQR4sAQhi5WEczwPVoLO/unfnPtGl+9cf4UGvDYFE0N2s08E3a+KHZhZCno= X-Received: by 2002:ac2:4da3:0:b0:4fe:1681:9377 with SMTP id h3-20020ac24da3000000b004fe16819377mr1110553lfe.44.1700813472297; Fri, 24 Nov 2023 00:11:12 -0800 (PST) MIME-Version: 1.0 References: <20231123181343.27624-1-amonakov@ispras.ru> <20231123181343.27624-3-amonakov@ispras.ru> In-Reply-To: <20231123181343.27624-3-amonakov@ispras.ru> From: Richard Biener Date: Fri, 24 Nov 2023 09:10:57 +0100 Message-ID: Subject: Re: [PATCH 2/2] gcc: configure: drop Valgrind 3.1 compatibility To: Alexander Monakov Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.5 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,T_SCC_BODY_TEXT_LINE 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 23, 2023 at 7:14=E2=80=AFPM Alexander Monakov wrote: > > Our system.h and configure.ac try to accommodate valgrind-3.1, but it is > more than 15 years old at this point. As Valgrind-based checking is a > developer-oriented feature, drop the compatibility stuff and streamline > the detection. OK. > gcc/ChangeLog: > > * config.in: Regenerate. > * configure: Regenerate. > * configure.ac: Delete manual checks for old Valgrind headers. > * system.h (VALGRIND_MAKE_MEM_NOACCESS): Delete. > (VALGRIND_MAKE_MEM_DEFINED): Delete. > (VALGRIND_MAKE_MEM_UNDEFINED): Delete. > (VALGRIND_MALLOCLIKE_BLOCK): Delete. > (VALGRIND_FREELIKE_BLOCK): Delete. > --- > gcc/config.in | 12 -------- > gcc/configure | 80 ++++++++---------------------------------------- > gcc/configure.ac | 49 +++-------------------------- > gcc/system.h | 23 ++------------ > 4 files changed, 20 insertions(+), 144 deletions(-) > > diff --git a/gcc/config.in b/gcc/config.in > index e100c20dcd..3dfc65b844 100644 > --- a/gcc/config.in > +++ b/gcc/config.in > @@ -1868,12 +1868,6 @@ > #endif > > > -/* Define if valgrind's memcheck.h header is installed. */ > -#ifndef USED_FOR_TARGET > -#undef HAVE_MEMCHECK_H > -#endif > - > - > /* Define to 1 if you have the header file. */ > #ifndef USED_FOR_TARGET > #undef HAVE_MEMORY_H > @@ -2136,12 +2130,6 @@ > #endif > > > -/* Define if valgrind's valgrind/memcheck.h header is installed. */ > -#ifndef USED_FOR_TARGET > -#undef HAVE_VALGRIND_MEMCHECK_H > -#endif > - > - > /* Define to 1 if you have the `vfork' function. */ > #ifndef USED_FOR_TARGET > #undef HAVE_VFORK > diff --git a/gcc/configure b/gcc/configure > index cc0c3aad67..5be4592ba0 100755 > --- a/gcc/configure > +++ b/gcc/configure > @@ -7679,63 +7679,6 @@ $as_echo "#define ENABLE_FOLD_CHECKING 1" >>confde= fs.h > fi > valgrind_path_defines=3D > valgrind_command=3D > - > -ac_fn_cxx_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valg= rind_h" "$ac_includes_default" > -if test "x$ac_cv_header_valgrind_h" =3D xyes; then : > - have_valgrind_h=3Dyes > -else > - have_valgrind_h=3Dno > -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 i= n " >&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_cxx_try_cpp "$LINENO"; then : > - gcc_cv_header_valgrind_memcheck_h=3Dyes > -else > - gcc_cv_header_valgrind_memcheck_h=3Dno > -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 i= n " >&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_cxx_try_cpp "$LINENO"; then : > - gcc_cv_header_memcheck_h=3Dyes > -else > - gcc_cv_header_memcheck_h=3Dno > -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 =3D yes; then > - > -$as_echo "#define HAVE_VALGRIND_MEMCHECK_H 1" >>confdefs.h > - > -fi > -if test $gcc_cv_header_memcheck_h =3D yes; then > - > -$as_echo "#define HAVE_MEMCHECK_H 1" >>confdefs.h > - > -fi > - > if test x$ac_valgrind_checking !=3D x ; then > > # Prepare PATH_SEPARATOR. > @@ -7804,11 +7747,8 @@ else > $as_echo "no" >&6; } > fi > > - if test "x$valgrind_path" =3D "x" \ > - || (test $have_valgrind_h =3D no \ > - && test $gcc_cv_header_memcheck_h =3D no \ > - && test $gcc_cv_header_valgrind_memcheck_h =3D no); then > - as_fn_error $? "*** Can't find both valgrind and valgrind/memchec= k.h, memcheck.h or valgrind.h" "$LINENO" 5 > + if test "x$valgrind_path" =3D "x"; then > + as_fn_error $? "*** Cannot find valgrind" "$LINENO" 5 > fi > valgrind_path_defines=3D-DVALGRIND_PATH=3D'\"'$valgrind_path'\"' > valgrind_command=3D"$valgrind_path -q" > @@ -7864,12 +7804,16 @@ else > enable_valgrind_annotations=3Dno > fi > > +ac_fn_cxx_check_header_mongrel "$LINENO" "valgrind/memcheck.h" "ac_cv_he= ader_valgrind_memcheck_h" "$ac_includes_default" > +if test "x$ac_cv_header_valgrind_memcheck_h" =3D xyes; then : > + > +fi > + > + > if test x$enable_valgrind_annotations !=3D xno \ > || test x$ac_valgrind_checking !=3D x; then > - if (test $have_valgrind_h =3D no \ > - && test $gcc_cv_header_memcheck_h =3D no \ > - && test $gcc_cv_header_valgrind_memcheck_h =3D no); then > - as_fn_error $? "*** Can't find valgrind/memcheck.h, memcheck.h or va= lgrind.h" "$LINENO" 5 > + if test $ac_cv_header_valgrind_memcheck_h =3D no; then > + as_fn_error $? "*** Cannot find valgrind/memcheck.h" "$LINENO" 5 > fi > > $as_echo "#define ENABLE_VALGRIND_ANNOTATIONS 1" >>confdefs.h > @@ -21602,7 +21546,7 @@ else > lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2 > lt_status=3D$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > -#line 21605 "configure" > +#line 21549 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > @@ -21708,7 +21652,7 @@ else > lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2 > lt_status=3D$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > -#line 21711 "configure" > +#line 21655 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > diff --git a/gcc/configure.ac b/gcc/configure.ac > index d9a35069e3..0cf5fda318 100644 > --- a/gcc/configure.ac > +++ b/gcc/configure.ac > @@ -778,49 +778,11 @@ if test x$ac_fold_checking !=3D x ; then > fi > valgrind_path_defines=3D > valgrind_command=3D > - > -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=3Dyes, have_valgrind_h=3Dno) > - > -# 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=3Dyes], > - [gcc_cv_header_valgrind_memcheck_h=3Dno]) > -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=3Dyes], > - [gcc_cv_header_memcheck_h=3Dno]) > -AC_MSG_RESULT($gcc_cv_header_memcheck_h) > -if test $gcc_cv_header_valgrind_memcheck_h =3D 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 =3D yes; then > - AC_DEFINE(HAVE_MEMCHECK_H, 1, > - [Define if valgrind's memcheck.h header is installed.]) > -fi > - > if test x$ac_valgrind_checking !=3D x ; then > AM_PATH_PROG_WITH_TEST(valgrind_path, valgrind, > [$ac_dir/$ac_word --version | grep valgrind- >/dev/null 2>&1]) > - if test "x$valgrind_path" =3D "x" \ > - || (test $have_valgrind_h =3D no \ > - && test $gcc_cv_header_memcheck_h =3D no \ > - && test $gcc_cv_header_valgrind_memcheck_h =3D no); then > - AC_MSG_ERROR([*** Can't find both valgrind and valgrind/memcheck.= h, memcheck.h or valgrind.h]) > + if test "x$valgrind_path" =3D "x"; then > + AC_MSG_ERROR([*** Cannot find valgrind]) > fi > valgrind_path_defines=3D-DVALGRIND_PATH=3D'\"'$valgrind_path'\"' > valgrind_command=3D"$valgrind_path -q" > @@ -869,12 +831,11 @@ AC_ARG_ENABLE(valgrind-annotations, > [AS_HELP_STRING([--enable-valgrind-annotations], > [enable valgrind runtime interaction])], [], > [enable_valgrind_annotations=3Dno]) > +AC_CHECK_HEADER(valgrind/memcheck.h) > if test x$enable_valgrind_annotations !=3D xno \ > || test x$ac_valgrind_checking !=3D x; then > - if (test $have_valgrind_h =3D no \ > - && test $gcc_cv_header_memcheck_h =3D no \ > - && test $gcc_cv_header_valgrind_memcheck_h =3D no); then > - AC_MSG_ERROR([*** Can't find valgrind/memcheck.h, memcheck.h or valg= rind.h]) > + if test $ac_cv_header_valgrind_memcheck_h =3D no; then > + AC_MSG_ERROR([*** Cannot find valgrind/memcheck.h]) > fi > AC_DEFINE(ENABLE_VALGRIND_ANNOTATIONS, 1, > [Define to get calls to the valgrind runtime enabled.]) > diff --git a/gcc/system.h b/gcc/system.h > index e924152ad4..16db87bd5a 100644 > --- a/gcc/system.h > +++ b/gcc/system.h > @@ -1217,28 +1217,11 @@ helper_const_non_const_cast (const char *p) > #endif > > #ifdef ENABLE_VALGRIND_ANNOTATIONS > -# ifdef HAVE_VALGRIND_MEMCHECK_H > -# include > -# elif defined HAVE_MEMCHECK_H > -# include > -# else > -# include > -# endif > -/* Compatibility macros to let valgrind 3.1 work. */ > -# ifndef VALGRIND_MAKE_MEM_NOACCESS > -# define VALGRIND_MAKE_MEM_NOACCESS VALGRIND_MAKE_NOACCESS > -# endif > -# ifndef VALGRIND_MAKE_MEM_DEFINED > -# define VALGRIND_MAKE_MEM_DEFINED VALGRIND_MAKE_READABLE > -# endif > -# ifndef VALGRIND_MAKE_MEM_UNDEFINED > -# define VALGRIND_MAKE_MEM_UNDEFINED VALGRIND_MAKE_WRITABLE > -# endif > +#include > #else > -/* Avoid #ifdef:s when we can help it. */ > +/* VALGRIND_DISCARD unregisters the given block handle, > + but our code misuses it for discarding annotations. */ > #define VALGRIND_DISCARD(x) > -#define VALGRIND_MALLOCLIKE_BLOCK(w,x,y,z) > -#define VALGRIND_FREELIKE_BLOCK(x,y) > #endif > > /* Macros to temporarily ignore some warnings. */ > -- > 2.39.2 >