diff options
author | Alexander Monakov <amonakov@ispras.ru> | 2023-11-23 20:48:43 +0300 |
---|---|---|
committer | Alexander Monakov <amonakov@ispras.ru> | 2023-11-24 16:17:45 +0300 |
commit | f9a10e91499ec9291fe28f20c34f1f1e65c521e8 (patch) | |
tree | 8f024a0df6ba32f7b79774a036d004ec7362e168 /gcc/system.h | |
parent | ab78426ae76cd4a31c384f17dd058b4ad8b39642 (diff) | |
download | gcc-f9a10e91499ec9291fe28f20c34f1f1e65c521e8.zip gcc-f9a10e91499ec9291fe28f20c34f1f1e65c521e8.tar.gz gcc-f9a10e91499ec9291fe28f20c34f1f1e65c521e8.tar.bz2 |
gcc: configure: drop Valgrind 3.1 compatibility
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.
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.
Diffstat (limited to 'gcc/system.h')
-rw-r--r-- | gcc/system.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/gcc/system.h b/gcc/system.h index e924152..16db87b 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 <valgrind/memcheck.h> -# elif defined HAVE_MEMCHECK_H -# include <memcheck.h> -# else -# include <valgrind.h> -# 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 <valgrind/memcheck.h> #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. */ |