From eee86d5a9b698bc2d10bfce462dd5172ed60b767 Mon Sep 17 00:00:00 2001 From: John Marino Date: Mon, 29 Aug 2016 14:10:42 -0500 Subject: [PATCH] binutils 2.25 linkers: Set default interpreter to valid path I originally thought these interpreter definitions didn't affect anything, but they may explain random stderr messages during building. In any case, it doesn't hurt to correct the definitions and this was also done for devel/binutils in dports. --- contrib/binutils-2.25/README.DRAGONFLY | 2 ++ contrib/binutils-2.25/bfd/elf64-x86-64.c | 2 +- contrib/binutils-2.25/gold/x86_64.cc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/binutils-2.25/README.DRAGONFLY b/contrib/binutils-2.25/README.DRAGONFLY index 32c3341c07..1fba3c76c0 100644 --- a/contrib/binutils-2.25/README.DRAGONFLY +++ b/contrib/binutils-2.25/README.DRAGONFLY @@ -12,4 +12,6 @@ A list of files and directories removed is in README.DELETED Local modifications applied to following files: bfd/bfdver.h (new) + bfd/elf64-x86-64.c + gold/x86_64.cc ld/ldlex.l diff --git a/contrib/binutils-2.25/bfd/elf64-x86-64.c b/contrib/binutils-2.25/bfd/elf64-x86-64.c index 18983e8b44..80d5dac628 100644 --- a/contrib/binutils-2.25/bfd/elf64-x86-64.c +++ b/contrib/binutils-2.25/bfd/elf64-x86-64.c @@ -521,7 +521,7 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz, /* The name of the dynamic interpreter. This is put in the .interp section. */ -#define ELF64_DYNAMIC_INTERPRETER "/lib/ld64.so.1" +#define ELF64_DYNAMIC_INTERPRETER "/libexec/ld-elf.so.2" #define ELF32_DYNAMIC_INTERPRETER "/lib/ldx32.so.1" /* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid diff --git a/contrib/binutils-2.25/gold/x86_64.cc b/contrib/binutils-2.25/gold/x86_64.cc index 10c75a2be2..7e63514c64 100644 --- a/contrib/binutils-2.25/gold/x86_64.cc +++ b/contrib/binutils-2.25/gold/x86_64.cc @@ -1021,7 +1021,7 @@ const Target::Target_info Target_x86_64<64>::x86_64_info = true, // is_default_stack_executable true, // can_icf_inline_merge_sections '\0', // wrap_char - "/lib/ld64.so.1", // program interpreter + "/libexec/ld-elf.so.2", // program interpreter 0x400000, // default_text_segment_address 0x1000, // abi_pagesize (overridable by -z max-page-size) 0x1000, // common_pagesize (overridable by -z common-page-size) -- 2.11.4.GIT