Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

2010-11-23 Gedare Bloom <giddyup44@yahoo.com>

Browse Source 
PR 1719/cpukit
	* arm_exc_abort.S: Avoid "bx" instruction to support ARMv4 and below.
This commit is contained in:
Sebastian Huber
2010-11-23 16:06:49 +00:00
parent cb914b4e06
commit a73dc5d0ed
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/score/cpu/arm/ChangeLog
View File

@@ -1,3 +1,8 @@
2010-11-23 Gedare Bloom <giddyup44@yahoo.com>
PR 1719/cpukit
* arm_exc_abort.S: Avoid "bx" instruction to support ARMv4 and below.
2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com> 2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com>
* rtems/score/arm.h: Make it a warning not error that the FPU multilib * rtems/score/arm.h: Make it a warning not error that the FPU multilib

10
cpukit/score/cpu/arm/arm_exc_abort.S
View File

@@ -51,7 +51,11 @@ prefetch_abort_handler:
arm_exc_data_abort_set_handler: arm_exc_data_abort_set_handler:
ldr r1, =data_abort_handler ldr r1, =data_abort_handler
str r0, [r1] str r0, [r1]
#ifdef __thumb__
bx lr bx lr
#else
mov pc, lr
#endif
#ifdef __thumb__ #ifdef __thumb__
.thumb_func .thumb_func
@@ -60,7 +64,11 @@ arm_exc_data_abort_set_handler:
arm_exc_prefetch_abort_set_handler: arm_exc_prefetch_abort_set_handler:
ldr r1, =prefetch_abort_handler ldr r1, =prefetch_abort_handler
str r0, [r1] str r0, [r1]
#ifdef __thumb__
bx lr bx lr
#else
mov pc, lr
#endif
.arm .arm
@@ -103,7 +111,7 @@ save_more_context:
moveq r0, #0xaa moveq r0, #0xaa
#ifndef __thumb__ #ifndef __thumb__
mov lr, pc mov lr, pc
bx r2 mov pc, r2
#else /* __thumb__ */ #else /* __thumb__ */
SWITCH_FROM_ARM_TO_THUMB r1 SWITCH_FROM_ARM_TO_THUMB r1
bl call_handler bl call_handler