diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-08-04 13:39:07 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-08-04 13:39:07 +0200 |
| commit | 3b4ce0a59774b0b742f4b67a3e736eb252751173 (patch) | |
| tree | 4e0becd365ee11e2151ede69e629362e85da6165 | |
| parent | 04102dd6881133bf25434a74fb9c664f9ef3c914 (diff) | |
| download | compiler-rt-embtk-support-release-3.3.tar.gz compiler-rt-embtk-support-release-3.3.tar.bz2 compiler-rt-embtk-support-release-3.3.tar.xz | |
[embtk] make this version of asan usable with clang version > 3.2embtk-support-release-3.3
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | lib/asan/asan_interface_internal.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/asan/asan_interface_internal.h b/lib/asan/asan_interface_internal.h index cf659750..15a0516a 100644 --- a/lib/asan/asan_interface_internal.h +++ b/lib/asan/asan_interface_internal.h @@ -25,9 +25,15 @@ extern "C" { // Everytime the asan ABI changes we also change the version number in this // name. Objects build with incompatible asan ABI version // will not link with run-time. -#if 0 // Workaround for llvm/clang-3.2 in embtoolkit - void __asan_init_v2() SANITIZER_INTERFACE_ATTRIBUTE; - #define __asan_init __asan_init_v2 +#ifdef ASAN_INTERFACE_VERSION + #define ASAN_INIT_FUNC(__version) __ASAN_INIT_FUNC(__version) + #define __ASAN_INIT_FUNC(___version) __asan_init_v##___version() + + #define ASAN_INIT_FUNC_NAME(__version) __ASAN_INIT_FUNC_NAME(__version) + #define __ASAN_INIT_FUNC_NAME(___version) __asan_init_v##___version + + void ASAN_INIT_FUNC(ASAN_INTERFACE_VERSION) SANITIZER_INTERFACE_ATTRIBUTE; + #define __asan_init ASAN_INIT_FUNC_NAME(ASAN_INTERFACE_VERSION) #else void __asan_init() SANITIZER_INTERFACE_ATTRIBUTE; #endif |