This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-984-g61f6514
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 21 May 2012 18:45:50 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-984-g61f6514
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 61f65140eb0fe350ef59aca95b89d784e30f24af (commit)
from 5fefb43629b36b143c9ac100b89408a2cbeed3a8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=61f65140eb0fe350ef59aca95b89d784e30f24af
commit 61f65140eb0fe350ef59aca95b89d784e30f24af
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon May 21 11:45:16 2012 -0700
Define __SYSCALL_WORDSIZE for x86-64
diff --git a/ChangeLog b/ChangeLog
index 014786f..8ebc3c4 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 4b3fc57..d835dff 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 9b38756..e4d5fe7 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
sysdeps/unix/sysv/linux/bits/statvfs.h | 5 +++--
sysdeps/x86_64/bits/wordsize.h | 5 +++++
3 files changed, 15 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources