From: Stefan Liebler <stli@linux.ibm.com>
Date: Wed, 14 May 2025 12:26:36 +0000 (+0200)
Subject: S390: Use cfi_val_offset instead of cfi_escape. 31bit part
X-Git-Tag: glibc-2.42~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=319f94dea2b7eeff12adb22ee50b46b64dd6a52d;p=thirdparty%2Fglibc.git

S390: Use cfi_val_offset instead of cfi_escape. 31bit part

Due to raising the minimum binutils version to version >=2.28,
the used cfi_escape for cfi_val_offset can now be ommitted.

The commit 0fc76d876261ee8253fef198ffec48c832edd4ff
has already adjusted it for the 64bit part of mcount.
This patch also adjusts it for the 31bit part of mcount.

Checked with "objdump -WF" / "objdump -Wf" that the previous
cfi_escape and the new cfi_val_offset are equal.
---

diff --git a/sysdeps/s390/s390-32/s390-mcount.S b/sysdeps/s390/s390-32/s390-mcount.S
index 59614eebd2..7f8457f804 100644
--- a/sysdeps/s390/s390-32/s390-mcount.S
+++ b/sysdeps/s390/s390-32/s390-mcount.S
@@ -54,11 +54,7 @@ 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
+	cfi_val_offset (r15, -96)
 	stm   %r14,%r5,96(%r15)
 	cfi_offset (r14, -128)
 	l     %r2,132(%r15)       # callers address  = first parameter