Skip to content

Commit a58125c

Browse files
committed
Revert "glibc: Patch to work around missing features in LLVM's s390x assembler."
This reverts commit b230e4f. Closes #21329.
1 parent 01b21e5 commit a58125c

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Diff for: lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S

+2-4
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
_start:
6262
cfi_startproc
6363
/* Mark r14 as undefined in order to stop unwinding here! */
64-
/* zig patch: r14 -> %r14. revert with llvm 20. */
65-
cfi_undefined (%r14)
64+
cfi_undefined (r14)
6665
/* Load argc and argv from stack. */
6766
la %r4,8(%r15) # get argv
6867
lg %r3,0(%r15) # get argc
@@ -86,8 +85,7 @@ _start:
8685

8786
/* Ok, now branch to the libc main routine. */
8887
#ifdef PIC
89-
/* zig patch: GOTENT -> GOT. revert with llvm 20. */
90-
larl %r2,main@GOT # load pointer to main
88+
larl %r2,main@GOTENT # load pointer to main
9189
lg %r2,0(%r2)
9290
brasl %r14,__libc_start_main@plt
9391
#else

Diff for: lib/libc/glibc/sysdeps/s390/s390-64/start.S

+3-6
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
_start:
6161
cfi_startproc
6262
/* Mark r14 as undefined in order to stop unwinding here! */
63-
/* zig patch: r14 -> %r14. revert with llvm 20. */
64-
cfi_undefined (%r14)
63+
cfi_undefined (r14)
6564
/* Load argc and argv from stack. */
6665
la %r4,8(%r15) # get argv
6766
lg %r3,0(%r15) # get argc
@@ -88,8 +87,7 @@ _start:
8887
# ifdef SHARED
8988
/* Used for dynamic linked position independent executable.
9089
=> Scrt1.o */
91-
/* zig patch: GOTENT -> GOT. revert with llvm 20. */
92-
larl %r2,main@GOT # load pointer to main
90+
larl %r2,main@GOTENT # load pointer to main
9391
lg %r2,0(%r2)
9492
# else
9593
/* Used for dynamic linked position dependent executable.
@@ -121,8 +119,7 @@ _start:
121119
use of GOT relocations before __libc_start_main is called. */
122120
__wrap_main:
123121
cfi_startproc
124-
/* zig patch: GOTENT -> GOT. revert with llvm 20. */
125-
larl %r1,main@GOT # load pointer to main
122+
larl %r1,main@GOTENT # load pointer to main
126123
lg %r1,0(%r1)
127124
br %r1
128125
cfi_endproc

0 commit comments

Comments
 (0)