diff options
| author | Mark Wielaard <mjw@redhat.com> | 2016-01-31 18:34:27 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2016-01-31 18:34:27 +0100 |
| commit | 0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f (patch) | |
| tree | 8c643811b62f09a257324e9cc64dad1c17d94d2e | |
| parent | 3da75f08818fa3d217e5d566477c7001cb774792 (diff) | |
| download | glibc-0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f.tar.gz glibc-0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f.tar.xz glibc-0f0f4db5b76c27a7fe5a4247e09c314d4e15c34f.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/elf.h | 15 |
2 files changed, 3 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog index fb853f32da..a0fd225cc6 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 1a7000b8c6..15f5a75dec 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. */ |