procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check __x86_64__ instead of __WORDSIZE

Browse source 
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
This commit is contained in:
H.J. Lu 2012-11-14 13:45:56 +00:00 • committed by H.J. Lu
parent 4053ca2c6f
commit 4a56a7be3d
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libsanitizer/ChangeLog
View file

@ -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.

4
libsanitizer/sanitizer_common/sanitizer_linux.cc
View file

@ -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;