diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 59a97c13c7..4fe5520010 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b2ccd25828b40310caeb094c0413e3a30a4dc0a5 Mon Sep 17 00:00:00 2001 | 1 | From 67735b3647f98ce0f010ff8b4f9b5c5da576cb17 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 | 3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 |
4 | Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK | 4 | Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK |
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 5 files changed, 7 insertions(+), 3 deletions(-) | 29 | 5 files changed, 7 insertions(+), 3 deletions(-) |
30 | 30 | ||
31 | diff --git a/ld/Makefile.am b/ld/Makefile.am | 31 | diff --git a/ld/Makefile.am b/ld/Makefile.am |
32 | index b55a873d927..61db131fb0d 100644 | 32 | index d31021c13e2..29782385ca4 100644 |
33 | --- a/ld/Makefile.am | 33 | --- a/ld/Makefile.am |
34 | +++ b/ld/Makefile.am | 34 | +++ b/ld/Makefile.am |
35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ | 35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ |
@@ -41,12 +41,12 @@ index b55a873d927..61db131fb0d 100644 | |||
41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 41 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
42 | WARN_CFLAGS = @WARN_CFLAGS@ | 42 | WARN_CFLAGS = @WARN_CFLAGS@ |
43 | NO_WERROR = @NO_WERROR@ | 43 | NO_WERROR = @NO_WERROR@ |
44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) |
45 | diff --git a/ld/Makefile.in b/ld/Makefile.in | 45 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
46 | index 61e93eeaf1e..860eb21a785 100644 | 46 | index ee0c98f65b0..04ee68a2c67 100644 |
47 | --- a/ld/Makefile.in | 47 | --- a/ld/Makefile.in |
48 | +++ b/ld/Makefile.in | 48 | +++ b/ld/Makefile.in |
49 | @@ -556,7 +556,8 @@ ZLIB = @zlibdir@ -lz | 49 | @@ -562,7 +562,8 @@ ZLIB = @zlibdir@ -lz |
50 | ZLIBINC = @zlibinc@ | 50 | ZLIBINC = @zlibinc@ |
51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ | 51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ |
52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | 52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ |
@@ -54,13 +54,13 @@ index 61e93eeaf1e..860eb21a785 100644 | |||
54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ | 54 | + -DELF_PLT_UNWIND_LIST_OPTIONS=@elf_plt_unwind_list_options@ \ |
55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
56 | 56 | ||
57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) |
58 | 58 | ||
59 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 59 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
60 | index 121c25d948f..34cbc60e5e9 100644 | 60 | index bfa0d54753a..0d61a3209ec 100644 |
61 | --- a/ld/ldelf.c | 61 | --- a/ld/ldelf.c |
62 | +++ b/ld/ldelf.c | 62 | +++ b/ld/ldelf.c |
63 | @@ -930,7 +930,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, | 63 | @@ -936,7 +936,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, |
64 | 64 | ||
65 | info.path = NULL; | 65 | info.path = NULL; |
66 | info.len = info.alloc = 0; | 66 | info.len = info.alloc = 0; |