Module Name: src
Committed By: matt
Date: Mon Jan 28 18:57:11 UTC 2013
Modified Files:
src/distrib/sets/lists/comp: ad.arm ad.armeb
src/distrib/sets/lists/debug: ad.arm ad.armeb
src/lib: Makefile
src/lib/libc_vfp: Makefile
Added Files:
src/distrib/sets/lists/base: ad.arm.shl
src/distrib/sets/lists/comp: ad.arm.shl
Log Message:
Enable building/installing libc_vfp for MACHINE_ARCH arm/armeb
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/base/ad.arm.shl
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/comp/ad.arm.shl
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/comp/ad.armeb
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/debug/ad.arm \
src/distrib/sets/lists/debug/ad.armeb
cvs rdiff -u -r1.196 -r1.197 src/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/lib/libc_vfp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.43 src/distrib/sets/lists/comp/ad.arm:1.44
--- src/distrib/sets/lists/comp/ad.arm:1.43 Wed Jan 16 16:01:05 2013
+++ src/distrib/sets/lists/comp/ad.arm Mon Jan 28 18:57:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.43 2013/01/16 16:01:05 christos Exp $
+# $NetBSD: ad.arm,v 1.44 2013/01/28 18:57:10 matt Exp $
./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
@@ -88,12 +88,11 @@
./usr/lib/libarm.a comp-c-lib
./usr/lib/libarm32.a comp-obsolete obsolete
./usr/lib/libarm32_p.a comp-obsolete obsolete
-./usr/lib/libarm32_pic.a comp-obsolete obsolete
./usr/lib/libarm_p.a comp-c-lib profile
-./usr/lib/libarm_pic.a comp-c-piclib
+./usr/lib/libc_vfp.a comp-c-lib
+./usr/lib/libc_vfp_p.a comp-c-lib profile
./usr/lib/libpmc.a comp-c-lib
./usr/lib/libpmc_p.a comp-c-proflib profile
-./usr/lib/libpmc_pic.a comp-c-piclib
./usr/libdata/lint/llib-larm.ln comp-c-lintlib lint
./usr/libdata/lint/llib-larm32.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lpmc.ln comp-c-lintlib lint
Index: src/distrib/sets/lists/comp/ad.armeb
diff -u src/distrib/sets/lists/comp/ad.armeb:1.10 src/distrib/sets/lists/comp/ad.armeb:1.11
--- src/distrib/sets/lists/comp/ad.armeb:1.10 Wed Jan 16 16:01:05 2013
+++ src/distrib/sets/lists/comp/ad.armeb Mon Jan 28 18:57:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.armeb,v 1.10 2013/01/16 16:01:05 christos Exp $
+# $NetBSD: ad.armeb,v 1.11 2013/01/28 18:57:11 matt Exp $
#
# The armeb MACHINE_ARCH never existed in NetBSD as a.out, so we
# skip the old a.out compatibility tools.
@@ -92,12 +92,11 @@
./usr/lib/libarm.a comp-c-lib
./usr/lib/libarm32.a comp-obsolete obsolete
./usr/lib/libarm32_p.a comp-obsolete obsolete
-./usr/lib/libarm32_pic.a comp-obsolete obsolete
./usr/lib/libarm_p.a comp-c-lib profile
-./usr/lib/libarm_pic.a comp-c-piclib
+./usr/lib/libc_vfp.a comp-c-lib
+./usr/lib/libc_vfp_p.a comp-c-lib profile
./usr/lib/libpmc.a comp-c-lib
./usr/lib/libpmc_p.a comp-c-proflib profile
-./usr/lib/libpmc_pic.a comp-c-piclib
./usr/libdata/lint/llib-larm.ln comp-c-lintlib lint
./usr/libdata/lint/llib-larm32.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lpmc.ln comp-c-lintlib lint
Index: src/distrib/sets/lists/debug/ad.arm
diff -u src/distrib/sets/lists/debug/ad.arm:1.1 src/distrib/sets/lists/debug/ad.arm:1.2
--- src/distrib/sets/lists/debug/ad.arm:1.1 Wed Jan 16 16:01:07 2013
+++ src/distrib/sets/lists/debug/ad.arm Mon Jan 28 18:57:11 2013
@@ -1,7 +1,8 @@
-# $NetBSD: ad.arm,v 1.1 2013/01/16 16:01:07 christos Exp $
+# $NetBSD: ad.arm,v 1.2 2013/01/28 18:57:11 matt Exp $
./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic
+./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic
./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-sys-debug debug,pic
./usr/lib/libarm_g.a -unknown- debuglib
./usr/lib/libpmc_g.a -unknown- debuglib
Index: src/distrib/sets/lists/debug/ad.armeb
diff -u src/distrib/sets/lists/debug/ad.armeb:1.1 src/distrib/sets/lists/debug/ad.armeb:1.2
--- src/distrib/sets/lists/debug/ad.armeb:1.1 Wed Jan 16 16:01:07 2013
+++ src/distrib/sets/lists/debug/ad.armeb Mon Jan 28 18:57:11 2013
@@ -1,6 +1,7 @@
-# $NetBSD: ad.armeb,v 1.1 2013/01/16 16:01:07 christos Exp $
+# $NetBSD: ad.armeb,v 1.2 2013/01/28 18:57:11 matt Exp $
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic
+./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic
./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-sys-debug debug,pic
./usr/lib/libarm_g.a -unknown- debuglib
./usr/lib/libpmc_g.a -unknown- debuglib
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.196 src/lib/Makefile:1.197
--- src/lib/Makefile:1.196 Tue Nov 20 16:33:06 2012
+++ src/lib/Makefile Mon Jan 28 18:57:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2012/11/20 16:33:06 agc Exp $
+# $NetBSD: Makefile,v 1.197 2013/01/28 18:57:09 matt Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -39,6 +39,9 @@ SUBDIR+= libarch \
libtelnet libterminfo \
libusbhid libutil libwrap liby libz
+.if (${MACHINE_ARCH:C/e[bl]$//} == "arm")
+SUBDIR+= libc_vfp
+.endif
.if (${MKRUMP} != "no")
SUBDIR+= librumpclient
.endif
Index: src/lib/libc_vfp/Makefile
diff -u src/lib/libc_vfp/Makefile:1.1 src/lib/libc_vfp/Makefile:1.2
--- src/lib/libc_vfp/Makefile:1.1 Mon Jan 28 17:04:40 2013
+++ src/lib/libc_vfp/Makefile Mon Jan 28 18:57:10 2013
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2013/01/28 17:04:40 matt Exp $
+# $NetBSD: Makefile,v 1.2 2013/01/28 18:57:10 matt Exp $
#
-LIB= c_vfp
+LIB= c_vfp
+
+USE_SHLIBDIR= yes
.include <bsd.own.mk>
CPUFLAGS+= -mfpu=vfp
-SRCS= vfpsf.S vfpdf.S
+SRCS= vfpsf.S vfpdf.S
.include <bsd.lib.mk>
Added files:
Index: src/distrib/sets/lists/base/ad.arm.shl
diff -u /dev/null src/distrib/sets/lists/base/ad.arm.shl:1.3
--- /dev/null Mon Jan 28 18:57:11 2013
+++ src/distrib/sets/lists/base/ad.arm.shl Mon Jan 28 18:57:10 2013
@@ -0,0 +1,7 @@
+# $NetBSD: ad.arm.shl,v 1.3 2013/01/28 18:57:10 matt Exp $
+./lib/libc_vfp.so base-sys-shlib dynamicroot
+./lib/libc_vfp.so.0 base-sys-shlib dynamicroot
+./lib/libc_vfp.so.0.0 base-sys-shlib dynamicroot
+./usr/lib/libc_vfp.so base-sys-shlib
+./usr/lib/libc_vfp.so.0 base-sys-shlib
+./usr/lib/libc_vfp.so.0.0 base-sys-shlib
Index: src/distrib/sets/lists/comp/ad.arm.shl
diff -u /dev/null src/distrib/sets/lists/comp/ad.arm.shl:1.3
--- /dev/null Mon Jan 28 18:57:11 2013
+++ src/distrib/sets/lists/comp/ad.arm.shl Mon Jan 28 18:57:10 2013
@@ -0,0 +1,5 @@
+# $NetBSD: ad.arm.shl,v 1.3 2013/01/28 18:57:10 matt Exp $
+./usr/lib/libarm32_pic.a comp-obsolete obsolete
+./usr/lib/libarm_pic.a comp-c-piclib
+./usr/lib/libc_vfp_pic.a comp-c-piclib
+./usr/lib/libpmc_pic.a comp-c-piclib
