aboutsummaryrefslogtreecommitdiff
path: root/libgloss
diff options
context:
space:
mode:
Diffstat (limited to 'libgloss')
-rw-r--r--libgloss/ChangeLog4
-rw-r--r--libgloss/arm/redboot-crt0.S4
2 files changed, 8 insertions, 0 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 391aae2..1391fc6 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24 Paul Brook <paul@codesourcery.com>
+
+ * arm/redboot-crt0.S: Use cps in Thumb-2 mode.
+
2006-02-22 Nathan Sidwell <nathan@codesourcery.com>
* m68k/Makefile.in (CF_SCRIPTS): New.
diff --git a/libgloss/arm/redboot-crt0.S b/libgloss/arm/redboot-crt0.S
index d059c22..2499ac0 100644
--- a/libgloss/arm/redboot-crt0.S
+++ b/libgloss/arm/redboot-crt0.S
@@ -33,9 +33,13 @@
mov r7, #0 /* Null frame pointer for Thumb. */
/* Enable interrupts for gdb debugging. */
+#ifdef __thumb2__
+ cpsie if
+#else
mrs r0, cpsr
bic r0, r0, #0xC0
msr cpsr, r0
+#endif
mov a2, #0 /* Second arg: fill value. */
ldr a1, .LC1 /* First arg: start of memory block. */