[newlib-cygwin] Include code in trap.S for APCS only.

[newlib-cygwin] Include code in trap.S for APCS only.

[Christophe Lyon]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=cc430406ac09d99570b5218668f2bb00371ae983

commit cc430406ac09d99570b5218668f2bb00371ae983
Author: Christophe Lyon <christophe.lyon@linaro.org>
Date:   Wed Apr 10 15:04:13 2019 +0000

    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__.

Diff:
---
 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 d854b57..845ad01 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 21b6937..681b3db 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.  */