From cf94bdc0742c13e2a0cac864c478b8626b266e1b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:11:38 +0200 Subject: Merging upstream version 1.66.0+dfsg1. Signed-off-by: Daniel Baumann --- ...-fix-wrong-vfork-aliases-in-libpthread.so.patch | 44 +++++++++++++++ ...more-fixes-to-the-vfork-aliases-in-libpth.patch | 63 ++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0001-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch create mode 100644 src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0002-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch (limited to 'src/ci/docker/host-x86_64/dist-mips-linux/patches') diff --git a/src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0001-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0001-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch new file mode 100644 index 000000000..393084df3 --- /dev/null +++ b/src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0001-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch @@ -0,0 +1,44 @@ +From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Sat, 18 Jun 2016 19:11:23 +0200 +Subject: [PATCH 1/2] MIPS, SPARC: fix wrong vfork aliases in libpthread.so + +With recent binutils versions the GNU libc fails to build on at least +MISP and SPARC, with this kind of error: + + /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0' + /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here + +It appears that on these architectures pt-vfork.S includes vfork.S +(through the alpha version of pt-vfork.S) and that the __vfork aliases +are not conditionalized on IS_IN (libc) like on other architectures. +Therefore the aliases are also wrongly included in libpthread.so. + +Fix this by properly conditionalizing the aliases like on other +architectures. + +Changelog: + * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize + hidden_def, weak_alias and strong_alias on [IS_IN (libc)]. + * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. +--- + sysdeps/unix/sysv/linux/mips/vfork.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S +index 8c6615143708..c0c0ce699159 100644 +--- a/sysdeps/unix/sysv/linux/mips/vfork.S ++++ b/sysdeps/unix/sysv/linux/mips/vfork.S +@@ -106,6 +106,8 @@ L(error): + #endif + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def(__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +-- +2.37.3 + diff --git a/src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0002-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0002-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch new file mode 100644 index 000000000..e28c7ae99 --- /dev/null +++ b/src/ci/docker/host-x86_64/dist-mips-linux/patches/glibc/2.23/0002-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch @@ -0,0 +1,63 @@ +From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Tue, 21 Jun 2016 23:59:37 +0200 +Subject: [PATCH 2/2] MIPS, SPARC: more fixes to the vfork aliases in + libpthread.so + +Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS +and SPARC, but failed to do it correctly, introducing an ABI change. + +This patch does the remaining changes needed to align the MIPS and SPARC +vfork implementations with the other architectures. That way the the +alpha version of pt-vfork.S works correctly for MIPS and SPARC. The +changes for alpha were done in 82aab97c. + +Changelog: + * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into + __libc_vfork. + (__vfork) [IS_IN (libc)]: Remove alias. + (__libc_vfork) [IS_IN (libc)]: Define as an alias. + * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. +--- + sysdeps/unix/sysv/linux/mips/vfork.S | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S +index c0c0ce699159..1867c8626ebe 100644 +--- a/sysdeps/unix/sysv/linux/mips/vfork.S ++++ b/sysdeps/unix/sysv/linux/mips/vfork.S +@@ -31,13 +31,13 @@ + LOCALSZ= 1 + FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK + GPOFF= FRAMESZ-(1*SZREG) +-NESTED(__vfork,FRAMESZ,sp) ++NESTED(__libc_vfork,FRAMESZ,sp) + #ifdef __PIC__ + SETUP_GP + #endif + PTR_SUBU sp, FRAMESZ + cfi_adjust_cfa_offset (FRAMESZ) +- SETUP_GP64_REG (a5, __vfork) ++ SETUP_GP64_REG (a5, __libc_vfork) + #ifdef __PIC__ + SAVE_GP (GPOFF) + #endif +@@ -104,10 +104,10 @@ L(error): + RESTORE_GP64_REG + j __syscall_error + #endif +- END(__vfork) ++ END(__libc_vfork) + + #if IS_IN (libc) +-libc_hidden_def(__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) ++libc_hidden_def (__vfork) + #endif +-- +2.37.3 + -- cgit v1.2.3