summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2014-09-10 22:43:36 +0000
committermatt <matt@NetBSD.org>2014-09-10 22:43:36 +0000
commite87a5e6062171517c3d7369edce59dbc4a2c716e (patch)
treed736889ae51845adaee1dce74404097b5493aeed /compat
parentbbfa90493cb40275c1537aca1daf52a9b8c2b182 (diff)
Enable building eabihf compat libraries after fixing bsd.eabihf.mk to use
use the proper variant of arm*--netbsdelf-eabihf
Diffstat (limited to 'compat')
-rw-r--r--compat/archdirs.mk4
-rw-r--r--compat/arm/eabihf/bsd.eabihf.mk10
2 files changed, 7 insertions, 7 deletions
diff --git a/compat/archdirs.mk b/compat/archdirs.mk
index b1781006611..202bbf09a20 100644
--- a/compat/archdirs.mk
+++ b/compat/archdirs.mk
@@ -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
diff --git a/compat/arm/eabihf/bsd.eabihf.mk b/compat/arm/eabihf/bsd.eabihf.mk
index e157bc2a942..de86ffca5ed 100644
--- a/compat/arm/eabihf/bsd.eabihf.mk
+++ b/compat/arm/eabihf/bsd.eabihf.mk
@@ -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