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.22-712-g0f0f4db
- From: mark at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 31 Jan 2016 17:36:41 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-712-g0f0f4db
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 0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f (commit)
from 3da75f08818fa3d217e5d566477c7001cb774792 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f
commit 0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f
Author: Mark Wielaard <mjw@redhat.com>
Date: Sun Jan 31 18:34:27 2016 +0100
Revert "elf/elf.h: Add new 386 and X86_64 relocations from binutils."
This reverts commit 3da75f08818fa3d217e5d566477c7001cb774792.
glibc 2.23 hard freeze doesn't allow this change at this time.
diff --git a/ChangeLog b/ChangeLog
index fb853f3..a0fd225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-2016-01-29 Mark Wielaard <mjw@redhat.com>
-
- * elf/elf.h (R_386_GOT32X): New.
- (R_386_NUM): Update.
- (R_X86_64_GOTPCRELX: New.
- (R_X86_64_REX_GOTPCRELX): New.
- (R_X86_64_NUM): Update.
-
2016-01-27 Paul Eggert <eggert@cs.ucla.edu>
[BZ #18240]
diff --git a/elf/elf.h b/elf/elf.h
index 1a7000b..15f5a75 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -1269,10 +1269,8 @@ typedef struct
argument, returning the TLS
offset for the symbol. */
#define R_386_IRELATIVE 42 /* Adjust indirectly by program base */
-#define R_386_GOT32X 43 /* Load from 32 bit GOT entry,
- relaxable. */
/* Keep this the last entry. */
-#define R_386_NUM 44
+#define R_386_NUM 43
/* SUN SPARC specific definitions. */
@@ -3146,15 +3144,8 @@ enum
#define R_X86_64_TLSDESC 36 /* TLS descriptor. */
#define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */
#define R_X86_64_RELATIVE64 38 /* 64-bit adjust by program base */
- /* 39 Reserved was R_X86_64_PC32_BND */
- /* 40 Reserved was R_X86_64_PLT32_BND */
-#define R_X86_64_GOTPCRELX 41 /* Load from 32 bit signed pc relative
- offset to GOT entry without REX
- prefix, relaxable. */
-#define R_X86_64_REX_GOTPCRELX 42 /* Load from 32 bit signed pc relative
- offset to GOT entry with REX prefix,
- relaxable. */
-#define R_X86_64_NUM 43
+
+#define R_X86_64_NUM 39
/* AM33 relocations. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 --------
elf/elf.h | 15 +++------------
2 files changed, 3 insertions(+), 20 deletions(-)
hooks/post-receive
--
GNU C Library master sources