[src/trunk]: src/sys/arch/arm/include Add earm MACHINE_ARCH for __ARM_EABI__

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f77238ec953c
branches:  trunk
changeset: 786250:f77238ec953c
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Apr 22 07:53:29 2013 +0000

description:
Add earm MACHINE_ARCH for __ARM_EABI__

diffstat:

 sys/arch/arm/include/param.h |  66 ++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 23 deletions(-)

diffs (81 lines):

diff -r 3cb13a647bd8 -r f77238ec953c sys/arch/arm/include/param.h
--- a/sys/arch/arm/include/param.h      Sun Apr 21 23:54:44 2013 +0000
+++ b/sys/arch/arm/include/param.h      Mon Apr 22 07:53:29 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.17 2012/08/03 08:11:40 matt Exp $  */
+/*     $NetBSD: param.h,v 1.18 2013/04/22 07:53:29 matt Exp $  */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -52,29 +52,49 @@
  */
 
 #if defined(_KERNEL)
-#ifndef MACHINE_ARCH                   /* XXX For now */
-#ifndef __ARMEB__
-#define        _MACHINE_ARCH   arm
-#define        MACHINE_ARCH    "arm"
-#else
-#define        _MACHINE_ARCH   armeb
-#define        MACHINE_ARCH    "armeb"
-#endif /* __ARMEB__ */
-#endif /* MACHINE_ARCH */
+# ifndef MACHINE_ARCH                  /* XXX For now */
+#  ifndef __ARMEB__
+#   ifdef __ARM_EABI__
+#    define    _MACHINE_ARCH   earm
+#    define    MACHINE_ARCH    "earm"
+#   else
+#    define    _MACHINE_ARCH   arm
+#    define    MACHINE_ARCH    "arm"
+#   endif
+#  else
+#   ifdef __ARM_EABI__
+#    define    _MACHINE_ARCH   earmeb
+#    define    MACHINE_ARCH    "earmeb"
+#   else
+#    define    _MACHINE_ARCH   armeb
+#    define    MACHINE_ARCH    "armeb"
+#   endif
+#  endif /* __ARMEB__ */
+# endif /* MACHINE_ARCH */
 #else
-#undef _MACHINE
-#undef MACHINE
-#undef _MACHINE_ARCH
-#undef MACHINE_ARCH
-#define        _MACHINE        arm
-#define        MACHINE         "arm"
-#ifndef __ARMEB__
-#define        _MACHINE_ARCH   arm
-#define        MACHINE_ARCH    "arm"
-#else
-#define        _MACHINE_ARCH   armeb
-#define        MACHINE_ARCH    "armeb"
-#endif /* __ARMEB__ */
+# undef _MACHINE
+# undef MACHINE
+# undef _MACHINE_ARCH
+# undef MACHINE_ARCH
+# define       _MACHINE        arm
+# define       MACHINE         "arm"
+# ifndef __ARMEB__
+#  ifdef __ARM_EABI__
+#   define     _MACHINE_ARCH   earm
+#   define     MACHINE_ARCH    "earm"
+#  else
+#   define     _MACHINE_ARCH   arm
+#   define     MACHINE_ARCH    "arm"
+#  endif
+# else
+#  ifdef __ARM_EABI__
+#   define     _MACHINE_ARCH   earmeb
+#   define     MACHINE_ARCH    "earmeb"
+#  else
+#   define     _MACHINE_ARCH   armeb
+#   define     MACHINE_ARCH    "armeb"
+#  endif
+# endif /* __ARMEB__ */
 #endif /* !_KERNEL */
 
 #define        MID_MACHINE     MID_ARM6