summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Gjenero <boris.gjenero@gmail.com>2013-05-22 13:05:47 -0400
committerBoris Gjenero <boris.gjenero@gmail.com>2013-05-24 02:02:04 +0200
commitf6e179bd8eeb417e0428b8290df4ca058782e8b3 (patch)
tree016a06cd891022b3fb99c4ea5174ab849f40b0b9
parent4077eac8398345d3500be794190eec83852135ba (diff)
downloadrockbox-f6e179bd8eeb417e0428b8290df4ca058782e8b3.zip
rockbox-f6e179bd8eeb417e0428b8290df4ca058782e8b3.tar.gz
rockbox-f6e179bd8eeb417e0428b8290df4ca058782e8b3.tar.bz2
rockbox-f6e179bd8eeb417e0428b8290df4ca058782e8b3.tar.xz
Remove data_abort_handler from ARM crt0 files.
This causes data_abort_handler from lib/unwarminder/safe_read.S to be used instead. It allows unwarminder to avoid data aborts when displaying the backtrace. A data_abort_handler remains in system-arm.c, but it is not used because it is declared as a weak symbol. Change-Id: I832066ed514347fe697e219872e90fbdd937f477 Reviewed-on: http://gerrit.rockbox.org/475 Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com> Tested-by: Boris Gjenero <boris.gjenero@gmail.com>
-rw-r--r--firmware/target/arm/pnx0101/crt0-pnx0101.S5
-rw-r--r--firmware/target/arm/pp/crt0-pp.S5
-rw-r--r--firmware/target/arm/pp/crt0-pp502x-bl-usb.S5
3 files changed, 0 insertions, 15 deletions
diff --git a/firmware/target/arm/pnx0101/crt0-pnx0101.S b/firmware/target/arm/pnx0101/crt0-pnx0101.S
index f297c29..51be8c7 100644
--- a/firmware/target/arm/pnx0101/crt0-pnx0101.S
+++ b/firmware/target/arm/pnx0101/crt0-pnx0101.S
@@ -203,11 +203,6 @@ fiq_handler:
ldmfd sp!, {r0-r7, r12, lr}
subs pc, lr, #4
-data_abort_handler:
- sub r0, lr, #8
- mov r1, #2
- b UIE
-
irq_handler:
#ifndef STUB
stmfd sp!, {r0-r11, r12, lr}
diff --git a/firmware/target/arm/pp/crt0-pp.S b/firmware/target/arm/pp/crt0-pp.S
index 5a9835a..4e7621e 100644
--- a/firmware/target/arm/pp/crt0-pp.S
+++ b/firmware/target/arm/pp/crt0-pp.S
@@ -402,11 +402,6 @@ prefetch_abort_handler:
mov r1, #1
b UIE
-data_abort_handler:
- sub r0, lr, #8
- mov r1, #2
- b UIE
-
/* Align stacks to cache line boundary */
.balign 32
diff --git a/firmware/target/arm/pp/crt0-pp502x-bl-usb.S b/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
index 7b0489b..93b1fba 100644
--- a/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
+++ b/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
@@ -351,11 +351,6 @@ prefetch_abort_handler:
mov r1, #1
b UIE
-data_abort_handler:
- sub r0, lr, #8
- mov r1, #2
- b UIE
-
/* should never happen in the bootloader */
fiq_handler:
subs pc, lr, #4