| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-03-10 07:54:31+01:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2025-04-04 06:08:10+02:00 |
| log | 6667e0fbb48501016e61862a89fd3072d5de19b7 |
| tree | be4a44cb11112da4bacda42f946d00869a5f3d1a |
| parent | 0d6f3aa6c14824996e5f0b5e4383644f4205882d |
| signature |  Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
Revert "glibc: Patch to work around missing features in LLVM's s390x assembler."
This reverts commit b230e4f598bd18b47f3f1c981869c597a06c7452.
Closes #21329.2 files changed, 5 insertions(+), 10 deletions(-)
lib- libc
- glibc
- sysdeps
- s390
- s390-64
lib/libc/glibc/sysdeps/s390/s390-64/start-2.33.S+2-4
| ... | @@ -61,8 +61,7 @@ | ... | @@ -61,8 +61,7 @@ |
| 61 | _start: | 61 | _start: |
| 62 | cfi_startproc | 62 | cfi_startproc |
| 63 | /* Mark r14 as undefined in order to stop unwinding here! */ | 63 | /* Mark r14 as undefined in order to stop unwinding here! */ |
| 64 | /* zig patch: r14 -> %r14. revert with llvm 20. */ | 64 | cfi_undefined (r14) |
| 65 | cfi_undefined (%r14) | ||
| 66 | /* Load argc and argv from stack. */ | 65 | /* Load argc and argv from stack. */ |
| 67 | la %r4,8(%r15) # get argv | 66 | la %r4,8(%r15) # get argv |
| 68 | lg %r3,0(%r15) # get argc | 67 | lg %r3,0(%r15) # get argc |
| ... | @@ -86,8 +85,7 @@ _start: | ... | @@ -86,8 +85,7 @@ _start: |
| 86 | 85 | ||
| 87 | /* Ok, now branch to the libc main routine. */ | 86 | /* Ok, now branch to the libc main routine. */ |
| 88 | #ifdef PIC | 87 | #ifdef PIC |
| 89 | /* zig patch: GOTENT -> GOT. revert with llvm 20. */ | 88 | larl %r2,main@GOTENT # load pointer to main |
| 90 | larl %r2,main@GOT # load pointer to main | ||
| 91 | lg %r2,0(%r2) | 89 | lg %r2,0(%r2) |
| 92 | brasl %r14,__libc_start_main@plt | 90 | brasl %r14,__libc_start_main@plt |
| 93 | #else | 91 | #else |
lib/libc/glibc/sysdeps/s390/s390-64/start.S+3-6
| ... | @@ -60,8 +60,7 @@ | ... | @@ -60,8 +60,7 @@ |
| 60 | _start: | 60 | _start: |
| 61 | cfi_startproc | 61 | cfi_startproc |
| 62 | /* Mark r14 as undefined in order to stop unwinding here! */ | 62 | /* Mark r14 as undefined in order to stop unwinding here! */ |
| 63 | /* zig patch: r14 -> %r14. revert with llvm 20. */ | 63 | cfi_undefined (r14) |
| 64 | cfi_undefined (%r14) | ||
| 65 | /* Load argc and argv from stack. */ | 64 | /* Load argc and argv from stack. */ |
| 66 | la %r4,8(%r15) # get argv | 65 | la %r4,8(%r15) # get argv |
| 67 | lg %r3,0(%r15) # get argc | 66 | lg %r3,0(%r15) # get argc |
| ... | @@ -88,8 +87,7 @@ _start: | ... | @@ -88,8 +87,7 @@ _start: |
| 88 | # ifdef SHARED | 87 | # ifdef SHARED |
| 89 | /* Used for dynamic linked position independent executable. | 88 | /* Used for dynamic linked position independent executable. |
| 90 | => Scrt1.o */ | 89 | => Scrt1.o */ |
| 91 | /* zig patch: GOTENT -> GOT. revert with llvm 20. */ | 90 | larl %r2,main@GOTENT # load pointer to main |
| 92 | larl %r2,main@GOT # load pointer to main | ||
| 93 | lg %r2,0(%r2) | 91 | lg %r2,0(%r2) |
| 94 | # else | 92 | # else |
| 95 | /* Used for dynamic linked position dependent executable. | 93 | /* Used for dynamic linked position dependent executable. |
| ... | @@ -121,8 +119,7 @@ _start: | ... | @@ -121,8 +119,7 @@ _start: |
| 121 | use of GOT relocations before __libc_start_main is called. */ | 119 | use of GOT relocations before __libc_start_main is called. */ |
| 122 | __wrap_main: | 120 | __wrap_main: |
| 123 | cfi_startproc | 121 | cfi_startproc |
| 124 | /* zig patch: GOTENT -> GOT. revert with llvm 20. */ | 122 | larl %r1,main@GOTENT # load pointer to main |
| 125 | larl %r1,main@GOT # load pointer to main | ||
| 126 | lg %r1,0(%r1) | 123 | lg %r1,0(%r1) |
| 127 | br %r1 | 124 | br %r1 |
| 128 | cfi_endproc | 125 | cfi_endproc |