Check __x86_64__ in x86-64 sys/reg.h

diff --git a/ChangeLog b/ChangeLog
index 4ecd85a88f38833983bdde67586c9fc7cec6fba8..52507ca721d73abc0e81a73a5c8d1878f3036204 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/reg.h b/sysdeps/unix/sysv/linux/x86_64/sys/reg.h
index 33b08cc9ba2b646a31dfa91ec2b301381319367a..aca96cf13fc1d0060f8d02930e63f91582b3af55 100644 (file)
--- 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.  */