From 6667e0fbb48501016e61862a89fd3072d5de19b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Mon, 10 Mar 2025 07:54:31 +0100 Subject: [PATCH] Revert "glibc: Patch to work around missing features in LLVM's s390x assembler." This reverts commit b230e4f598bd18b47f3f1c981869c597a06c7452. Closes #21329. --- lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S | 6 ++---- lib/libc/glibc/sysdeps/s390/s390-64/start.S | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S b/lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S index 37503dd1dc..02ed4aad51 100644 --- a/lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S +++ b/lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S @@ -61,8 +61,7 @@ _start: cfi_startproc /* Mark r14 as undefined in order to stop unwinding here! */ - /* zig patch: r14 -> %r14. revert with llvm 20. */ - cfi_undefined (%r14) + cfi_undefined (r14) /* Load argc and argv from stack. */ la %r4,8(%r15) # get argv lg %r3,0(%r15) # get argc @@ -86,8 +85,7 @@ _start: /* Ok, now branch to the libc main routine. */ #ifdef PIC - /* zig patch: GOTENT -> GOT. revert with llvm 20. */ - larl %r2,main@GOT # load pointer to main + larl %r2,main@GOTENT # load pointer to main lg %r2,0(%r2) brasl %r14,__libc_start_main@plt #else diff --git a/lib/libc/glibc/sysdeps/s390/s390-64/start.S b/lib/libc/glibc/sysdeps/s390/s390-64/start.S index 959d761164..ab40519307 100644 --- a/lib/libc/glibc/sysdeps/s390/s390-64/start.S +++ b/lib/libc/glibc/sysdeps/s390/s390-64/start.S @@ -60,8 +60,7 @@ _start: cfi_startproc /* Mark r14 as undefined in order to stop unwinding here! */ - /* zig patch: r14 -> %r14. revert with llvm 20. */ - cfi_undefined (%r14) + cfi_undefined (r14) /* Load argc and argv from stack. */ la %r4,8(%r15) # get argv lg %r3,0(%r15) # get argc @@ -88,8 +87,7 @@ _start: # ifdef SHARED /* Used for dynamic linked position independent executable. => Scrt1.o */ - /* zig patch: GOTENT -> GOT. revert with llvm 20. */ - larl %r2,main@GOT # load pointer to main + larl %r2,main@GOTENT # load pointer to main lg %r2,0(%r2) # else /* Used for dynamic linked position dependent executable. @@ -121,8 +119,7 @@ _start: use of GOT relocations before __libc_start_main is called. */ __wrap_main: cfi_startproc - /* zig patch: GOTENT -> GOT. revert with llvm 20. */ - larl %r1,main@GOT # load pointer to main + larl %r1,main@GOTENT # load pointer to main lg %r1,0(%r1) br %r1 cfi_endproc