summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.30.bb (renamed from meta/recipes-core/glibc/cross-localedef-native_2.29.bb)11
-rw-r--r--meta/recipes-core/glibc/glibc-common.inc9
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.30.bb (renamed from meta/recipes-core/glibc/glibc-locale_2.29.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-mtrace_2.30.bb (renamed from meta/recipes-core/glibc/glibc-mtrace_2.29.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-scripts_2.30.bb (renamed from meta/recipes-core/glibc/glibc-scripts_2.29.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-version.inc8
-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/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch204
-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-.patch21
-rw-r--r--meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch6
-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.patch6
-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.patch12
-rw-r--r--meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch24
-rw-r--r--meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0026-intl-Emit-no-lines-in-bison-generated-files.patch (renamed from meta/recipes-core/glibc/glibc/0028-intl-Emit-no-lines-in-bison-generated-files.patch)6
-rw-r--r--meta/recipes-core/glibc/glibc/0027-inject-file-assembly-directives.patch (renamed from meta/recipes-core/glibc/glibc/0029-inject-file-assembly-directives.patch)6
-rw-r--r--meta/recipes-core/glibc/glibc/0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch (renamed from meta/recipes-core/glibc/glibc/0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch)6
-rw-r--r--meta/recipes-core/glibc/glibc/CVE-2019-9169.patch37
-rw-r--r--meta/recipes-core/glibc/glibc_2.30.bb (renamed from meta/recipes-core/glibc/glibc_2.29.bb)28
38 files changed, 131 insertions, 385 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 32176dae47..69f6344c04 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ GCCVERSION ?= "9.%"
22SDKGCCVERSION ?= "${GCCVERSION}" 22SDKGCCVERSION ?= "${GCCVERSION}"
23BINUVERSION ?= "2.32%" 23BINUVERSION ?= "2.32%"
24GDBVERSION ?= "8.3%" 24GDBVERSION ?= "8.3%"
25GLIBCVERSION ?= "2.29%" 25GLIBCVERSION ?= "2.30%"
26LINUXLIBCVERSION ?= "5.0%" 26LINUXLIBCVERSION ?= "5.0%"
27QEMUVERSION ?= "4.0%" 27QEMUVERSION ?= "4.0%"
28GOVERSION ?= "1.12%" 28GOVERSION ?= "1.12%"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.29.bb b/meta/recipes-core/glibc/cross-localedef-native_2.30.bb
index 8bc7cd649b..e4923c73d5 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.29.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.30.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72 \
8 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 8 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
9 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" 9 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
10 10
11require glibc-version.inc
12
11# Tell autotools that we're working in the localedef directory 13# Tell autotools that we're working in the localedef directory
12# 14#
13AUTOTOOLS_SCRIPT_PATH = "${S}/localedef" 15AUTOTOOLS_SCRIPT_PATH = "${S}/localedef"
@@ -17,15 +19,6 @@ inherit autotools
17 19
18FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" 20FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
19 21
20SRCBRANCH ?= "release/${PV}/master"
21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
23
24PV = "2.29"
25
26SRCREV_glibc ?= "86013ef5cea322b8f4b9c22f230c22cce369e947"
27SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655"
28
29SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 22SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
30 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ 23 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
31 file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ 24 file://0016-timezone-re-written-tzselect-as-posix-sh.patch \
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc
index cded384592..fa46fd89f1 100644
--- a/meta/recipes-core/glibc/glibc-common.inc
+++ b/meta/recipes-core/glibc/glibc-common.inc
@@ -3,10 +3,11 @@ DESCRIPTION = "The GNU C Library is used as the system C library in most systems
3HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" 3HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "GPLv2 & LGPLv2.1" 5LICENSE = "GPLv2 & LGPLv2.1"
6LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \ 6
7 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 7LIC_FILES_CHKSUM ?= "file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72 \
8 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 9 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
9 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 10 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
10 11
11CVE_PRODUCT = "glibc" 12CVE_PRODUCT = "glibc"
12 13
@@ -21,4 +22,4 @@ ARM_INSTRUCTION_SET_armv6 = "arm"
21# 22#
22COMPATIBLE_HOST_libc-musl_class-target = "null" 23COMPATIBLE_HOST_libc-musl_class-target = "null"
23 24
24PV = "2.29" 25PV = "2.30"
diff --git a/meta/recipes-core/glibc/glibc-locale_2.29.bb b/meta/recipes-core/glibc/glibc-locale_2.30.bb
index f7702e0358..f7702e0358 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.29.bb
+++ b/meta/recipes-core/glibc/glibc-locale_2.30.bb
diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.29.bb b/meta/recipes-core/glibc/glibc-mtrace_2.30.bb
index 0b69bad46a..0b69bad46a 100644
--- a/meta/recipes-core/glibc/glibc-mtrace_2.29.bb
+++ b/meta/recipes-core/glibc/glibc-mtrace_2.30.bb
diff --git a/meta/recipes-core/glibc/glibc-scripts_2.29.bb b/meta/recipes-core/glibc/glibc-scripts_2.30.bb
index 5a89bd8022..5a89bd8022 100644
--- a/meta/recipes-core/glibc/glibc-scripts_2.29.bb
+++ b/meta/recipes-core/glibc/glibc-scripts_2.30.bb
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc
new file mode 100644
index 0000000000..c18c583399
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc-version.inc
@@ -0,0 +1,8 @@
1SRCBRANCH ?= "release/2.30/master"
2PV = "2.30"
3SRCREV_glibc ?= "be9a328c93834648e0bec106a1f86357d1a8c7e1"
4SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655"
5
6GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
7
8UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
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 86ad9eaf1c..d86d1d8dc7 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 0cac7493366586e8f87e8459359c15f702ef8c81 Mon Sep 17 00:00:00 2001 1From f6984c923b41155979764bfa3f44609572be5414 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/30] nativesdk-glibc: Look for host system ld.so.cache as 4Subject: [PATCH 01/28] 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 f972524421..e53c3a1b7b 100644 34index 5abeb867f1..981bd5b4af 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@@ -2085,6 +2085,14 @@ _dl_map_object (struct link_map *loader, const char *name, 37@@ -2080,6 +2080,14 @@ _dl_map_object (struct link_map *loader, const char *name,
38 } 38 }
39 } 39 }
40 40
@@ -49,7 +49,7 @@ index f972524421..e53c3a1b7b 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@@ -2143,14 +2151,6 @@ _dl_map_object (struct link_map *loader, const char *name, 52@@ -2138,14 +2146,6 @@ _dl_map_object (struct link_map *loader, const char *name,
53 } 53 }
54 #endif 54 #endif
55 55
@@ -65,5 +65,5 @@ index f972524421..e53c3a1b7b 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.20.1 682.22.0
69 69
diff --git a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch b/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
deleted file mode 100644
index 1a343149c0..0000000000
--- a/meta/recipes-core/glibc/glibc/0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch
+++ /dev/null
@@ -1,204 +0,0 @@
1From 3f635fb43389b54f682fc9ed2acc0b2aaf4a923d Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Mon, 4 Feb 2019 06:31:01 -0800
4Subject: [PATCH] x86-64 memcmp: Use unsigned Jcc instructions on size [BZ
5 #24155]
6
7Since the size argument is unsigned. we should use unsigned Jcc
8instructions, instead of signed, to check size.
9
10Tested on x86-64 and x32, with and without --disable-multi-arch.
11
12 [BZ #24155]
13 CVE-2019-7309
14 * NEWS: Updated for CVE-2019-7309.
15 * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the
16 upper 32 bits of RDX register for x32. Use unsigned Jcc
17 instructions, instead of signed.
18 * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2.
19 * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test.
20
21CVE: CVE-2019-7309
22Upstream-Status: Backport
23Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
24Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
25---
26 sysdeps/x86_64/memcmp.S | 20 +++---
27 sysdeps/x86_64/x32/Makefile | 3 +-
28 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c | 79 ++++++++++++++++++++++++
29 5 files changed, 111 insertions(+), 10 deletions(-)
30 create mode 100644 sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
31
32diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
33index 1fc487caa5..1322bb3b92 100644
34--- a/sysdeps/x86_64/memcmp.S
35+++ b/sysdeps/x86_64/memcmp.S
36@@ -21,14 +21,18 @@
37
38 .text
39 ENTRY (memcmp)
40- test %rdx, %rdx
41+#ifdef __ILP32__
42+ /* Clear the upper 32 bits. */
43+ movl %edx, %edx
44+#endif
45+ test %RDX_LP, %RDX_LP
46 jz L(finz)
47 cmpq $1, %rdx
48- jle L(finr1b)
49+ jbe L(finr1b)
50 subq %rdi, %rsi
51 movq %rdx, %r10
52 cmpq $32, %r10
53- jge L(gt32)
54+ jae L(gt32)
55 /* Handle small chunks and last block of less than 32 bytes. */
56 L(small):
57 testq $1, %r10
58@@ -156,7 +160,7 @@ L(A32):
59 movq %r11, %r10
60 andq $-32, %r10
61 cmpq %r10, %rdi
62- jge L(mt16)
63+ jae L(mt16)
64 /* Pre-unroll to be ready for unrolled 64B loop. */
65 testq $32, %rdi
66 jz L(A64)
67@@ -178,7 +182,7 @@ L(A64):
68 movq %r11, %r10
69 andq $-64, %r10
70 cmpq %r10, %rdi
71- jge L(mt32)
72+ jae L(mt32)
73
74 L(A64main):
75 movdqu (%rdi,%rsi), %xmm0
76@@ -216,7 +220,7 @@ L(mt32):
77 movq %r11, %r10
78 andq $-32, %r10
79 cmpq %r10, %rdi
80- jge L(mt16)
81+ jae L(mt16)
82
83 L(A32main):
84 movdqu (%rdi,%rsi), %xmm0
85@@ -254,7 +258,7 @@ L(ATR):
86 movq %r11, %r10
87 andq $-32, %r10
88 cmpq %r10, %rdi
89- jge L(mt16)
90+ jae L(mt16)
91 testq $16, %rdi
92 jz L(ATR32)
93
94@@ -325,7 +329,7 @@ L(ATR64main):
95 movq %r11, %r10
96 andq $-32, %r10
97 cmpq %r10, %rdi
98- jge L(mt16)
99+ jae L(mt16)
100
101 L(ATR32res):
102 movdqa (%rdi,%rsi), %xmm0
103diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile
104index 1557724b0c..8748956563 100644
105--- a/sysdeps/x86_64/x32/Makefile
106+++ b/sysdeps/x86_64/x32/Makefile
107@@ -8,7 +8,8 @@ endif
108 ifeq ($(subdir),string)
109 tests += tst-size_t-memchr tst-size_t-memcmp tst-size_t-memcpy \
110 tst-size_t-memrchr tst-size_t-memset tst-size_t-strncasecmp \
111- tst-size_t-strncmp tst-size_t-strncpy tst-size_t-strnlen
112+ tst-size_t-strncmp tst-size_t-strncpy tst-size_t-strnlen \
113+ tst-size_t-memcmp-2
114 endif
115
116 ifeq ($(subdir),wcsmbs)
117diff --git a/sysdeps/x86_64/x32/tst-size_t-memcmp-2.c b/sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
118new file mode 100644
119index 0000000000..d8ae1a0813
120--- /dev/null
121+++ b/sysdeps/x86_64/x32/tst-size_t-memcmp-2.c
122@@ -0,0 +1,79 @@
123+/* Test memcmp with size_t in the lower 32 bits of 64-bit register.
124+ Copyright (C) 2019 Free Software Foundation, Inc.
125+ This file is part of the GNU C Library.
126+
127+ The GNU C Library is free software; you can redistribute it and/or
128+ modify it under the terms of the GNU Lesser General Public
129+ License as published by the Free Software Foundation; either
130+ version 2.1 of the License, or (at your option) any later version.
131+
132+ The GNU C Library is distributed in the hope that it will be useful,
133+ but WITHOUT ANY WARRANTY; without even the implied warranty of
134+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
135+ Lesser General Public License for more details.
136+
137+ You should have received a copy of the GNU Lesser General Public
138+ License along with the GNU C Library; if not, see
139+ <http://www.gnu.org/licenses/>. */
140+
141+#define TEST_MAIN
142+#ifdef WIDE
143+# define TEST_NAME "wmemcmp"
144+#else
145+# define TEST_NAME "memcmp"
146+#endif
147+
148+#include "test-size_t.h"
149+
150+#ifdef WIDE
151+# include <inttypes.h>
152+# include <wchar.h>
153+
154+# define MEMCMP wmemcmp
155+# define CHAR wchar_t
156+#else
157+# define MEMCMP memcmp
158+# define CHAR char
159+#endif
160+
161+IMPL (MEMCMP, 1)
162+
163+typedef int (*proto_t) (const CHAR *, const CHAR *, size_t);
164+
165+static int
166+__attribute__ ((noinline, noclone))
167+do_memcmp (parameter_t a, parameter_t b)
168+{
169+ return CALL (&b, a.p, b.p, a.len);
170+}
171+
172+static int
173+test_main (void)
174+{
175+ test_init ();
176+
177+ parameter_t dest = { { page_size / sizeof (CHAR) }, buf1 };
178+ parameter_t src = { { 0 }, buf2 };
179+
180+ memcpy (buf1, buf2, page_size);
181+
182+ CHAR *p = (CHAR *) buf1;
183+ p[page_size / sizeof (CHAR) - 1] = (CHAR) 1;
184+
185+ int ret = 0;
186+ FOR_EACH_IMPL (impl, 0)
187+ {
188+ src.fn = impl->fn;
189+ int res = do_memcmp (dest, src);
190+ if (res >= 0)
191+ {
192+ error (0, 0, "Wrong result in function %s: %i >= 0",
193+ impl->name, res);
194+ ret = 1;
195+ }
196+ }
197+
198+ return ret ? EXIT_FAILURE : EXIT_SUCCESS;
199+}
200+
201+#include <support/test-driver.c>
202--
2032.17.1
204
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 f663e18edd..63531082a4 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 f275c04e263fc2ebf2eaad6ac1ab3c838647bb14 Mon Sep 17 00:00:00 2001 1From b91c323d809039bf9b8c445418579a8b5fe61aea 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/30] nativesdk-glibc: Fix buffer overrun with a relocated 4Subject: [PATCH 02/28] 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 e53c3a1b7b..2bd9bc27f2 100644 25index 981bd5b4af..c7a0fa58cb 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@@ -1785,7 +1785,19 @@ open_path (const char *name, size_t namelen, int mode, 28@@ -1780,7 +1780,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 e53c3a1b7b..2bd9bc27f2 100644
46 { 46 {
47 struct r_search_path_elem *this_dir = *dirs; 47 struct r_search_path_elem *this_dir = *dirs;
48-- 48--
492.20.1 492.22.0
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 fd909f644a..48f5a78716 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 92df5673de18779b612609afa4f687e33e5ecb6e Mon Sep 17 00:00:00 2001 1From 3aceb84e2bc0f796204fe059beede91179b1bc6e 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/30] nativesdk-glibc: Raise the size of arrays containing dl 4Subject: [PATCH 03/28] 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
@@ -41,7 +41,7 @@ index d8d1e2344e..d2247bfc4f 100644
41 _dl_cache_libcmp (const char *p1, const char *p2) 41 _dl_cache_libcmp (const char *p1, const char *p2)
42 { 42 {
43diff --git a/elf/dl-load.c b/elf/dl-load.c 43diff --git a/elf/dl-load.c b/elf/dl-load.c
44index 2bd9bc27f2..4170cc1a09 100644 44index c7a0fa58cb..4b87505d45 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@@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro; 47@@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro;
@@ -67,7 +67,7 @@ index 243829f5f7..0e74241703 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;
69diff --git a/elf/ldconfig.c b/elf/ldconfig.c 69diff --git a/elf/ldconfig.c b/elf/ldconfig.c
70index 206cd51df6..2fd4fb54ae 100644 70index 3bc9e61891..6a23096435 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,10 +81,10 @@ index 206cd51df6..2fd4fb54ae 100644
81 a platform. */ 81 a platform. */
82 static int 82 static int
83diff --git a/elf/rtld.c b/elf/rtld.c 83diff --git a/elf/rtld.c b/elf/rtld.c
84index 5d97f41b7b..26c5fef929 100644 84index c9490ff694..3962373ebb 100644
85--- a/elf/rtld.c 85--- a/elf/rtld.c
86+++ b/elf/rtld.c 86+++ b/elf/rtld.c
87@@ -130,6 +130,7 @@ dso_name_valid_for_suid (const char *p) 87@@ -173,6 +173,7 @@ dso_name_valid_for_suid (const char *p)
88 } 88 }
89 return *p != '\0'; 89 return *p != '\0';
90 } 90 }
@@ -92,7 +92,7 @@ index 5d97f41b7b..26c5fef929 100644
92 92
93 /* LD_AUDIT variable contents. Must be processed before the 93 /* LD_AUDIT variable contents. Must be processed before the
94 audit_list below. */ 94 audit_list below. */
95@@ -1001,12 +1002,12 @@ of this helper program; chances are you did not intend to run this program.\n\ 95@@ -1220,13 +1221,13 @@ 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\
@@ -102,8 +102,9 @@ index 5d97f41b7b..26c5fef929 100644
102 variable LD_LIBRARY_PATH\n\ 102 variable LD_LIBRARY_PATH\n\
103 --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\ 103 --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\
104 in LIST\n\ 104 in LIST\n\
105- --audit LIST use objects named in LIST as auditors\n"); 105 --audit LIST use objects named in LIST as auditors\n\
106+ --audit LIST use objects named in LIST as auditors\n", LD_SO_CACHE); 106- --preload LIST preload objects named in LIST\n");
107+ --preload LIST preload objects named in LIST\n", LD_SO_CACHE);
107 108
108 ++_dl_skip_args; 109 ++_dl_skip_args;
109 --_dl_argc; 110 --_dl_argc;
@@ -136,5 +137,5 @@ index bc8b40331d..b0fdd2144b 100644
136 # define add_system_dir(dir) add_dir (dir) 137 # define add_system_dir(dir) add_dir (dir)
137 #endif 138 #endif
138-- 139--
1392.20.1 1402.22.0
140 141
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 d6c9aac69d..a43f294345 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 ff0f4756f1a98202726c65745aca38354864e033 Mon Sep 17 00:00:00 2001 1From e41e042149eac349e09fa629fcac4c64e574322c 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/30] nativesdk-glibc: Allow 64 bit atomics for x86 4Subject: [PATCH 04/28] 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.
@@ -38,5 +38,5 @@ index aa60ca4cd6..3e42e00183 100644
38 # define SEG_REG "gs" 38 # define SEG_REG "gs"
39 # define BR_CONSTRAINT "r" 39 # define BR_CONSTRAINT "r"
40-- 40--
412.20.1 412.22.0
42 42
diff --git a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
index 9f9f503a1e..3aad603ada 100644
--- a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
+++ b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
@@ -1,7 +1,7 @@
1From b2ec111dc3a42d9dce71c903524724ae82ff22d8 Mon Sep 17 00:00:00 2001 1From 50ab0b0c116f4ae3d975ec1b15ed4595fd9147f6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:55:12 -0700 3Date: Fri, 3 Aug 2018 09:55:12 -0700
4Subject: [PATCH 05/30] nativesdk-glibc: Make relocatable install for locales 4Subject: [PATCH 05/28] nativesdk-glibc: Make relocatable install for locales
5 5
6The glibc locale path is hard-coded to the install prefix, but in SDKs we need 6The glibc locale path is hard-coded to the install prefix, but in SDKs we need
7to be able to relocate the binaries. Expand the strings to 4K and put them in a 7to be able to relocate the binaries. Expand the strings to 4K and put them in a
@@ -66,5 +66,5 @@ index 7c1cc3eecb..53cb8bfc59 100644
66 /* Load the locale data for CATEGORY from the file specified by *NAME. 66 /* Load the locale data for CATEGORY from the file specified by *NAME.
67 If *NAME is "", use environment variables as specified by POSIX, and 67 If *NAME is "", use environment variables as specified by POSIX, and
68-- 68--
692.20.1 692.22.0
70 70
diff --git a/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
index a6dddebbc0..5e1c591432 100644
--- a/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
+++ b/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
@@ -1,7 +1,7 @@
1From 4dc4b4f63dd79734078fa54446edb7fe2d9c74fa Mon Sep 17 00:00:00 2001 1From 7cccf5cec09f2a42cc3fe5d82ce21b7309330b33 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 06/30] fsl e500/e5500/e6500/603e fsqrt implementation 4Subject: [PATCH 06/28] 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 0000000000..04ff8cc181
1580@@ -0,0 +1 @@ 1580@@ -0,0 +1 @@
1581+powerpc/powerpc64/e6500/fpu 1581+powerpc/powerpc64/e6500/fpu
1582-- 1582--
15832.20.1 15832.22.0
1584 1584
diff --git a/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
index 17ffc6fd48..ae6fb268a5 100644
--- a/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
+++ b/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
@@ -1,7 +1,7 @@
1From 5506296ef55a6e4916febab63805ddf2d5a5293c Mon Sep 17 00:00:00 2001 1From dc715f6c70d01e9c3b31c1825fa5bc447967c847 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 07/30] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known 4Subject: [PATCH 07/28] 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 c9743e6692..6307f918fc 100644
29 29
30 static struct known_names known_libs[] = 30 static struct known_names known_libs[] =
31-- 31--
322.20.1 322.22.0
33 33
diff --git a/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
index aacc9f2e3c..8bed20306e 100644
--- a/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
+++ b/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
@@ -1,7 +1,7 @@
1From ea969d7767428d73823c91ad9955829bd66b9e58 Mon Sep 17 00:00:00 2001 1From 42a01c55786a9472934e12e0bf0c40983579b607 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 08/30] ppc/sqrt: Fix undefined reference to `__sqrt_finite' 4Subject: [PATCH 08/28] 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 26fa067abf..9d175122a8 100644
204 } 204 }
205+strong_alias (__ieee754_sqrtf, __sqrtf_finite) 205+strong_alias (__ieee754_sqrtf, __sqrtf_finite)
206-- 206--
2072.20.1 2072.22.0
208 208
diff --git a/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index b1d4413036..8a5d6d8b7f 100644
--- a/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,7 +1,7 @@
1From a9e6ca45cdaf13ee595089a5a580d00a95a06bf1 Mon Sep 17 00:00:00 2001 1From a0fcb9135bc8c2b9d8a161d166b6f9d56d7af245 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 09/30] __ieee754_sqrt{,f} are now inline functions and call 4Subject: [PATCH 09/28] __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 9d175122a8..10de1f0cc3 100644
383+ 383+
384 strong_alias (__ieee754_sqrtf, __sqrtf_finite) 384 strong_alias (__ieee754_sqrtf, __sqrtf_finite)
385-- 385--
3862.20.1 3862.22.0
387 387
diff --git a/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
index 46d205808e..a140a15479 100644
--- a/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
+++ b/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
@@ -1,7 +1,7 @@
1From 50ad00401eb16bb88c57d95bc927deeec4033e01 Mon Sep 17 00:00:00 2001 1From 9c1f2229c48c37b38628c485ef16e01f6780160c 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 10/30] Quote from bug 1443 which explains what the patch does 4Subject: [PATCH 10/28] 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 7a2f9d9b78..36a1dd1888 100644
58 58
59 case R_ARM_TLS_TPOFF32: 59 case R_ARM_TLS_TPOFF32:
60-- 60--
612.20.1 612.22.0
62 62
diff --git a/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index 293b72e79e..cb99092eef 100644
--- a/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
@@ -1,7 +1,7 @@
1From a29a718890a3f32e7135f6b64b1a80c74f2d1454 Mon Sep 17 00:00:00 2001 1From 171d2afb930917b0cfbe9df770774da1c92dd185 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 11/30] eglibc: run libm-err-tab.pl with specific dirs in ${S} 4Subject: [PATCH 11/28] 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 4f76ee85d2..04b8c8c320 100644
32 touch $@ 32 touch $@
33 33
34-- 34--
352.20.1 352.22.0
36 36
diff --git a/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 6e175b64d1..e233fbe542 100644
--- a/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,7 +1,7 @@
1From 777da88a819738683e4389580cfbfded2a83e87e Mon Sep 17 00:00:00 2001 1From 376be7b96152ef501c8cf95ed6dc52c0318bd26a 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 12/30] __ieee754_sqrt{,f} are now inline functions and call 4Subject: [PATCH 12/28] __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 812653558f..10de1f0cc3 100644
57 #endif 57 #endif
58 { 58 {
59-- 59--
602.20.1 602.22.0
61 61
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 b5adecba06..9ba52e6e10 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 f98b1b9e6b569abd3594b4923ace0c966c9daece Mon Sep 17 00:00:00 2001 1From 1ba4e9577437632856d719cbd5d63b5a76cbb4c4 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/30] sysdeps/gnu/configure.ac: handle correctly 4Subject: [PATCH 13/28] 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 634fe4de2a..3db1697f4f 100644
38 ;; 38 ;;
39 esac 39 esac
40-- 40--
412.20.1 412.22.0
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 1cd91475db..0a602bb38c 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 b9cd992052550d4b2bba954099e221677a6652e7 Mon Sep 17 00:00:00 2001 1From b84999dcf642b07e6c14e6ff507be14743349949 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/30] Add unused attribute 4Subject: [PATCH 14/28] 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 91e0ad3141..2e9549fe49 100644
30 { 30 {
31 int slash_count = 0; 31 int slash_count = 0;
32-- 32--
332.20.1 332.22.0
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 f2e1802392..dd6562a631 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 e8a88fb3bb6ffcc43871a7caf7ad9c59bd183e50 Mon Sep 17 00:00:00 2001 1From 7c57f84bef4aaffe4204a7a354411ab3ea7e5273 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/30] 'yes' within the path sets wrong config variables 4Subject: [PATCH 15/28] '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 f9cba6e15d..b21f72f1e4 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.20.1 2622.22.0
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 8a9fa4916c..4d1cf31973 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 10f470476dc947d7b950d6a66f7c06f500c96c60 Mon Sep 17 00:00:00 2001 1From a74f31ea9edf105f1a6dc26497aa2a12ae736660 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/30] timezone: re-written tzselect as posix sh 4Subject: [PATCH 16/28] 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 18fce27e24..70745f9d36 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.20.1 442.22.0
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 a27759a39a..e4f8a135d3 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 809392d20fa9a9f8159242451f9969e65a658835 Mon Sep 17 00:00:00 2001 1From 95882b9864ff20e476d15c6825c83728eb99597f 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/30] Remove bash dependency for nscd init script 4Subject: [PATCH 17/28] 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.
@@ -71,5 +71,5 @@ index a882da7d8b..b02986ec15 100644
71 ;; 71 ;;
72 esac 72 esac
73-- 73--
742.20.1 742.22.0
75 75
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 f80a3ee1d2..b5efc43042 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 016d6987600d49d3f45874096e943b97d1667539 Mon Sep 17 00:00:00 2001 1From 6b603d25cc5723ba631dfc60b544774db1147d81 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/30] eglibc: Cross building and testing instructions 4Subject: [PATCH 18/28] 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 0000000000..b67b468466
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.20.1 6182.22.0
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 603bf21888..0333db2814 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 7e4423528d362cf6268b1902a8e30d710431f333 Mon Sep 17 00:00:00 2001 1From 2864aaae984d945445f3f79869c703e0b791df88 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/30] eglibc: Help bootstrap cross toolchain 4Subject: [PATCH 19/28] eglibc: Help bootstrap cross toolchain
5 5
6Taken from EGLIBC, r1484 + r1525 6Taken from EGLIBC, r1484 + r1525
7 7
@@ -29,7 +29,7 @@ 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 4a014d6eff..3a1f419bc3 100644 32index 9fbf705200..64bfd455bc 100644
33--- a/Makefile 33--- a/Makefile
34+++ b/Makefile 34+++ b/Makefile
35@@ -70,9 +70,18 @@ subdir-dirs = include 35@@ -70,9 +70,18 @@ subdir-dirs = include
@@ -52,7 +52,7 @@ index 4a014d6eff..3a1f419bc3 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@@ -195,6 +204,16 @@ others: $(common-objpfx)testrun.sh 55@@ -196,6 +205,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 4a014d6eff..3a1f419bc3 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@@ -221,6 +240,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) 72@@ -222,6 +241,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 0000000000..1d2b669aff
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.20.1 992.22.0
100 100
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch
index 985b17b583..965ad6578e 100644
--- a/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch
+++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch
@@ -1,7 +1,7 @@
1From 8c4d7d70a84a69fe5e8d69539368aa11f8fe20aa Mon Sep 17 00:00:00 2001 1From e2667086bf984de4d3f1226b9467761cd5a4c39f 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 20/30] eglibc: Clear cache lines on ppc8xx 4Subject: [PATCH 20/28] 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 4fd5f70700..1a21e4675c 100644
79 break; 79 break;
80 #ifndef SHARED 80 #ifndef SHARED
81-- 81--
822.20.1 822.22.0
83 83
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch
index fb1b43b18c..76551cf559 100644
--- a/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch
+++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch
@@ -1,7 +1,7 @@
1From 19f041215673d4499ee9b23805d5c224c4063689 Mon Sep 17 00:00:00 2001 1From b7290e54a1bda7a0212131655bc27926fc22de22 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 21/30] eglibc: Resolve __fpscr_values on SH4 4Subject: [PATCH 21/28] 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 6ce36d6dd5..425811cc77 100644
52+weak_alias (___fpscr_values, __fpscr_values) 52+weak_alias (___fpscr_values, __fpscr_values)
53+ 53+
54-- 54--
552.20.1 552.22.0
56 56
diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
index a2d35d43ed..c46021a478 100644
--- a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
+++ b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
@@ -1,7 +1,7 @@
1From 1ae15f60a84f16187e06a05906f44a6658bae487 Mon Sep 17 00:00:00 2001 1From be382b4e0c6de52573f7e037f2d4ff9b1b5bbb6b 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 22/30] eglibc: Forward port cross locale generation support 4Subject: [PATCH 22/28] eglibc: Forward port cross locale generation support
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 create mode 100644 locale/catnames.c 23 create mode 100644 locale/catnames.c
24 24
25diff --git a/locale/Makefile b/locale/Makefile 25diff --git a/locale/Makefile b/locale/Makefile
26index 764e751c36..866957fefa 100644 26index d78cf9b83a..e166f5252e 100644
27--- a/locale/Makefile 27--- a/locale/Makefile
28+++ b/locale/Makefile 28+++ b/locale/Makefile
29@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ 29@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \
@@ -150,7 +150,7 @@ index 94c122df68..80e53e12c8 100644
150 return NULL; 150 return NULL;
151 } 151 }
152diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c 152diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
153index bb4e2c539d..9d08d422c4 100644 153index 6baab6cfb0..b12a2fceab 100644
154--- a/locale/programs/ld-collate.c 154--- a/locale/programs/ld-collate.c
155+++ b/locale/programs/ld-collate.c 155+++ b/locale/programs/ld-collate.c
156@@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, 156@@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen,
@@ -199,7 +199,7 @@ index bb4e2c539d..9d08d422c4 100644
199 == runp->wcnext->wcs[runp->nwcs - 1] + 1)); 199 == runp->wcnext->wcs[runp->nwcs - 1] + 1));
200 200
201diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c 201diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
202index 36fd08ba80..08155a27d6 100644 202index cfc9c43fd5..6572cc199c 100644
203--- a/locale/programs/ld-ctype.c 203--- a/locale/programs/ld-ctype.c
204+++ b/locale/programs/ld-ctype.c 204+++ b/locale/programs/ld-ctype.c
205@@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, 205@@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap,
@@ -211,7 +211,7 @@ index 36fd08ba80..08155a27d6 100644
211 : 0); 211 : 0);
212 212
213 init_locale_data (&file, nelems); 213 init_locale_data (&file, nelems);
214@@ -1926,7 +1926,7 @@ read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype, 214@@ -1927,7 +1927,7 @@ read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype,
215 ignore = 1; 215 ignore = 1;
216 else 216 else
217 /* This value is usable. */ 217 /* This value is usable. */
@@ -220,7 +220,7 @@ index 36fd08ba80..08155a27d6 100644
220 220
221 first = 0; 221 first = 0;
222 } 222 }
223@@ -2460,8 +2460,8 @@ with character code range values one must use the absolute ellipsis `...'")); 223@@ -2461,8 +2461,8 @@ with character code range values one must use the absolute ellipsis `...'"));
224 } 224 }
225 225
226 handle_tok_digit: 226 handle_tok_digit:
@@ -231,7 +231,7 @@ index 36fd08ba80..08155a27d6 100644
231 handle_digits = 1; 231 handle_digits = 1;
232 goto read_charclass; 232 goto read_charclass;
233 233
234@@ -3901,8 +3901,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 234@@ -3904,8 +3904,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
235 235
236 while (idx < number) 236 while (idx < number)
237 { 237 {
@@ -241,7 +241,7 @@ index 36fd08ba80..08155a27d6 100644
241 if (res == 0) 241 if (res == 0)
242 { 242 {
243 replace = 1; 243 replace = 1;
244@@ -3939,11 +3938,11 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 244@@ -3942,11 +3941,11 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
245 for (size_t cnt = 0; cnt < number; ++cnt) 245 for (size_t cnt = 0; cnt < number; ++cnt)
246 { 246 {
247 struct translit_to_t *srunp; 247 struct translit_to_t *srunp;
@@ -255,7 +255,7 @@ index 36fd08ba80..08155a27d6 100644
255 srunp = srunp->next; 255 srunp = srunp->next;
256 } 256 }
257 /* Plus one for the extra NUL character marking the end of 257 /* Plus one for the extra NUL character marking the end of
258@@ -3967,18 +3966,18 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 258@@ -3970,18 +3969,18 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
259 ctype->translit_from_idx[cnt] = from_len; 259 ctype->translit_from_idx[cnt] = from_len;
260 ctype->translit_to_idx[cnt] = to_len; 260 ctype->translit_to_idx[cnt] = to_len;
261 261
@@ -521,7 +521,7 @@ index c063fc097d..4e7465e55a 100644
521+ 521+
522 #endif /* locfile.h */ 522 #endif /* locfile.h */
523diff --git a/locale/setlocale.c b/locale/setlocale.c 523diff --git a/locale/setlocale.c b/locale/setlocale.c
524index 9427a5ad28..8f4140d684 100644 524index 9bd35454b9..2a67dc6589 100644
525--- a/locale/setlocale.c 525--- a/locale/setlocale.c
526+++ b/locale/setlocale.c 526+++ b/locale/setlocale.c
527@@ -64,36 +64,6 @@ static char *const _nl_current_used[] = 527@@ -64,36 +64,6 @@ static char *const _nl_current_used[] =
@@ -562,5 +562,5 @@ index 9427a5ad28..8f4140d684 100644
562 # define WEAK_POSTLOAD(postload) weak_extern (postload) 562 # define WEAK_POSTLOAD(postload) weak_extern (postload)
563 #else 563 #else
564-- 564--
5652.20.1 5652.22.0
566 566
diff --git a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
index 0f7c5fdf72..17667da99f 100644
--- a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
+++ b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
@@ -1,7 +1,7 @@
1From 809c79b7d554a4ec83921df9d8773c99a03dc81c Mon Sep 17 00:00:00 2001 1From afa8d6faeddeb80aca318b33edf49d9f8ce65761 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 23/30] Define DUMMY_LOCALE_T if not defined 4Subject: [PATCH 23/28] 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 a1e6e0ec3c..7f75528eae 100644
28 #define PACKAGE _libc_intl_domainname 28 #define PACKAGE _libc_intl_domainname
29 #ifndef VERSION 29 #ifndef VERSION
30-- 30--
312.20.1 312.22.0
32 32
diff --git a/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch b/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
index c289e544ee..f68e4f4fa6 100644
--- a/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
+++ b/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
@@ -1,7 +1,7 @@
1From b2d1c9b4159bfd661a4996588d06d922491dfecb Mon Sep 17 00:00:00 2001 1From c13e18adb634a6fd59129150ab7f9468f64dc931 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:42:06 -0700 3Date: Fri, 3 Aug 2018 09:42:06 -0700
4Subject: [PATCH 24/30] localedef --add-to-archive uses a hard-coded locale 4Subject: [PATCH 24/28] localedef --add-to-archive uses a hard-coded locale
5 path 5 path
6 6
7it doesn't exist in normal use, and there's no way to pass an 7it doesn't exist in normal use, and there's no way to pass an
@@ -80,5 +80,5 @@ index e6310b18be..f54a76eade 100644
80 if (readonly) 80 if (readonly)
81 { 81 {
82-- 82--
832.20.1 832.22.0
84 84
diff --git a/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
index 0ddd2e58b2..76a9eb2563 100644
--- a/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
+++ b/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
@@ -1,7 +1,7 @@
1From 804b05a034bfaf4e3427243e6baf736086822cd0 Mon Sep 17 00:00:00 2001 1From 7c9ebe966bb97dd14de5719905b61311211ae3c8 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 25/30] elf/dl-deps.c: Make _dl_build_local_scope breadth first 4Subject: [PATCH 25/28] 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
@@ -52,5 +52,5 @@ index e12c353158..9234daac05 100644
52 } 52 }
53 53
54-- 54--
552.20.1 552.22.0
56 56
diff --git a/meta/recipes-core/glibc/glibc/0028-intl-Emit-no-lines-in-bison-generated-files.patch b/meta/recipes-core/glibc/glibc/0026-intl-Emit-no-lines-in-bison-generated-files.patch
index 0eb006ffb7..7589e11d57 100644
--- a/meta/recipes-core/glibc/glibc/0028-intl-Emit-no-lines-in-bison-generated-files.patch
+++ b/meta/recipes-core/glibc/glibc/0026-intl-Emit-no-lines-in-bison-generated-files.patch
@@ -1,7 +1,7 @@
1From 39f910a4b8195d0538425aad7f0ebdc232b7a582 Mon Sep 17 00:00:00 2001 1From aa5c758fbb7dbb026df33fc6bdc05548547bdb17 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:44:00 -0700 3Date: Fri, 3 Aug 2018 09:44:00 -0700
4Subject: [PATCH 28/30] intl: Emit no lines in bison generated files 4Subject: [PATCH 26/28] intl: Emit no lines in bison generated files
5 5
6Improve reproducibility: 6Improve reproducibility:
7Do not put any #line preprocessor commands in bison generated files. 7Do not put any #line preprocessor commands in bison generated files.
@@ -30,5 +30,5 @@ index 9eea8d57e3..627dce4cf1 100644
30 $(inst_localedir)/locale.alias: locale.alias $(+force) 30 $(inst_localedir)/locale.alias: locale.alias $(+force)
31 $(do-install) 31 $(do-install)
32-- 32--
332.20.1 332.22.0
34 34
diff --git a/meta/recipes-core/glibc/glibc/0029-inject-file-assembly-directives.patch b/meta/recipes-core/glibc/glibc/0027-inject-file-assembly-directives.patch
index 2874fb5815..dc205a833f 100644
--- a/meta/recipes-core/glibc/glibc/0029-inject-file-assembly-directives.patch
+++ b/meta/recipes-core/glibc/glibc/0027-inject-file-assembly-directives.patch
@@ -1,7 +1,7 @@
1From 649bfb399265eb48a9fe8db1c2b5a31633c55152 Mon Sep 17 00:00:00 2001 1From fecd98040a2ae1bc5943a40a1623d76a696e0785 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Nov 2018 17:29:35 -0800 3Date: Thu, 29 Nov 2018 17:29:35 -0800
4Subject: [PATCH 29/30] inject file assembly directives 4Subject: [PATCH 27/28] inject file assembly directives
5 5
6Currently, non-IA builds are not reproducibile since build paths are 6Currently, non-IA builds are not reproducibile since build paths are
7being injected into the debug symbols. These are coming from the use of 7being injected into the debug symbols. These are coming from the use of
@@ -300,5 +300,5 @@ index eeb96544e3..da182b28f8 100644
300+ 300+
301 #include <brk.S> 301 #include <brk.S>
302-- 302--
3032.20.1 3032.22.0
304 304
diff --git a/meta/recipes-core/glibc/glibc/0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch b/meta/recipes-core/glibc/glibc/0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
index adc2424002..6c49066fd1 100644
--- a/meta/recipes-core/glibc/glibc/0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
+++ b/meta/recipes-core/glibc/glibc/0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
@@ -1,7 +1,7 @@
1From 6ddab9c8692e6a777c2e2e7a6ca26a65df7d2c5d Mon Sep 17 00:00:00 2001 1From d934788e3221c28c9a1892235cbe4cfd1b28ced0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com> 2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Mon, 17 Dec 2018 21:36:18 +0000 3Date: Mon, 17 Dec 2018 21:36:18 +0000
4Subject: [PATCH 30/30] locale: prevent maybe-uninitialized errors with -Os [BZ 4Subject: [PATCH 28/28] locale: prevent maybe-uninitialized errors with -Os [BZ
5 #19444] 5 #19444]
6 6
7Fixes following error when building for aarch64 with -Os: 7Fixes following error when building for aarch64 with -Os:
@@ -52,5 +52,5 @@ index 7ca81498b2..d608ca70bb 100644
52 const unsigned char *usrc; 52 const unsigned char *usrc;
53 53
54-- 54--
552.20.1 552.22.0
56 56
diff --git a/meta/recipes-core/glibc/glibc/CVE-2019-9169.patch b/meta/recipes-core/glibc/glibc/CVE-2019-9169.patch
deleted file mode 100644
index cf3744b24a..0000000000
--- a/meta/recipes-core/glibc/glibc/CVE-2019-9169.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1CVE: CVE-2019-9169
2CVE: CVE-2018-20796
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 583dd860d5b833037175247230a328f0050dbfe9 Mon Sep 17 00:00:00 2001
7From: Paul Eggert <eggert@cs.ucla.edu>
8Date: Mon, 21 Jan 2019 11:08:13 -0800
9Subject: [PATCH] regex: fix read overrun [BZ #24114]
10
11Problem found by AddressSanitizer, reported by Hongxu Chen in:
12https://debbugs.gnu.org/34140
13* posix/regexec.c (proceed_next_node):
14Do not read past end of input buffer.
15---
16 posix/regexec.c | 6 ++++--
17 2 files changed, 13 insertions(+), 3 deletions(-)
18
19diff --git a/posix/regexec.c b/posix/regexec.c
20index 91d5a79..084b122 100644
21--- a/posix/regexec.c
22+++ b/posix/regexec.c
23@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
24 else if (naccepted)
25 {
26 char *buf = (char *) re_string_get_buffer (&mctx->input);
27- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
28- naccepted) != 0)
29+ if (mctx->input.valid_len - *pidx < naccepted
30+ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
31+ naccepted)
32+ != 0))
33 return -1;
34 }
35 }
36--
372.9.3
diff --git a/meta/recipes-core/glibc/glibc_2.29.bb b/meta/recipes-core/glibc/glibc_2.30.bb
index c6b2caad42..03add3363c 100644
--- a/meta/recipes-core/glibc/glibc_2.29.bb
+++ b/meta/recipes-core/glibc/glibc_2.30.bb
@@ -1,21 +1,8 @@
1require glibc.inc 1require glibc.inc
2 2require glibc-version.inc
3LIC_FILES_CHKSUM = "file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72 \
4 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
6 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
7 3
8DEPENDS += "gperf-native bison-native make-native" 4DEPENDS += "gperf-native bison-native make-native"
9 5
10PV = "2.29"
11
12SRCREV ?= "86013ef5cea322b8f4b9c22f230c22cce369e947"
13
14SRCBRANCH ?= "release/${PV}/master"
15
16GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
18
19NATIVESDKFIXES ?= "" 6NATIVESDKFIXES ?= ""
20NATIVESDKFIXES_class-nativesdk = "\ 7NATIVESDKFIXES_class-nativesdk = "\
21 file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \ 8 file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \
@@ -25,7 +12,7 @@ NATIVESDKFIXES_class-nativesdk = "\
25 file://0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch \ 12 file://0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch \
26" 13"
27 14
28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 15SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
29 file://etc/ld.so.conf \ 16 file://etc/ld.so.conf \
30 file://generate-supported.mk \ 17 file://generate-supported.mk \
31 file://makedbs.sh \ 18 file://makedbs.sh \
@@ -51,13 +38,10 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
51 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 38 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
52 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ 39 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
53 file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ 40 file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
54 file://0028-intl-Emit-no-lines-in-bison-generated-files.patch \ 41 file://0026-intl-Emit-no-lines-in-bison-generated-files.patch \
55 file://0029-inject-file-assembly-directives.patch \ 42 file://0027-inject-file-assembly-directives.patch \
56 file://0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ 43 file://0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
57 file://0001-x86-64-memcmp-Use-unsigned-Jcc-instructions-on-size-.patch \ 44 "
58 file://CVE-2019-9169.patch \
59"
60
61S = "${WORKDIR}/git" 45S = "${WORKDIR}/git"
62B = "${WORKDIR}/build-${TARGET_SYS}" 46B = "${WORKDIR}/build-${TARGET_SYS}"
63 47