From 80fc285599e493c1d2cfd84620107a1162e550fe Mon Sep 17 00:00:00 2001 From: Tommi Rantala Date: Thu, 2 Aug 2012 13:51:32 +0300 Subject: [PATCH] MIPS: fix symbol naming for `mips_lock', `mips_local_resume', and `mips_local_addr_space_init' Properly export the symbol names also on MIPS. `make check' was complaining: src/.libs/libunwind.a(Linit.o): In function `mips_local_addr_space_init': src/mips/Ginit.c:183: multiple definition of `mips_local_addr_space_init' ../src/.libs/libunwind-mips.a(Ginit.o):src/mips/Ginit.c:183: first defined here src/.libs/libunwind.a(Lglobal.o): In function `_ULmips_init': src/mips/Gglobal.c:42: multiple definition of `mips_lock' ../src/.libs/libunwind-mips.a(Gglobal.o):src/mips/Gglobal.c:42: first defined here collect2: ld returned 1 exit status --- src/mips/unwind_i.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/mips/unwind_i.h b/src/mips/unwind_i.h index faf3237f..216fb916 100644 --- a/src/mips/unwind_i.h +++ b/src/mips/unwind_i.h @@ -32,16 +32,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "libunwind_i.h" -/* -#define x86_lock UNW_OBJ(lock) -#define x86_local_resume UNW_OBJ(local_resume) -#define x86_local_addr_space_init UNW_OBJ(local_addr_space_init) -#define x86_scratch_loc UNW_OBJ(scratch_loc) +#define mips_lock UNW_OBJ(lock) +#define mips_local_resume UNW_OBJ(local_resume) +#define mips_local_addr_space_init UNW_OBJ(local_addr_space_init) -extern int x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, +extern int mips_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg); -extern dwarf_loc_t x86_scratch_loc (struct cursor *c, unw_regnum_t reg); -*/ extern void mips_local_addr_space_init (void);