about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorIlya Leoshkevich <iii@linux.ibm.com>2018-08-10 09:07:44 +0200
committerStefan Liebler <stli@linux.ibm.com>2018-08-10 09:07:44 +0200
commit8f135efcad9f32daaa560b7403ab8c1498c0c659 (patch)
tree086a4b3ff4175bb9ee7f33565a585f1a66c51702 /sysdeps
parent71c01af52fdf643abe3946f934693a55887a8ead (diff)
downloadglibc-8f135efcad9f32daaa560b7403ab8c1498c0c659.tar.gz
glibc-8f135efcad9f32daaa560b7403ab8c1498c0c659.tar.xz
glibc-8f135efcad9f32daaa560b7403ab8c1498c0c659.zip
S390: Fix unwind in 32-bit _mcount
* Fix CFI offset for %r14.
* Fix unwound value of %r15 being off by 128 bytes.

ChangeLog:

	* sysdeps/s390/s390-32/s390-mcount.S (_mcount):
	Fix unwind.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/s390/s390-32/s390-mcount.S8
1 files changed, 6 insertions, 2 deletions
diff --git a/sysdeps/s390/s390-32/s390-mcount.S b/sysdeps/s390/s390-32/s390-mcount.S
index 153777e1b8..84f48a20fc 100644
--- a/sysdeps/s390/s390-32/s390-mcount.S
+++ b/sysdeps/s390/s390-32/s390-mcount.S
@@ -55,9 +55,13 @@ C_LABEL(_mcount)
 	/* Save the caller-clobbered registers.  */
 	ahi   %r15,-128
 	cfi_adjust_cfa_offset (128)
+	/* binutils 2.28+: .cfi_val_offset r15, -96 */
+	.cfi_escape \
+		/* DW_CFA_val_offset */ 0x14, \
+		/* r15 */               0x0f, \
+		/* scaled offset */     0x18
 	stm   %r14,%r5,96(%r15)
-	cfi_offset (r14, 0)
-	cfi_offset (r15, 4)
+	cfi_offset (r14, -128)
 	l     %r2,132(%r15)       # callers address  = first parameter
 	la    %r2,0(%r2)          # clear bit 0
 	la    %r3,0(%r14)         # callees address  = second parameter