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-139-g314054e
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Feb 2012 18:06:18 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-139-g314054e
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 314054eaef2aec965d2f1bced7e86abca118463e (commit)
from d8e0ca509a83e832123f6ab508fce620159fb2dc (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=314054eaef2aec965d2f1bced7e86abca118463e
commit 314054eaef2aec965d2f1bced7e86abca118463e
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Feb 6 18:05:54 2012 +0000
Match x86 PIC thunk names to compiler version.
diff --git a/ChangeLog b/ChangeLog
index 1925407..b0e625b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-06 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/i386/sysdep.h: Include <features.h>.
+ (GET_PC_THUNK, GET_PC_THUNK_STR): Define conditionally on compiler
+ version.
+
2012-02-05 Joseph Myers <joseph@codesourcery.com>
* sysdeps/i386/sysdep.h (SETUP_PIC_REG_STR, LOAD_PIC_REG_STR):
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 2c0aafa..1dbb8e1 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -20,10 +20,23 @@
#include <sysdeps/generic/sysdep.h>
-#ifdef __ASSEMBLER__
-# define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg
+#include <features.h> /* For __GNUC_PREREQ. */
+
+/* It is desirable that the names of PIC thunks match those used by
+ GCC so that multiple copies are eliminated by the linker. */
+
+#ifdef __ASSEMBLER__
+# if __GNUC_PREREQ (4, 7)
+# define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg
+# else
+# define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg
+# endif
#else
-# define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
+# if __GNUC_PREREQ (4, 7)
+# define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
+# else
+# define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
+# endif
#endif
#ifdef __ASSEMBLER__
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/i386/sysdep.h | 19 ++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources