From 3c46e5578f1038ffc705d2db5e552f1e4af0a867 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Mon, 19 Aug 2013 16:34:29 +0000
Subject: [PATCH] if softfloat, Install a ld.so.conf to use libc_vfp.so if
 there is a VFP on evbarm (no other arm ports a CPU supporting VFP).

---
 distrib/sets/lists/etc/md.evbarm | 2 ++
 etc/Makefile                     | 4 ++--
 etc/etc.evbarm/ld.so.conf        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 distrib/sets/lists/etc/md.evbarm
 create mode 100644 etc/etc.evbarm/ld.so.conf

diff --git a/distrib/sets/lists/etc/md.evbarm b/distrib/sets/lists/etc/md.evbarm
new file mode 100644
index 000000000000..24ec6c6afb0a
--- /dev/null
+++ b/distrib/sets/lists/etc/md.evbarm
@@ -0,0 +1,2 @@
+# $NetBSD: md.evbarm,v 1.3 2013/08/19 16:34:30 matt Exp $
+./etc/ld.so.conf			etc-sys-etc	softfloat
diff --git a/etc/Makefile b/etc/Makefile
index e664ae534520..45867bdfa5ae 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.409 2013/05/01 15:57:44 agc Exp $
+#	$NetBSD: Makefile,v 1.410 2013/08/19 16:34:29 matt Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -105,7 +105,7 @@ BIN1+=	etc.${MACHINE}/disktab
 BIN1+=	disktab
 .endif
 
-.if exists(etc.${MACHINE}/ld.so.conf)
+.if exists(etc.${MACHINE}/ld.so.conf) && empty(MACHINE_ARCH:M*arm*hf*)
 BIN1+=	etc.${MACHINE}/ld.so.conf
 .endif
 
diff --git a/etc/etc.evbarm/ld.so.conf b/etc/etc.evbarm/ld.so.conf
new file mode 100644
index 000000000000..a8842d991a1b
--- /dev/null
+++ b/etc/etc.evbarm/ld.so.conf
@@ -0,0 +1 @@
+libc.so.12	machdep.fpu_present	1:libc_vfp.so.0,libc.so.12