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 | 47 |
1 files changed, 23 insertions, 24 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 197caae921..55892417f4 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,4 +1,4 @@ | |||
1 | From 3ea08e491a8494ff03e598b5e0fc2d8131e75da9 Mon Sep 17 00:00:00 2001 | 1 | From 49caf586b80ba030a0ee4af9f6128ff2979ea636 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] nativesdk-glibc: Raise the size of arrays containing dl paths |
@@ -19,17 +19,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | elf/dl-load.c | 4 ++-- | 19 | elf/dl-load.c | 4 ++-- |
20 | elf/dl-usage.c | 6 ++++-- | 20 | elf/dl-usage.c | 6 ++++-- |
21 | elf/interp.c | 2 +- | 21 | elf/interp.c | 2 +- |
22 | elf/ldconfig.c | 3 +++ | 22 | elf/ldconfig.c | 2 ++ |
23 | elf/rtld.c | 1 + | 23 | elf/rtld.c | 1 + |
24 | iconv/gconv_conf.c | 2 +- | 24 | iconv/gconv_conf.c | 2 +- |
25 | sysdeps/generic/dl-cache.h | 4 ---- | 25 | sysdeps/generic/dl-cache.h | 4 ---- |
26 | 8 files changed, 16 insertions(+), 10 deletions(-) | 26 | 8 files changed, 15 insertions(+), 10 deletions(-) |
27 | 27 | ||
28 | 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 |
29 | index 32f3bef5ea..71f3a82dc0 100644 | 29 | index 85f3f179ed..cc55887c56 100644 |
30 | --- a/elf/dl-cache.c | 30 | --- a/elf/dl-cache.c |
31 | +++ b/elf/dl-cache.c | 31 | +++ b/elf/dl-cache.c |
32 | @@ -359,6 +359,10 @@ search_cache (const char *string_table, uint32_t string_table_size, | 32 | @@ -352,6 +352,10 @@ search_cache (const char *string_table, uint32_t string_table_size, |
33 | return best; | 33 | return best; |
34 | } | 34 | } |
35 | 35 | ||
@@ -41,10 +41,10 @@ index 32f3bef5ea..71f3a82dc0 100644 | |||
41 | _dl_cache_libcmp (const char *p1, const char *p2) | 41 | _dl_cache_libcmp (const char *p1, const char *p2) |
42 | { | 42 | { |
43 | 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 |
44 | index f455207e79..a144e24fcf 100644 | 44 | index c4a543fb00..27fb70f09b 100644 |
45 | --- a/elf/dl-load.c | 45 | --- a/elf/dl-load.c |
46 | +++ b/elf/dl-load.c | 46 | +++ b/elf/dl-load.c |
47 | @@ -115,8 +115,8 @@ enum { ncapstr = 1, max_capstrlen = 0 }; | 47 | @@ -117,8 +117,8 @@ enum { ncapstr = 1, max_capstrlen = 0 }; |
48 | gen-trusted-dirs.awk. */ | 48 | gen-trusted-dirs.awk. */ |
49 | #include "trusted-dirs.h" | 49 | #include "trusted-dirs.h" |
50 | 50 | ||
@@ -56,7 +56,7 @@ index f455207e79..a144e24fcf 100644 | |||
56 | SYSTEM_DIRS_LEN | 56 | SYSTEM_DIRS_LEN |
57 | }; | 57 | }; |
58 | diff --git a/elf/dl-usage.c b/elf/dl-usage.c | 58 | diff --git a/elf/dl-usage.c b/elf/dl-usage.c |
59 | index 6e26818bd7..f09e8b93e5 100644 | 59 | index 5baac4ba8e..60097ad0e2 100644 |
60 | --- a/elf/dl-usage.c | 60 | --- a/elf/dl-usage.c |
61 | +++ b/elf/dl-usage.c | 61 | +++ b/elf/dl-usage.c |
62 | @@ -25,6 +25,8 @@ | 62 | @@ -25,6 +25,8 @@ |
@@ -68,7 +68,7 @@ index 6e26818bd7..f09e8b93e5 100644 | |||
68 | void | 68 | void |
69 | _dl_usage (const char *argv0, const char *wrong_option) | 69 | _dl_usage (const char *argv0, const char *wrong_option) |
70 | { | 70 | { |
71 | @@ -244,7 +246,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ | 71 | @@ -185,7 +187,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ |
72 | --list list all dependencies and how they are resolved\n\ | 72 | --list list all dependencies and how they are resolved\n\ |
73 | --verify verify that given object really is a dynamically linked\n\ | 73 | --verify verify that given object really is a dynamically linked\n\ |
74 | object we can handle\n\ | 74 | object we can handle\n\ |
@@ -77,7 +77,7 @@ index 6e26818bd7..f09e8b93e5 100644 | |||
77 | --library-path PATH use given PATH instead of content of the environment\n\ | 77 | --library-path PATH use given PATH instead of content of the environment\n\ |
78 | variable LD_LIBRARY_PATH\n\ | 78 | variable LD_LIBRARY_PATH\n\ |
79 | --glibc-hwcaps-prepend LIST\n\ | 79 | --glibc-hwcaps-prepend LIST\n\ |
80 | @@ -266,7 +268,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ | 80 | @@ -204,7 +206,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ |
81 | \n\ | 81 | \n\ |
82 | This program interpreter self-identifies as: " RTLD "\n\ | 82 | This program interpreter self-identifies as: " RTLD "\n\ |
83 | ", | 83 | ", |
@@ -85,9 +85,9 @@ index 6e26818bd7..f09e8b93e5 100644 | |||
85 | + argv0, LD_SO_CACHE); | 85 | + argv0, LD_SO_CACHE); |
86 | print_search_path_for_help (state); | 86 | print_search_path_for_help (state); |
87 | print_hwcaps_subdirectories (state); | 87 | print_hwcaps_subdirectories (state); |
88 | print_legacy_hwcap_directories (); | 88 | _exit (EXIT_SUCCESS); |
89 | diff --git a/elf/interp.c b/elf/interp.c | 89 | diff --git a/elf/interp.c b/elf/interp.c |
90 | index 91966702ca..dc86c20e83 100644 | 90 | index 8b705824bf..7d094829f3 100644 |
91 | --- a/elf/interp.c | 91 | --- a/elf/interp.c |
92 | +++ b/elf/interp.c | 92 | +++ b/elf/interp.c |
93 | @@ -18,5 +18,5 @@ | 93 | @@ -18,5 +18,5 @@ |
@@ -98,24 +98,23 @@ index 91966702ca..dc86c20e83 100644 | |||
98 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) | 98 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) |
99 | = RUNTIME_LINKER; | 99 | = RUNTIME_LINKER; |
100 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c | 100 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c |
101 | index 28ed637a29..5d38a60c5d 100644 | 101 | index b64c54b53e..caf7001745 100644 |
102 | --- a/elf/ldconfig.c | 102 | --- a/elf/ldconfig.c |
103 | +++ b/elf/ldconfig.c | 103 | +++ b/elf/ldconfig.c |
104 | @@ -176,6 +176,9 @@ static struct argp argp = | 104 | @@ -150,6 +150,8 @@ static struct argp argp = |
105 | options, parse_opt, NULL, doc, NULL, more_help, NULL | 105 | options, parse_opt, NULL, doc, NULL, more_help, NULL |
106 | }; | 106 | }; |
107 | 107 | ||
108 | + | ||
109 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); | 108 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); |
110 | + | 109 | + |
111 | /* Check if string corresponds to an important hardware capability or | 110 | /* Handle program arguments. */ |
112 | a platform. */ | 111 | static error_t |
113 | static int | 112 | parse_opt (int key, char *arg, struct argp_state *state) |
114 | diff --git a/elf/rtld.c b/elf/rtld.c | 113 | diff --git a/elf/rtld.c b/elf/rtld.c |
115 | index 596b6ac3d9..1ccd33f668 100644 | 114 | index 4f494b792e..d1c1252188 100644 |
116 | --- a/elf/rtld.c | 115 | --- a/elf/rtld.c |
117 | +++ b/elf/rtld.c | 116 | +++ b/elf/rtld.c |
118 | @@ -185,6 +185,7 @@ dso_name_valid_for_suid (const char *p) | 117 | @@ -190,6 +190,7 @@ dso_name_valid_for_suid (const char *p) |
119 | } | 118 | } |
120 | return *p != '\0'; | 119 | return *p != '\0'; |
121 | } | 120 | } |
@@ -124,11 +123,11 @@ index 596b6ac3d9..1ccd33f668 100644 | |||
124 | static void | 123 | static void |
125 | audit_list_init (struct audit_list *list) | 124 | audit_list_init (struct audit_list *list) |
126 | diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c | 125 | diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c |
127 | index 682f949834..7eed87bc9d 100644 | 126 | index 1063c31a2b..57fa832e52 100644 |
128 | --- a/iconv/gconv_conf.c | 127 | --- a/iconv/gconv_conf.c |
129 | +++ b/iconv/gconv_conf.c | 128 | +++ b/iconv/gconv_conf.c |
130 | @@ -36,7 +36,7 @@ | 129 | @@ -35,7 +35,7 @@ |
131 | 130 | #include <gconv_parseconfdir.h> | |
132 | 131 | ||
133 | /* This is the default path where we look for module lists. */ | 132 | /* This is the default path where we look for module lists. */ |
134 | -static const char default_gconv_path[] = GCONV_PATH; | 133 | -static const char default_gconv_path[] = GCONV_PATH; |
@@ -137,7 +136,7 @@ index 682f949834..7eed87bc9d 100644 | |||
137 | /* Type to represent search path. */ | 136 | /* Type to represent search path. */ |
138 | struct path_elem | 137 | struct path_elem |
139 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h | 138 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h |
140 | index 964d50a486..94bf68ca9d 100644 | 139 | index 919e49ffc8..cd3f8ba94b 100644 |
141 | --- a/sysdeps/generic/dl-cache.h | 140 | --- a/sysdeps/generic/dl-cache.h |
142 | +++ b/sysdeps/generic/dl-cache.h | 141 | +++ b/sysdeps/generic/dl-cache.h |
143 | @@ -34,10 +34,6 @@ | 142 | @@ -34,10 +34,6 @@ |