From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 129589 invoked by alias); 2 Aug 2018 07:59:38 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 129484 invoked by uid 89); 2 Aug 2018 07:59:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-27.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:995 X-HELO: mx0a-001b2d01.pphosted.com From: Ilya Leoshkevich To: libc-alpha@sourceware.org Cc: stli@linux.ibm.com, Ilya Leoshkevich Subject: [PATCH 12/12] S390: Fix unwind in 32-bit _mcount Date: Thu, 02 Aug 2018 07:59:00 -0000 In-Reply-To: <20180802075735.3457-1-iii@linux.ibm.com> References: <20180802075735.3457-1-iii@linux.ibm.com> x-cbid: 18080207-4275-0000-0000-000002A25EC1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080207-4276-0000-0000-000037AA776B Message-Id: <20180802075735.3457-13-iii@linux.ibm.com> X-SW-Source: 2018-08/txt/msg00035.txt.bz2 * Fix CFI offset for %r14. * Fix unwound value of %r15 being off by 128 bytes. * sysdeps/s390/s390-32/s390-mcount.S (_mcount): Fix unwind. --- sysdeps/s390/s390-32/s390-mcount.S | 8 ++++++-- 1 file 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 -- 2.18.0