Module Name: src
Committed By: rjs
Date: Thu May 5 21:14:15 UTC 2016
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
src/sys/arch/evbarm64/conf: std.a64emul std.evbarm64
Log Message:
Fix config(1) errors and warnings.
Set up arm headers for the build.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm64/conf/std.a64emul
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm64/conf/std.evbarm64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.6 src/sys/arch/aarch64/conf/Makefile.aarch64:1.7
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.6 Mon Aug 24 14:04:24 2015
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Thu May 5 21:14:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.6 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.aarch64,v 1.7 2016/05/05 21:14:14 rjs Exp $
# Makefile for NetBSD
#
@@ -88,6 +88,16 @@ spl.o vectors.o: assym.h
## (7) misc settings
##
+# define .MAIN _before_ the make() check, so that implicit target
+# would be defined
+.MAIN: all
+
+.if make(depend) || make(all) || make(dependall)
+.BEGIN:
+ @rm -f arm && \
+ ln -s $S/arch/arm/include arm
+.endif
+
##
## (8) config(8) generated machinery
##
Index: src/sys/arch/evbarm64/conf/std.a64emul
diff -u src/sys/arch/evbarm64/conf/std.a64emul:1.1 src/sys/arch/evbarm64/conf/std.a64emul:1.2
--- src/sys/arch/evbarm64/conf/std.a64emul:1.1 Sun Aug 10 05:47:38 2014
+++ src/sys/arch/evbarm64/conf/std.a64emul Thu May 5 21:14:15 2016
@@ -1,6 +1,6 @@
-# $NetBSD: std.a64emul,v 1.1 2014/08/10 05:47:38 matt Exp $
+# $NetBSD: std.a64emul,v 1.2 2016/05/05 21:14:15 rjs Exp $
-machine evbarm64 aarch64 arm
+machine evbarm64 aarch64
maxpartitions 16
include "arch/evbarm64/conf/std.evbarm64"
Index: src/sys/arch/evbarm64/conf/std.evbarm64
diff -u src/sys/arch/evbarm64/conf/std.evbarm64:1.2 src/sys/arch/evbarm64/conf/std.evbarm64:1.3
--- src/sys/arch/evbarm64/conf/std.evbarm64:1.2 Thu May 7 19:14:56 2015
+++ src/sys/arch/evbarm64/conf/std.evbarm64 Thu May 5 21:14:15 2016
@@ -1,7 +1,5 @@
-# $NetBSD: std.evbarm64,v 1.2 2015/05/07 19:14:56 mrg Exp $
+# $NetBSD: std.evbarm64,v 1.3 2016/05/05 21:14:15 rjs Exp $
include "conf/std"
include "arch/aarch64/conf/std.aarch64" # arch standard options
-options CHILD_MAX=1024 # 160 is too few
-options OPEN_MAX=1024 # 128 is too few
