summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-01-12 12:20:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:22 +0000
commit49fec741ebd62e6a4157e364321b9fec8931825b (patch)
tree305062cbc3ae0a6ae0bc510bfd05b0c1cb0c3999
parentf4c96ea8292e9641214c32b5858d7653651b054f (diff)
downloadpoky-49fec741ebd62e6a4157e364321b9fec8931825b.tar.gz
glibc: Upgrade to 2.25 snapshot
glibc 2.25 release is in freeze stage now (From OE-Core rev: b72dbf70646e9dca0dbb5b22bc70d919e6eb8bdc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.25.bb (renamed from meta/recipes-core/glibc/cross-localedef-native_2.24.bb)5
-rw-r--r--meta/recipes-core/glibc/glibc-initial_2.25.bb (renamed from meta/recipes-core/glibc/glibc-initial_2.24.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.25.bb (renamed from meta/recipes-core/glibc/glibc-locale_2.24.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-mtrace_2.25.bb (renamed from meta/recipes-core/glibc/glibc-mtrace_2.24.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-scripts_2.25.bb (renamed from meta/recipes-core/glibc/glibc-scripts_2.24.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch12
-rw-r--r--meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch123
-rw-r--r--meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch14
-rw-r--r--meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch14
-rw-r--r--meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch20
-rw-r--r--meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch18
-rw-r--r--meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch (renamed from meta/recipes-core/glibc/glibc/0026-build_local_scope.patch)8
-rw-r--r--meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch46
-rw-r--r--meta/recipes-core/glibc/glibc/0027-locale-fix-hard-coded-reference-to-gcc-E.patch (renamed from meta/recipes-core/glibc/glibc/0001-locale-fix-hard-coded-reference-to-gcc-E.patch)17
-rw-r--r--meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch98
-rw-r--r--meta/recipes-core/glibc/glibc_2.25.bb (renamed from meta/recipes-core/glibc/glibc_2.24.bb)23
36 files changed, 270 insertions, 252 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 7fceb58ee6..91143c4100 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -26,7 +26,7 @@ GCCVERSION ?= "6.3%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.27%" 27BINUVERSION ?= "2.27%"
28GDBVERSION ?= "7.12%" 28GDBVERSION ?= "7.12%"
29GLIBCVERSION ?= "2.24" 29GLIBCVERSION ?= "2.25"
30UCLIBCVERSION ?= "1.0%" 30UCLIBCVERSION ?= "1.0%"
31LINUXLIBCVERSION ?= "4.8%" 31LINUXLIBCVERSION ?= "4.8%"
32 32
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb b/meta/recipes-core/glibc/cross-localedef-native_2.25.bb
index d4cccedb43..82511b179c 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.25.bb
@@ -17,11 +17,12 @@ inherit autotools
17 17
18FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" 18FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
19 19
20SRCBRANCH ?= "release/${PV}/master" 20#SRCBRANCH ?= "release/${PV}/master"
21SRCBRANCH ?= "master"
21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 22GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
23 24
24SRCREV_glibc ?= "ea23815a795f72035262953dad5beb03e09c17dd" 25SRCREV_glibc ?= "bb440151433f0298e7a6786ccd30cd084812f897"
25SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71" 26SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71"
26 27
27SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
diff --git a/meta/recipes-core/glibc/glibc-initial_2.24.bb b/meta/recipes-core/glibc/glibc-initial_2.25.bb
index e86770e12d..e86770e12d 100644
--- a/meta/recipes-core/glibc/glibc-initial_2.24.bb
+++ b/meta/recipes-core/glibc/glibc-initial_2.25.bb
diff --git a/meta/recipes-core/glibc/glibc-locale_2.24.bb b/meta/recipes-core/glibc/glibc-locale_2.25.bb
index f7702e0358..f7702e0358 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.24.bb
+++ b/meta/recipes-core/glibc/glibc-locale_2.25.bb
diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.24.bb b/meta/recipes-core/glibc/glibc-mtrace_2.25.bb
index 0b69bad46a..0b69bad46a 100644
--- a/meta/recipes-core/glibc/glibc-mtrace_2.24.bb
+++ b/meta/recipes-core/glibc/glibc-mtrace_2.25.bb
diff --git a/meta/recipes-core/glibc/glibc-scripts_2.24.bb b/meta/recipes-core/glibc/glibc-scripts_2.25.bb
index 5a89bd8022..5a89bd8022 100644
--- a/meta/recipes-core/glibc/glibc-scripts_2.24.bb
+++ b/meta/recipes-core/glibc/glibc-scripts_2.25.bb
diff --git a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
index ca3375805d..0553f8a472 100644
--- a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
+++ b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
@@ -1,7 +1,7 @@
1From 7e11aafc3a7cb873b3f648740c8acd379597e4d1 Mon Sep 17 00:00:00 2001 1From 2727e58d1d269994de17cadb12195001b14585e7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:48:24 +0000 3Date: Wed, 18 Mar 2015 01:48:24 +0000
4Subject: [PATCH 01/25] nativesdk-glibc: Look for host system ld.so.cache as 4Subject: [PATCH 01/26] nativesdk-glibc: Look for host system ld.so.cache as
5 well 5 well
6 6
7Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
@@ -31,10 +31,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
31 1 file changed, 8 insertions(+), 8 deletions(-) 31 1 file changed, 8 insertions(+), 8 deletions(-)
32 32
33diff --git a/elf/dl-load.c b/elf/dl-load.c 33diff --git a/elf/dl-load.c b/elf/dl-load.c
34index c0d6249..2c73105 100644 34index 51fb0d0..f503dbc 100644
35--- a/elf/dl-load.c 35--- a/elf/dl-load.c
36+++ b/elf/dl-load.c 36+++ b/elf/dl-load.c
37@@ -2094,6 +2094,14 @@ _dl_map_object (struct link_map *loader, const char *name, 37@@ -2054,6 +2054,14 @@ _dl_map_object (struct link_map *loader, const char *name,
38 } 38 }
39 } 39 }
40 40
@@ -49,7 +49,7 @@ index c0d6249..2c73105 100644
49 #ifdef USE_LDCONFIG 49 #ifdef USE_LDCONFIG
50 if (fd == -1 50 if (fd == -1
51 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) 51 && (__glibc_likely ((mode & __RTLD_SECURE) == 0)
52@@ -2152,14 +2160,6 @@ _dl_map_object (struct link_map *loader, const char *name, 52@@ -2112,14 +2120,6 @@ _dl_map_object (struct link_map *loader, const char *name,
53 } 53 }
54 #endif 54 #endif
55 55
@@ -65,5 +65,5 @@ index c0d6249..2c73105 100644
65 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) 65 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
66 _dl_debug_printf ("\n"); 66 _dl_debug_printf ("\n");
67-- 67--
682.8.2 682.10.2
69 69
diff --git a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
index 5428468c5a..e5ef3410e9 100644
--- a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
+++ b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
@@ -1,7 +1,7 @@
1From 5fd884dc28d5d84001fae8ffdd8be698bb84143e Mon Sep 17 00:00:00 2001 1From 1578f52647ec8804186d1944d4cd2095132efc39 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:50:00 +0000 3Date: Wed, 18 Mar 2015 01:50:00 +0000
4Subject: [PATCH 02/25] nativesdk-glibc: Fix buffer overrun with a relocated 4Subject: [PATCH 02/26] nativesdk-glibc: Fix buffer overrun with a relocated
5 SDK 5 SDK
6 6
7When ld-linux-*.so.2 is relocated to a path that is longer than the 7When ld-linux-*.so.2 is relocated to a path that is longer than the
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 12 insertions(+) 22 1 file changed, 12 insertions(+)
23 23
24diff --git a/elf/dl-load.c b/elf/dl-load.c 24diff --git a/elf/dl-load.c b/elf/dl-load.c
25index 2c73105..c7b8797 100644 25index f503dbc..3a3d112 100644
26--- a/elf/dl-load.c 26--- a/elf/dl-load.c
27+++ b/elf/dl-load.c 27+++ b/elf/dl-load.c
28@@ -1793,7 +1793,19 @@ open_path (const char *name, size_t namelen, int mode, 28@@ -1753,7 +1753,19 @@ open_path (const char *name, size_t namelen, int mode,
29 given on the command line when rtld is run directly. */ 29 given on the command line when rtld is run directly. */
30 return -1; 30 return -1;
31 31
@@ -46,5 +46,5 @@ index 2c73105..c7b8797 100644
46 { 46 {
47 struct r_search_path_elem *this_dir = *dirs; 47 struct r_search_path_elem *this_dir = *dirs;
48-- 48--
492.8.2 492.10.2
50 50
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 7cba6cc367..9e207e44d9 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 @@
1From c99892f2018cd7fa0f37b53e6cebec99fa036472 Mon Sep 17 00:00:00 2001 1From e53968d61804b6bab32ec6e13cc0b3cd57214796 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:51:38 +0000 3Date: Wed, 18 Mar 2015 01:51:38 +0000
4Subject: [PATCH 03/25] nativesdk-glibc: Raise the size of arrays containing dl 4Subject: [PATCH 03/26] nativesdk-glibc: Raise the size of arrays containing dl
5 paths 5 paths
6 6
7This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings 7This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings
@@ -21,13 +21,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 elf/interp.c | 2 +- 21 elf/interp.c | 2 +-
22 elf/ldconfig.c | 3 +++ 22 elf/ldconfig.c | 3 +++
23 elf/rtld.c | 5 +++-- 23 elf/rtld.c | 5 +++--
24 iconv/gconv_conf.c | 2 +-
24 sysdeps/generic/dl-cache.h | 4 ---- 25 sysdeps/generic/dl-cache.h | 4 ----
25 6 files changed, 13 insertions(+), 9 deletions(-) 26 7 files changed, 14 insertions(+), 10 deletions(-)
26 27
27Index: git/elf/dl-cache.c 28diff --git a/elf/dl-cache.c b/elf/dl-cache.c
28=================================================================== 29index cfa335e..daa12ec 100644
29--- git.orig/elf/dl-cache.c 30--- a/elf/dl-cache.c
30+++ git/elf/dl-cache.c 31+++ b/elf/dl-cache.c
31@@ -132,6 +132,10 @@ do \ 32@@ -132,6 +132,10 @@ do \
32 while (0) 33 while (0)
33 34
@@ -39,11 +40,11 @@ Index: git/elf/dl-cache.c
39 int 40 int
40 internal_function 41 internal_function
41 _dl_cache_libcmp (const char *p1, const char *p2) 42 _dl_cache_libcmp (const char *p1, const char *p2)
42Index: git/elf/dl-load.c 43diff --git a/elf/dl-load.c b/elf/dl-load.c
43=================================================================== 44index 3a3d112..a1410e4 100644
44--- git.orig/elf/dl-load.c 45--- a/elf/dl-load.c
45+++ git/elf/dl-load.c 46+++ b/elf/dl-load.c
46@@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_re 47@@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro;
47 /* Get the generated information about the trusted directories. */ 48 /* Get the generated information about the trusted directories. */
48 #include "trusted-dirs.h" 49 #include "trusted-dirs.h"
49 50
@@ -54,10 +55,10 @@ Index: git/elf/dl-load.c
54 { 55 {
55 SYSTEM_DIRS_LEN 56 SYSTEM_DIRS_LEN
56 }; 57 };
57Index: git/elf/interp.c 58diff --git a/elf/interp.c b/elf/interp.c
58=================================================================== 59index 9448802..e7e8c70 100644
59--- git.orig/elf/interp.c 60--- a/elf/interp.c
60+++ git/elf/interp.c 61+++ b/elf/interp.c
61@@ -18,5 +18,5 @@ 62@@ -18,5 +18,5 @@
62 63
63 #include <runtime-linker.h> 64 #include <runtime-linker.h>
@@ -65,10 +66,10 @@ Index: git/elf/interp.c
65-const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp"))) 66-const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp")))
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;
68Index: git/elf/ldconfig.c 69diff --git a/elf/ldconfig.c b/elf/ldconfig.c
69=================================================================== 70index 467ca82..631a2a9 100644
70--- git.orig/elf/ldconfig.c 71--- a/elf/ldconfig.c
71+++ git/elf/ldconfig.c 72+++ b/elf/ldconfig.c
72@@ -168,6 +168,9 @@ static struct argp argp = 73@@ -168,6 +168,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 };
@@ -79,10 +80,10 @@ Index: git/elf/ldconfig.c
79 /* Check if string corresponds to an important hardware capability or 80 /* Check if string corresponds to an important hardware capability or
80 a platform. */ 81 a platform. */
81 static int 82 static int
82Index: git/elf/rtld.c 83diff --git a/elf/rtld.c b/elf/rtld.c
83=================================================================== 84index 4ec25d7..e159c12 100644
84--- git.orig/elf/rtld.c 85--- a/elf/rtld.c
85+++ git/elf/rtld.c 86+++ b/elf/rtld.c
86@@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local 87@@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local
87 strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) 88 strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
88 #endif 89 #endif
@@ -91,7 +92,7 @@ Index: git/elf/rtld.c
91 92
92 /* List of auditing DSOs. */ 93 /* List of auditing DSOs. */
93 static struct audit_list 94 static struct audit_list
94@@ -873,12 +874,12 @@ of this helper program; chances are you 95@@ -854,12 +855,12 @@ 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\
@@ -106,10 +107,23 @@ Index: git/elf/rtld.c
106 107
107 ++_dl_skip_args; 108 ++_dl_skip_args;
108 --_dl_argc; 109 --_dl_argc;
109Index: git/sysdeps/generic/dl-cache.h 110diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
110=================================================================== 111index e235188..569f72e 100644
111--- git.orig/sysdeps/generic/dl-cache.h 112--- a/iconv/gconv_conf.c
112+++ git/sysdeps/generic/dl-cache.h 113+++ b/iconv/gconv_conf.c
114@@ -36,7 +36,7 @@
115
116
117 /* This is the default path where we look for module lists. */
118-static const char default_gconv_path[] = GCONV_PATH;
119+static char default_gconv_path[4096] __attribute__ ((section (".gccrelocprefix"))) = GCONV_PATH;
120
121 /* The path elements, as determined by the __gconv_get_path function.
122 All path elements end in a slash. */
123diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
124index eb2f900..505804e 100644
125--- a/sysdeps/generic/dl-cache.h
126+++ b/sysdeps/generic/dl-cache.h
113@@ -27,10 +27,6 @@ 127@@ -27,10 +27,6 @@
114 ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID) 128 ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
115 #endif 129 #endif
@@ -121,51 +135,6 @@ Index: git/sysdeps/generic/dl-cache.h
121 #ifndef add_system_dir 135 #ifndef add_system_dir
122 # define add_system_dir(dir) add_dir (dir) 136 # define add_system_dir(dir) add_dir (dir)
123 #endif 137 #endif
124Index: git/iconv/gconv_conf.c 138--
125=================================================================== 1392.10.2
126--- git.orig/iconv/gconv_conf.c 140
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. */
137Index: git/locale/findlocale.c
138===================================================================
139--- git.orig/locale/findlocale.c
140+++ git/locale/findlocale.c
141@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attr
142 which are somehow addressed. */
143 struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
144
145-const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR;
146+char _nl_default_locale_path[4096] __attribute__ ((section (".gccrelocprefix"))) attribute_hidden = COMPLOCALEDIR;
147
148 /* Checks if the name is actually present, that is, not NULL and not
149 empty. */
150@@ -168,7 +168,7 @@ _nl_find_locale (const char *locale_path
151
152 /* Nothing in the archive. Set the default path to search below. */
153 locale_path = _nl_default_locale_path;
154- locale_path_len = sizeof _nl_default_locale_path;
155+ locale_path_len = strlen(_nl_default_locale_path) + 1;
156 }
157 else
158 /* We really have to load some data. First see whether the name is
159Index: git/locale/localeinfo.h
160===================================================================
161--- git.orig/locale/localeinfo.h
162+++ git/locale/localeinfo.h
163@@ -322,7 +322,7 @@ _nl_lookup_word (locale_t l, int categor
164 }
165
166 /* Default search path if no LOCPATH environment variable. */
167-extern const char _nl_default_locale_path[] attribute_hidden;
168+extern char _nl_default_locale_path[] attribute_hidden;
169
170 /* Load the locale data for CATEGORY from the file specified by *NAME.
171 If *NAME is "", use environment variables as specified by POSIX, and
diff --git a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
index 3127de68ec..b981f7bf7d 100644
--- a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
+++ b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
@@ -1,7 +1,7 @@
1From a56e7aa2fd10b178b9498f88a7a2ca8aad671a53 Mon Sep 17 00:00:00 2001 1From 0b95f34207ffed3aa53fa949662bfbccc7c864a4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 14:35:35 -0800 3Date: Thu, 31 Dec 2015 14:35:35 -0800
4Subject: [PATCH 04/25] nativesdk-glibc: Allow 64 bit atomics for x86 4Subject: [PATCH 04/26] nativesdk-glibc: Allow 64 bit atomics for x86
5 5
6The fix consist of allowing 64bit atomic ops for x86. 6The fix consist of allowing 64bit atomic ops for x86.
7This should be safe for i586 and newer CPUs. 7This should be safe for i586 and newer CPUs.
@@ -11,8 +11,6 @@ Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 13---
14Upstream-Status: Pending
15
16 sysdeps/i386/atomic-machine.h | 2 +- 14 sysdeps/i386/atomic-machine.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
18 16
@@ -30,5 +28,5 @@ index ce62b33..4fe44ea 100644
30 28
31 29
32-- 30--
332.8.2 312.10.2
34 32
diff --git a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
index dc0dfad9a8..ee50000319 100644
--- a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
+++ b/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
@@ -1,7 +1,7 @@
1From 450473ce27b47cebec2c5c5b611a8c8bed41e6e8 Mon Sep 17 00:00:00 2001 1From 77a7495376c7d0c5507c0ec99bf1568150339ef4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:01:50 +0000 3Date: Wed, 18 Mar 2015 00:01:50 +0000
4Subject: [PATCH 05/25] fsl e500/e5500/e6500/603e fsqrt implementation 4Subject: [PATCH 05/26] fsl e500/e5500/e6500/603e fsqrt implementation
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Edmar Wienskoski <edmar@freescale.com> 7Signed-off-by: Edmar Wienskoski <edmar@freescale.com>
@@ -1580,5 +1580,5 @@ index 0000000..04ff8cc
1580@@ -0,0 +1 @@ 1580@@ -0,0 +1 @@
1581+powerpc/powerpc64/e6500/fpu 1581+powerpc/powerpc64/e6500/fpu
1582-- 1582--
15832.8.2 15832.10.2
1584 1584
diff --git a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
index f267f66cde..9088d29c4a 100644
--- a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
+++ b/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
@@ -1,7 +1,7 @@
1From bb065b78e9e0d3301e64a26e37550a657c885ebc Mon Sep 17 00:00:00 2001 1From 520cb9e746af637cf01fea385b7f4ee4aadbdfdd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:11:22 +0000 3Date: Wed, 18 Mar 2015 00:11:22 +0000
4Subject: [PATCH 06/25] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known 4Subject: [PATCH 06/26] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known
5 names 5 names
6 6
7This bolts in a hook for OE to pass its own version of interpreter 7This bolts in a hook for OE to pass its own version of interpreter
@@ -29,5 +29,5 @@ index 8a66ffe..08d56fc 100644
29 29
30 static struct known_names known_libs[] = 30 static struct known_names known_libs[] =
31-- 31--
322.8.2 322.10.2
33 33
diff --git a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
index 612e892e87..f33defe075 100644
--- a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
+++ b/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
@@ -1,7 +1,7 @@
1From 4a91bbdb11a15f93094695bba4e0849c421fad48 Mon Sep 17 00:00:00 2001 1From 64130262787d54e2e6695ae4ed8783bfec14ffef Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:15:07 +0000 3Date: Wed, 18 Mar 2015 00:15:07 +0000
4Subject: [PATCH 07/25] ppc/sqrt: Fix undefined reference to `__sqrt_finite' 4Subject: [PATCH 07/26] ppc/sqrt: Fix undefined reference to `__sqrt_finite'
5 5
6on ppc fixes the errors like below 6on ppc fixes the errors like below
7| ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite' 7| ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite'
@@ -204,5 +204,5 @@ index 26fa067..9d17512 100644
204 } 204 }
205+strong_alias (__ieee754_sqrtf, __sqrtf_finite) 205+strong_alias (__ieee754_sqrtf, __sqrtf_finite)
206-- 206--
2072.8.2 2072.10.2
208 208
diff --git a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 9e222b7b45..26f65c5b17 100644
--- a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,7 +1,7 @@
1From ce2746a1560b4430d89d114e1b65c7be225b4c2a Mon Sep 17 00:00:00 2001 1From 5afb0147e3e49c3b474404524014efe51b2bca5a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:16:38 +0000 3Date: Wed, 18 Mar 2015 00:16:38 +0000
4Subject: [PATCH 08/25] __ieee754_sqrt{,f} are now inline functions and call 4Subject: [PATCH 08/26] __ieee754_sqrt{,f} are now inline functions and call
5 out __slow versions 5 out __slow versions
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -383,5 +383,5 @@ index 9d17512..10de1f0 100644
383+ 383+
384 strong_alias (__ieee754_sqrtf, __sqrtf_finite) 384 strong_alias (__ieee754_sqrtf, __sqrtf_finite)
385-- 385--
3862.8.2 3862.10.2
387 387
diff --git a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
index 7aa74df239..d416acde3e 100644
--- a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
+++ b/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
@@ -1,7 +1,7 @@
1From 1b61649e545de76dd79a5e2c39bb16d0c4623160 Mon Sep 17 00:00:00 2001 1From ddd51bb4e005432cb3c0f8f33822954408a9fee1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:20:09 +0000 3Date: Wed, 18 Mar 2015 00:20:09 +0000
4Subject: [PATCH 09/25] Quote from bug 1443 which explains what the patch does 4Subject: [PATCH 09/26] Quote from bug 1443 which explains what the patch does
5 : 5 :
6 6
7 We build some random program and link it with -lust. When we run it, 7 We build some random program and link it with -lust. When we run it,
@@ -58,5 +58,5 @@ index 60eee00..7d54d5e 100644
58 58
59 case R_ARM_TLS_TPOFF32: 59 case R_ARM_TLS_TPOFF32:
60-- 60--
612.8.2 612.10.2
62 62
diff --git a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index 14963a3577..276f1fa4c2 100644
--- a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
@@ -1,7 +1,7 @@
1From 91af416408b8718b004c83d93a6daa1f34cba48d Mon Sep 17 00:00:00 2001 1From d7e74670825330f5421a55f5aa2a1ce6fda7d7fb Mon Sep 17 00:00:00 2001
2From: Ting Liu <b28495@freescale.com> 2From: Ting Liu <b28495@freescale.com>
3Date: Wed, 19 Dec 2012 04:39:57 -0600 3Date: Wed, 19 Dec 2012 04:39:57 -0600
4Subject: [PATCH 10/25] eglibc: run libm-err-tab.pl with specific dirs in ${S} 4Subject: [PATCH 10/26] eglibc: run libm-err-tab.pl with specific dirs in ${S}
5 5
6libm-err-tab.pl will parse all the files named "libm-test-ulps" 6libm-err-tab.pl will parse all the files named "libm-test-ulps"
7in the given dir recursively. To avoid parsing the one in 7in the given dir recursively. To avoid parsing the one in
@@ -32,5 +32,5 @@ index f2f694f..e062833 100644
32 touch $@ 32 touch $@
33 33
34-- 34--
352.8.2 352.10.2
36 36
diff --git a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index e92d04c62b..096dab5474 100644
--- a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,7 +1,7 @@
1From 6a71f688471fe0c85f8ad9afc4ee0723a20aae1d Mon Sep 17 00:00:00 2001 1From d6e2076571263e45c48889896d3d94ff576df2be Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:24:46 +0000 3Date: Wed, 18 Mar 2015 00:24:46 +0000
4Subject: [PATCH 11/25] __ieee754_sqrt{,f} are now inline functions and call 4Subject: [PATCH 11/26] __ieee754_sqrt{,f} are now inline functions and call
5 out __slow versions 5 out __slow versions
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -57,5 +57,5 @@ index 8126535..10de1f0 100644
57 #endif 57 #endif
58 { 58 {
59-- 59--
602.8.2 602.10.2
61 61
diff --git a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch b/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
index 4cba03f238..7728c61a9d 100644
--- a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
+++ b/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch
@@ -1,7 +1,7 @@
1From f9d024edb158659e403b51cc9d93da9bca6e5d7b Mon Sep 17 00:00:00 2001 1From c0974c746e026650bef5d1940eb3f519765c77af Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:25:45 +0000 3Date: Wed, 18 Mar 2015 00:25:45 +0000
4Subject: [PATCH 12/25] Make ld --version output matching grok gold's output 4Subject: [PATCH 12/26] Make ld --version output matching grok gold's output
5 5
6adapted from from upstream branch roland/gold-vs-libc 6adapted from from upstream branch roland/gold-vs-libc
7 7
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 2 insertions(+), 2 deletions(-) 14 2 files changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 8fe5937..7888a3f 100755 17index 5cf3230..391f29d 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -4482,7 +4482,7 @@ else 20@@ -4555,7 +4555,7 @@ else
21 # Found it, now check the version. 21 # Found it, now check the version.
22 { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 22 { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5
23 $as_echo_n "checking version of $LD... " >&6; } 23 $as_echo_n "checking version of $LD... " >&6; }
@@ -27,10 +27,10 @@ index 8fe5937..7888a3f 100755
27 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 27 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
28 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) 28 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*)
29diff --git a/configure.ac b/configure.ac 29diff --git a/configure.ac b/configure.ac
30index 3c766b7..6908a99 100644 30index d719fad..5b5877c 100644
31--- a/configure.ac 31--- a/configure.ac
32+++ b/configure.ac 32+++ b/configure.ac
33@@ -944,7 +944,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, 33@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version,
34 [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], 34 [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*],
35 AS=: critic_missing="$critic_missing as") 35 AS=: critic_missing="$critic_missing as")
36 AC_CHECK_PROG_VER(LD, $LD, --version, 36 AC_CHECK_PROG_VER(LD, $LD, --version,
@@ -40,5 +40,5 @@ index 3c766b7..6908a99 100644
40 LD=: critic_missing="$critic_missing ld") 40 LD=: critic_missing="$critic_missing ld")
41 41
42-- 42--
432.8.2 432.10.2
44 44
diff --git a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
index 6a82f8d933..1c81c729db 100644
--- a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
+++ b/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
@@ -1,7 +1,7 @@
1From 2ece12093c8ba4cf688d235f35d36f1feb02324c Mon Sep 17 00:00:00 2001 1From 2a12eadfd7940b6b0913de8e95d851254cce7953 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:27:10 +0000 3Date: Wed, 18 Mar 2015 00:27:10 +0000
4Subject: [PATCH 13/25] sysdeps/gnu/configure.ac: handle correctly 4Subject: [PATCH 13/26] sysdeps/gnu/configure.ac: handle correctly
5 $libc_cv_rootsbindir 5 $libc_cv_rootsbindir
6 6
7Upstream-Status:Pending 7Upstream-Status:Pending
@@ -38,5 +38,5 @@ index 634fe4d..3db1697 100644
38 ;; 38 ;;
39 esac 39 esac
40-- 40--
412.8.2 412.10.2
42 42
diff --git a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch b/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
index d14a6d4cd5..b23e104ff8 100644
--- a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
+++ b/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
@@ -1,7 +1,7 @@
1From 9fec083dc99d2b524090e1d098e03709eed64a72 Mon Sep 17 00:00:00 2001 1From ec4f7763b30603b7ba0b70bd7750e34d442821b3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:28:41 +0000 3Date: Wed, 18 Mar 2015 00:28:41 +0000
4Subject: [PATCH 14/25] Add unused attribute 4Subject: [PATCH 14/26] Add unused attribute
5 5
6Helps in avoiding gcc warning when header is is included in 6Helps in avoiding gcc warning when header is is included in
7a source file which does not use both functions 7a source file which does not use both functions
@@ -30,5 +30,5 @@ index 95cbce7..191a0dd 100644
30 { 30 {
31 int slash_count = 0; 31 int slash_count = 0;
32-- 32--
332.8.2 332.10.2
34 34
diff --git a/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
index 8ceccec419..98d425a7bd 100644
--- a/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
+++ b/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
@@ -1,7 +1,7 @@
1From 1794a97cba0b09b726eebc565c783c7b7c22dfba Mon Sep 17 00:00:00 2001 1From 18d64951cbb68d8d75e8ef347cbd0e0a5c14604b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:31:06 +0000 3Date: Wed, 18 Mar 2015 00:31:06 +0000
4Subject: [PATCH 15/25] 'yes' within the path sets wrong config variables 4Subject: [PATCH 15/26] 'yes' within the path sets wrong config variables
5 5
6It seems that the 'AC_EGREP_CPP(yes...' example is quite popular 6It seems that the 'AC_EGREP_CPP(yes...' example is quite popular
7but being such a short word to grep it is likely to produce 7but being such a short word to grep it is likely to produce
@@ -259,5 +259,5 @@ index 0822915..9a32fdd 100644
259 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) 259 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])
260 if test $libc_cv_ppc64_def_call_elf = no; then 260 if test $libc_cv_ppc64_def_call_elf = no; then
261-- 261--
2622.8.2 2622.10.2
263 263
diff --git a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
index e5b508330c..426a2c0c2d 100644
--- a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
+++ b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
@@ -1,7 +1,7 @@
1From fdb5c9c88e3d1bc5ae6ef9ebcfcf560d3c42f0a6 Mon Sep 17 00:00:00 2001 1From 2bed515b9f9f613ae0db9b9607d8fa60a4afca5b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:33:03 +0000 3Date: Wed, 18 Mar 2015 00:33:03 +0000
4Subject: [PATCH 16/25] timezone: re-written tzselect as posix sh 4Subject: [PATCH 16/26] timezone: re-written tzselect as posix sh
5 5
6To avoid the bash dependency. 6To avoid the bash dependency.
7 7
@@ -41,5 +41,5 @@ index 2c3b2f4..0c04a61 100755
41 # Output one argument as-is to standard output. 41 # Output one argument as-is to standard output.
42 # Safer than 'echo', which can mishandle '\' or leading '-'. 42 # Safer than 'echo', which can mishandle '\' or leading '-'.
43-- 43--
442.8.2 442.10.2
45 45
diff --git a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
index c8da05dc6e..6c2506ccc3 100644
--- a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
+++ b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
@@ -1,7 +1,7 @@
1From 88ad88d014a5ee68b0e044d2def5ab13743c8ae0 Mon Sep 17 00:00:00 2001 1From c8814875b362efbfd778345d0d2777478bf11a30 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 14:33:02 -0800 3Date: Thu, 31 Dec 2015 14:33:02 -0800
4Subject: [PATCH 17/25] Remove bash dependency for nscd init script 4Subject: [PATCH 17/26] Remove bash dependency for nscd init script
5 5
6The nscd init script uses #! /bin/bash but only really uses one bashism 6The nscd init script uses #! /bin/bash but only really uses one bashism
7(translated strings), so remove them and switch the shell to #!/bin/sh. 7(translated strings), so remove them and switch the shell to #!/bin/sh.
@@ -9,8 +9,6 @@ The nscd init script uses #! /bin/bash but only really uses one bashism
9Signed-off-by: Ross Burton <ross.burton@intel.com> 9Signed-off-by: Ross Burton <ross.burton@intel.com>
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 11---
12Upstream-Status: Pending
13
14 nscd/nscd.init | 14 +++++++------- 12 nscd/nscd.init | 14 +++++++-------
15 1 file changed, 7 insertions(+), 7 deletions(-) 13 1 file changed, 7 insertions(+), 7 deletions(-)
16 14
@@ -71,5 +69,5 @@ index a882da7..b02986e 100644
71 ;; 69 ;;
72 esac 70 esac
73-- 71--
742.8.2 722.10.2
75 73
diff --git a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
index 1750765247..2ec01f05c7 100644
--- a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
+++ b/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
@@ -1,7 +1,7 @@
1From 49c0ad7dc2e02e808ed150296a109b586c34115a Mon Sep 17 00:00:00 2001 1From df96d6b61bb60f13cd3d4989d1afc56d705f4a33 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:42:58 +0000 3Date: Wed, 18 Mar 2015 00:42:58 +0000
4Subject: [PATCH 18/25] eglibc: Cross building and testing instructions 4Subject: [PATCH 18/26] eglibc: Cross building and testing instructions
5 5
6Ported from eglibc 6Ported from eglibc
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -615,5 +615,5 @@ index 0000000..b67b468
615+ simply place copies of these libraries in the top GLIBC build 615+ simply place copies of these libraries in the top GLIBC build
616+ directory. 616+ directory.
617-- 617--
6182.8.2 6182.10.2
619 619
diff --git a/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch b/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
index f983d86a90..f5921bb7be 100644
--- a/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
+++ b/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
@@ -1,7 +1,7 @@
1From e881face7a10354612bf634b44e09e3bc6462c67 Mon Sep 17 00:00:00 2001 1From 2cb7e3cae4020f431d426ad1740bb25506cde899 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:49:28 +0000 3Date: Wed, 18 Mar 2015 00:49:28 +0000
4Subject: [PATCH 19/25] eglibc: Help bootstrap cross toolchain 4Subject: [PATCH 19/26] eglibc: Help bootstrap cross toolchain
5 5
6Taken from EGLIBC, r1484 + r1525 6Taken from EGLIBC, r1484 + r1525
7 7
@@ -29,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 create mode 100644 include/stubs-bootstrap.h 29 create mode 100644 include/stubs-bootstrap.h
30 30
31diff --git a/Makefile b/Makefile 31diff --git a/Makefile b/Makefile
32index 32748b3..6d055ba 100644 32index 1ae3281..26ab7bf 100644
33--- a/Makefile 33--- a/Makefile
34+++ b/Makefile 34+++ b/Makefile
35@@ -69,9 +69,18 @@ subdir-dirs = include 35@@ -70,9 +70,18 @@ subdir-dirs = include
36 vpath %.h $(subdir-dirs) 36 vpath %.h $(subdir-dirs)
37 37
38 # What to install. 38 # What to install.
@@ -52,7 +52,7 @@ index 32748b3..6d055ba 100644
52 ifeq (yes,$(build-shared)) 52 ifeq (yes,$(build-shared))
53 headers += gnu/lib-names.h 53 headers += gnu/lib-names.h
54 endif 54 endif
55@@ -151,6 +160,16 @@ others: $(common-objpfx)testrun.sh 55@@ -152,6 +161,16 @@ others: $(common-objpfx)testrun.sh
56 56
57 subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs) 57 subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
58 58
@@ -69,7 +69,7 @@ index 32748b3..6d055ba 100644
69 ifndef abi-variants 69 ifndef abi-variants
70 installed-stubs = $(inst_includedir)/gnu/stubs.h 70 installed-stubs = $(inst_includedir)/gnu/stubs.h
71 else 71 else
72@@ -177,6 +196,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) 72@@ -178,6 +197,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force)
73 73
74 install-others-nosubdir: $(installed-stubs) 74 install-others-nosubdir: $(installed-stubs)
75 endif 75 endif
@@ -96,5 +96,5 @@ index 0000000..1d2b669
96+ EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but 96+ EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but
97+ an empty stubs.h like this will do fine for GCC. */ 97+ an empty stubs.h like this will do fine for GCC. */
98-- 98--
992.8.2 992.10.2
100 100
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch
index 30c4c69877..43445739b1 100644
--- a/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch
+++ b/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch
@@ -1,7 +1,7 @@
1From 723a31d3e2627211b39fbcc08f75b3c23c4096c5 Mon Sep 17 00:00:00 2001 1From b2ed906ec864583b43379ef9ad2b5630c1232565 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 15:10:33 -0800 3Date: Thu, 31 Dec 2015 15:10:33 -0800
4Subject: [PATCH 20/25] eglibc: cherry-picked from 4Subject: [PATCH 20/26] eglibc: cherry-picked from
5 5
6http://www.eglibc.org/archives/patches/msg00772.html 6http://www.eglibc.org/archives/patches/msg00772.html
7 7
@@ -60,5 +60,5 @@ index a4b376f..3256e12 100644
60 if (resp->nscount > 0) 60 if (resp->nscount > 0)
61 __res_iclose (resp, true); 61 __res_iclose (resp, true);
62-- 62--
632.8.2 632.10.2
64 64
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch
index 8931c9e250..a9a73916f3 100644
--- a/meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch
+++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Clear-cache-lines-on-ppc8xx.patch
@@ -1,7 +1,7 @@
1From 9699873820d0347c2f377f0d86bce615d87a5e47 Mon Sep 17 00:00:00 2001 1From 000ab518aa1269714bc0a9a4633b0a538fae91d9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 15:15:09 -0800 3Date: Thu, 31 Dec 2015 15:15:09 -0800
4Subject: [PATCH 21/25] eglibc: Clear cache lines on ppc8xx 4Subject: [PATCH 21/26] eglibc: Clear cache lines on ppc8xx
5 5
62007-06-13 Nathan Sidwell <nathan@codesourcery.com> 62007-06-13 Nathan Sidwell <nathan@codesourcery.com>
7 Mark Shinwell <shinwell@codesourcery.com> 7 Mark Shinwell <shinwell@codesourcery.com>
@@ -79,5 +79,5 @@ index 0efd297..8cc0ef8 100644
79 break; 79 break;
80 #ifndef SHARED 80 #ifndef SHARED
81-- 81--
822.8.2 822.10.2
83 83
diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch b/meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch
index f53f5ff87c..c0cd5b0d12 100644
--- a/meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch
+++ b/meta/recipes-core/glibc/glibc/0022-eglibc-Resolve-__fpscr_values-on-SH4.patch
@@ -1,7 +1,7 @@
1From 8904f4249c930d187e19c7e9d3e73c835d11e18f Mon Sep 17 00:00:00 2001 1From a50c6e80543fb4cbc589978c11fe846bf4a94492 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:55:53 +0000 3Date: Wed, 18 Mar 2015 00:55:53 +0000
4Subject: [PATCH 22/25] eglibc: Resolve __fpscr_values on SH4 4Subject: [PATCH 22/26] eglibc: Resolve __fpscr_values on SH4
5 5
62010-09-29 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 62010-09-29 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7 Andrew Stubbs <ams@codesourcery.com> 7 Andrew Stubbs <ams@codesourcery.com>
@@ -52,5 +52,5 @@ index 0024d79..d1db7e4 100644
52+weak_alias (___fpscr_values, __fpscr_values) 52+weak_alias (___fpscr_values, __fpscr_values)
53+ 53+
54-- 54--
552.8.2 552.10.2
56 56
diff --git a/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch b/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch
index f985f3ca14..c3e571f8a9 100644
--- a/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch
+++ b/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch
@@ -1,7 +1,7 @@
1From 1947f211fab4001e84bb52868cddbd401e597889 Mon Sep 17 00:00:00 2001 1From 101568daf48d99e71b280a2fdd85460fe740d583 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:57:01 +0000 3Date: Wed, 18 Mar 2015 01:57:01 +0000
4Subject: [PATCH 23/25] eglibc: Install PIC archives 4Subject: [PATCH 23/26] eglibc: Install PIC archives
5 5
6Forward port from eglibc 6Forward port from eglibc
7 7
@@ -29,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 1 file changed, 40 insertions(+), 2 deletions(-) 29 1 file changed, 40 insertions(+), 2 deletions(-)
30 30
31diff --git a/Makerules b/Makerules 31diff --git a/Makerules b/Makerules
32index 53eabfa..1cd2a53 100644 32index 61a0240..373e628 100644
33--- a/Makerules 33--- a/Makerules
34+++ b/Makerules 34+++ b/Makerules
35@@ -694,6 +694,9 @@ ifeq ($(build-shared),yes) 35@@ -762,6 +762,9 @@ ifeq ($(build-shared),yes)
36 $(common-objpfx)libc.so: $(common-objpfx)libc.map 36 $(common-objpfx)libc.so: $(common-objpfx)libc.map
37 endif 37 endif
38 common-generated += libc.so libc_pic.os 38 common-generated += libc.so libc_pic.os
@@ -42,7 +42,7 @@ index 53eabfa..1cd2a53 100644
42 ifdef libc.so-version 42 ifdef libc.so-version
43 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so 43 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
44 $(make-link) 44 $(make-link)
45@@ -936,6 +939,7 @@ endif 45@@ -1004,6 +1007,7 @@ endif
46 46
47 install: check-install-supported 47 install: check-install-supported
48 48
@@ -50,7 +50,7 @@ index 53eabfa..1cd2a53 100644
50 install: $(installed-libcs) 50 install: $(installed-libcs)
51 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) 51 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
52 $(make-target-directory) 52 $(make-target-directory)
53@@ -964,6 +968,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ 53@@ -1032,6 +1036,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\
54 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so)) 54 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
55 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) 55 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
56 56
@@ -73,7 +73,7 @@ index 53eabfa..1cd2a53 100644
73 # For versioned libraries, we install three files: 73 # For versioned libraries, we install three files:
74 # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script 74 # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script
75 # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink 75 # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink
76@@ -1206,9 +1226,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ 76@@ -1275,9 +1295,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \
77 endif # headers-nonh 77 endif # headers-nonh
78 endif # headers 78 endif # headers
79 79
@@ -97,7 +97,7 @@ index 53eabfa..1cd2a53 100644
97 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin)) 97 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))
98 install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script)) 98 install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))
99 install-rootsbin-nosubdir: \ 99 install-rootsbin-nosubdir: \
100@@ -1221,6 +1254,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) 100@@ -1290,6 +1323,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
101 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) 101 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
102 install-others-nosubdir: $(install-others) 102 install-others-nosubdir: $(install-others)
103 install-others-programs-nosubdir: $(install-others-programs) 103 install-others-programs-nosubdir: $(install-others-programs)
@@ -108,7 +108,7 @@ index 53eabfa..1cd2a53 100644
108 108
109 # We need all the `-nosubdir' targets so that `install' in the parent 109 # We need all the `-nosubdir' targets so that `install' in the parent
110 # doesn't depend on several things which each iterate over the subdirs. 110 # doesn't depend on several things which each iterate over the subdirs.
111@@ -1230,7 +1267,8 @@ install-%:: install-%-nosubdir ; 111@@ -1299,7 +1336,8 @@ install-%:: install-%-nosubdir ;
112 112
113 .PHONY: install install-no-libc.a-nosubdir 113 .PHONY: install install-no-libc.a-nosubdir
114 install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ 114 install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \
@@ -119,5 +119,5 @@ index 53eabfa..1cd2a53 100644
119 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ 119 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
120 install-rootsbin-nosubdir install-sbin-nosubdir \ 120 install-rootsbin-nosubdir install-sbin-nosubdir \
121-- 121--
1222.8.2 1222.10.2
123 123
diff --git a/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch
index c45b557ab7..3399890de1 100644
--- a/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch
+++ b/meta/recipes-core/glibc/glibc/0024-eglibc-Forward-port-cross-locale-generation-support.patch
@@ -1,7 +1,7 @@
1From 11d7633178301add26a24657e2f1596a2f7dddce Mon Sep 17 00:00:00 2001 1From 82516e3ed372f618c886a2de4f9498f597aa8a8b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:33:49 +0000 3Date: Wed, 18 Mar 2015 01:33:49 +0000
4Subject: [PATCH 24/25] eglibc: Forward port cross locale generation support 4Subject: [PATCH 24/26] eglibc: Forward port cross locale generation support
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -91,7 +91,7 @@ index 0000000..9fad357
91+ [LC_ALL] = sizeof ("LC_ALL") - 1 91+ [LC_ALL] = sizeof ("LC_ALL") - 1
92+ }; 92+ };
93diff --git a/locale/localeinfo.h b/locale/localeinfo.h 93diff --git a/locale/localeinfo.h b/locale/localeinfo.h
94index 94627f3..d0db77b 100644 94index 1f4da92..7f68935 100644
95--- a/locale/localeinfo.h 95--- a/locale/localeinfo.h
96+++ b/locale/localeinfo.h 96+++ b/locale/localeinfo.h
97@@ -224,7 +224,7 @@ __libc_tsd_define (extern, __locale_t, LOCALE) 97@@ -224,7 +224,7 @@ __libc_tsd_define (extern, __locale_t, LOCALE)
@@ -363,10 +363,10 @@ index b885f65..0afb631 100644
363 size_t bufmax = 56; 363 size_t bufmax = 56;
364 364
365diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c 365diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
366index 6becd9a..8ddd080 100644 366index b4c48f1..ed08d48 100644
367--- a/locale/programs/localedef.c 367--- a/locale/programs/localedef.c
368+++ b/locale/programs/localedef.c 368+++ b/locale/programs/localedef.c
369@@ -114,6 +114,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; 369@@ -108,6 +108,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
370 #define OPT_LIST_ARCHIVE 309 370 #define OPT_LIST_ARCHIVE 309
371 #define OPT_LITTLE_ENDIAN 400 371 #define OPT_LITTLE_ENDIAN 400
372 #define OPT_BIG_ENDIAN 401 372 #define OPT_BIG_ENDIAN 401
@@ -374,7 +374,7 @@ index 6becd9a..8ddd080 100644
374 374
375 /* Definitions of arguments for argp functions. */ 375 /* Definitions of arguments for argp functions. */
376 static const struct argp_option options[] = 376 static const struct argp_option options[] =
377@@ -150,6 +151,8 @@ static const struct argp_option options[] = 377@@ -143,6 +144,8 @@ static const struct argp_option options[] =
378 N_("Generate little-endian output") }, 378 N_("Generate little-endian output") },
379 { "big-endian", OPT_BIG_ENDIAN, NULL, 0, 379 { "big-endian", OPT_BIG_ENDIAN, NULL, 0,
380 N_("Generate big-endian output") }, 380 N_("Generate big-endian output") },
@@ -383,7 +383,7 @@ index 6becd9a..8ddd080 100644
383 { NULL, 0, NULL, 0, NULL } 383 { NULL, 0, NULL, 0, NULL }
384 }; 384 };
385 385
386@@ -239,12 +242,14 @@ main (int argc, char *argv[]) 386@@ -232,12 +235,14 @@ main (int argc, char *argv[])
387 ctype locale. (P1003.2 4.35.5.2) */ 387 ctype locale. (P1003.2 4.35.5.2) */
388 setlocale (LC_CTYPE, "POSIX"); 388 setlocale (LC_CTYPE, "POSIX");
389 389
@@ -398,7 +398,7 @@ index 6becd9a..8ddd080 100644
398 398
399 /* Process charmap file. */ 399 /* Process charmap file. */
400 charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1); 400 charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1);
401@@ -338,6 +343,9 @@ parse_opt (int key, char *arg, struct argp_state *state) 401@@ -328,6 +333,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
402 case OPT_BIG_ENDIAN: 402 case OPT_BIG_ENDIAN:
403 set_big_endian (true); 403 set_big_endian (true);
404 break; 404 break;
@@ -562,5 +562,5 @@ index 69b3141..1cef0be 100644
562 # define WEAK_POSTLOAD(postload) weak_extern (postload) 562 # define WEAK_POSTLOAD(postload) weak_extern (postload)
563 #else 563 #else
564-- 564--
5652.8.2 5652.10.2
566 566
diff --git a/meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch b/meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch
index 9d60d02828..1f0f5d4da2 100644
--- a/meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch
+++ b/meta/recipes-core/glibc/glibc/0025-Define-DUMMY_LOCALE_T-if-not-defined.patch
@@ -1,7 +1,7 @@
1From 89ec25290d34413ce5c8ba6c378e31dbae3a37c0 Mon Sep 17 00:00:00 2001 1From c2d8cdeab116caacdfedb35eeb3e743b44807bec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 20 Apr 2016 21:11:00 -0700 3Date: Wed, 20 Apr 2016 21:11:00 -0700
4Subject: [PATCH 25/25] Define DUMMY_LOCALE_T if not defined 4Subject: [PATCH 25/26] Define DUMMY_LOCALE_T if not defined
5 5
6This is a hack to fix building the locale bits on an older 6This is a hack to fix building the locale bits on an older
7CentOs 5.X machine 7CentOs 5.X machine
@@ -28,5 +28,5 @@ index f606365..0e5f8c3 100644
28 #define PACKAGE _libc_intl_domainname 28 #define PACKAGE _libc_intl_domainname
29 #ifndef VERSION 29 #ifndef VERSION
30-- 30--
312.8.2 312.10.2
32 32
diff --git a/meta/recipes-core/glibc/glibc/0026-build_local_scope.patch b/meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
index 8e0cb83194..852f5304ce 100644
--- a/meta/recipes-core/glibc/glibc/0026-build_local_scope.patch
+++ b/meta/recipes-core/glibc/glibc/0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
@@ -1,7 +1,7 @@
1From 6e4ec5a3c5fe63b6458036f18d43124de4a7e724 Mon Sep 17 00:00:00 2001 1From fb315c197cca61299a6f6588ea3460145c255d06 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com> 2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Thu, 18 Aug 2016 14:07:58 -0500 3Date: Thu, 18 Aug 2016 14:07:58 -0500
4Subject: [PATCH] elf/dl-deps.c: Make _dl_build_local_scope breadth first 4Subject: [PATCH 26/26] elf/dl-deps.c: Make _dl_build_local_scope breadth first
5 5
6According to the ELF specification: 6According to the ELF specification:
7 7
@@ -24,7 +24,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
24 1 file changed, 10 insertions(+), 4 deletions(-) 24 1 file changed, 10 insertions(+), 4 deletions(-)
25 25
26diff --git a/elf/dl-deps.c b/elf/dl-deps.c 26diff --git a/elf/dl-deps.c b/elf/dl-deps.c
27index 6a82987..fc37c87 100644 27index 6a82987..53be824 100644
28--- a/elf/dl-deps.c 28--- a/elf/dl-deps.c
29+++ b/elf/dl-deps.c 29+++ b/elf/dl-deps.c
30@@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) 30@@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map)
@@ -52,5 +52,5 @@ index 6a82987..fc37c87 100644
52 } 52 }
53 53
54-- 54--
552.5.5 552.10.2
56 56
diff --git a/meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch b/meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch
deleted file mode 100644
index 95067d37a5..0000000000
--- a/meta/recipes-core/glibc/glibc/0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Backport patch to fix CVE-2016-6323 for glibc. And remove the section of
2ChangeLog which can't be applied.
3
4Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e2ff6c]
5CVE: CVE-2016-6323
6Signed-off-by: Kai Kang <kai.kang@windriver.com>
7---
8From 9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617 Mon Sep 17 00:00:00 2001
9From: Andreas Schwab <schwab@suse.de>
10Date: Mon, 8 Aug 2016 09:29:18 +0200
11Subject: [PATCH] arm: mark __startcontext as .cantunwind (bug 20435)
12
13__startcontext marks the bottom of the call stack of the contexts created
14by makecontext.
15---
16 ChangeLog | 6 ++++++
17 sysdeps/unix/sysv/linux/arm/setcontext.S | 7 +++++++
18 2 files changed, 13 insertions(+)
19
20diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S
21index 603e508..d1f168f 100644
22--- a/sysdeps/unix/sysv/linux/arm/setcontext.S
23+++ b/sysdeps/unix/sysv/linux/arm/setcontext.S
24@@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext)
25
26 /* Called when a makecontext() context returns. Start the
27 context in R4 or fall through to exit(). */
28+ /* Unwind descriptors are looked up based on PC - 2, so we have to
29+ make sure to mark the instruction preceding the __startcontext
30+ label as .cantunwind. */
31+ .fnstart
32+ .cantunwind
33+ nop
34 ENTRY(__startcontext)
35 movs r0, r4
36 bne PLTJMP(__setcontext)
37
38 @ New context was 0 - exit
39 b PLTJMP(HIDDEN_JUMPTARGET(exit))
40+ .fnend
41 END(__startcontext)
42
43 #ifdef PIC
44--
452.10.1
46
diff --git a/meta/recipes-core/glibc/glibc/0001-locale-fix-hard-coded-reference-to-gcc-E.patch b/meta/recipes-core/glibc/glibc/0027-locale-fix-hard-coded-reference-to-gcc-E.patch
index d5fce7371b..71c0bdcaea 100644
--- a/meta/recipes-core/glibc/glibc/0001-locale-fix-hard-coded-reference-to-gcc-E.patch
+++ b/meta/recipes-core/glibc/glibc/0027-locale-fix-hard-coded-reference-to-gcc-E.patch
@@ -1,30 +1,29 @@
1From 2c0ab83eb54c0e0fccbf261726dc03803b236079 Mon Sep 17 00:00:00 2001 1From a2fc86cb8d0366171f100ebd033aeb9609fa40de Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <jeremy.rosen@smile.fr> 2From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <jeremy.rosen@smile.fr>
3Date: Mon, 22 Aug 2016 16:09:25 +0200 3Date: Mon, 22 Aug 2016 16:09:25 +0200
4Subject: [PATCH] locale: fix hard-coded reference to gcc -E 4Subject: [PATCH 27/27] locale: fix hard-coded reference to gcc -E
5 5
6When new version of compilers are published, they may not be compatible with 6When new version of compilers are published, they may not be compatible with
7older versions of software. This is particularly common when software is built 7older versions of software. This is particularly common when software is built
8with -Werror. 8with -Werror.
9 9
10Autotools provides a way for a user to specify the name of his compiler using a 10Autotools provides a way for a user to specify the name of his compiler using a
11set of variables ($CC $CXX $CPP etc.). Those variables are used correctly when 11set of variables ($CC $CXX $CPP etc.). Those variables are used correctly when
12compiling glibc but the script used to generate transliterations in the locale/ 12compiling glibc but the script used to generate transliterations in the locale/
13subdirectory directly calls the gcc binary to get the output of the 13subdirectory directly calls the gcc binary to get the output of the
14preprocessor instead of using the $CPP variable provided by the build 14preprocessor instead of using the $CPP variable provided by the build
15environment. 15environment.
16 16
17This patch replaces the hard-coded reference to the gcc binary with the proper 17This patch replaces the hard-coded reference to the gcc binary with the proper
18environment variable, thus allowing a user to override it. 18environment variable, thus allowing a user to override it.
19 19
20Upstream-Status : Submitted [https://sourceware.org/ml/libc-alpha/2016-08/msg00746.html] 20Upstream-Status : Submitted [https://sourceware.org/ml/libc-alpha/2016-08/msg00746.html]
21
22--- 21---
23 locale/gen-translit.pl | 2 +- 22 locale/gen-translit.pl | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-) 23 1 file changed, 1 insertion(+), 1 deletion(-)
25 24
26diff --git a/locale/gen-translit.pl b/locale/gen-translit.pl 25diff --git a/locale/gen-translit.pl b/locale/gen-translit.pl
27index 30d3f2f..7b287fa 100644 26index 30d3f2f..e976530 100644
28--- a/locale/gen-translit.pl 27--- a/locale/gen-translit.pl
29+++ b/locale/gen-translit.pl 28+++ b/locale/gen-translit.pl
30@@ -1,5 +1,5 @@ 29@@ -1,5 +1,5 @@
@@ -35,5 +34,5 @@ index 30d3f2f..7b287fa 100644
35 34
36 sub cstrlen { 35 sub cstrlen {
37-- 36--
382.9.3 372.10.2
39 38
diff --git a/meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch b/meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch
new file mode 100644
index 0000000000..8c146c0f60
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch
@@ -0,0 +1,98 @@
1From ee65c9dde382e0235b6b53fa847b23d0097f554f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 12 Jan 2017 12:13:32 -0800
4Subject: [PATCH 28/28] Revert "Check IFUNC definition in unrelocated shared
5 library [BZ #20019]"
6
7This reverts commit 0e6d3adc60d8073397af6a320e594d98d7fbedde.
8
9Causes regression in OE a new tracker to fix it has been opened
10
11https://sourceware.org/bugzilla/show_bug.cgi?id=21041
12---
13Upstream-Status: Inappropriate
14
15 ChangeLog | 7 -------
16 sysdeps/i386/dl-machine.h | 18 +-----------------
17 sysdeps/x86_64/dl-machine.h | 18 +-----------------
18 3 files changed, 2 insertions(+), 41 deletions(-)
19
20diff --git a/ChangeLog b/ChangeLog
21index f06c02a3c6..11d718d561 100644
22--- a/ChangeLog
23+++ b/ChangeLog
24@@ -4396,13 +4396,6 @@
25
26 * math/test-nan-overflow.c: Include stdlib.h for malloc.
27
28-2016-10-28 H.J. Lu <hongjiu.lu@intel.com>
29-
30- [BZ #20019]
31- * sysdeps/i386/dl-machine.h (elf_machine_rel): Check IFUNC
32- definition in unrelocated shared library.
33- * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise.
34-
35 2016-10-28 Florian Weimer <fweimer@redhat.com>
36
37 [BZ #20729]
38diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
39index 6eca69d567..a9edb41aa6 100644
40--- a/sysdeps/i386/dl-machine.h
41+++ b/sysdeps/i386/dl-machine.h
42@@ -321,23 +321,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
43 0)
44 && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)
45 && __builtin_expect (!skip_ifunc, 1))
46- {
47-# ifndef RTLD_BOOTSTRAP
48- if (sym_map != map
49- && sym_map->l_type != lt_executable
50- && !sym_map->l_relocated)
51- {
52- const char *strtab
53- = (const char *) D_PTR (map, l_info[DT_STRTAB]);
54- _dl_fatal_printf ("\
55-%s: Relink `%s' with `%s' for IFUNC symbol `%s'\n",
56- RTLD_PROGNAME, map->l_name,
57- sym_map->l_name,
58- strtab + refsym->st_name);
59- }
60-# endif
61- value = ((Elf32_Addr (*) (void)) value) ();
62- }
63+ value = ((Elf32_Addr (*) (void)) value) ();
64
65 switch (r_type)
66 {
67diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
68index 3e7ae22c67..b3eb33f036 100644
69--- a/sysdeps/x86_64/dl-machine.h
70+++ b/sysdeps/x86_64/dl-machine.h
71@@ -331,23 +331,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
72 0)
73 && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)
74 && __builtin_expect (!skip_ifunc, 1))
75- {
76-# ifndef RTLD_BOOTSTRAP
77- if (sym_map != map
78- && sym_map->l_type != lt_executable
79- && !sym_map->l_relocated)
80- {
81- const char *strtab
82- = (const char *) D_PTR (map, l_info[DT_STRTAB]);
83- _dl_fatal_printf ("\
84-%s: Relink `%s' with `%s' for IFUNC symbol `%s'\n",
85- RTLD_PROGNAME, map->l_name,
86- sym_map->l_name,
87- strtab + refsym->st_name);
88- }
89-# endif
90- value = ((ElfW(Addr) (*) (void)) value) ();
91- }
92+ value = ((ElfW(Addr) (*) (void)) value) ();
93
94 switch (r_type)
95 {
96--
972.11.0
98
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.25.bb
index 475c13339a..a21fee0a1c 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.25.bb
@@ -7,14 +7,19 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
7 7
8DEPENDS += "gperf-native" 8DEPENDS += "gperf-native"
9 9
10SRCREV ?= "ea23815a795f72035262953dad5beb03e09c17dd" 10SRCREV ?= "bb440151433f0298e7a6786ccd30cd084812f897"
11 11
12SRCBRANCH ?= "release/${PV}/master" 12#SRCBRANCH ?= "release/${PV}/master"
13SRCBRANCH ?= "master"
13 14
14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 15GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
16 17
17SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 18SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
19 file://etc/ld.so.conf \
20 file://generate-supported.mk \
21 \
22 ${NATIVESDKFIXES} \
18 file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ 23 file://0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \
19 file://0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ 24 file://0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \
20 file://0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \ 25 file://0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \
@@ -36,17 +41,13 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
36 file://0023-eglibc-Install-PIC-archives.patch \ 41 file://0023-eglibc-Install-PIC-archives.patch \
37 file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ 42 file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
38 file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 43 file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
39 file://0026-build_local_scope.patch \ 44 file://0026-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
40 file://0027-arm-mark-__startcontext-as-.cantunwind-bug-20435.patch \ 45 file://0027-locale-fix-hard-coded-reference-to-gcc-E.patch \
46 file://0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch \
41" 47"
42 48
43SRC_URI += "\ 49NATIVESDKFIXES ?= ""
44 file://etc/ld.so.conf \ 50NATIVESDKFIXES_class-nativesdk = "\
45 file://generate-supported.mk \
46 file://0001-locale-fix-hard-coded-reference-to-gcc-E.patch \
47 "
48
49SRC_URI_append_class-nativesdk = "\
50 file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \ 51 file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \
51 file://0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \ 52 file://0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \
52 file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ 53 file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \