From 4a56a7be3d2cfca5cc74e75dc4b4365d8f1fbcc5 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Wed, 14 Nov 2012 13:45:56 +0000
Subject: [PATCH] Check __x86_64__ instead of __WORDSIZE
PR other/55292
Backport from upstream revision 167883
* sanitizer_common/sanitizer_linux.cc (internal_mmap): Check
__x86_64__ instead of __WORDSIZE.
(internal_filesize): Likwise.
From-SVN: r193500
---
libsanitizer/ChangeLog | 8 ++++++++
libsanitizer/sanitizer_common/sanitizer_linux.cc | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index c67c7f11db2b..725e85c5c441 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR other/55292
+ Backport from upstream revision 167883
+ * sanitizer_common/sanitizer_linux.cc (internal_mmap): Check
+ __x86_64__ instead of __WORDSIZE.
+ (internal_filesize): Likwise.
+
2012-11-14 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (AC_CONFIG_AUX_DIR): Removed.
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
index ab6c5a4b82c4..e90a68ca1c40 100644
--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
@@ -34,7 +34,7 @@ namespace __sanitizer {
// --------------- sanitizer_libc.h
void *internal_mmap(void *addr, uptr length, int prot, int flags,
int fd, u64 offset) {
-#if __WORDSIZE == 64
+#if defined __x86_64__
return (void *)syscall(__NR_mmap, addr, length, prot, flags, fd, offset);
#else
return (void *)syscall(__NR_mmap2, addr, length, prot, flags, fd, offset);
@@ -67,7 +67,7 @@ uptr internal_write(fd_t fd, const void *buf, uptr count) {
}
uptr internal_filesize(fd_t fd) {
-#if __WORDSIZE == 64
+#if defined __x86_64__
struct stat st;
if (syscall(__NR_fstat, fd, &st))
return -1;
--
GitLab