From 9795b468eb39233498a5289ff3297f96c787e848 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 7 Jul 2008 00:46:51 +0000 Subject: [PATCH] * emultempl/armelf.em (elf32_arm_add_stub_section): Use bfd_make_section_with_flags. * emultempl/avrelf.em (avr_elf_create_output_section_statements): Likewise. * emultempl/hppaelf.em (hppaelf_add_stub_section): Likewise. * emultempl/m68hc1xelf.em (m68hc11elf_add_stub_section): Likewise. * emultempl/m68kcoff.em (gld${EMULATION_NAME}_after_open): Likewise. * emultempl/m68kelf.em (m68k_elf_after_open): Likewise. * emultempl/ppc64elf.em (ppc_add_stub_section): Likewise. * emultempl/sh64elf.em (sh64_elf_${EMULATION_NAME}_before_allocation): Likewise. --- ld/ChangeLog | 14 ++++++++++++++ ld/emultempl/armelf.em | 8 +++----- ld/emultempl/avrelf.em | 10 ++++------ ld/emultempl/hppaelf.em | 8 +++----- ld/emultempl/m68hc1xelf.em | 8 +++----- ld/emultempl/m68kcoff.em | 13 ++++++------- ld/emultempl/m68kelf.em | 11 +++++------ ld/emultempl/ppc64elf.em | 8 +++----- ld/emultempl/sh64elf.em | 16 +++++++--------- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 8ad99bc0f3c..9a3620525b3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,17 @@ +2008-07-07 Alan Modra + + * emultempl/armelf.em (elf32_arm_add_stub_section): Use + bfd_make_section_with_flags. + * emultempl/avrelf.em (avr_elf_create_output_section_statements): + Likewise. + * emultempl/hppaelf.em (hppaelf_add_stub_section): Likewise. + * emultempl/m68hc1xelf.em (m68hc11elf_add_stub_section): Likewise. + * emultempl/m68kcoff.em (gld${EMULATION_NAME}_after_open): Likewise. + * emultempl/m68kelf.em (m68k_elf_after_open): Likewise. + * emultempl/ppc64elf.em (ppc_add_stub_section): Likewise. + * emultempl/sh64elf.em (sh64_elf_${EMULATION_NAME}_before_allocation): + Likewise. + 2008-07-06 Nathan Sidwell * ld.texinfo (File Commands): Document that INCLUDE can be used in diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 6ebb30e9677..d142961c3f7 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -276,13 +276,11 @@ elf32_arm_add_stub_section (const char *stub_sec_name, lang_output_section_statement_type *os; struct hook_stub_info info; - stub_sec = bfd_make_section_anyway (stub_file->the_bfd, stub_sec_name); - if (stub_sec == NULL) - goto err_ret; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); - if (!bfd_set_section_flags (stub_file->the_bfd, stub_sec, flags)) + stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, + stub_sec_name, flags); + if (stub_sec == NULL) goto err_ret; bfd_set_section_alignment (stub_file->the_bfd, stub_sec, 3); diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em index 14b9ac2f17a..1bd7bb3cae4 100644 --- a/ld/emultempl/avrelf.em +++ b/ld/emultempl/avrelf.em @@ -122,14 +122,12 @@ avr_elf_create_output_section_statements (void) /* Now we add the stub section. */ - avr_stub_section = bfd_make_section_anyway (stub_file->the_bfd, - ".trampolines"); - if (avr_stub_section == NULL) - goto err_ret; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); - if (!bfd_set_section_flags (stub_file->the_bfd, avr_stub_section, flags)) + avr_stub_section = bfd_make_section_anyway_with_flags (stub_file->the_bfd, + ".trampolines", + flags); + if (avr_stub_section == NULL) goto err_ret; avr_stub_section->alignment_power = 1; diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em index 182ab5307bb..6186cb97213 100644 --- a/ld/emultempl/hppaelf.em +++ b/ld/emultempl/hppaelf.em @@ -179,13 +179,11 @@ hppaelf_add_stub_section (const char *stub_sec_name, asection *input_section) lang_output_section_statement_type *os; struct hook_stub_info info; - stub_sec = bfd_make_section_anyway (stub_file->the_bfd, stub_sec_name); - if (stub_sec == NULL) - goto err_ret; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); - if (!bfd_set_section_flags (stub_file->the_bfd, stub_sec, flags)) + stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, + stub_sec_name, flags); + if (stub_sec == NULL) goto err_ret; output_section = input_section->output_section; diff --git a/ld/emultempl/m68hc1xelf.em b/ld/emultempl/m68hc1xelf.em index c54eacd5e51..0c1305b62d1 100644 --- a/ld/emultempl/m68hc1xelf.em +++ b/ld/emultempl/m68hc1xelf.em @@ -254,13 +254,11 @@ m68hc11elf_add_stub_section (const char *stub_sec_name, lang_output_section_statement_type *os; struct hook_stub_info info; - stub_sec = bfd_make_section_anyway (stub_file->the_bfd, stub_sec_name); - if (stub_sec == NULL) - goto err_ret; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); - if (!bfd_set_section_flags (stub_file->the_bfd, stub_sec, flags)) + stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, + stub_sec_name, flags); + if (stub_sec == NULL) goto err_ret; output_section = tramp_section->output_section; diff --git a/ld/emultempl/m68kcoff.em b/ld/emultempl/m68kcoff.em index a79eb2c1a17..276c3b258aa 100644 --- a/ld/emultempl/m68kcoff.em +++ b/ld/emultempl/m68kcoff.em @@ -4,7 +4,7 @@ fragment <, based on generic.em by Steve Chamberlain , embedded relocs code based on @@ -88,13 +88,12 @@ gld${EMULATION_NAME}_after_open (void) { asection *relsec; - relsec = bfd_make_section (abfd, ".emreloc"); + relsec = bfd_make_section_with_flags (abfd, ".emreloc", + (SEC_ALLOC + | SEC_LOAD + | SEC_HAS_CONTENTS + | SEC_IN_MEMORY)); if (relsec == NULL - || ! bfd_set_section_flags (abfd, relsec, - (SEC_ALLOC - | SEC_LOAD - | SEC_HAS_CONTENTS - | SEC_IN_MEMORY)) || ! bfd_set_section_alignment (abfd, relsec, 2) || ! bfd_set_section_size (abfd, relsec, datasec->reloc_count * 12)) diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em index 57a8f1d2247..441b4897fc8 100644 --- a/ld/emultempl/m68kelf.em +++ b/ld/emultempl/m68kelf.em @@ -100,13 +100,12 @@ m68k_elf_after_open (void) { asection *relsec; - relsec = bfd_make_section (abfd, ".emreloc"); + relsec = bfd_make_section_with_flags (abfd, ".emreloc", + (SEC_ALLOC + | SEC_LOAD + | SEC_HAS_CONTENTS + | SEC_IN_MEMORY)); if (relsec == NULL - || ! bfd_set_section_flags (abfd, relsec, - (SEC_ALLOC - | SEC_LOAD - | SEC_HAS_CONTENTS - | SEC_IN_MEMORY)) || ! bfd_set_section_alignment (abfd, relsec, 2) || ! bfd_set_section_size (abfd, relsec, datasec->reloc_count * 12)) diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index 51623b18a43..9a49fa5a341 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -221,13 +221,11 @@ ppc_add_stub_section (const char *stub_sec_name, asection *input_section) lang_output_section_statement_type *os; struct hook_stub_info info; - stub_sec = bfd_make_section_anyway (stub_file->the_bfd, stub_sec_name); - if (stub_sec == NULL) - goto err_ret; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_KEEP); - if (!bfd_set_section_flags (stub_file->the_bfd, stub_sec, flags)) + stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, + stub_sec_name, flags); + if (stub_sec == NULL) goto err_ret; output_section = input_section->output_section; diff --git a/ld/emultempl/sh64elf.em b/ld/emultempl/sh64elf.em index d8cce232307..5c588ce2c12 100644 --- a/ld/emultempl/sh64elf.em +++ b/ld/emultempl/sh64elf.em @@ -203,15 +203,13 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void) sh64_elf_section_data; no need to set it specifically here. */ cranges - = bfd_make_section (link_info.output_bfd, - SH64_CRANGES_SECTION_NAME); - if (cranges == NULL - || !bfd_set_section_flags (link_info.output_bfd, - cranges, - SEC_LINKER_CREATED - | SEC_KEEP - | SEC_HAS_CONTENTS - | SEC_DEBUGGING)) + = bfd_make_section_with_flags (link_info.output_bfd, + SH64_CRANGES_SECTION_NAME, + SEC_LINKER_CREATED + | SEC_KEEP + | SEC_HAS_CONTENTS + | SEC_DEBUGGING); + if (cranges == NULL) einfo (_("%P%E%F: Can't make .cranges section\n")); } -- 2.30.2