diff options
Diffstat (limited to 'ld/emultempl')
| -rw-r--r-- | ld/emultempl/nds32elf.em | 1 | ||||
| -rw-r--r-- | ld/emultempl/ppc32elf.em | 16 | ||||
| -rw-r--r-- | ld/emultempl/ppc64elf.em | 1 | ||||
| -rw-r--r-- | ld/emultempl/sh64elf.em | 5 | ||||
| -rw-r--r-- | ld/emultempl/xtensaelf.em | 8 |
5 files changed, 9 insertions, 22 deletions
diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em index 08da695bac0..7c1ddfe2492 100644 --- a/ld/emultempl/nds32elf.em +++ b/ld/emultempl/nds32elf.em @@ -22,7 +22,6 @@ fragment <<EOF -#include "libbfd.h" #include "elf-bfd.h" #include "elf/nds32.h" #include "bfd_stdint.h" diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em index a0255cd5323..95df30d4031 100644 --- a/ld/emultempl/ppc32elf.em +++ b/ld/emultempl/ppc32elf.em @@ -24,7 +24,6 @@ # fragment <<EOF -#include "libbfd.h" #include "elf32-ppc.h" #include "ldlex.h" #include "ldlang.h" @@ -39,9 +38,7 @@ static int notlsopt = 0; /* Choose the correct place for .got. */ static int old_got = 0; -static bfd_vma pagesize = 0; - -static struct ppc_elf_params params = { PLT_UNSET, -1, 0, 0, 0, 0, 0 }; +static struct ppc_elf_params params = { PLT_UNSET, -1, 0, 0, 0, 0, 0, 0 }; static void ppc_after_open_output (void) @@ -49,9 +46,8 @@ ppc_after_open_output (void) if (params.emit_stub_syms < 0) params.emit_stub_syms = (link_info.emitrelocations || bfd_link_pic (&link_info)); - if (pagesize == 0) - pagesize = config.commonpagesize; - params.pagesize_p2 = bfd_log2 (pagesize); + if (params.pagesize == 0) + params.pagesize = config.commonpagesize; ppc_elf_link_params (&link_info, ¶ms); } @@ -331,10 +327,10 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}' if (optarg != NULL) { char *end; - pagesize = strtoul (optarg, &end, 0); + params.pagesize = strtoul (optarg, &end, 0); if (*end - || (pagesize < 4096 && pagesize != 0) - || pagesize != (pagesize & -pagesize)) + || (params.pagesize < 4096 && params.pagesize != 0) + || params.pagesize != (params.pagesize & -params.pagesize)) einfo (_("%P%F: invalid pagesize `%s'\''\n"), optarg); } break; diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index d7c0686d681..eaa692db607 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -25,7 +25,6 @@ fragment <<EOF #include "ldctor.h" -#include "libbfd.h" #include "elf-bfd.h" #include "elf64-ppc.h" #include "ldlex.h" diff --git a/ld/emultempl/sh64elf.em b/ld/emultempl/sh64elf.em index c538f395114..0d425101155 100644 --- a/ld/emultempl/sh64elf.em +++ b/ld/emultempl/sh64elf.em @@ -29,7 +29,6 @@ LDEMUL_BEFORE_ALLOCATION=sh64_elf_${EMULATION_NAME}_before_allocation fragment <<EOF #include "libiberty.h" -#include "libbfd.h" #include "elf-bfd.h" #include "elf/sh.h" #include "elf32-sh64.h" @@ -332,7 +331,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void) { oflags_isa = SHF_SH5_ISA32_MIXED; - BFD_ASSERT (sh64_elf_section_data (osec)->sh64_info); + ASSERT (sh64_elf_section_data (osec)->sh64_info); sh64_elf_section_data (osec)->sh64_info->contents_flags = SHF_SH5_ISA32_MIXED; @@ -382,7 +381,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void) if (cranges->contents != NULL) free (cranges->contents); - BFD_ASSERT (sh64_elf_section_data (cranges)->sh64_info != NULL); + ASSERT (sh64_elf_section_data (cranges)->sh64_info != NULL); /* Make sure we have .cranges in memory even if there were only assembler-generated .cranges. */ diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em index 01ac7a96a69..4a87ac4e349 100644 --- a/ld/emultempl/xtensaelf.em +++ b/ld/emultempl/xtensaelf.em @@ -26,7 +26,6 @@ fragment <<EOF #include <xtensa-config.h> #include "../bfd/elf-bfd.h" -#include "../bfd/libbfd.h" #include "elf/xtensa.h" #include "bfd.h" @@ -116,12 +115,7 @@ replace_insn_sec_with_prop_sec (bfd *abfd, if (insn_sec->size != 0) { - insn_contents = (bfd_byte *) bfd_malloc (insn_sec->size); - if (insn_contents == NULL) - { - *error_message = _("out of memory"); - goto cleanup; - } + insn_contents = (bfd_byte *) xmalloc (insn_sec->size); if (! bfd_get_section_contents (abfd, insn_sec, insn_contents, (file_ptr) 0, insn_sec->size)) { |