Module Name: src
Committed By: matt
Date: Sat Apr 27 08:44:35 UTC 2013
Modified Files:
src/compat: archdirs.mk
src/compat/arm/eabi: bsd.eabi.mk
Added Files:
src/compat/arm/oabi: Makefile bsd.oabi.mk
Log Message:
MKCOMPAT support for earm.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/archdirs.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/arm/eabi/bsd.eabi.mk
cvs rdiff -u -r0 -r1.1 src/compat/arm/oabi/Makefile \
src/compat/arm/oabi/bsd.oabi.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.2 src/compat/archdirs.mk:1.3
--- src/compat/archdirs.mk:1.2 Fri Aug 3 08:02:47 2012
+++ src/compat/archdirs.mk Sat Apr 27 08:44:35 2013
@@ -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= sparc64/sparc
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
Index: src/compat/arm/eabi/bsd.eabi.mk
diff -u src/compat/arm/eabi/bsd.eabi.mk:1.1 src/compat/arm/eabi/bsd.eabi.mk:1.2
--- src/compat/arm/eabi/bsd.eabi.mk:1.1 Fri Aug 3 08:02:47 2012
+++ src/compat/arm/eabi/bsd.eabi.mk Sat Apr 27 08:44:35 2013
@@ -1,11 +1,28 @@
-# $NetBSD: bsd.eabi.mk,v 1.1 2012/08/03 08:02:47 matt Exp $
+# $NetBSD: bsd.eabi.mk,v 1.2 2013/04/27 08:44:35 matt Exp $
-MLIBDIR= eabi
+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
-CPUFLAGS+= -mabi=aapcs-linux
-LDADD+= -mabi=aapcs-linux
-LDFLAGS+= -mabi=aapcs-linux
-MKDEPFLAGS+= -mabi=aapcs-linux
+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"
Added files:
Index: src/compat/arm/oabi/Makefile
diff -u /dev/null src/compat/arm/oabi/Makefile:1.1
--- /dev/null Sat Apr 27 08:44:35 2013
+++ src/compat/arm/oabi/Makefile Sat Apr 27 08:44:35 2013
@@ -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"
Index: src/compat/arm/oabi/bsd.oabi.mk
diff -u /dev/null src/compat/arm/oabi/bsd.oabi.mk:1.1
--- /dev/null Sat Apr 27 08:44:35 2013
+++ src/compat/arm/oabi/bsd.oabi.mk Sat Apr 27 08:44:35 2013
@@ -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"
