From: H.J. Lu <hjl.tools@gmail.com>
Date: Mon, 21 May 2012 18:45:16 +0000 (-0700)
Subject: Define __SYSCALL_WORDSIZE for x86-64
X-Git-Tag: glibc-2.16-tps~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61f65140eb0fe350ef59aca95b89d784e30f24af;p=thirdparty%2Fglibc.git

Define __SYSCALL_WORDSIZE for x86-64
---

diff --git a/ChangeLog b/ChangeLog
index 014786fb4c8..8ebc3c4f1c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/bits/statvfs.h (_STATVFSBUF_F_UNUSED):
+	Don't define if [__SYSCALL_WORDSIZE != 32].
+	* sysdeps/x86_64/bits/wordsize.h (__SYSCALL_WORDSIZE):
+	New macro.
+
 2012-05-21  Bruno Haible  <bruno@clisp.org>
 	    Andreas Jaeger  <aj@suse.de>
 
diff --git a/sysdeps/unix/sysv/linux/bits/statvfs.h b/sysdeps/unix/sysv/linux/bits/statvfs.h
index 4b3fc5733e0..d835dff0193 100644
--- a/sysdeps/unix/sysv/linux/bits/statvfs.h
+++ b/sysdeps/unix/sysv/linux/bits/statvfs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1998,2000,2001,2002,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997-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
@@ -21,7 +21,8 @@
 
 #include <bits/types.h>  /* For __fsblkcnt_t and __fsfilcnt_t.  */
 
-#if __WORDSIZE == 32
+#if (__WORDSIZE == 32 \
+     && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32))
 #define _STATVFSBUF_F_UNUSED
 #endif
 
diff --git a/sysdeps/x86_64/bits/wordsize.h b/sysdeps/x86_64/bits/wordsize.h
index 9b38756fd58..e4d5fe71ef9 100644
--- a/sysdeps/x86_64/bits/wordsize.h
+++ b/sysdeps/x86_64/bits/wordsize.h
@@ -6,3 +6,8 @@
 #else
 # define __WORDSIZE	32
 #endif
+
+#ifdef __x86_64__
+/* Both x86-64 and x32 use the 64-bit system call interface.  */
+# define __SYSCALL_WORDSIZE		64
+#endif