From 43ea71b175b54891a0e96cdee28a3f4e0b37950e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 5 Oct 2017 10:45:04 +0000 Subject: [PATCH] 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. From-SVN: r253442 --- libsanitizer/ChangeLog | 9 +++++++++ libsanitizer/configure.tgt | 2 ++ 2 files changed, 11 insertions(+) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 7aa9d287804..0858d074d5f 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,12 @@ +2017-10-05 H.J. Lu + + Backported from mainline + 2017-10-05 H.J. Lu + + 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 Backported from mainline diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt index 82e8a5513c5..573e3b482e9 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 ;;