summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-08-12 12:27:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-14 08:13:32 +0100
commit21cfb871f7da604f1fab957d7747cb03b113b971 (patch)
treebb0458236bad9d746b550a5368b5e8b437c1cd1a /meta/recipes-core/glibc/glibc
parent271bbd9cc3d492402aaa95ffa295949403c2bfd0 (diff)
downloadpoky-21cfb871f7da604f1fab957d7747cb03b113b971.tar.gz
glibc: Bump to latest 2.36 branch
Drop upstreamed patches (From OE-Core rev: e6ca788c180816f81f4f4271caf4f78e9ce6bbcc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc')
-rw-r--r--meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch28
-rw-r--r--meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch32
2 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch b/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch
deleted file mode 100644
index 2caff3a0d5..0000000000
--- a/meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 1d4d09d9dff96f46674262534ce1f0e51a8252cb Mon Sep 17 00:00:00 2001
2From: Noah Goldstein <goldstein.w.n@gmail.com>
3Date: Sun, 7 Aug 2022 22:42:30 +0800
4Subject: [PATCH] x86: Fix `#define STRCPY` guard in strcpy-sse2.S
5
6`#ifndef STPCPY` is incorrect for checking if `STRCPY` is already
7defined. It doesn't end up mattering as the whole check is
8guarded by `#if IS_IN (libc)` but is incorrect none the less.
9
10Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=312ded0d6339e8c463d0395397b5825401b14f54]
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2.S b/sysdeps/x86_64/multiarch/strcpy-sse2.S
17index e29b411314..d6b9bae5f8 100644
18--- a/sysdeps/x86_64/multiarch/strcpy-sse2.S
19+++ b/sysdeps/x86_64/multiarch/strcpy-sse2.S
20@@ -22,7 +22,7 @@
21
22 # include <sysdep.h>
23
24-# ifndef STPCPY
25+# ifndef STRCPY
26 # define STRCPY __strcpy_sse2
27 # endif
28
diff --git a/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch b/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch
deleted file mode 100644
index a2c951ad93..0000000000
--- a/meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From f0e36cf0b348dbc990af9f869196710ca89c28c2 Mon Sep 17 00:00:00 2001
2From: Noah Goldstein <goldstein.w.n@gmail.com>
3Date: Sun, 7 Aug 2022 23:54:19 +0800
4Subject: [PATCH] elf: Replace `strcpy` call with `memcpy` [BZ #29454]
5
6GCC normally does this optimization for us in
7strlen_pass::handle_builtin_strcpy but only for optimized
8build. To avoid needing to include strcpy.S in the rtld build to
9support the debug build, just do the optimization by hand.
10
11Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=483cfe1a6a33d6335b1901581b41040d2d412511]
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 elf/dl-cache.c | 5 +++--
15 1 file changed, 3 insertions(+), 2 deletions(-)
16
17diff --git a/elf/dl-cache.c b/elf/dl-cache.c
18index c02a95d9b5..03a6d236e8 100644
19--- a/elf/dl-cache.c
20+++ b/elf/dl-cache.c
21@@ -513,8 +513,9 @@ _dl_load_cache_lookup (const char *name)
22 we are accessing. Therefore we must make the copy of the
23 mapping data without using malloc. */
24 char *temp;
25- temp = alloca (strlen (best) + 1);
26- strcpy (temp, best);
27+ size_t best_len = strlen (best) + 1;
28+ temp = alloca (best_len);
29+ memcpy (temp, best, best_len);
30 return __strdup (temp);
31 }
32