diff options
| author | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-01-07 09:36:31 +0100 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-01-07 09:36:31 +0100 |
| commit | 93a45ff1ca6d459618bb0cf93580c4b2809a4b61 (patch) | |
| tree | 01ba50a65134ba45d974f63156617392dabfd430 /sysdeps/s390/s390-64 | |
| parent | d5780febe69c2fe42d857e2feed54e9f4ba9ab87 (diff) | |
| download | glibc-93a45ff1ca6d459618bb0cf93580c4b2809a4b61.tar.gz glibc-93a45ff1ca6d459618bb0cf93580c4b2809a4b61.tar.xz glibc-93a45ff1ca6d459618bb0cf93580c4b2809a4b61.zip | |
S/390: Make jmp_buf extendible.
Diffstat (limited to 'sysdeps/s390/s390-64')
| -rw-r--r-- | sysdeps/s390/s390-64/__longjmp-common.c (renamed from sysdeps/s390/s390-64/__longjmp.c) | 2 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/setjmp-common.S (renamed from sysdeps/s390/s390-64/setjmp.S) | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp-common.c index 168ebf562b..46cabb67bc 100644 --- a/sysdeps/s390/s390-64/__longjmp.c +++ b/sysdeps/s390/s390-64/__longjmp-common.c @@ -25,7 +25,7 @@ /* Jump to the position specified by ENV, causing the setjmp call there to return VAL, or 1 if VAL is 0. */ -void +attribute_hidden void __longjmp (__jmp_buf env, int val) { #ifdef PTR_DEMANGLE diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp-common.S index 5462dab277..9cdcae45c5 100644 --- a/sysdeps/s390/s390-64/setjmp.S +++ b/sysdeps/s390/s390-64/setjmp-common.S @@ -27,24 +27,24 @@ ENTRY (setjmp) .weak C_SYMBOL_NAME (setjmp) lghi %r3,1 /* Second argument of one. */ - j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */ + j 0f /* Branch relativ to __sigsetjmp. */ END (setjmp) /* Binary compatibility entry point. */ ENTRY(_setjmp) .weak C_SYMBOL_NAME (_setjmp) slgr %r3,%r3 /* Second argument of zero. */ - j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */ -END (setjmp) + j 0f /* Branch relativ to __sigsetjmp. */ +END (_setjmp) libc_hidden_def (_setjmp) ENTRY(__setjmp) slgr %r3,%r3 /* Second argument of zero. */ - j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */ -END (setjmp) + j 0f /* Branch relativ to __sigsetjmp. */ +END (__setjmp) ENTRY(__sigsetjmp) -.Linternal_sigsetjmp: +0: #ifdef PTR_MANGLE stmg %r6,%r13,0(%r2) /* Store registers in jmp_buf. */ lgr %r4,%r14 @@ -55,6 +55,10 @@ ENTRY(__sigsetjmp) #else stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */ #endif +#ifndef __V1_JMPBUF + lghi %r4,0 + stg %r4,144(%r2) /* Set __flags to 0. */ +#endif std %f8,80(%r2) std %f9,88(%r2) std %f10,96(%r2) |