From ec633a1911e365ba6016fa9fcbd81cad72f7afdb Mon Sep 17 00:00:00 2001 From: Ken Werner Date: Wed, 2 Mar 2011 17:40:07 +0100 Subject: [PATCH] Use UNW_OBJ instead of UNWI_ARCH_OBJ to rename unwi_unwind_method on ARM. This results in different unwi_unwind_method symbol names for the local and generic versions. It allows to statically link against both libraries. Signed-off-by: Ken Werner --- include/tdep-arm/libunwind_i.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tdep-arm/libunwind_i.h b/include/tdep-arm/libunwind_i.h index bae9c4de..5f02ed07 100644 --- a/include/tdep-arm/libunwind_i.h +++ b/include/tdep-arm/libunwind_i.h @@ -260,7 +260,7 @@ extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, #define UNW_ARM_METHOD_DWARF 0x01 #define UNW_ARM_METHOD_FRAME 0x02 -#define unwi_unwind_method UNWI_ARCH_OBJ(unwind_method) +#define unwi_unwind_method UNW_OBJ(unwind_method) extern int unwi_unwind_method; #define UNW_TRY_METHOD(x) (unwi_unwind_method & x)