summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2019-04-10 15:04:13 +0000
committerChristophe Lyon <christophe.lyon@linaro.org>2019-04-11 14:20:21 +0000
commitcc430406ac09d99570b5218668f2bb00371ae983 (patch)
tree597da24312e919d347534bf3ddf61658decb1550
parent630808d2a2865634df3f54cec403a058511596e7 (diff)
downloadcygnal-cc430406ac09d99570b5218668f2bb00371ae983.tar.gz
cygnal-cc430406ac09d99570b5218668f2bb00371ae983.tar.bz2
cygnal-cc430406ac09d99570b5218668f2bb00371ae983.zip
Include code in trap.S for APCS only.
The code in trap.S is to support the old APCS chunked stack variant, which dates back to the Acorn days, so put it under #ifndef __ARM_EABI__. * libgloss/arm/trap.S: Use __ARM_EABI rather than PREFER_THUMB. * newlib/libc/sys/arm/trap.S: Use __ARM_EABI rather than __thumb2__.
-rw-r--r--libgloss/arm/trap.S2
-rw-r--r--newlib/libc/sys/arm/trap.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgloss/arm/trap.S b/libgloss/arm/trap.S
index d854b57bb..845ad0173 100644
--- a/libgloss/arm/trap.S
+++ b/libgloss/arm/trap.S
@@ -1,6 +1,6 @@
#include "arm.h"
/* Run-time exception support */
-#ifndef PREFER_THUMB
+#ifndef __ARM_EABI__
#include "swi.h"
/* .text is used instead of .section .text so it works with arm-aout too. */
diff --git a/newlib/libc/sys/arm/trap.S b/newlib/libc/sys/arm/trap.S
index 21b6937f9..681b3dbe0 100644
--- a/newlib/libc/sys/arm/trap.S
+++ b/newlib/libc/sys/arm/trap.S
@@ -1,5 +1,5 @@
/* Run-time exception support */
-#if !defined(__thumb2__)
+#ifndef __ARM_EABI__
#include "swi.h"
/* .text is used instead of .section .text so it works with arm-aout too. */