diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-14 18:23:20 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-11 15:57:08 +0100 |
commit | 1f4f343ff290019987f25d06ea0c00d495660919 (patch) | |
tree | f139bbba8e209a1094a0fc14d446a4e0aba9e9be /meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch | |
parent | 715b05e9e193200c2e41fe4881b2ab1fdb639cc2 (diff) | |
download | poky-1f4f343ff290019987f25d06ea0c00d495660919.tar.gz |
glibc: Upgrade to 2.25.90
Eventually it will be released as 2.26 final
(From OE-Core rev: 5a58883258206893d15990953c8691b05473eecb)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 36 |
1 files changed, 18 insertions, 18 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 9e207e44d9..397e8b3169 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 e53968d61804b6bab32ec6e13cc0b3cd57214796 Mon Sep 17 00:00:00 2001 | 1 | From 490a0eb4da1af726ea5d68e3efc0d18ba94c4054 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/26] 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 |
@@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
26 | 7 files changed, 14 insertions(+), 10 deletions(-) | 26 | 7 files changed, 14 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 cfa335e..daa12ec 100644 | 29 | index e9632da0b3..4de529d2cf 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 | @@ -132,6 +132,10 @@ do \ | 32 | @@ -133,6 +133,10 @@ do \ |
33 | while (0) | 33 | while (0) |
34 | 34 | ||
35 | 35 | ||
@@ -41,7 +41,7 @@ index cfa335e..daa12ec 100644 | |||
41 | internal_function | 41 | internal_function |
42 | _dl_cache_libcmp (const char *p1, const char *p2) | 42 | _dl_cache_libcmp (const char *p1, const char *p2) |
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 3a3d112..a1410e4 100644 | 44 | index 19c1db9948..70c259b400 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 | @@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; | 47 | @@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; |
@@ -56,7 +56,7 @@ index 3a3d112..a1410e4 100644 | |||
56 | SYSTEM_DIRS_LEN | 56 | SYSTEM_DIRS_LEN |
57 | }; | 57 | }; |
58 | diff --git a/elf/interp.c b/elf/interp.c | 58 | diff --git a/elf/interp.c b/elf/interp.c |
59 | index 9448802..e7e8c70 100644 | 59 | index b6e8f04444..47c20415bc 100644 |
60 | --- a/elf/interp.c | 60 | --- a/elf/interp.c |
61 | +++ b/elf/interp.c | 61 | +++ b/elf/interp.c |
62 | @@ -18,5 +18,5 @@ | 62 | @@ -18,5 +18,5 @@ |
@@ -67,7 +67,7 @@ index 9448802..e7e8c70 100644 | |||
67 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) | 67 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) |
68 | = RUNTIME_LINKER; | 68 | = RUNTIME_LINKER; |
69 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c | 69 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c |
70 | index 467ca82..631a2a9 100644 | 70 | index 99caf9e9bb..36ea5df5f1 100644 |
71 | --- a/elf/ldconfig.c | 71 | --- a/elf/ldconfig.c |
72 | +++ b/elf/ldconfig.c | 72 | +++ b/elf/ldconfig.c |
73 | @@ -168,6 +168,9 @@ static struct argp argp = | 73 | @@ -168,6 +168,9 @@ static struct argp argp = |
@@ -81,18 +81,18 @@ index 467ca82..631a2a9 100644 | |||
81 | a platform. */ | 81 | a platform. */ |
82 | static int | 82 | static int |
83 | diff --git a/elf/rtld.c b/elf/rtld.c | 83 | diff --git a/elf/rtld.c b/elf/rtld.c |
84 | index 4ec25d7..e159c12 100644 | 84 | index 65647fb1c8..cd8381cb33 100644 |
85 | --- a/elf/rtld.c | 85 | --- a/elf/rtld.c |
86 | +++ b/elf/rtld.c | 86 | +++ b/elf/rtld.c |
87 | @@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local | 87 | @@ -128,6 +128,7 @@ dso_name_valid_for_suid (const char *p) |
88 | strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) | 88 | } |
89 | #endif | 89 | return *p != '\0'; |
90 | 90 | } | |
91 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); | 91 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); |
92 | 92 | ||
93 | /* List of auditing DSOs. */ | 93 | /* LD_AUDIT variable contents. Must be processed before the |
94 | static struct audit_list | 94 | audit_list below. */ |
95 | @@ -854,12 +855,12 @@ of this helper program; chances are you did not intend to run this program.\n\ | 95 | @@ -999,12 +1000,12 @@ of this helper program; chances are you did not intend to run this program.\n\ |
96 | --list list all dependencies and how they are resolved\n\ | 96 | --list list all dependencies and how they are resolved\n\ |
97 | --verify verify that given object really is a dynamically linked\n\ | 97 | --verify verify that given object really is a dynamically linked\n\ |
98 | object we can handle\n\ | 98 | object we can handle\n\ |
@@ -108,7 +108,7 @@ index 4ec25d7..e159c12 100644 | |||
108 | ++_dl_skip_args; | 108 | ++_dl_skip_args; |
109 | --_dl_argc; | 109 | --_dl_argc; |
110 | diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c | 110 | diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c |
111 | index e235188..569f72e 100644 | 111 | index 5aa055de6e..b9a14b9bd3 100644 |
112 | --- a/iconv/gconv_conf.c | 112 | --- a/iconv/gconv_conf.c |
113 | +++ b/iconv/gconv_conf.c | 113 | +++ b/iconv/gconv_conf.c |
114 | @@ -36,7 +36,7 @@ | 114 | @@ -36,7 +36,7 @@ |
@@ -121,7 +121,7 @@ index e235188..569f72e 100644 | |||
121 | /* The path elements, as determined by the __gconv_get_path function. | 121 | /* The path elements, as determined by the __gconv_get_path function. |
122 | All path elements end in a slash. */ | 122 | All path elements end in a slash. */ |
123 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h | 123 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h |
124 | index eb2f900..505804e 100644 | 124 | index 1f0b8f629d..acbe68399d 100644 |
125 | --- a/sysdeps/generic/dl-cache.h | 125 | --- a/sysdeps/generic/dl-cache.h |
126 | +++ b/sysdeps/generic/dl-cache.h | 126 | +++ b/sysdeps/generic/dl-cache.h |
127 | @@ -27,10 +27,6 @@ | 127 | @@ -27,10 +27,6 @@ |
@@ -136,5 +136,5 @@ index eb2f900..505804e 100644 | |||
136 | # define add_system_dir(dir) add_dir (dir) | 136 | # define add_system_dir(dir) add_dir (dir) |
137 | #endif | 137 | #endif |
138 | -- | 138 | -- |
139 | 2.10.2 | 139 | 2.13.2 |
140 | 140 | ||