diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-05 10:45:04 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-05 10:45:04 +0000 |
| commit | b2bf0e7f02c0c94b3c6a59c4c1e69a5fb4887f88 (patch) | |
| tree | 7e77d25ddbc74207b7e3dfd66fe27c30dee452ef /libsanitizer | |
| parent | 79130248bd5d1d2286b011a4a004291cc0c6f13d (diff) | |
Add sanitizer_linux_x86_64.lo if __x86_64__ is defined by $CC
Since size of "void *" is 4 bytes for x32, check if __x86_64__ is defined
by $CC, instead of
if test x$ac_cv_sizeof_void_p = x8; then
to decide wether sanitizer_linux_x86_64.lo should be used.
Backported from mainline
PR sanitizer/82379
* configure.tgt (SANITIZER_COMMON_TARGET_DEPENDENT_OBJECTS): Set
to sanitizer_linux_x86_64.lo if __x86_64__ is defined by $CC.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@253442 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 9 | ||||
| -rw-r--r-- | libsanitizer/configure.tgt | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 7aa9d287804b..0858d074d5f0 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,12 @@ +2017-10-05 H.J. Lu <hongjiu.lu@intel.com> + + Backported from mainline + 2017-10-05 H.J. Lu <hongjiu.lu@intel.com> + + PR sanitizer/82379 + * configure.tgt (SANITIZER_COMMON_TARGET_DEPENDENT_OBJECTS): Set + to sanitizer_linux_x86_64.lo if __x86_64__ is defined by $CC. + 2017-09-07 Jakub Jelinek <jakub@redhat.com> Backported from mainline diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt index 82e8a5513c59..573e3b482e9e 100644 --- a/libsanitizer/configure.tgt +++ b/libsanitizer/configure.tgt @@ -27,6 +27,8 @@ case "${target}" in TSAN_SUPPORTED=yes LSAN_SUPPORTED=yes TSAN_TARGET_DEPENDENT_OBJECTS=tsan_rtl_amd64.lo + fi + if echo "int x = __x86_64__;" | $CC -c -x c -o /dev/null - > /dev/null 2>&1; then SANITIZER_COMMON_TARGET_DEPENDENT_OBJECTS=sanitizer_linux_x86_64.lo fi ;; |