Module Name: src
Committed By: matt
Date: Wed Sep 10 22:43:36 UTC 2014
Modified Files:
src/compat: archdirs.mk
src/compat/arm/eabihf: bsd.eabihf.mk
Log Message:
Enable building eabihf compat libraries after fixing bsd.eabihf.mk to use
use the proper variant of arm*--netbsdelf-eabihf
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/archdirs.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/arm/eabihf/bsd.eabihf.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.6 src/compat/archdirs.mk:1.7
--- src/compat/archdirs.mk:1.6 Mon Aug 11 04:33:30 2014
+++ src/compat/archdirs.mk Wed Sep 10 22:43:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.6 2014/08/11 04:33:30 matt Exp $
+# $NetBSD: archdirs.mk,v 1.7 2014/09/10 22:43:36 matt Exp $
# list of subdirs used per-platform
@@ -32,7 +32,7 @@ ARCHDIR_SUBDIR= powerpc64/powerpc
.if (${MACHINE_ARCH} == "aarch64")
ARCHDIR_SUBDIR+= arm/eabi
-#ARCHDIR_SUBDIR+= arm/eabihf
+ARCHDIR_SUBDIR+= arm/eabihf
ARCHDIR_SUBDIR+= arm/oabi
.elif (${MACHINE_ARCH} == "aarch64eb")
ARCHDIR_SUBDIR= arm/eabi
Index: src/compat/arm/eabihf/bsd.eabihf.mk
diff -u src/compat/arm/eabihf/bsd.eabihf.mk:1.1 src/compat/arm/eabihf/bsd.eabihf.mk:1.2
--- src/compat/arm/eabihf/bsd.eabihf.mk:1.1 Sun Aug 10 23:26:25 2014
+++ src/compat/arm/eabihf/bsd.eabihf.mk Wed Sep 10 22:43:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabihf.mk,v 1.1 2014/08/10 23:26:25 matt Exp $
+# $NetBSD: bsd.eabihf.mk,v 1.2 2014/09/10 22:43:36 matt Exp $
.if !defined(MLIBDIR)
@@ -9,22 +9,22 @@ EARM_COMPAT_FLAGS+= -mabi=aapcs-linux
MKSOFTFLOAT=no
.if ${MACHINE_ARCH} == "aarch64eb"
-EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-eabihf
EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
ARM_MACHINE_ARCH= earmv7hfeb
LDFLAGS+= -Wl,--be8
ARM_LD= -m armelfb_nbsd_eabihf --be8
.elif ${MACHINE_ARCH} == "aarch64"
-EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-eabihf
EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
ARM_MACHINE_ARCH= earmv7hf
ARM_LD= -m armelf_nbsd_eabihf
.elif !empty(MACHINE_ARCH:M*eb)
-EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-eabihf
ARM_MACHINE_ARCH= earmhfeb
ARM_LD= -m armelfb_nbsd_eabihf
.else
-EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-eabihf
ARM_MACHINE_ARCH= earmhf
ARM_LD= -m armelf_nbsd_eabihf
.endif
