From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 19 Dec 2018 11:24:59 +0000 (+0100)
Subject: gcc defines __SANITIZE_ADDRESS__ and not __ADDRESS_SANITIZER__, use the correct ... 
X-Git-Tag: v9.11.6rc1~78^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=11cce88a41c675488538e883f3a548cb2cccf53d;p=thirdparty%2Fbind9.git

gcc defines __SANITIZE_ADDRESS__ and not __ADDRESS_SANITIZER__, use the correct #define

(cherry picked from commit 8903d68d69bfb843a75225f23c279f88d4107c4c)
---

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 1254472fac7..f9a46ebb770 100644
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -259,7 +259,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 	/* Open the library */
 	dlopen_flags = RTLD_NOW|RTLD_GLOBAL;
 
-#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
+#if defined(RTLD_DEEPBIND) && !__SANITIZE_ADDRESS__
 	/*
 	 * If RTLD_DEEPBIND is available then use it. This can avoid
 	 * issues with a module using a different version of a system
diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
index e38480a275a..15561ce4948 100644
--- a/lib/dns/dyndb.c
+++ b/lib/dns/dyndb.c
@@ -133,7 +133,7 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname,
 		      instname, filename);
 
 	flags = RTLD_NOW|RTLD_LOCAL;
-#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
+#if defined(RTLD_DEEPBIND) && !__SANITIZE_ADDRESS__
 	flags |= RTLD_DEEPBIND;
 #endif
 
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index c9a1a1dfdee..df32569d560 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -212,9 +212,9 @@
 #define __has_feature(x) 0
 #endif
 
-/* GCC defines __ADDRESS_SANITIZER__, so reuse the macro for clang */
+/* GCC defines __SANITIZE_ADDRESS__, so reuse the macro for clang */
 #if __has_feature(address_sanitizer)
-#define __ADDRESS_SANITIZER__
+#define __SANITIZE_ADDRESS__
 #endif
 
 #ifdef UNIT_TESTING