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-1005-ga4f6e48
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 May 2012 16:25:43 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-1005-ga4f6e48
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 a4f6e481247a9af67547a4037c66c046f8c35824 (commit)
via f63d5db67c5ac9da31e03e389fa454314ef96a35 (commit)
from 98a61bcbca89e50a3bdfa92fa851546bccee41e7 (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=a4f6e481247a9af67547a4037c66c046f8c35824
commit a4f6e481247a9af67547a4037c66c046f8c35824
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue May 22 09:25:29 2012 -0700
Add x32 support to x86_64/bits/fcntl.h
diff --git a/ChangeLog b/ChangeLog
index 1918d8b..9194b9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-05-22 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Don't include
+ <bits/wordsize.h>. Check __x86_64__ instead of __WORDSIZE.
+
* sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER):
Use "neg %eax".
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
index b38d55c..9fa5ecb 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
@@ -1,6 +1,5 @@
/* O_*, F_*, FD_* bit values for Linux/x86-64.
- Copyright (C) 2001,2002,2004,2006,2007,2009,2010,2011
- Free Software Foundation, Inc.
+ Copyright (C) 2001-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
@@ -22,7 +21,6 @@
#endif
#include <sys/types.h>
-#include <bits/wordsize.h>
#ifdef __USE_GNU
# include <bits/uio.h>
#endif
@@ -65,7 +63,7 @@
#endif
#ifdef __USE_LARGEFILE64
-# if __WORDSIZE == 64
+# ifdef __x86_64__
# define O_LARGEFILE 0
# else
# define O_LARGEFILE 0100000
@@ -78,7 +76,7 @@
#define F_SETFD 2 /* Set file descriptor flags. */
#define F_GETFL 3 /* Get file status flags. */
#define F_SETFL 4 /* Set file status flags. */
-#if __WORDSIZE == 64
+#ifdef __x86_64__
# define F_GETLK 5 /* Get record locking info. */
# define F_SETLK 6 /* Set record locking info (non-blocking). */
# define F_SETLKW 7 /* Set record locking info (blocking). */
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f63d5db67c5ac9da31e03e389fa454314ef96a35
commit f63d5db67c5ac9da31e03e389fa454314ef96a35
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue May 22 09:24:24 2012 -0700
Use "neg %eax" in i386 SYSCALL_ERROR_HANDLER
diff --git a/ChangeLog b/ChangeLog
index ee29e04..1918d8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-05-22 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER):
+ Use "neg %eax".
+
* time/mktime.c: Update copyright years.
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index e7d7103..6c4f778 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -112,9 +112,8 @@
# define SYSCALL_ERROR_HANDLER \
0:SETUP_PIC_REG(cx); \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
- xorl %edx, %edx; \
- subl %eax, %edx; \
- movl %edx, rtld_errno@GOTOFF(%ecx); \
+ negl %eax; \
+ movl %eax, rtld_errno@GOTOFF(%ecx); \
orl $-1, %eax; \
jmp L(pseudo_end);
@@ -129,9 +128,8 @@
0:SETUP_PIC_REG (cx); \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
movl SYSCALL_ERROR_ERRNO@GOTNTPOFF(%ecx), %ecx; \
- xorl %edx, %edx; \
- subl %eax, %edx; \
- SYSCALL_ERROR_HANDLER_TLS_STORE (%edx, %ecx); \
+ negl %eax; \
+ SYSCALL_ERROR_HANDLER_TLS_STORE (%eax, %ecx); \
orl $-1, %eax; \
jmp L(pseudo_end);
# ifndef NO_TLS_DIRECT_SEG_REFS
@@ -147,10 +145,9 @@
# define SYSCALL_ERROR_HANDLER \
0:SETUP_PIC_REG(cx); \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
- xorl %edx, %edx; \
- subl %eax, %edx; \
+ negl %eax; \
movl errno@GOT(%ecx), %ecx; \
- movl %edx, (%ecx); \
+ movl %eax, (%ecx); \
orl $-1, %eax; \
jmp L(pseudo_end);
# endif /* _LIBC_REENTRANT */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/i386/sysdep.h | 15 ++++++---------
sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 8 +++-----
3 files changed, 15 insertions(+), 14 deletions(-)
hooks/post-receive
--
GNU C Library master sources