diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 23a604922ab..18e63ebfdcf 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,28 @@ +2003-11-03 Daniel Jacobowitz + + * elf-bfd.h (struct elf_backend_data): Remove plt_header_size. + * elf-m10300.c (elf_backend_plt_header_size): Don't define. + * elf32-arm.h (elf_backend_plt_header_size): Don't define. + * elf32-cris.c (elf_backend_plt_header_size): Don't define. + * elf32-i386.c (elf_backend_plt_header_size): Don't define. + * elf32-mips.c (elf_backend_plt_header_size): Don't define. + * elf32-ppc.c (elf_backend_plt_header_size): Don't define. + * elf32-s390.c (elf_backend_plt_header_size): Don't define. + * elf32-sh.c (elf_backend_plt_header_size): Don't define. + * elf32-sparc.c (elf_backend_plt_header_size): Don't define. + * elf64-alpha.c (elf_backend_plt_header_size): Don't define. + * elf64-hppa.c (elf_backend_plt_header_size): Don't define. + * elf64-mips.c (elf_backend_plt_header_size): Don't define. + * elf64-ppc.c (elf_backend_plt_header_size): Don't define. + * elf64-s390.c (elf_backend_plt_header_size): Don't define. + * elf64-sh64.c (elf_backend_plt_header_size): Don't define. + * elf64-sparc.c (elf_backend_plt_header_size): Don't define. + * elf64-x86-64.c (elf_backend_plt_header_size): Don't define. + * elfn32-mips.c (elf_backend_plt_header_size): Don't define. + * elfxx-ia64.c (elf_backend_plt_header_size): Don't define. + * elfxx-target.h (elf_backend_plt_header_size): Don't define + or include in target initializer. + 2003-11-03 Andrew Cagney * section.c (bfd_set_section_contents): Make the "location" buffer diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 6f98cc2f769..a1019b635dc 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -894,10 +894,9 @@ struct elf_backend_data .got section */ bfd_vma got_symbol_offset; - /* The size in bytes of the headers for the GOT and PLT. This includes - the so-called reserved entries on some systems. */ + /* The size in bytes of the header for the GOT. This includes the + so-called reserved entries on some systems. */ bfd_vma got_header_size; - bfd_vma plt_header_size; /* This is TRUE if the linker should act like collect and gather global constructors and destructors by name. This is TRUE for diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index dc25c38aff1..95005739ff1 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -4874,6 +4874,5 @@ _bfd_mn10300_elf_finish_dynamic_sections (output_bfd, info) #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT0_ENTRY_SIZE #include "elf32-target.h" diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index a86f916f714..a42f75a5c5f 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -4148,7 +4148,6 @@ elf32_arm_final_write_processing (abfd, linker) #endif #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT_HEADER_SIZE #include "elf32-target.h" diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index d630a2a84c9..762101a29dc 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -3064,7 +3064,6 @@ elf_cris_reloc_type_class (rela) #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT_ENTRY_SIZE /* Later, we my want to optimize RELA entries into REL entries for dynamic linking and libraries (if it's a win of any significance). Until then, diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 11fadabc998..8f50a3dd49b 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -3240,7 +3240,6 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd, #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT_ENTRY_SIZE /* Support RELA for objdump of prelink objects. */ #define elf_info_to_howto elf_i386_info_to_howto_rel diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index e495cc46dd5..b17008eaaa4 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -1940,7 +1940,6 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = { #define elf_backend_ecoff_debug_swap &mips_elf32_ecoff_debug_swap #define elf_backend_got_header_size (4 * MIPS_RESERVED_GOTNO) -#define elf_backend_plt_header_size 0 #define elf_backend_may_use_rel_p 1 #define elf_backend_may_use_rela_p 0 #define elf_backend_default_use_rela_p 0 diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index a37eb3a284a..85755bb9dfa 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -6224,7 +6224,6 @@ static struct bfd_elf_special_section const ppc_elf_special_sections[]= #define elf_backend_can_gc_sections 1 #define elf_backend_can_refcount 1 #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT_INITIAL_ENTRY_SIZE #define elf_backend_rela_normal 1 #define bfd_elf32_mkobject ppc_elf_mkobject diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 5b07ab0db7b..7f6c54ffa91 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -3463,7 +3463,6 @@ elf_s390_grok_prstatus (abfd, note) #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT_ENTRY_SIZE #define elf_backend_rela_normal 1 #define elf_info_to_howto elf_s390_info_to_howto diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 134356d9ae7..4fa6620bcc1 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -7555,7 +7555,6 @@ elf32_shlin_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 12 -#define elf_backend_plt_header_size PLT_ENTRY_SIZE #ifndef INCLUDE_SHMEDIA diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index 50d968e6734..f226b07be82 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -3478,7 +3478,6 @@ elf32_sparc_reloc_type_class (rela) #define elf_backend_plt_readonly 0 #define elf_backend_want_plt_sym 1 #define elf_backend_got_header_size 4 -#define elf_backend_plt_header_size (4*PLT_ENTRY_SIZE) #define elf_backend_rela_normal 1 #include "elf32-target.h" diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 7b1592daa7f..1d1eea7d5da 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -5600,7 +5600,6 @@ static const struct elf_size_info alpha_elf_size_info = #define elf_backend_plt_readonly 0 #define elf_backend_want_plt_sym 1 #define elf_backend_got_header_size 0 -#define elf_backend_plt_header_size PLT_HEADER_SIZE #include "elf64-target.h" diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index 9eced4c9cc6..b2ca72618f4 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -2772,7 +2772,6 @@ const struct elf_size_info hppa64_elf_size_info = #define elf_backend_plt_readonly 0 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 0 -#define elf_backend_plt_header_size 0 #define elf_backend_type_change_ok TRUE #define elf_backend_get_symbol_type elf64_hppa_elf_get_symbol_type #define elf_backend_reloc_type_class elf64_hppa_reloc_type_class diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c index 3a874d898e8..11d0565f6c6 100644 --- a/bfd/elf64-mips.c +++ b/bfd/elf64-mips.c @@ -2913,7 +2913,6 @@ const struct elf_size_info mips_elf64_size_info = #define elf_backend_grok_psinfo elf64_mips_grok_psinfo #define elf_backend_got_header_size (4 * MIPS_RESERVED_GOTNO) -#define elf_backend_plt_header_size 0 /* MIPS ELF64 can use a mixture of REL and RELA, but some Relocations work better/work only in RELA, so we default to this. */ diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 283f6337f45..da3edc47037 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -65,7 +65,6 @@ static bfd_reloc_status_type ppc64_elf_unhandled_reloc #define elf_backend_plt_not_loaded 1 #define elf_backend_got_symbol_offset 0 #define elf_backend_got_header_size 8 -#define elf_backend_plt_header_size PLT_INITIAL_ENTRY_SIZE #define elf_backend_can_gc_sections 1 #define elf_backend_can_refcount 1 #define elf_backend_rela_normal 1 diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index de712f77e3b..b299bb7f03b 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -3411,7 +3411,6 @@ const struct elf_size_info s390_elf64_size_info = #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 24 -#define elf_backend_plt_header_size PLT_ENTRY_SIZE #define elf_backend_rela_normal 1 #define elf_info_to_howto elf_s390_info_to_howto diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index 1a679d37648..f7d1afff6d5 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -4209,7 +4209,6 @@ static struct bfd_elf_special_section const sh64_elf64_special_sections[]= #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 24 -#define elf_backend_plt_header_size PLT_ENTRY_SIZE #include "elf64-target.h" diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index a74a7f339c0..8c99477fdfb 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -3236,6 +3236,5 @@ const struct elf_size_info sparc64_elf_size_info = #define elf_backend_plt_alignment 8 #define elf_backend_got_header_size 8 -#define elf_backend_plt_header_size PLT_HEADER_SIZE #include "elf64-target.h" diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 8aed4982337..9c5a1ea5b95 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2792,7 +2792,6 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf #define elf_backend_plt_readonly 1 #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size (GOT_ENTRY_SIZE*3) -#define elf_backend_plt_header_size PLT_ENTRY_SIZE #define elf_backend_rela_normal 1 #define elf_info_to_howto elf64_x86_64_info_to_howto diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c index 60c6ad0404f..d944a467e64 100644 --- a/bfd/elfn32-mips.c +++ b/bfd/elfn32-mips.c @@ -2248,7 +2248,6 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = { #define elf_backend_ecoff_debug_swap &mips_elf32_ecoff_debug_swap #define elf_backend_got_header_size (4 * MIPS_RESERVED_GOTNO) -#define elf_backend_plt_header_size 0 /* MIPS n32 ELF can use a mixture of REL and RELA, but some Relocations work better/work only in RELA, so we default to this. */ diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c index 74049197206..8a109e921f4 100644 --- a/bfd/elfxx-ia64.c +++ b/bfd/elfxx-ia64.c @@ -4900,7 +4900,6 @@ elfNN_hpux_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, #define elf_backend_want_plt_sym 0 #define elf_backend_plt_alignment 5 #define elf_backend_got_header_size 0 -#define elf_backend_plt_header_size PLT_HEADER_SIZE #define elf_backend_want_got_plt 1 #define elf_backend_may_use_rel_p 1 #define elf_backend_may_use_rela_p 1 diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index 40c49d7a92b..40fe8e76ece 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -343,9 +343,6 @@ #ifndef elf_backend_got_header_size #define elf_backend_got_header_size 0 #endif -#ifndef elf_backend_plt_header_size -#define elf_backend_plt_header_size 0 -#endif #ifndef elf_backend_post_process_headers #define elf_backend_post_process_headers NULL #endif @@ -507,7 +504,6 @@ static const struct elf_backend_data elfNN_bed = elf_backend_special_sections, elf_backend_got_symbol_offset, elf_backend_got_header_size, - elf_backend_plt_header_size, elf_backend_collect, elf_backend_type_change_ok, elf_backend_may_use_rel_p,