diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/s390/s390-32/sysdep.h | 8 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/sysdep.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S | 31 |
4 files changed, 28 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog index bf6c25aceb..cd10dc1509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2017-06-19 Stefan Liebler <stli@linux.vnet.ibm.com> + + [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. + 2017-06-19 Christian Borntraeger <borntraeger@de.ibm.com> * sysdeps/unix/sysv/linux/s390/s390-32/syscall.S (syscall): diff --git a/sysdeps/s390/s390-32/sysdep.h b/sysdeps/s390/s390-32/sysdep.h index 15a4e3e687..60cf1e7f2e 100644 --- a/sysdeps/s390/s390-32/sysdep.h +++ b/sysdeps/s390/s390-32/sysdep.h @@ -82,14 +82,14 @@ lose: SYSCALL_PIC_SETUP \ END (name) #undef JUMPTARGET -#ifdef PIC +#ifdef SHARED #define JUMPTARGET(name) name##@PLT #define SYSCALL_PIC_SETUP \ - bras %r12,1f \ -0: .long _GLOBAL_OFFSET_TABLE_-0b \ + bras %r12,1f; \ +0: .long _GLOBAL_OFFSET_TABLE_-0b; \ 1: al %r12,0(%r12) #else -#define JUMPTARGET(name) name +#define JUMPTARGET(name) name #define SYSCALL_PIC_SETUP /* Nothing. */ #endif diff --git a/sysdeps/s390/s390-64/sysdep.h b/sysdeps/s390/s390-64/sysdep.h index a4dfc67178..419cd015ad 100644 --- a/sysdeps/s390/s390-64/sysdep.h +++ b/sysdeps/s390/s390-64/sysdep.h @@ -77,7 +77,7 @@ lose: SYSCALL_PIC_SETUP \ END (name) #undef JUMPTARGET -#ifdef PIC +#ifdef SHARED #define JUMPTARGET(name) name##@PLT #define SYSCALL_PIC_SETUP \ larl %r12,_GLOBAL_OFFSET_TABLE_ diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S b/sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S index f32cd3ca39..887d841a87 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/__makecontext_ret.S @@ -32,25 +32,18 @@ ENTRY(__makecontext_ret) lr %r2,%r8 br %r9 1: lhi %r2,0 /* EXIT return value. */ - basr %r13,0 -2: -#ifdef PIC - l %r12,4f-2b(%r13) - la %r12,0(%r12,%r13) /* GOT pointer in r12 after this. */ - l %r1,3f-2b(%r13) - bas %r14,0(%r1,%r12) - .align 4 -3: - .long HIDDEN_JUMPTARGET (exit)@GOTOFF -4: - .long _GLOBAL_OFFSET_TABLE_-2b -#else - l %r1,3f-2b(%r13) - basr %r14,%r1 - .align 4 -3: - .long HIDDEN_JUMPTARGET (exit) +#ifdef NO_HIDDEN + /* If SHARED and NO_HIDDEN is defined, we need to setup got pointer + as HIDDEN_JUMPTARGET expands to JUMPTARGET which expands to + exit@PLT. Otherwise HIDDEN_JUMPTARGET expands to __GI_exit if + SHARED is defined and to exit if SHARED is not defined. */ + SYSCALL_PIC_SETUP #endif - .align 2 + basr %r1,0 +2: + al %r1,3f-2b(%r1) + basr %r14,%r1 /* Call exit. */ j .+2 /* Trap if exit returns for some reason. */ +3: + .long HIDDEN_JUMPTARGET (exit) - 2b END(__makecontext_ret) |