upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ondřej Surý 2018-12-19 12:24:59 +01:00
parent 37c2d69547
commit 8903d68d69
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/named/unix/dlz_dlopen_driver.c
View file

@ -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

2
lib/dns/dyndb.c
View file

@ -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

4
lib/isc/include/isc/util.h
View file

@ -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)

2
lib/ns/hooks.c
View file

@ -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