binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch

3 Date: Wed, 19 Feb 2020 09:51:16 -0800
4 Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK
18 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
20 Upstream-Status: Inappropriate [OE specific tweak]
22 Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 ---
24  ld/Makefile.am | 3 ++-
25  ld/Makefile.in | 3 ++-
26  ld/ldelf.c     | 2 +-
29  5 files changed, 7 insertions(+), 3 deletions(-)
31 diff --git a/ld/Makefile.am b/ld/Makefile.am
33 --- a/ld/Makefile.am
35 @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@
37  ELF_CFLAGS=-DELF_LIST_OPTIONS=@elf_list_options@ \
38  	   -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
39 -	   -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@
40 +	   -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \
41 +           -DSYSCONFDIR="\"$(sysconfdir)\""
45 diff --git a/ld/Makefile.in b/ld/Makefile.in
47 --- a/ld/Makefile.in
49 @@ -576,7 +576,8 @@ ZLIB = @zlibdir@ -lz
51  ELF_CFLAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \
52  	   -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \
53 -	   -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@
54 +	   -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \
55 +           -DSYSCONFDIR="\"$(sysconfdir)\""
59 diff --git a/ld/ldelf.c b/ld/ldelf.c
61 --- a/ld/ldelf.c
63 @@ -939,7 +939,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force,
66        info.len = info.alloc = 0;
67 -      tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf",
72 diff --git a/ld/ldmain.c b/ld/ldmain.c
74 --- a/ld/ldmain.c
76 @@ -69,6 +69,7 @@ char *program_name;
84 diff --git a/ld/ldmain.h b/ld/ldmain.h
86 --- a/ld/ldmain.h
88 @@ -23,6 +23,7 @@