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

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 016b39086240f02795ac9d42b444e312270b330f..1a3e6e4f38456f4a6a40626930a7dfef6fb61f80 100644 (file)
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -257,7 +257,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 47cb3374a3602b7a1b38db72c3f593acaefae025..0dcf5a5fe798ccf3c16d903eb52050a9e78185be 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 06530d1cdc1f22cc213b5fc1e2cf877c1b47c95b..a0e08bfc10fe23fd62c667aab8a856ba47f258ea 100644 (file)
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -206,9 +206,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
 
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 6)

diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c
index c5212428f1bd00a77dd541711f887b154a142cef..83c390de3a973e9aec4fea3af398432c09d54cb4 100644 (file)
--- a/lib/ns/hooks.c
+++ b/lib/ns/hooks.c
@@ -109,7 +109,7 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) {
        REQUIRE(pluginp != NULL && *pluginp == NULL);
 
        flags = RTLD_LAZY | RTLD_LOCAL;
-#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
+#if defined(RTLD_DEEPBIND) && !__SANITIZE_ADDRESS__
        flags |= RTLD_DEEPBIND;
 #endif