diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-09-02 11:10:51 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-09-02 11:10:51 -0700 |
| commit | aa595247af472bb95bcd36c166335c851e3e752d (patch) | |
| tree | b0389ff65693d81a02a4762ae0b76283690d07b8 /bfd | |
| parent | b9ce864ca8dcd0e52e2b7c655603b181fa19cfbf (diff) | |
| download | gdb-aa595247af472bb95bcd36c166335c851e3e752d.zip gdb-aa595247af472bb95bcd36c166335c851e3e752d.tar.gz gdb-aa595247af472bb95bcd36c166335c851e3e752d.tar.bz2 | |
x86: Define PLT_CIE_LENGTH and PLT_FDE_* in elfxx-x86.h
Since PLT_CIE_LENGTH, PLT_FDE_LENGTH, PLT_FDE_START_OFFSET and
PLT_FDE_LEN_OFFSET are identical in elf32-i386.c and elf64-x86-64.c,
they can be defined in elfxx-x86.h.
* elf32-i386.c (PLT_CIE_LENGTH, PLT_FDE_LENGTH,
PLT_FDE_START_OFFSET, PLT_FDE_LEN_OFFSET): Moved to ...
* elfxx-x86.h (PLT_CIE_LENGTH, PLT_FDE_LENGTH,
PLT_FDE_START_OFFSET, PLT_FDE_LEN_OFFSET): Here.
* elf64-x86-64.c (PLT_CIE_LENGTH, PLT_FDE_LENGTH,
PLT_FDE_START_OFFSET, PLT_FDE_LEN_OFFSET): Removed.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 4 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 4 | ||||
| -rw-r--r-- | bfd/elfxx-x86.h | 5 |
4 files changed, 14 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4d6fb59..23cb882 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,14 @@ 2017-09-02 H.J. Lu <hongjiu.lu@intel.com> + * elf32-i386.c (PLT_CIE_LENGTH, PLT_FDE_LENGTH, + PLT_FDE_START_OFFSET, PLT_FDE_LEN_OFFSET): Moved to ... + * elfxx-x86.h (PLT_CIE_LENGTH, PLT_FDE_LENGTH, + PLT_FDE_START_OFFSET, PLT_FDE_LEN_OFFSET): Here. + * elf64-x86-64.c (PLT_CIE_LENGTH, PLT_FDE_LENGTH, + PLT_FDE_START_OFFSET, PLT_FDE_LEN_OFFSET): Removed. + +2017-09-02 H.J. Lu <hongjiu.lu@intel.com> + * elf32-i386.c (elf_i386_allocate_dynrelocs): Removed. (elf_i386_allocate_local_dynrelocs): Likewise. (elf_i386_size_dynamic_sections): Replace diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 2caff7f..034511c 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -656,10 +656,6 @@ static const bfd_byte elf_i386_pic_non_lazy_ibt_plt_entry[LAZY_PLT_ENTRY_SIZE] = static const bfd_byte elf_i386_eh_frame_lazy_plt[] = { -#define PLT_CIE_LENGTH 20 -#define PLT_FDE_LENGTH 36 -#define PLT_FDE_START_OFFSET 4 + PLT_CIE_LENGTH + 8 -#define PLT_FDE_LEN_OFFSET 4 + PLT_CIE_LENGTH + 12 PLT_CIE_LENGTH, 0, 0, 0, /* CIE length */ 0, 0, 0, 0, /* CIE ID */ 1, /* CIE version */ diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index ed67d89..08a8c92 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -647,10 +647,6 @@ static const bfd_byte elf_x32_non_lazy_ibt_plt_entry[LAZY_PLT_ENTRY_SIZE] = static const bfd_byte elf_x86_64_eh_frame_lazy_plt[] = { -#define PLT_CIE_LENGTH 20 -#define PLT_FDE_LENGTH 36 -#define PLT_FDE_START_OFFSET 4 + PLT_CIE_LENGTH + 8 -#define PLT_FDE_LEN_OFFSET 4 + PLT_CIE_LENGTH + 12 PLT_CIE_LENGTH, 0, 0, 0, /* CIE length */ 0, 0, 0, 0, /* CIE ID */ 1, /* CIE version */ diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index c694daf..00d38de 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -26,6 +26,11 @@ #include "bfd_stdint.h" #include "hashtab.h" +#define PLT_CIE_LENGTH 20 +#define PLT_FDE_LENGTH 36 +#define PLT_FDE_START_OFFSET 4 + PLT_CIE_LENGTH + 8 +#define PLT_FDE_LEN_OFFSET 4 + PLT_CIE_LENGTH + 12 + #define ABI_64_P(abfd) \ (get_elf_backend_data (abfd)->s->elfclass == ELFCLASS64) |