PR25477, ld 2.34 tries to load ${prefix}/etc/ld.so.conf

	PR 25477
	* ldelf.c (ldelf_check_ld_so_conf): Add prefix parameter and
	correct concat.
	(ldelf_after_open): Add prefix parameter.
	* ldelf.h (ldelf_after_open): Update prototype.
	* emultempl/elf.em (gld${EMULATION_NAME}_after_open): Pass $prefix
	to ldelf_after_open.
	* Makefile.am: Correct z80 dependencies.
	* Makefile.in: Regenerate.

(cherry picked from commit ef8f08ca13f6c111cc549a3e13be5c5e2d95ca82)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index bcafc947a88c26cbe61687af799297cd78257a0c..76df7b02ced845e14c660fe3a45cd9ecc59f242e 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,6 +1,17 @@
 2020-01-29  Alan Modra  <amodra@gmail.com>
 
        Apply from master
+       2020-01-29  Alan Modra  <amodra@gmail.com>
+       PR 25477
+       * ldelf.c (ldelf_check_ld_so_conf): Add prefix parameter and
+       correct concat.
+       (ldelf_after_open): Add prefix parameter.
+       * ldelf.h (ldelf_after_open): Update prototype.
+       * emultempl/elf.em (gld${EMULATION_NAME}_after_open): Pass $prefix
+       to ldelf_after_open.
+       * Makefile.am: Correct z80 dependencies.
+       * Makefile.in: Regenerate.
+
        2020-01-28  Alan Modra  <amodra@gmail.com>
        * ldexp.c (fold_name): Don't print bfd_link_hash_lookup failed
        in first phase.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 2ed13eba87c27958fd4f15371d6ed5ca30f4ada0..4a9b8404b7b1c1366fb867669d4900a2a3a7ae4d 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -775,6 +775,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xs.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Pc@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Pc@am__quote@
@@ -873,7 +874,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez80.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez8001.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez8002.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez80elf32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elfb.Pc@am__quote@

diff --git a/ld/Makefile.in b/ld/Makefile.in
index f635845643531d9e566a5b5ba7854fdc76dfd170..46d9b14077924f4fc8f1f4ff5078479e41bdd670 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2379,6 +2379,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xs.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Pc@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Pc@am__quote@
@@ -2477,7 +2478,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez80.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez8001.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez8002.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ez80elf32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elfb.Pc@am__quote@

diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
index 9c32397c8d3993ae2eeb0590f450f72cc0e7f537..42c552b36eda23cde2d6eb16c313ad40f54b7f3a 100644 (file)
--- a/ld/emultempl/elf.em
+++ b/ld/emultempl/elf.em
@@ -125,7 +125,7 @@ static void
 gld${EMULATION_NAME}_after_open (void)
 {
   ldelf_after_open ($IS_LIBPATH, $IS_NATIVE,
-                   $IS_LINUX_TARGET, $IS_FREEBSD_TARGET, $ELFSIZE);
+                   $IS_LINUX_TARGET, $IS_FREEBSD_TARGET, $ELFSIZE, "$prefix");
 }
 
 EOF

diff --git a/ld/ldelf.c b/ld/ldelf.c
index 6c20fbeff51e65b829f9848fd337291a2088b361..2e27cf48a816dc78bd76d2f0185a601d2edfb392 100644 (file)
--- a/ld/ldelf.c
+++ b/ld/ldelf.c
@@ -894,7 +894,7 @@ ldelf_parse_ld_so_conf (struct ldelf_ld_so_conf *info, const char *filename)
 
 static bfd_boolean
 ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
-                       int elfsize)
+                       int elfsize, const char *prefix)
 {
   static bfd_boolean initialized;
   static const char *ld_so_conf;
@@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
 
       info.path = NULL;
       info.len = info.alloc = 0;
-      tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf",
+      tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf",
                        (const char *) NULL);
       if (!ldelf_parse_ld_so_conf (&info, tmppath))
        {
@@ -986,7 +986,7 @@ ldelf_check_needed (lang_input_statement_type *s)
 
 void
 ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
-                 int elfsize)
+                 int elfsize, const char *prefix)
 {
   struct bfd_link_needed_list *needed, *l;
   struct elf_link_hash_table *htab;
@@ -1260,7 +1260,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
                break;
 
              if (is_linux
-                 && ldelf_check_ld_so_conf (l, force, elfsize))
+                 && ldelf_check_ld_so_conf (l, force, elfsize, prefix))
                break;
            }
 

diff --git a/ld/ldelf.h b/ld/ldelf.h
index baf5183e012cec8d31bf23520f775b94e0c63a8f..492649b29349a5b8cb284722b6336c8ec4690930 100644 (file)
--- a/ld/ldelf.h
+++ b/ld/ldelf.h
@@ -22,7 +22,7 @@ extern const char *ldelf_emit_note_gnu_build_id;
 
 extern void ldelf_after_parse (void);
 extern bfd_boolean ldelf_load_symbols (lang_input_statement_type *);
-extern void ldelf_after_open (int, int, int, int, int);
+extern void ldelf_after_open (int, int, int, int, int, const char *);
 extern bfd_boolean ldelf_setup_build_id (bfd *);
 extern void ldelf_append_to_separated_string (char **, char *);
 extern void ldelf_before_allocation (char *, char *, const char *);