From cc430406ac09d99570b5218668f2bb00371ae983 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Wed, 10 Apr 2019 15:04:13 +0000 Subject: [PATCH] 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__. --- libgloss/arm/trap.S | 2 +- newlib/libc/sys/arm/trap.S | 2 +- 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. */