summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/unwarminder/SOURCES2
-rw-r--r--lib/unwarminder/backtrace-unwarminder.c (renamed from lib/unwarminder/backtrace.c)2
-rw-r--r--lib/unwarminder/backtrace-unwarminder.h (renamed from lib/unwarminder/backtrace.h)2
-rw-r--r--lib/unwarminder/unwarminder.make1
4 files changed, 4 insertions, 3 deletions
diff --git a/lib/unwarminder/SOURCES b/lib/unwarminder/SOURCES
index b2e5e3e4b9..87c7d69010 100644
--- a/lib/unwarminder/SOURCES
+++ b/lib/unwarminder/SOURCES
@@ -1,4 +1,4 @@
-backtrace.c
+backtrace-unwarminder.c
get_sp.S
unwarm_arm.c
unwarm.c
diff --git a/lib/unwarminder/backtrace.c b/lib/unwarminder/backtrace-unwarminder.c
index 683d2fdcc1..7808a1f2d7 100644
--- a/lib/unwarminder/backtrace.c
+++ b/lib/unwarminder/backtrace-unwarminder.c
@@ -106,7 +106,7 @@ Boolean CliInvalidateW(const Int32 a)
return TRUE;
}
-void backtrace(int pcAddr, int spAddr, unsigned *line)
+void rb_backtrace(int pcAddr, int spAddr, unsigned *line)
{
lcd_putsf(0, (*line)++, "pc:%08x sp:%08x", pcAddr, spAddr);
lcd_update();
diff --git a/lib/unwarminder/backtrace.h b/lib/unwarminder/backtrace-unwarminder.h
index 3bf3eb5aac..e08f725aaf 100644
--- a/lib/unwarminder/backtrace.h
+++ b/lib/unwarminder/backtrace-unwarminder.h
@@ -49,7 +49,7 @@ CliStack;
extern const UnwindCallbacks cliCallbacks;
-void backtrace(int pcAddr, int spAddr, unsigned *line);
+void rb_backtrace(int pcAddr, int spAddr, unsigned *line);
#endif
diff --git a/lib/unwarminder/unwarminder.make b/lib/unwarminder/unwarminder.make
index 5093156f54..563c5cadab 100644
--- a/lib/unwarminder/unwarminder.make
+++ b/lib/unwarminder/unwarminder.make
@@ -16,6 +16,7 @@ UNWARMLIB = $(BUILDDIR)/lib/libunwarminder.a
CORE_LIBS += $(UNWARMLIB)
INCLUDES += -I$(UNWARMLIB_DIR)
+DEFINES += -DBACKTRACE_UNWARMINDER
$(UNWARMLIB): $(UNWARMLIB_OBJ)
$(SILENT)$(shell rm -f $@)