[EABI] test for eabi compatibility a little bit better than before

arch/arm/rules.mk

@@ -89,9 +89,7 @@ OBJS += \
 # set the default toolchain to arm elf and set a #define
 TOOLCHAIN_PREFIX ?= arm-elf-
 ifeq ($(TOOLCHAIN_PREFIX),arm-none-linux-gnueabi-)
-DEFINES += \
-	WITH_LINUX_EABI_TOOLCHAIN=1
-
+# XXX test for EABI better than this
 # eabi compilers dont need this
 THUMBINTERWORK:=
 else

lib/libc/eabi.c

@@ -21,10 +21,10 @@
  */
 
 /* some cruft we have to define when using the linux toolchain */
-#if WITH_LINUX_EABI_TOOLCHAIN
-
 #include <unwind.h>
 
+#if defined(__ARM_EABI_UNWINDER__) && __ARM_EABI_UNWINDER__
+
 /* Our toolchain has eabi functionality built in, but they're not really used.
  * so we stub them out here. */
 _Unwind_Reason_Code __aeabi_unwind_cpp_pr0(_Unwind_State state, _Unwind_Control_Block *ucbp, _Unwind_Context *context)
@@ -42,8 +42,10 @@ _Unwind_Reason_Code __aeabi_unwind_cpp_pr2(_Unwind_State state, _Unwind_Control_
         return _URC_FAILURE;
 }
 
+#endif
+
+/* needed by some piece of EABI */
 void raise(void)
 {
 }
 
-#endif