qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "elf/elf.h: Add new 386 and X86_64 relocations from binutils." 

This reverts commit 3da75f0881.

glibc 2.23 hard freeze doesn't allow this change at this time.
This commit is contained in:
Mark Wielaard 2016-01-31 18:34:27 +01:00
parent 3da75f0881
commit 0f0f4db5b7
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2016-01-27 Paul Eggert <eggert@cs.ucla.edu>
[BZ #18240] [BZ #18240]

15
elf/elf.h
View File

@ -1269,10 +1269,8 @@ typedef struct
argument, returning the TLS argument, returning the TLS
offset for the symbol. */ offset for the symbol. */
#define R_386_IRELATIVE 42 /* Adjust indirectly by program base */ #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. */ /* Keep this the last entry. */
#define R_386_NUM 44 #define R_386_NUM 43
/* SUN SPARC specific definitions. */ /* SUN SPARC specific definitions. */
@ -3146,15 +3144,8 @@ enum
#define R_X86_64_TLSDESC 36 /* TLS descriptor. */ #define R_X86_64_TLSDESC 36 /* TLS descriptor. */
#define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */ #define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */
#define R_X86_64_RELATIVE64 38 /* 64-bit adjust 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_NUM 39
#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
/* AM33 relocations. */ /* AM33 relocations. */