From 0fc76d876261ee8253fef198ffec48c832edd4ff Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 13 May 2025 13:28:57 +0200 Subject: [PATCH] S390: Use cfi_val_offset instead of cfi_escape. Due to raising the minimum binutils version to version >=2.28, the used cfi_escape for cfi_val_offset can now be ommitted. Checked with "objdump -WF" / "objdump -Wf" that the previous cfi_escape and the new cfi_val_offset are equal. --- sysdeps/generic/sysdep.h | 3 +++ sysdeps/s390/s390-64/s390x-mcount.h | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h index 4c0dda4d23..ef5eba2c87 100644 --- a/sysdeps/generic/sysdep.h +++ b/sysdeps/generic/sysdep.h @@ -45,6 +45,7 @@ # define cfi_adjust_cfa_offset(off) .cfi_adjust_cfa_offset off # define cfi_offset(reg, off) .cfi_offset reg, off # define cfi_rel_offset(reg, off) .cfi_rel_offset reg, off +# define cfi_val_offset(reg, off) .cfi_val_offset reg, off # define cfi_register(r1, r2) .cfi_register r1, r2 # define cfi_return_column(reg) .cfi_return_column reg # define cfi_restore(reg) .cfi_restore reg @@ -74,6 +75,8 @@ ".cfi_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off) # define CFI_REL_OFFSET(reg, off) \ ".cfi_rel_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off) +# define CFI_VAL_OFFSET(reg, off) \ + ".cfi_val_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off) # define CFI_REGISTER(r1, r2) \ ".cfi_register " CFI_STRINGIFY(r1) "," CFI_STRINGIFY(r2) # define CFI_RETURN_COLUMN(reg) \ diff --git a/sysdeps/s390/s390-64/s390x-mcount.h b/sysdeps/s390/s390-64/s390x-mcount.h index b82f1a8e6b..c5bd70d160 100644 --- a/sysdeps/s390/s390-64/s390x-mcount.h +++ b/sysdeps/s390/s390-64/s390x-mcount.h @@ -68,11 +68,7 @@ C_LABEL(MCOUNT_SYMBOL) /* Save the caller-clobbered registers. */ aghi %r15,-224 cfi_adjust_cfa_offset (224) - /* binutils 2.28+: .cfi_val_offset r15, -160 */ - .cfi_escape \ - /* DW_CFA_val_offset */ 0x14, \ - /* r15 */ 0x0f, \ - /* scaled offset */ 0x14 + cfi_val_offset (r15, -160) stmg %r14,%r5,160(%r15) cfi_offset (r14, -224) cfi_offset (r0, -224+16) -- 2.47.2