diff options
author | Boris Gjenero <boris.gjenero@gmail.com> | 2013-05-22 13:05:47 -0400 |
---|---|---|
committer | Boris Gjenero <boris.gjenero@gmail.com> | 2013-05-24 02:02:04 +0200 |
commit | f6e179bd8eeb417e0428b8290df4ca058782e8b3 (patch) | |
tree | 016a06cd891022b3fb99c4ea5174ab849f40b0b9 /firmware | |
parent | 4077eac8398345d3500be794190eec83852135ba (diff) | |
download | rockbox-f6e179bd8eeb417e0428b8290df4ca058782e8b3.tar.gz rockbox-f6e179bd8eeb417e0428b8290df4ca058782e8b3.zip |
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>
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/pnx0101/crt0-pnx0101.S | 5 | ||||
-rw-r--r-- | firmware/target/arm/pp/crt0-pp.S | 5 | ||||
-rw-r--r-- | firmware/target/arm/pp/crt0-pp502x-bl-usb.S | 5 |
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 f297c29d0c..51be8c72a3 100644 --- a/firmware/target/arm/pnx0101/crt0-pnx0101.S +++ b/firmware/target/arm/pnx0101/crt0-pnx0101.S | |||
@@ -203,11 +203,6 @@ fiq_handler: | |||
203 | ldmfd sp!, {r0-r7, r12, lr} | 203 | ldmfd sp!, {r0-r7, r12, lr} |
204 | subs pc, lr, #4 | 204 | subs pc, lr, #4 |
205 | 205 | ||
206 | data_abort_handler: | ||
207 | sub r0, lr, #8 | ||
208 | mov r1, #2 | ||
209 | b UIE | ||
210 | |||
211 | irq_handler: | 206 | irq_handler: |
212 | #ifndef STUB | 207 | #ifndef STUB |
213 | stmfd sp!, {r0-r11, r12, lr} | 208 | 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 5a9835a71f..4e7621ecc8 100644 --- a/firmware/target/arm/pp/crt0-pp.S +++ b/firmware/target/arm/pp/crt0-pp.S | |||
@@ -402,11 +402,6 @@ prefetch_abort_handler: | |||
402 | mov r1, #1 | 402 | mov r1, #1 |
403 | b UIE | 403 | b UIE |
404 | 404 | ||
405 | data_abort_handler: | ||
406 | sub r0, lr, #8 | ||
407 | mov r1, #2 | ||
408 | b UIE | ||
409 | |||
410 | /* Align stacks to cache line boundary */ | 405 | /* Align stacks to cache line boundary */ |
411 | .balign 32 | 406 | .balign 32 |
412 | 407 | ||
diff --git a/firmware/target/arm/pp/crt0-pp502x-bl-usb.S b/firmware/target/arm/pp/crt0-pp502x-bl-usb.S index 7b0489b2a8..93b1fbaeb5 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: | |||
351 | mov r1, #1 | 351 | mov r1, #1 |
352 | b UIE | 352 | b UIE |
353 | 353 | ||
354 | data_abort_handler: | ||
355 | sub r0, lr, #8 | ||
356 | mov r1, #2 | ||
357 | b UIE | ||
358 | |||
359 | /* should never happen in the bootloader */ | 354 | /* should never happen in the bootloader */ |
360 | fiq_handler: | 355 | fiq_handler: |
361 | subs pc, lr, #4 | 356 | subs pc, lr, #4 |