diff --git a/LoongArch-Add-static-PIE-support.patch b/LoongArch-Add-static-PIE-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..a0c21b49870459efe6f37ee04b2c21048411a4f4 --- /dev/null +++ b/LoongArch-Add-static-PIE-support.patch @@ -0,0 +1,162 @@ +From 82aa8c58156bbaab18bc44a80ca00159557c7f27 Mon Sep 17 00:00:00 2001 +From: XingLi +Date: Thu, 27 Jul 2023 09:25:19 +0800 +Subject: [PATCH 1/3] LoongArch: Add static PIE support + +If the compiler is new enough, enable static PIE support. In the static +PIE version of _start (in rcrt1.o), use la.pcrel instead of la.got +because in a static PIE we cannot use GOT entries until the dynamic +relocations for GOT are resolved. + +From: Xi Ruoyao +Date: Sat, 24 Sep 2022 15:45:34 +0800 +--- + sysdeps/loongarch/configure | 51 ++++++++++++++++++++++++++++++++++ + sysdeps/loongarch/configure.ac | 38 ++++++++++++++++++++++++- + sysdeps/loongarch/start.S | 14 ++++++++-- + 3 files changed, 99 insertions(+), 4 deletions(-) + +diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure +index 1e5abf81..db6341e8 100644 +--- a/sysdeps/loongarch/configure ++++ b/sysdeps/loongarch/configure +@@ -2,3 +2,54 @@ + # Local configure fragment for sysdeps/loongarch/elf. + + #AC_DEFINE(PI_STATIC_AND_HIDDEN) ++$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the toolchain is sufficient to build static PIE on LoongArch" >&5 ++$as_echo_n "checking if the toolchain is sufficient to build static PIE on LoongArch... " >&6; } ++if ${libc_cv_static_pie_on_loongarch+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ cat > conftest.S << EOF ++.global _start ++.type _start, @function ++_start: ++ li.w \$a7, 93 ++ /* This ensures the assembler supports explicit reloc. */ ++ pcalau12i \$a0, %pc_hi20(x) ++ ld.w \$a0, \$a0, %pc_lo12(x) ++ syscall 0 ++ ++.data ++x: ++ .word 0 ++ /* This should produce an R_LARCH_RELATIVE in the static PIE. */ ++ .dword _start ++EOF ++ libc_cv_static_pie_on_loongarch=no ++ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest conftest.S' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } \ ++ && { ac_try='LC_ALL=C $READELF -Wr conftest | grep -q R_LARCH_RELATIVE' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } ++ then ++ libc_cv_static_pie_on_loongarch=yes ++ fi ++ rm -rf conftest.* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_static_pie_on_loongarch" >&5 ++$as_echo "$libc_cv_static_pie_on_loongarch" >&6; } ++ ++if test "$libc_cv_static_pie_on_loongarch" = yes; then ++ $as_echo "#define SUPPORT_STATIC_PIE 1" >>confdefs.h ++ ++fi ++ +diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac +index 67b46ce0..603085cd 100644 +--- a/sysdeps/loongarch/configure.ac ++++ b/sysdeps/loongarch/configure.ac +@@ -3,4 +3,40 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + + dnl It is always possible to access static and hidden symbols in an + dnl position independent way. +-#AC_DEFINE(PI_STATIC_AND_HIDDEN) ++ AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC) ++ ++dnl Test if the toolchain is new enough for static PIE. ++dnl We need a GAS supporting explicit reloc (older GAS produces stack-based ++dnl reloc and triggers an internal error in the linker). And, we need GCC to ++dnl pass the correct linker flags for static PIE. GCC >= 13 and GAS >= 2.40 ++dnl satisify the requirement, but a distro may backport static PIE support into ++dnl earlier GCC or Binutils releases as well. ++AC_CACHE_CHECK([if the toolchain is sufficient to build static PIE on LoongArch], ++libc_cv_static_pie_on_loongarch, [ ++ cat > conftest.S << EOF ++.global _start ++.type _start, @function ++_start: ++ li.w \$a7, 93 ++ /* This ensures the assembler supports explicit reloc. */ ++ pcalau12i \$a0, %pc_hi20(x) ++ ld.w \$a0, \$a0, %pc_lo12(x) ++ syscall 0 ++ ++.data ++x: ++ .word 0 ++ /* This should produce an R_LARCH_RELATIVE in the static PIE. */ ++ .dword _start ++EOF ++ libc_cv_static_pie_on_loongarch=no ++ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest conftest.S]) \ ++ && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest | grep -q R_LARCH_RELATIVE]) ++ then ++ libc_cv_static_pie_on_loongarch=yes ++ fi ++ rm -rf conftest.*]) ++ ++if test "$libc_cv_static_pie_on_loongarch" = yes; then ++ AC_DEFINE(SUPPORT_STATIC_PIE) ++fi +diff --git a/sysdeps/loongarch/start.S b/sysdeps/loongarch/start.S +index 9ecfb5e2..cb2b6c5b 100644 +--- a/sysdeps/loongarch/start.S ++++ b/sysdeps/loongarch/start.S +@@ -44,9 +44,17 @@ ENTRY (ENTRY_POINT) + cfi_undefined (1) + or a5, a0, zero /* rtld_fini */ + ++#if defined(PIC) && !defined(SHARED) ++/* For static PIE, the GOT cannot be used in _start because the GOT entries are ++ offsets instead of real addresses before __libc_start_main. */ ++# define LA la.pcrel ++#else + /* We must get symbol main through GOT table, since main may not be local. + For instance: googletest defines main in dynamic library. */ +- la.got a0, t0, main ++# define LA la.got ++#endif ++ ++ LA a0, t0, main + #ifdef __loongarch_lp64 + ld.d a1, sp, 0 + addi.d a2, sp, SZREG +@@ -61,10 +69,10 @@ ENTRY (ENTRY_POINT) + move a4, zero /* used to be fini */ + or a6, sp, zero /* stack_end */ + +- la.got ra, t0, __libc_start_main ++ LA ra, t0, __libc_start_main + jirl ra, ra, 0 + +- la.got ra, t0, abort ++ LA ra, t0, abort + jirl ra, ra, 0 + END (ENTRY_POINT) + +-- +2.27.0 + diff --git a/LoongArch-Fix-the-condition-to-use-PC-relative-addre.patch b/LoongArch-Fix-the-condition-to-use-PC-relative-addre.patch new file mode 100644 index 0000000000000000000000000000000000000000..d188ec23da59d00ceb2761461d31f8d88bb570c8 --- /dev/null +++ b/LoongArch-Fix-the-condition-to-use-PC-relative-addre.patch @@ -0,0 +1,181 @@ +From d29ac2028078612c6b4c25fb5be857ca35b37a3b Mon Sep 17 00:00:00 2001 +From: XingLi +Date: Thu, 27 Jul 2023 09:32:21 +0800 +Subject: [PATCH 2/3] LoongArch: Fix the condition to use PC-relative + addressing in start.S + +A start.o compiled from start.S with -DPIC and no -DSHARED is used by +both crt1.o and rcrt1.o. So the LoongArch static PIE patch +unintentionally introduced PC-relative addressing for main and +__libc_start_main into crt1.o. + +While the latest Binutils (trunk, which will be released as 2.40) +supports the PC-relative relocs against an external function by creating +a PLT entry, the 2.39 release branch doesn't (and won't) support this. +An error is raised: + + "PLT stub does not represent and symbol not defined." + +So, we need the following changes: + +1. Check if ld supports the PC-relative relocs against an external + function. If it's not supported, we deem static PIE unsupported. +2. Change start.S. If static PIE is supported, use PC-relative + addressing for main and __libc_start_main and rely on the linker to + create PLT entries. Otherwise, restore the old behavior (using GOT + to address these functions). + +An alternative would be adding a new "static-pie-start.S", and some +custom logic into Makefile to build rcrt1.o with it. And, restore +start.S to the state before static PIE change so crt1.o won't contain +PC-relative relocs against external symbols. But I can't see any +benefit of this alternative, so I'd just keep it simple. + +Tested by building glibc with the following configurations: + +1. Binutils trunk + GCC trunk. Static PIE enabled. All tests + passed. +2. Binutils 2.39 branch + GCC trunk. Static PIE disabled. Tests + related to ifunc failed (it's a known issue). All other tests + passed. +3. Binutils 2.39 branch + GCC 12 branch, cross compilation with + build-many-glibcs.py from x86_64-linux-gnu. Static PIE disabled. + Build succeeded. + +From: Xi Ruoyao +Date: Sun, 2 Oct 2022 22:23:09 +0800 +--- + sysdeps/loongarch/configure | 29 +++++++++++++++++++++++++---- + sysdeps/loongarch/configure.ac | 18 ++++++++++++++---- + sysdeps/loongarch/start.S | 11 +++++++---- + 3 files changed, 46 insertions(+), 12 deletions(-) + +diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure +index db6341e8..4f0ac252 100644 +--- a/sysdeps/loongarch/configure ++++ b/sysdeps/loongarch/configure +@@ -11,7 +11,7 @@ if ${libc_cv_static_pie_on_loongarch+:} false; then : + $as_echo_n "(cached) " >&6 + else + +- cat > conftest.S << EOF ++ cat > conftest1.S << EOF + .global _start + .type _start, @function + _start: +@@ -27,14 +27,35 @@ x: + /* This should produce an R_LARCH_RELATIVE in the static PIE. */ + .dword _start + EOF ++ cat > conftest2.S << EOF ++.global f ++.type f, @function ++f: ++ /* The linker should be able to handle this and produce a PLT entry. */ ++ la.pcrel \$t0, \$t0, external_func ++ jirl \$zero, \$t0, 0 ++EOF ++ + libc_cv_static_pie_on_loongarch=no +- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest conftest.S' ++ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest1 conftest1.S' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } \ ++ && { ac_try='LC_ALL=C $READELF -Wr conftest1 | grep -q R_LARCH_RELATIVE' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } \ ++ && { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -shared -fPIC -o conftest2.so conftest2.S' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ +- && { ac_try='LC_ALL=C $READELF -Wr conftest | grep -q R_LARCH_RELATIVE' ++ && { ac_try='LC_ALL=C $READELF -Wr conftest2.so | grep -q 'R_LARCH_JUMP_SLOT.*external_func'' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -43,7 +64,7 @@ EOF + then + libc_cv_static_pie_on_loongarch=yes + fi +- rm -rf conftest.* ++ rm -rf conftest* + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_static_pie_on_loongarch" >&5 + $as_echo "$libc_cv_static_pie_on_loongarch" >&6; } +diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac +index 603085cd..bfe4e0f2 100644 +--- a/sysdeps/loongarch/configure.ac ++++ b/sysdeps/loongarch/configure.ac +@@ -13,7 +13,7 @@ dnl satisify the requirement, but a distro may backport static PIE support into + dnl earlier GCC or Binutils releases as well. + AC_CACHE_CHECK([if the toolchain is sufficient to build static PIE on LoongArch], + libc_cv_static_pie_on_loongarch, [ +- cat > conftest.S << EOF ++ cat > conftest1.S << EOF + .global _start + .type _start, @function + _start: +@@ -28,14 +28,24 @@ x: + .word 0 + /* This should produce an R_LARCH_RELATIVE in the static PIE. */ + .dword _start ++EOF ++ cat > conftest2.S << EOF ++.global f ++.type f, @function ++f: ++ /* The linker should be able to handle this and produce a PLT entry. */ ++ la.pcrel \$t0, \$t0, external_func ++ jirl \$zero, \$t0, 0 + EOF + libc_cv_static_pie_on_loongarch=no +- if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest conftest.S]) \ +- && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest | grep -q R_LARCH_RELATIVE]) ++ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest1 conftest1.S]) \ ++ && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest1 | grep -q R_LARCH_RELATIVE]) \ ++ && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -shared -fPIC -o conftest2.so conftest2.S]) \ ++ && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest2.so | grep -q 'R_LARCH_JUMP_SLOT.*external_func']) + then + libc_cv_static_pie_on_loongarch=yes + fi +- rm -rf conftest.*]) ++ rm -rf conftest* ]) + + if test "$libc_cv_static_pie_on_loongarch" = yes; then + AC_DEFINE(SUPPORT_STATIC_PIE) +diff --git a/sysdeps/loongarch/start.S b/sysdeps/loongarch/start.S +index cb2b6c5b..11e4cede 100644 +--- a/sysdeps/loongarch/start.S ++++ b/sysdeps/loongarch/start.S +@@ -44,13 +44,16 @@ ENTRY (ENTRY_POINT) + cfi_undefined (1) + or a5, a0, zero /* rtld_fini */ + +-#if defined(PIC) && !defined(SHARED) ++#if ENABLE_STATIC_PIE + /* For static PIE, the GOT cannot be used in _start because the GOT entries are +- offsets instead of real addresses before __libc_start_main. */ ++ offsets instead of real addresses before __libc_start_main. ++ __libc_start_main and/or main may be not local, so we rely on the linker to ++ produce PLT entries for them. GNU ld >= 2.40 supports this. */ + # define LA la.pcrel + #else +-/* We must get symbol main through GOT table, since main may not be local. +- For instance: googletest defines main in dynamic library. */ ++/* Old GNU ld (< 2.40) cannot handle PC relative address against a non-local ++ function correctly. We deem these old linkers failing to support static PIE ++ and load the addresses from GOT. */ + # define LA la.got + #endif + +-- +2.27.0 + diff --git a/LoongArch-Further-refine-the-condition-to-enable-sta.patch b/LoongArch-Further-refine-the-condition-to-enable-sta.patch new file mode 100644 index 0000000000000000000000000000000000000000..03fa828e9d115755ec299be508b826ae23b03a4e --- /dev/null +++ b/LoongArch-Further-refine-the-condition-to-enable-sta.patch @@ -0,0 +1,55 @@ +From 8e39b3ab56422fa2f5e65aa67fabd928f40c5e32 Mon Sep 17 00:00:00 2001 +From: XingLi +Date: Thu, 27 Jul 2023 09:36:23 +0800 +Subject: [PATCH 3/3] LoongArch: Further refine the condition to enable static + PIE + +Before GCC r13-2728, it would produce a normal dynamic-linked executable +with -static-pie. I mistakely believed it would produce a static-linked +executable, so failed to detect the breakage. Then with Binutils 2.40 +and (vanilla) GCC 12, libc_cv_static_pie_on_loongarch is mistakenly +enabled and cause a building failure with "undefined reference to +_DYNAMIC". + +Fix the issue by disabling static PIE if -static-pie creates something +with a INTERP header. + +From: Xi Ruoyao +Date: Mon, 27 Feb 2023 19:08:09 +0800 +--- + sysdeps/loongarch/configure | 6 ++++++ + sysdeps/loongarch/configure.ac | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure +index 4f0ac252..9fec0a73 100644 +--- a/sysdeps/loongarch/configure ++++ b/sysdeps/loongarch/configure +@@ -48,6 +48,12 @@ EOF + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } \ ++ && ! { ac_try='LC_ALL=C $READELF -Wl conftest1 | grep -q INTERP' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ + && { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -shared -fPIC -o conftest2.so conftest2.S' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 +diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac +index bfe4e0f2..6d0b4d0d 100644 +--- a/sysdeps/loongarch/configure.ac ++++ b/sysdeps/loongarch/configure.ac +@@ -40,6 +40,7 @@ EOF + libc_cv_static_pie_on_loongarch=no + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostdlib -fPIE -o conftest1 conftest1.S]) \ + && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest1 | grep -q R_LARCH_RELATIVE]) \ ++ && ! AC_TRY_COMMAND([LC_ALL=C $READELF -Wl conftest1 | grep -q INTERP]) \ + && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -shared -fPIC -o conftest2.so conftest2.S]) \ + && AC_TRY_COMMAND([LC_ALL=C $READELF -Wr conftest2.so | grep -q 'R_LARCH_JUMP_SLOT.*external_func']) + then +-- +2.27.0 + diff --git a/glibc.spec b/glibc.spec index 41fa7bf3b4d87a985abed971d1f13fa1b37882c9..d3fc8284dce5a756eb10133ebbcc86338a7b3703 100644 --- a/glibc.spec +++ b/glibc.spec @@ -54,7 +54,7 @@ %endif # Only some architectures have static PIE support -%define pie_arches %{ix86} x86_64 aarch64 +%define pie_arches %{ix86} x86_64 aarch64 loongarch64 %define enablekernel 3.2 %define target %{_target_cpu}-%{_vendor}-linux @@ -70,7 +70,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 127 +Release: 128 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -307,21 +307,24 @@ Patch9029: 5_6-LoongArch-Optimize-string-function-strcpy.patch Patch9030: 6_6-LoongArch-Optimize-string-functions-strlen-strnlen.patch Patch9031: math-Fix-asin-and-acos-invalid-exception-with-old-gc.patch Patch9032: LoongArch-Fix-ptr-mangling-demangling-and-SHMLBA.patch +Patch9033: LoongArch-Add-static-PIE-support.patch +Patch9034: LoongArch-Fix-the-condition-to-use-PC-relative-addre.patch +Patch9035: LoongArch-Further-refine-the-condition-to-enable-sta.patch %endif -Patch9033: add-pthread_cond_clockwait-GLIBC_2_28.patch -Patch9034: 0001-ld.so-support-ld.so-mmap-hugetlb-hugepage-according-.patch -Patch9035: 0002-elf-ld.so-keep-compatible-with-the-original-policy-o.patch -Patch9036: 0003-elf-ld.so-remove-_mmap_hole-when-ld.so-mmap-PT_LOAD-.patch -Patch9037: elf-ld.so-add-MAP_NORESERVE-flag-for-the-first-mmap-2MB-contig.patch -Patch9038: elf-ld.so-prohibit-multiple-i-options-and-do-not-allow-i-speci.patch -Patch9039: elf-ld.so-Consider-maybe-existing-hole-between-PT_LO.patch -Patch9040: add-GB18030-2022-charmap-BZ-30243.patch +Patch9036: add-pthread_cond_clockwait-GLIBC_2_28.patch +Patch9037: 0001-ld.so-support-ld.so-mmap-hugetlb-hugepage-according-.patch +Patch9038: 0002-elf-ld.so-keep-compatible-with-the-original-policy-o.patch +Patch9039: 0003-elf-ld.so-remove-_mmap_hole-when-ld.so-mmap-PT_LOAD-.patch +Patch9030: elf-ld.so-add-MAP_NORESERVE-flag-for-the-first-mmap-2MB-contig.patch +Patch9041: elf-ld.so-prohibit-multiple-i-options-and-do-not-allow-i-speci.patch +Patch9042: elf-ld.so-Consider-maybe-existing-hole-between-PT_LO.patch +Patch9043: add-GB18030-2022-charmap-BZ-30243.patch %if %{with noseparate_code} -Patch9041: add-Wl-z-noseparate-code-for-so.patch +Patch9044: add-Wl-z-noseparate-code-for-so.patch %endif -Patch9042: display-declaration-fstat-function-make-fstat-call-t.patch +Patch9045: display-declaration-fstat-function-make-fstat-call-t.patch Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) @@ -1487,6 +1490,9 @@ fi %endif %changelog +* Fri Jul 28 2023 lixing - 2.34-128 +- DESC: Add static PIE support for LoongArch + * Sun Jul 16 2023 Qingqing Li - 2.34-127 - time: Fix use-after-free in getdate