diff options
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. */ |