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.  */