[src/trunk]: src/compat MKCOMPAT support for earm.

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

details:   https://anonhg.NetBSD.org/src/rev/58cf5c4a082e
branches:  trunk
changeset: 786355:58cf5c4a082e
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Apr 27 08:44:35 2013 +0000

description:
MKCOMPAT support for earm.

diffstat:

 compat/archdirs.mk          |  12 ++++++++++--
 compat/arm/eabi/bsd.eabi.mk |  33 +++++++++++++++++++++++++--------
 compat/arm/oabi/Makefile    |   5 +++++
 compat/arm/oabi/bsd.oabi.mk |  29 +++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 10 deletions(-)

diffs (111 lines):

diff -r 9f11f10c63dc -r 58cf5c4a082e compat/archdirs.mk
--- a/compat/archdirs.mk        Sat Apr 27 08:43:19 2013 +0000
+++ b/compat/archdirs.mk        Sat Apr 27 08:44:35 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: archdirs.mk,v 1.2 2012/08/03 08:02:47 matt Exp $
+#      $NetBSD: archdirs.mk,v 1.3 2013/04/27 08:44:35 matt Exp $
 
 # list of subdirs used per-platform
 
@@ -10,10 +10,18 @@
 ARCHDIR_SUBDIR=        amd64/i386
 .endif
 
-.if (${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "arm")
+.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
 ARCHDIR_SUBDIR=        arm/eabi
 .endif
 
+.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
+ARCHDIR_SUBDIR=        arm/oabi
+.endif
+
+.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
+ARCHDIR_SUBDIR=        arm/oabi arm/eabi
+.endif
+
 .if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
 ARCHDIR_SUBDIR=        mips64/64 mips64/o32
 .endif
diff -r 9f11f10c63dc -r 58cf5c4a082e compat/arm/eabi/bsd.eabi.mk
--- a/compat/arm/eabi/bsd.eabi.mk       Sat Apr 27 08:43:19 2013 +0000
+++ b/compat/arm/eabi/bsd.eabi.mk       Sat Apr 27 08:44:35 2013 +0000
@@ -1,11 +1,28 @@
-#      $NetBSD: bsd.eabi.mk,v 1.1 2012/08/03 08:02:47 matt Exp $
-
-MLIBDIR=       eabi
+#      $NetBSD: bsd.eabi.mk,v 1.2 2013/04/27 08:44:35 matt Exp $
 
-COPTS+=                -mabi=aapcs-linux
-CPUFLAGS+=     -mabi=aapcs-linux
-LDADD+=                -mabi=aapcs-linux
-LDFLAGS+=      -mabi=aapcs-linux
-MKDEPFLAGS+=   -mabi=aapcs-linux
+MLIBDIR=               eabi
+.if ${MACHINE_ARCH:M*eb} != ""
+EARM_MACHINE_ARCH=     earmeb
+LD+=                   -m armelfb_nbsd_eabi
+.else
+EARM_MACHINE_ARCH=     earm
+LD+=                   -m armelf_nbsd_eabi
+.endif
+LIBC_MACHINE_ARCH=     ${EARM_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH=   ${EARM_MACHINE_ARCH}
+COMMON_MACHINE_ARCH=   ${EARM_MACHINE_ARCH}
+KVM_MACHINE_ARCH=      ${EARM_MACHINE_ARCH}
+PTHREAD_MACHINE_ARCH=  ${EARM_MACHINE_ARCH}
+BFD_MACHINE_ARCH=      ${EARM_MACHINE_ARCH}
+CSU_MACHINE_ARCH=      ${EARM_MACHINE_ARCH}
+CRYPTO_MACHINE_CPU=    ${EARM_MACHINE_ARCH}
+LDELFSO_MACHINE_CPU=   ${EARM_MACHINE_ARCH}
+GOMP_MACHINE_ARCH=     ${EARM_MACHINE_ARCH}
+
+COPTS+=                -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+CPUFLAGS+=     -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+LDADD+=                -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+LDFLAGS+=      -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
+MKDEPFLAGS+=   -mabi=aapcs-linux -mfloat-abi=soft -Wa,-meabi=5
 
 .include "${.PARSEDIR}/../../Makefile.compat"
diff -r 9f11f10c63dc -r 58cf5c4a082e compat/arm/oabi/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/compat/arm/oabi/Makefile  Sat Apr 27 08:44:35 2013 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2013/04/27 08:44:35 matt Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.oabi.mk
+
+.include "../../compatsubdir.mk"
diff -r 9f11f10c63dc -r 58cf5c4a082e compat/arm/oabi/bsd.oabi.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/compat/arm/oabi/bsd.oabi.mk       Sat Apr 27 08:44:35 2013 +0000
@@ -0,0 +1,29 @@
+#      $NetBSD: bsd.oabi.mk,v 1.1 2013/04/27 08:44:35 matt Exp $
+
+MLIBDIR=               oabi
+.if ${MACHINE_ARCH:M*eb} != ""
+ARM_MACHINE_ARCH=      armeb
+LD+=                   -m armelfb
+.else
+ARM_MACHINE_ARCH=      arm
+LD+=                   -m armelf
+.endif
+LIBC_MACHINE_ARCH=     ${ARM_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH=   ${ARM_MACHINE_ARCH}
+LIBEXECINFO_MACHINE_ARCH=      ${ARM_MACHINE_ARCH}
+COMMON_MACHINE_ARCH=   ${ARM_MACHINE_ARCH}
+KVM_MACHINE_ARCH=      ${ARM_MACHINE_ARCH}
+PTHREAD_MACHINE_ARCH=  ${ARM_MACHINE_ARCH}
+BFD_MACHINE_ARCH=      ${ARM_MACHINE_ARCH}
+CSU_MACHINE_ARCH=      ${ARM_MACHINE_ARCH}
+CRYPTO_MACHINE_CPU=    ${ARM_MACHINE_ARCH}
+LDELFSO_MACHINE_CPU=   ${ARM_MACHINE_ARCH}
+GOMP_MACHINE_ARCH=     ${ARM_MACHINE_ARCH}
+
+COPTS+=                -mabi=apcs-gnu -mfloat-abi=soft
+CPUFLAGS+=     -mabi=apcs-gnu -mfloat-abi=soft
+LDADD+=                -mabi=apcs-gnu -mfloat-abi=soft
+LDFLAGS+=      -mabi=apcs-gnu -mfloat-abi=soft
+MKDEPFLAGS+=   -mabi=apcs-gnu -mfloat-abi=soft
+
+.include "${.PARSEDIR}/../../Makefile.compat"