diff options
| author | Mark Wielaard <[email protected]> | 2015-06-10 17:04:19 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2015-06-10 17:04:19 +0200 |
| commit | f1a21ea179628baca9aecca7f537ba1436973ec8 (patch) | |
| tree | 41ed88cba4f1cbd7827b2f732be45c781a215d88 /lib/eu-config.h | |
| parent | 073b85c1e6089f752551a5431f3163c45219f5a6 (diff) | |
| parent | 5aa90b90adcce527ea3eb098990c809ab69cbf64 (diff) | |
Merge branch 'master' into portable
Fixup futimens issues.
Diffstat (limited to 'lib/eu-config.h')
| -rw-r--r-- | lib/eu-config.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/eu-config.h b/lib/eu-config.h index d89f3a8a..88cac670 100644 --- a/lib/eu-config.h +++ b/lib/eu-config.h @@ -73,7 +73,8 @@ /* Define ALLOW_UNALIGNED if the architecture allows operations on unaligned memory locations. */ -#if defined __i386__ || defined __x86_64__ +#define SANITIZE_UNDEFINED 1 +#if (defined __i386__ || defined __x86_64__) && ! CHECK_UNDEFINED # define ALLOW_UNALIGNED 1 #else # define ALLOW_UNALIGNED 0 @@ -174,7 +175,7 @@ hakmem_popcount (unsigned int x) #endif /* HAVE_BUILTIN_POPCOUNT */ -#ifdef SHARED +#ifdef SYMBOL_VERSIONING # define OLD_VERSION(name, version) \ asm (".globl _compat." #version "." #name "\n" \ "_compat." #version "." #name " = " #name "\n" \ @@ -192,8 +193,8 @@ hakmem_popcount (unsigned int x) # define OLD_VERSION(name, version) /* Nothing for static linking. */ # define NEW_VERSION(name, version) /* Nothing for static linking. */ # define COMPAT_VERSION_NEWPROTO(name, version, prefix) \ - error "should use #ifdef SHARED" -# define COMPAT_VERSION(name, version, prefix) error "should use #ifdef SHARED" + error "should use #ifdef SYMBOL_VERSIONING" +# define COMPAT_VERSION(name, version, prefix) error "should use #ifdef SYMBOL_VERSIONING" #endif |