mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-13 14:50:17 +00:00
5e5b3b8866
Building glibc with gcc configured with --enable-default-pie failed on s390 due to assembler messages: ../sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S:44: Error: junk at end of line, first unrecognized character is `@' HIDDEN_JUMPTARGET was expanded to exit@PLT@GOTOFF. If SHARED is not defined, HIDDEN_JUMPTARGET is defined to JUMPTARGET in sysdeps/s390/s390-32/sysdep.h. There it expanded to exit@PLT in non SHARED case as PIC is defined if gcc is configured with --enable-default-pie. Thus I've changed the "ifdef PIC" to "ifdef SHARED" as we do not want PLTs in the static obj files. I've also changed this in sysdeps/s390/s390-64/sysdep.h. I've also adjusted sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S. If glibc is configured with --disable-hidden-plt, then NO_HIDDEN is defined. In SHARED case HIDDEN_JUMPTARGET would be expanded to exit@PLT@GOTOFF instead of __GI_exit@GOTOFF. Now we jump to: - __GI_exit if SHARED is defined - exit@PLT if SHARED and NO_HIDDEN is defined - exit if both are not defined. On s390 31bit we have to setup GOT pointer in r12 if we use a PLT stub. Therefore I use SYSCALL_PIC_SETUP from sysdep.h and added the missing semicolons. ChangeLog: [BZ #21537] * sysdeps/s390/s390-32/sysdep.h (JUMPTARGET, SYSCALL_PIC_SETUP): Check SHARED instead of PIC. (SYSCALL_PIC_SETUP): Add missing semicolons. * sysdeps/s390/s390-64/sysdep.h (JUMPTARGET, SYSCALL_PIC_SETUP): Check SHARED instead of PIC. * sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S (__makecontext_ret): Adjust code to jump to exit. |
||
|---|---|---|
| .. | ||
| bits | ||
| fpu | ||
| s390-32 | ||
| s390-64 | ||
| sys | ||
| arch-fork.h | ||
| brk.c | ||
| configure | ||
| configure.ac | ||
| dl-cache.h | ||
| dl-procinfo.h | ||
| elision-conf.c | ||
| elision-conf.h | ||
| elision-lock.c | ||
| elision-timed.c | ||
| elision-trylock.c | ||
| elision-unlock.c | ||
| force-elision.h | ||
| htm.h | ||
| Implies | ||
| init-first.c | ||
| jmp-unwind.c | ||
| kernel-features.h | ||
| ldconfig.h | ||
| ldd-rewrite.sed | ||
| libanl.abilist | ||
| libc-vdso.h | ||
| localplt.data | ||
| longjmp_chk.c | ||
| lowlevellock.h | ||
| Makefile | ||
| mmap_internal.h | ||
| nldbl-abi.h | ||
| opensock.c | ||
| pt-longjmp.c | ||
| pt-vfork.S | ||
| pthread_mutex_cond_lock.c | ||
| pthread_mutex_lock.c | ||
| pthread_mutex_timedlock.c | ||
| pthread_mutex_trylock.c | ||
| readelflib.c | ||
| rt-sysdep.S | ||
| sa_len.c | ||
| semtimedop.c | ||
| sigcontextinfo.h | ||
| sysconf.c | ||
| system.c | ||
| ucontext_i.sym | ||
| Versions | ||