diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-02-21 15:25:32 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-02-21 15:25:32 +0100 |
| commit | 4be7da26b58105b8920aeab125a9eb051367ff8f (patch) | |
| tree | e528075adf5c6bb529bc8c76e1001beefc6c047d /libsanitizer | |
| parent | c0da9c377c3b2099c3dd8f28864abce6304889dd (diff) | |
| download | gcc-4be7da26b58105b8920aeab125a9eb051367ff8f.tar.gz | |
asan_rtl.cc (__asan_preinit): Don't add if PIC macro is defined.
* asan/asan_rtl.cc (__asan_preinit): Don't add if PIC macro is
defined. Add used attribute.
From-SVN: r196205
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 5 | ||||
| -rw-r--r-- | libsanitizer/asan/asan_rtl.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index ed857384853..ece68cbab53 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2013-02-21 Jakub Jelinek <jakub@redhat.com> + + * asan/asan_rtl.cc (__asan_preinit): Don't add if PIC macro is + defined. Add used attribute. + 2013-02-21 Kostya Serebryany <kcc@google.com> * All source files: Merge from upstream r175733. diff --git a/libsanitizer/asan/asan_rtl.cc b/libsanitizer/asan/asan_rtl.cc index e22fcd34fb1..4b0afd2731a 100644 --- a/libsanitizer/asan/asan_rtl.cc +++ b/libsanitizer/asan/asan_rtl.cc @@ -520,11 +520,11 @@ void __asan_init() { } } -#if ASAN_USE_PREINIT_ARRAY +#if ASAN_USE_PREINIT_ARRAY && !defined (PIC) // On Linux, we force __asan_init to be called before anyone else // by placing it into .preinit_array section. // FIXME: do we have anything like this on Mac? - __attribute__((section(".preinit_array"))) + __attribute__((section(".preinit_array"), used)) void (*__asan_preinit)(void) =__asan_init; #elif defined(_WIN32) && defined(_DLL) // On Windows, when using dynamic CRT (/MD), we can put a pointer |