Skip to contentSkip to conversation

glibc: Update patch status

PATCH In review Khem Raj 2 participants 3 messages Aug 9, 2022 – Aug 11, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 glibc: Update patch status

These patches were appplied in master

---
 .../0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch     | 2 +-
 .../0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch +1 -1
index 2d14a4c6196..2caff3a0d53 100644
@@ -7,7 +7,7 @@ Subject: [PATCH] x86: Fix `#define STRCPY` guard in strcpy-sse2.S
 defined.  It doesn't end up mattering as the whole check is
 guarded by `#if IS_IN (libc)` but is incorrect none the less.
 
-Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=29454 https://sourceware.org/pipermail/libc-alpha/2022-August/141289.html]
+Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=312ded0d6339e8c463d0395397b5825401b14f54]
 Signed-off-by: Martin Jansa <[email protected]>
 ---
  sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +-
meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch +1 -1
index 1b347b33226..a2c951ad936 100644
@@ -8,7 +8,7 @@ strlen_pass::handle_builtin_strcpy but only for optimized
 build. To avoid needing to include strcpy.S in the rtld build to
 support the debug build, just do the optimization by hand.
 
-Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=29454 https://sourceware.org/pipermail/libc-alpha/2022-August/141290.html]
+Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=483cfe1a6a33d6335b1901581b41040d2d412511]
 Signed-off-by: Martin Jansa <[email protected]>
 ---
  elf/dl-cache.c | 5 +++--
Signature · 1 line
2.37.1
#1 lore raw

The 2nd more important part was backported to 2.36 branch
https://sourceware.org/git/?p=glibc.git;a=commit;h=302bc33bc53c787da6e74162a7092e9c0fb964a8

If you plan to do another SRCREV bump before glibc upgrade is merged, then we can drop these 2 changes. (I'll try to do another build tests with DEBUG_BUILD, but probably next week or so).

Quoted 66 lines · Khem Raj

These patches were appplied in master

---
 .../0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch     | 2 +-
 .../0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch     | 2 +-
 2 files changed, 2 insertions(+), 2 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 index 2d14a4c6196..2caff3a0d53 100644
---
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

(quoted diff) +0 -0
@@ -7,7 +7,7 @@ Subject: [PATCH] x86: Fix `#define STRCPY` guard in

strcpy-sse2.S
defined. It doesn't end up mattering as the whole check is guarded by #if IS_IN (libc) but is incorrect none the less.

-Upstream-Status: Submitted [
https://sourceware.org/bugzilla/show_bug.cgi?id=29454
https://sourceware.org/pipermail/libc-alpha/2022-August/141289.html]
+Upstream-Status: Backport [
https://sourceware.org/git/?p=glibc.git;a=commit;h=312ded0d6339e8c463d0395397b5825401b14f54
]

---

  sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +-

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 index 1b347b33226..a2c951ad936 100644
---
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

meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch +0 -1
@@ -8,7 +8,7 @@ strlen_pass::handle_builtin_strcpy but only for optimized
 build. To avoid needing to include strcpy.S in the rtld build to
 support the debug build, just do the optimization by hand.
 
-Upstream-Status: Submitted [

https://sourceware.org/bugzilla/show_bug.cgi?id=29454
https://sourceware.org/pipermail/libc-alpha/2022-August/141290.html]
+Upstream-Status: Backport [
https://sourceware.org/git/?p=glibc.git;a=commit;h=483cfe1a6a33d6335b1901581b41040d2d412511
]

---

  elf/dl-cache.c | 5 +++--

--
2.37.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#169155):
https://lists.openembedded.org/g/openembedded-core/message/169155
Mute This Topic: https://lists.openembedded.org/mt/92916378/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#2 lore raw
Quoted 4 lines · Martin Jansa

The 2nd more important part was backported to 2.36 branch https://sourceware.org/git/?p=glibc.git;a=commit;h=302bc33bc53c787da6e74162a7092e9c0fb964a8

If you plan to do another SRCREV bump before glibc upgrade is merged, then we can drop these 2 changes. (I'll try to do another build tests with DEBUG_BUILD, but probably next week or so).

I think, I might do, if Alex reports issues as he is already testing it out.

Quoted 49 lines · Khem Raj
Quoted 47 lines

These patches were appplied in master

---
 .../0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch     | 2 +-
 .../0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/glibc/glibc/0026-x86-Fix-define-STRCPY-guard-in-strcpy-sse2.S.patch +1 -1
index 2d14a4c6196..2caff3a0d53 100644
@@ -7,7 +7,7 @@ Subject: [PATCH] x86: Fix `#define STRCPY` guard in strcpy-sse2.S
 defined.  It doesn't end up mattering as the whole check is
 guarded by `#if IS_IN (libc)` but is incorrect none the less.
 
-Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=29454 https://sourceware.org/pipermail/libc-alpha/2022-August/141289.html]
+Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=312ded0d6339e8c463d0395397b5825401b14f54]
 Signed-off-by: Martin Jansa <[email protected]>
 ---
  sysdeps/x86_64/multiarch/strcpy-sse2.S | 2 +-
meta/recipes-core/glibc/glibc/0027-elf-Replace-strcpy-call-with-memcpy-BZ-29454.patch +1 -2
index 1b347b33226..a2c951ad936 100644
@@ -8,7 +8,7 @@ strlen_pass::handle_builtin_strcpy but only for optimized
 build. To avoid needing to include strcpy.S in the rtld build to
 support the debug build, just do the optimization by hand.
 
-Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=29454 https://sourceware.org/pipermail/libc-alpha/2022-August/141290.html]
+Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=483cfe1a6a33d6335b1901581b41040d2d412511]
 Signed-off-by: Martin Jansa <[email protected]>
 ---
  elf/dl-cache.c | 5 +++--
--

2.37.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#169155): https://lists.openembedded.org/g/openembedded-core/message/169155
Mute This Topic: https://lists.openembedded.org/mt/92916378/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-