gcc defines __SANITIZE_ADDRESS__ and not __ADDRESS_SANITIZER__, use the correct ...

(cherry picked from commit 8903d68d69bfb843a75225f23c279f88d4107c4c)

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 1254472fac7eb95633967d53721dc8ccedb901fc..f9a46ebb77003620a1355465fbf3765bff0decb4 100644 (file)
--- 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 e38480a275a470a469ab0739aebefe9203b0481f..15561ce4948928b4cfa58fceea756f28287fbddd 100644 (file)
--- 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 c9a1a1dfdeea820b1a2550ae7992ffc398d48f94..df32569d560dbf34209af447a594f9781da4e16d 100644 (file)
--- 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