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-140-gd4a54ac
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Feb 2012 23:01:54 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-140-gd4a54ac
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 d4a54ac6494dd47a9c3d490e02897c69c0432341 (commit)
from 314054eaef2aec965d2f1bced7e86abca118463e (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=d4a54ac6494dd47a9c3d490e02897c69c0432341
commit d4a54ac6494dd47a9c3d490e02897c69c0432341
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Feb 6 23:01:25 2012 +0000
Undefine and redefine __i686 for assembly code.
diff --git a/ChangeLog b/ChangeLog
index b0e625b..0f74311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-02-06 Joseph Myers <joseph@codesourcery.com>
+ [BZ #411]
+ * sysdeps/i386/sysdep.h (__i686): Undefine and redefine.
+
+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.
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 1dbb8e1..c1dac6c 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -23,7 +23,13 @@
#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. */
+ GCC so that multiple copies are eliminated by the linker. Because
+ GCC 4.6 and earlier use __i686 in the names, it is necessary to
+ override that predefined macro. */
+#if defined __i686 && defined __ASSEMBLER__
+#undef __i686
+#define __i686 __i686
+#endif
#ifdef __ASSEMBLER__
# if __GNUC_PREREQ (4, 7)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/i386/sysdep.h | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources