From 6cf38561ae768ac6d72976e0c62f148e5082e447 Mon Sep 17 00:00:00 2001 From: WANG Xuerui Date: Sun, 28 Aug 2022 17:51:26 +0800 Subject: [LoongArch64] Fix build with upstream kernel headers The libunwind LoongArch64 port was done using an early fork of Linux, with slightly different naming for the register definition symbols. The libunwind port went in before the kernel port got finalized and merged, and was never adjusted; so fixing the usage here before release. Practically no user would be affected since everyone on (development) upstream kernels would have migrated long ago. Fixes: c5f1d12c77de ("Add port for Linux on LoongArch") Signed-off-by: WANG Xuerui --- src/coredump/_UCD_access_reg_linux.c | 62 ++++++++++++++++----------------- src/ptrace/_UPT_reg_offset.c | 66 ++++++++++++++++++------------------ 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/coredump/_UCD_access_reg_linux.c b/src/coredump/_UCD_access_reg_linux.c index 6ec50bac..bb682616 100644 --- a/src/coredump/_UCD_access_reg_linux.c +++ b/src/coredump/_UCD_access_reg_linux.c @@ -67,37 +67,37 @@ _UCD_access_reg (unw_addr_space_t as, static const uint8_t remap_regs[] = { - [UNW_LOONGARCH64_R0] = LOONGARCH64_EF_R0, - [UNW_LOONGARCH64_R1] = LOONGARCH64_EF_R1, - [UNW_LOONGARCH64_R2] = LOONGARCH64_EF_R2, - [UNW_LOONGARCH64_R3] = LOONGARCH64_EF_R3, - [UNW_LOONGARCH64_R4] = LOONGARCH64_EF_R4, - [UNW_LOONGARCH64_R5] = LOONGARCH64_EF_R5, - [UNW_LOONGARCH64_R6] = LOONGARCH64_EF_R6, - [UNW_LOONGARCH64_R7] = LOONGARCH64_EF_R7, - [UNW_LOONGARCH64_R8] = LOONGARCH64_EF_R8, - [UNW_LOONGARCH64_R9] = LOONGARCH64_EF_R9, - [UNW_LOONGARCH64_R10] = LOONGARCH64_EF_R10, - [UNW_LOONGARCH64_R11] = LOONGARCH64_EF_R11, - [UNW_LOONGARCH64_R12] = LOONGARCH64_EF_R12, - [UNW_LOONGARCH64_R13] = LOONGARCH64_EF_R13, - [UNW_LOONGARCH64_R14] = LOONGARCH64_EF_R14, - [UNW_LOONGARCH64_R15] = LOONGARCH64_EF_R15, - [UNW_LOONGARCH64_R16] = LOONGARCH64_EF_R16, - [UNW_LOONGARCH64_R17] = LOONGARCH64_EF_R17, - [UNW_LOONGARCH64_R18] = LOONGARCH64_EF_R18, - [UNW_LOONGARCH64_R19] = LOONGARCH64_EF_R19, - [UNW_LOONGARCH64_R20] = LOONGARCH64_EF_R20, - [UNW_LOONGARCH64_R21] = LOONGARCH64_EF_R21, - [UNW_LOONGARCH64_R22] = LOONGARCH64_EF_R22, - [UNW_LOONGARCH64_R23] = LOONGARCH64_EF_R23, - [UNW_LOONGARCH64_R24] = LOONGARCH64_EF_R24, - [UNW_LOONGARCH64_R25] = LOONGARCH64_EF_R25, - [UNW_LOONGARCH64_R28] = LOONGARCH64_EF_R28, - [UNW_LOONGARCH64_R29] = LOONGARCH64_EF_R29, - [UNW_LOONGARCH64_R30] = LOONGARCH64_EF_R30, - [UNW_LOONGARCH64_R31] = LOONGARCH64_EF_R31, - [UNW_LOONGARCH64_PC] = LOONGARCH64_EF_CSR_EPC, + [UNW_LOONGARCH64_R0] = LOONGARCH_EF_R0, + [UNW_LOONGARCH64_R1] = LOONGARCH_EF_R1, + [UNW_LOONGARCH64_R2] = LOONGARCH_EF_R2, + [UNW_LOONGARCH64_R3] = LOONGARCH_EF_R3, + [UNW_LOONGARCH64_R4] = LOONGARCH_EF_R4, + [UNW_LOONGARCH64_R5] = LOONGARCH_EF_R5, + [UNW_LOONGARCH64_R6] = LOONGARCH_EF_R6, + [UNW_LOONGARCH64_R7] = LOONGARCH_EF_R7, + [UNW_LOONGARCH64_R8] = LOONGARCH_EF_R8, + [UNW_LOONGARCH64_R9] = LOONGARCH_EF_R9, + [UNW_LOONGARCH64_R10] = LOONGARCH_EF_R10, + [UNW_LOONGARCH64_R11] = LOONGARCH_EF_R11, + [UNW_LOONGARCH64_R12] = LOONGARCH_EF_R12, + [UNW_LOONGARCH64_R13] = LOONGARCH_EF_R13, + [UNW_LOONGARCH64_R14] = LOONGARCH_EF_R14, + [UNW_LOONGARCH64_R15] = LOONGARCH_EF_R15, + [UNW_LOONGARCH64_R16] = LOONGARCH_EF_R16, + [UNW_LOONGARCH64_R17] = LOONGARCH_EF_R17, + [UNW_LOONGARCH64_R18] = LOONGARCH_EF_R18, + [UNW_LOONGARCH64_R19] = LOONGARCH_EF_R19, + [UNW_LOONGARCH64_R20] = LOONGARCH_EF_R20, + [UNW_LOONGARCH64_R21] = LOONGARCH_EF_R21, + [UNW_LOONGARCH64_R22] = LOONGARCH_EF_R22, + [UNW_LOONGARCH64_R23] = LOONGARCH_EF_R23, + [UNW_LOONGARCH64_R24] = LOONGARCH_EF_R24, + [UNW_LOONGARCH64_R25] = LOONGARCH_EF_R25, + [UNW_LOONGARCH64_R28] = LOONGARCH_EF_R28, + [UNW_LOONGARCH64_R29] = LOONGARCH_EF_R29, + [UNW_LOONGARCH64_R30] = LOONGARCH_EF_R30, + [UNW_LOONGARCH64_R31] = LOONGARCH_EF_R31, + [UNW_LOONGARCH64_PC] = LOONGARCH_EF_CSR_ERA, }; #else #if defined(UNW_TARGET_MIPS) diff --git a/src/ptrace/_UPT_reg_offset.c b/src/ptrace/_UPT_reg_offset.c index 38290441..ea13e6de 100644 --- a/src/ptrace/_UPT_reg_offset.c +++ b/src/ptrace/_UPT_reg_offset.c @@ -759,39 +759,39 @@ const int _UPT_reg_offset[UNW_REG_LAST + 1] = #elif defined(UNW_TARGET_LOONGARCH64) # include - [UNW_LOONGARCH64_R0] = LOONGARCH64_EF_R0, - [UNW_LOONGARCH64_R1] = LOONGARCH64_EF_R1, - [UNW_LOONGARCH64_R2] = LOONGARCH64_EF_R2, - [UNW_LOONGARCH64_R3] = LOONGARCH64_EF_R3, - [UNW_LOONGARCH64_R4] = LOONGARCH64_EF_R4, - [UNW_LOONGARCH64_R5] = LOONGARCH64_EF_R5, - [UNW_LOONGARCH64_R6] = LOONGARCH64_EF_R6, - [UNW_LOONGARCH64_R7] = LOONGARCH64_EF_R7, - [UNW_LOONGARCH64_R8] = LOONGARCH64_EF_R8, - [UNW_LOONGARCH64_R9] = LOONGARCH64_EF_R9, - [UNW_LOONGARCH64_R10] = LOONGARCH64_EF_R10, - [UNW_LOONGARCH64_R11] = LOONGARCH64_EF_R11, - [UNW_LOONGARCH64_R12] = LOONGARCH64_EF_R12, - [UNW_LOONGARCH64_R13] = LOONGARCH64_EF_R13, - [UNW_LOONGARCH64_R14] = LOONGARCH64_EF_R14, - [UNW_LOONGARCH64_R15] = LOONGARCH64_EF_R15, - [UNW_LOONGARCH64_R16] = LOONGARCH64_EF_R16, - [UNW_LOONGARCH64_R17] = LOONGARCH64_EF_R17, - [UNW_LOONGARCH64_R18] = LOONGARCH64_EF_R18, - [UNW_LOONGARCH64_R19] = LOONGARCH64_EF_R19, - [UNW_LOONGARCH64_R20] = LOONGARCH64_EF_R20, - [UNW_LOONGARCH64_R21] = LOONGARCH64_EF_R21, - [UNW_LOONGARCH64_R22] = LOONGARCH64_EF_R22, - [UNW_LOONGARCH64_R23] = LOONGARCH64_EF_R23, - [UNW_LOONGARCH64_R24] = LOONGARCH64_EF_R24, - [UNW_LOONGARCH64_R25] = LOONGARCH64_EF_R25, - [UNW_LOONGARCH64_R26] = LOONGARCH64_EF_R26, - [UNW_LOONGARCH64_R27] = LOONGARCH64_EF_R27, - [UNW_LOONGARCH64_R28] = LOONGARCH64_EF_R28, - [UNW_LOONGARCH64_R29] = LOONGARCH64_EF_R29, - [UNW_LOONGARCH64_R30] = LOONGARCH64_EF_R30, - [UNW_LOONGARCH64_R31] = LOONGARCH64_EF_R31, - [UNW_LOONGARCH64_PC] = LOONGARCH64_EF_CSR_EPC + [UNW_LOONGARCH64_R0] = LOONGARCH_EF_R0, + [UNW_LOONGARCH64_R1] = LOONGARCH_EF_R1, + [UNW_LOONGARCH64_R2] = LOONGARCH_EF_R2, + [UNW_LOONGARCH64_R3] = LOONGARCH_EF_R3, + [UNW_LOONGARCH64_R4] = LOONGARCH_EF_R4, + [UNW_LOONGARCH64_R5] = LOONGARCH_EF_R5, + [UNW_LOONGARCH64_R6] = LOONGARCH_EF_R6, + [UNW_LOONGARCH64_R7] = LOONGARCH_EF_R7, + [UNW_LOONGARCH64_R8] = LOONGARCH_EF_R8, + [UNW_LOONGARCH64_R9] = LOONGARCH_EF_R9, + [UNW_LOONGARCH64_R10] = LOONGARCH_EF_R10, + [UNW_LOONGARCH64_R11] = LOONGARCH_EF_R11, + [UNW_LOONGARCH64_R12] = LOONGARCH_EF_R12, + [UNW_LOONGARCH64_R13] = LOONGARCH_EF_R13, + [UNW_LOONGARCH64_R14] = LOONGARCH_EF_R14, + [UNW_LOONGARCH64_R15] = LOONGARCH_EF_R15, + [UNW_LOONGARCH64_R16] = LOONGARCH_EF_R16, + [UNW_LOONGARCH64_R17] = LOONGARCH_EF_R17, + [UNW_LOONGARCH64_R18] = LOONGARCH_EF_R18, + [UNW_LOONGARCH64_R19] = LOONGARCH_EF_R19, + [UNW_LOONGARCH64_R20] = LOONGARCH_EF_R20, + [UNW_LOONGARCH64_R21] = LOONGARCH_EF_R21, + [UNW_LOONGARCH64_R22] = LOONGARCH_EF_R22, + [UNW_LOONGARCH64_R23] = LOONGARCH_EF_R23, + [UNW_LOONGARCH64_R24] = LOONGARCH_EF_R24, + [UNW_LOONGARCH64_R25] = LOONGARCH_EF_R25, + [UNW_LOONGARCH64_R26] = LOONGARCH_EF_R26, + [UNW_LOONGARCH64_R27] = LOONGARCH_EF_R27, + [UNW_LOONGARCH64_R28] = LOONGARCH_EF_R28, + [UNW_LOONGARCH64_R29] = LOONGARCH_EF_R29, + [UNW_LOONGARCH64_R30] = LOONGARCH_EF_R30, + [UNW_LOONGARCH64_R31] = LOONGARCH_EF_R31, + [UNW_LOONGARCH64_PC] = LOONGARCH_EF_CSR_ERA #else # error Fix me. #endif -- cgit v1.2.1