diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 60f9f17b89..23b9fcbe96 100644 --- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e76048898ae9aa49dc70d6f9b1bbc22082e61fe3 Mon Sep 17 00:00:00 2001 | 1 | From c99892f2018cd7fa0f37b53e6cebec99fa036472 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 03/24] nativesdk-glibc: Raise the size of arrays containing dl | 4 | Subject: [PATCH 03/25] nativesdk-glibc: Raise the size of arrays containing dl |
5 | paths | 5 | paths |
6 | 6 | ||
7 | 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 |
@@ -25,7 +25,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 6 files changed, 13 insertions(+), 9 deletions(-) | 25 | 6 files changed, 13 insertions(+), 9 deletions(-) |
26 | 26 | ||
27 | diff --git a/elf/dl-cache.c b/elf/dl-cache.c | 27 | diff --git a/elf/dl-cache.c b/elf/dl-cache.c |
28 | index dec49bc..862f1d8 100644 | 28 | index cfa335e..daa12ec 100644 |
29 | --- a/elf/dl-cache.c | 29 | --- a/elf/dl-cache.c |
30 | +++ b/elf/dl-cache.c | 30 | +++ b/elf/dl-cache.c |
31 | @@ -132,6 +132,10 @@ do \ | 31 | @@ -132,6 +132,10 @@ do \ |
@@ -40,7 +40,7 @@ index dec49bc..862f1d8 100644 | |||
40 | internal_function | 40 | internal_function |
41 | _dl_cache_libcmp (const char *p1, const char *p2) | 41 | _dl_cache_libcmp (const char *p1, const char *p2) |
42 | diff --git a/elf/dl-load.c b/elf/dl-load.c | 42 | diff --git a/elf/dl-load.c b/elf/dl-load.c |
43 | index c4a42e9..acf6c03 100644 | 43 | index c7b8797..37a1beb 100644 |
44 | --- a/elf/dl-load.c | 44 | --- a/elf/dl-load.c |
45 | +++ b/elf/dl-load.c | 45 | +++ b/elf/dl-load.c |
46 | @@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; | 46 | @@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; |
@@ -55,7 +55,7 @@ index c4a42e9..acf6c03 100644 | |||
55 | SYSTEM_DIRS_LEN | 55 | SYSTEM_DIRS_LEN |
56 | }; | 56 | }; |
57 | diff --git a/elf/interp.c b/elf/interp.c | 57 | diff --git a/elf/interp.c b/elf/interp.c |
58 | index 422ea95e..6d61a36 100644 | 58 | index 9448802..e7e8c70 100644 |
59 | --- a/elf/interp.c | 59 | --- a/elf/interp.c |
60 | +++ b/elf/interp.c | 60 | +++ b/elf/interp.c |
61 | @@ -18,5 +18,5 @@ | 61 | @@ -18,5 +18,5 @@ |
@@ -66,10 +66,10 @@ index 422ea95e..6d61a36 100644 | |||
66 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) | 66 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) |
67 | = RUNTIME_LINKER; | 67 | = RUNTIME_LINKER; |
68 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c | 68 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c |
69 | index f54ec22..0e78a83 100644 | 69 | index 467ca82..631a2a9 100644 |
70 | --- a/elf/ldconfig.c | 70 | --- a/elf/ldconfig.c |
71 | +++ b/elf/ldconfig.c | 71 | +++ b/elf/ldconfig.c |
72 | @@ -167,6 +167,9 @@ static struct argp argp = | 72 | @@ -168,6 +168,9 @@ static struct argp argp = |
73 | options, parse_opt, NULL, doc, NULL, more_help, NULL | 73 | options, parse_opt, NULL, doc, NULL, more_help, NULL |
74 | }; | 74 | }; |
75 | 75 | ||
@@ -80,7 +80,7 @@ index f54ec22..0e78a83 100644 | |||
80 | a platform. */ | 80 | a platform. */ |
81 | static int | 81 | static int |
82 | diff --git a/elf/rtld.c b/elf/rtld.c | 82 | diff --git a/elf/rtld.c b/elf/rtld.c |
83 | index 52160df..80f0582 100644 | 83 | index 647661c..4e16a43 100644 |
84 | --- a/elf/rtld.c | 84 | --- a/elf/rtld.c |
85 | +++ b/elf/rtld.c | 85 | +++ b/elf/rtld.c |
86 | @@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local | 86 | @@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local |
@@ -107,7 +107,7 @@ index 52160df..80f0582 100644 | |||
107 | ++_dl_skip_args; | 107 | ++_dl_skip_args; |
108 | --_dl_argc; | 108 | --_dl_argc; |
109 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h | 109 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h |
110 | index 70d4aeb..5c726d0 100644 | 110 | index eb2f900..505804e 100644 |
111 | --- a/sysdeps/generic/dl-cache.h | 111 | --- a/sysdeps/generic/dl-cache.h |
112 | +++ b/sysdeps/generic/dl-cache.h | 112 | +++ b/sysdeps/generic/dl-cache.h |
113 | @@ -27,10 +27,6 @@ | 113 | @@ -27,10 +27,6 @@ |
@@ -121,16 +121,6 @@ index 70d4aeb..5c726d0 100644 | |||
121 | #ifndef add_system_dir | 121 | #ifndef add_system_dir |
122 | # define add_system_dir(dir) add_dir (dir) | 122 | # define add_system_dir(dir) add_dir (dir) |
123 | #endif | 123 | #endif |
124 | Index: git/iconv/gconv_conf.c | 124 | -- |
125 | =================================================================== | 125 | 2.8.2 |
126 | --- git.orig/iconv/gconv_conf.c | 126 | |
127 | +++ git/iconv/gconv_conf.c | ||
128 | @@ -36,7 +36,7 @@ | ||
129 | |||
130 | |||
131 | /* This is the default path where we look for module lists. */ | ||
132 | -static const char default_gconv_path[] = GCONV_PATH; | ||
133 | +static char default_gconv_path[4096] __attribute__ ((section (".gccrelocprefix"))) = GCONV_PATH; | ||
134 | |||
135 | /* The path elements, as determined by the __gconv_get_path function. | ||
136 | All path elements end in a slash. */ | ||