Merge branch '787-use-correct-define-v9_12' into 'v9_12'

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

See merge request isc-projects/bind9!1256

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

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
 

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