aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-16 10:20:45 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-16 10:20:45 -0700
commit5e90c8ad55a1196846e2b06e3f6a6d3c805542e0 (patch)
tree6d87b0ebeb3ee790e46ffe4bdceca2ef150e4d7d
parent23dfb58b4d868e3c90cdb472e4e6e6d7469f0ee1 (diff)
downloadglibc-5e90c8ad55a1196846e2b06e3f6a6d3c805542e0.tar
glibc-5e90c8ad55a1196846e2b06e3f6a6d3c805542e0.tar.gz
glibc-5e90c8ad55a1196846e2b06e3f6a6d3c805542e0.tar.bz2
glibc-5e90c8ad55a1196846e2b06e3f6a6d3c805542e0.zip
Check __x86_64__ in x86-64 sys/reg.h
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sys/reg.h5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ecd85a88f..52507ca721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/sys/reg.h: Don't
+ include <bits/wordsize.h>. Check __x86_64__ instead of
+ __WORDSIZE.
+
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/sys/procfs.h (elf_greg_t): Use
"unsigned long long int" if __x86_64__ is defined.
(elf_fpregset_t): Check __x86_64__ instead of __WORDSIZE.
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/reg.h b/sysdeps/unix/sysv/linux/x86_64/sys/reg.h
index 33b08cc9ba..aca96cf13f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sys/reg.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sys/reg.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,10 +17,9 @@
#ifndef _SYS_REG_H
#define _SYS_REG_H 1
-#include <bits/wordsize.h>
-#if __WORDSIZE == 64
+#ifdef __x86_64__
/* Index into an array of 8 byte longs returned from ptrace for
location of the users' stored general purpose registers. */