diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 294c2b975e..2073576aac 100644 --- a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 1b97befbe693eb93a77b6098f6ae1394a53462f4 Mon Sep 17 00:00:00 2001 | 1 | From 19cd858f5f04a6ac584fbd89a2fbc51791263b85 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 18 Mar 2015 01:51:38 +0000 | 3 | Date: Wed, 18 Mar 2015 01:51:38 +0000 |
4 | Subject: [PATCH] nativesdk-glibc: Raise the size of arrays containing dl paths | 4 | Subject: [PATCH 05/29] nativesdk-glibc: Raise the size of arrays containing dl |
5 | paths | ||
5 | 6 | ||
6 | This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings | 7 | This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings |
7 | and lengths as well as ld.so.cache path in the dynamic loader to specific | 8 | and lengths as well as ld.so.cache path in the dynamic loader to specific |
@@ -25,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 7 files changed, 14 insertions(+), 10 deletions(-) | 26 | 7 files changed, 14 insertions(+), 10 deletions(-) |
26 | 27 | ||
27 | diff --git a/elf/dl-cache.c b/elf/dl-cache.c | 28 | diff --git a/elf/dl-cache.c b/elf/dl-cache.c |
28 | index 3eedd9afcf..efdfe5cae7 100644 | 29 | index 93d185e788..e115b18756 100644 |
29 | --- a/elf/dl-cache.c | 30 | --- a/elf/dl-cache.c |
30 | +++ b/elf/dl-cache.c | 31 | +++ b/elf/dl-cache.c |
31 | @@ -133,6 +133,10 @@ do \ | 32 | @@ -133,6 +133,10 @@ do \ |
@@ -40,10 +41,10 @@ index 3eedd9afcf..efdfe5cae7 100644 | |||
40 | _dl_cache_libcmp (const char *p1, const char *p2) | 41 | _dl_cache_libcmp (const char *p1, const char *p2) |
41 | { | 42 | { |
42 | diff --git a/elf/dl-load.c b/elf/dl-load.c | 43 | diff --git a/elf/dl-load.c b/elf/dl-load.c |
43 | index 7cb8a86fab..e32d4aa936 100644 | 44 | index e1b3486549..5226d0c4fa 100644 |
44 | --- a/elf/dl-load.c | 45 | --- a/elf/dl-load.c |
45 | +++ b/elf/dl-load.c | 46 | +++ b/elf/dl-load.c |
46 | @@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro; | 47 | @@ -111,8 +111,8 @@ static size_t max_capstrlen attribute_relro; |
47 | gen-trusted-dirs.awk. */ | 48 | gen-trusted-dirs.awk. */ |
48 | #include "trusted-dirs.h" | 49 | #include "trusted-dirs.h" |
49 | 50 | ||
@@ -66,10 +67,10 @@ index 331cc1df48..885b2d9476 100644 | |||
66 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) | 67 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) |
67 | = RUNTIME_LINKER; | 68 | = RUNTIME_LINKER; |
68 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c | 69 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c |
69 | index 681ed78496..8833ed0a6b 100644 | 70 | index 0c090dca15..6bb6e0fe72 100644 |
70 | --- a/elf/ldconfig.c | 71 | --- a/elf/ldconfig.c |
71 | +++ b/elf/ldconfig.c | 72 | +++ b/elf/ldconfig.c |
72 | @@ -168,6 +168,9 @@ static struct argp argp = | 73 | @@ -171,6 +171,9 @@ static struct argp argp = |
73 | options, parse_opt, NULL, doc, NULL, more_help, NULL | 74 | options, parse_opt, NULL, doc, NULL, more_help, NULL |
74 | }; | 75 | }; |
75 | 76 | ||
@@ -80,18 +81,18 @@ index 681ed78496..8833ed0a6b 100644 | |||
80 | a platform. */ | 81 | a platform. */ |
81 | static int | 82 | static int |
82 | diff --git a/elf/rtld.c b/elf/rtld.c | 83 | diff --git a/elf/rtld.c b/elf/rtld.c |
83 | index 553cfbd1b7..39347c2c03 100644 | 84 | index 5b882163fa..db407b5d8b 100644 |
84 | --- a/elf/rtld.c | 85 | --- a/elf/rtld.c |
85 | +++ b/elf/rtld.c | 86 | +++ b/elf/rtld.c |
86 | @@ -175,6 +175,7 @@ dso_name_valid_for_suid (const char *p) | 87 | @@ -217,6 +217,7 @@ dso_name_valid_for_suid (const char *p) |
87 | } | 88 | } |
88 | return *p != '\0'; | 89 | return *p != '\0'; |
89 | } | 90 | } |
90 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); | 91 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); |
91 | 92 | ||
92 | /* LD_AUDIT variable contents. Must be processed before the | 93 | static void |
93 | audit_list below. */ | 94 | audit_list_init (struct audit_list *list) |
94 | @@ -1222,13 +1223,13 @@ of this helper program; chances are you did not intend to run this program.\n\ | 95 | @@ -1286,13 +1287,13 @@ of this helper program; chances are you did not intend to run this program.\n\ |
95 | --list list all dependencies and how they are resolved\n\ | 96 | --list list all dependencies and how they are resolved\n\ |
96 | --verify verify that given object really is a dynamically linked\n\ | 97 | --verify verify that given object really is a dynamically linked\n\ |
97 | object we can handle\n\ | 98 | object we can handle\n\ |
@@ -135,3 +136,6 @@ index 6b310e9e15..3877311df4 100644 | |||
135 | #ifndef add_system_dir | 136 | #ifndef add_system_dir |
136 | # define add_system_dir(dir) add_dir (dir) | 137 | # define add_system_dir(dir) add_dir (dir) |
137 | #endif | 138 | #endif |
139 | -- | ||
140 | 2.27.0 | ||
141 | |||