CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Aug 16 17:40:16 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch sh3 to GCC 10. buh bye GCC 9!
thanks to everyone who helped (most espcially rin@.)
To generate a diff of this commit:
cvs rdiff -u -r1.1258 -r1.1259 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1258 src/share/mk/bsd.own.mk:1.1259
--- src/share/mk/bsd.own.mk:1.1258 Sun Jul 11 22:07:35 2021
+++ src/share/mk/bsd.own.mk Mon Aug 16 17:40:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1258 2021/07/11 22:07:35 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1259 2021/08/16 17:40:16 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -72,11 +72,7 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_CPU} != "sh3"
HAVE_GCC?= 10
-.else
-HAVE_GCC?= 9
-.endif
#
# Platforms that can't run a modern GCC natively
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Aug 15 10:30:39 UTC 2021
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Fix sun2 build for ldap/gssapi
To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.337 src/share/mk/bsd.prog.mk:1.338
--- src/share/mk/bsd.prog.mk:1.337 Sat Aug 14 12:16:32 2021
+++ src/share/mk/bsd.prog.mk Sun Aug 15 06:30:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.337 2021/08/14 16:16:32 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.338 2021/08/15 10:30:39 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -227,11 +227,13 @@ LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
+LIBGSSAPI_LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
+LIBGSSAPI_DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
.if (${MKLDAP} != "no")
-LIBLDAP_LDADD+= -lldap -llber -lgssapi -lssl -lcrypto
-LIBLDAP_DPADD+= ${LIBLDAP} ${LIBLBER} ${LIBGSSAPI} ${LIBSSL} ${LIBCRYPTO}
+LIBLDAP_LDADD+= -lldap -llber ${LIBGSSAPI_LDADD} -lssl -lcrypto
+LIBLDAP_DPADD+= ${LIBLDAP} ${LIBLBER} ${LIBGSSAPI_DPADD} ${LIBSSL} ${LIBCRYPTO}
.endif
# PAM applications, if linked statically, need more libraries
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sat Aug 14 16:16:32 UTC 2021
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Centralize the ldap libraries
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.336 src/share/mk/bsd.prog.mk:1.337
--- src/share/mk/bsd.prog.mk:1.336 Thu Nov 12 12:53:43 2020
+++ src/share/mk/bsd.prog.mk Sat Aug 14 12:16:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.336 2020/11/12 17:53:43 nia Exp $
+# $NetBSD: bsd.prog.mk,v 1.337 2021/08/14 16:16:32 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -229,6 +229,11 @@ LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
.endif
+.if (${MKLDAP} != "no")
+LIBLDAP_LDADD+= -lldap -llber -lgssapi -lssl -lcrypto
+LIBLDAP_DPADD+= ${LIBLDAP} ${LIBLBER} ${LIBGSSAPI} ${LIBSSL} ${LIBCRYPTO}
+.endif
+
# PAM applications, if linked statically, need more libraries
.if (${MKPIC} == "no")
PAM_STATIC_LDADD+= -lssh
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Jul 11 22:07:35 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch Mesa 19 to use MesaLib.old subdir.
To generate a diff of this commit:
cvs rdiff -u -r1.1257 -r1.1258 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1257 src/share/mk/bsd.own.mk:1.1258
--- src/share/mk/bsd.own.mk:1.1257 Sat Jun 19 06:19:35 2021
+++ src/share/mk/bsd.own.mk Sun Jul 11 22:07:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1257 2021/06/19 06:19:35 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1258 2021/07/11 22:07:35 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1259,18 +1259,17 @@ MKDTB.earmv7hf= yes
MKDTB.earmv7eb= yes
MKDTB.earmv7hfeb= yes
-# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
-HAVE_MESA_VER?= 18
-.if ${HAVE_MESA_VER} == "10"
+HAVE_MESA_VER?= 19
+.if ${HAVE_MESA_VER} == 19
EXTERNAL_MESALIB_DIR?= MesaLib.old
-.elif ${HAVE_MESA_VER} == "18"
+.elif ${HAVE_MESA_VER} == 21
EXTERNAL_MESALIB_DIR?= MesaLib
.endif
-# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18
+# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer
# XXX This knows that MKX11=no is default below, but would
# require splitting the below loop in two parts.
-.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} == "18"
+.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} >= 19
MKLLVMRT.amd64= yes
MKLLVMRT.i386= yes
MKLLVMRT.aarch64= yes
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sun Jul 11 00:13:49 UTC 2021 Modified Files: src/share/mk: bsd.x11.mk Log Message: xorg-server is now 1.20.12. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.139 src/share/mk/bsd.x11.mk:1.140 --- src/share/mk/bsd.x11.mk:1.139 Thu Jun 3 07:40:48 2021 +++ src/share/mk/bsd.x11.mk Sun Jul 11 00:13:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.139 2021/06/03 07:40:48 rin Exp $ +# $NetBSD: bsd.x11.mk,v 1.140 2021/07/11 00:13:49 mrg Exp $ .include @@ -133,7 +133,7 @@ XORG_SERVER_MINOR= 10 XORG_SERVER_TEENY= 6 .else XORG_SERVER_MINOR= 20 -XORG_SERVER_TEENY= 11 +XORG_SERVER_TEENY= 12 .endif XVENDORNAMESHORT= '"X.Org"'
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Thu Jun 3 07:40:48 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk bsd.x11.mk
Log Message:
Switch amiga to Xorg server 1.20; wsfb(4) is only graphic driver both for
1.10 and 1.20 (Xamiga was gone a long ago...), and there is no reason to
stay with 1.10.
At least, 1.20 works fine on wsdisplay(4) at amidisplaycc(4).
To generate a diff of this commit:
cvs rdiff -u -r1.1255 -r1.1256 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.138 -r1.139 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1255 src/share/mk/bsd.own.mk:1.1256
--- src/share/mk/bsd.own.mk:1.1255 Sat May 29 12:25:08 2021
+++ src/share/mk/bsd.own.mk Thu Jun 3 07:40:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1255 2021/05/29 12:25:08 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1256 2021/06/03 07:40:48 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1580,7 +1580,6 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
# During transition from xorg-server 1.10 to 1.20
.if \
${MACHINE} == "alpha" || \
-${MACHINE} == "amiga" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "vax"
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.138 src/share/mk/bsd.x11.mk:1.139
--- src/share/mk/bsd.x11.mk:1.138 Tue Apr 27 04:02:09 2021
+++ src/share/mk/bsd.x11.mk Thu Jun 3 07:40:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.138 2021/04/27 04:02:09 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.139 2021/06/03 07:40:48 rin Exp $
.include
@@ -82,7 +82,6 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
-DDDXOSVERRORF -DDDXTIME -DUSB_HID
.if !(${MACHINE} == "acorn32" || \
-${MACHINE} == "amiga" || \
${MACHINE} == "pmax" || \
${MACHINE} == "sun3" || \
${MACHINE} == "x68k" || \
CVS commit: src/share/mk
Module Name:src
Committed By: jmcneill
Date: Wed Jun 2 10:28:21 UTC 2021
Modified Files:
src/share/mk: bsd.dtb.mk
Log Message:
Add support for installing a copy of dtb files to the base dtb directory
when DTBSUBDIR is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/mk/bsd.dtb.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dtb.mk
diff -u src/share/mk/bsd.dtb.mk:1.2 src/share/mk/bsd.dtb.mk:1.3
--- src/share/mk/bsd.dtb.mk:1.2 Tue May 19 08:59:36 2020
+++ src/share/mk/bsd.dtb.mk Wed Jun 2 10:28:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dtb.mk,v 1.2 2020/05/19 08:59:36 rin Exp $
+# $NetBSD: bsd.dtb.mk,v 1.3 2021/06/02 10:28:21 jmcneill Exp $
.include
.include
@@ -71,11 +71,24 @@ dtbinstall: dtb
${INSTALL_FILE} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
${.OBJDIR}/${_dtb} ${DESTDIR}${DTBINSTDIR}
.endfor
+.if defined(DTSSUBDIR)
+.for _dtb in ${DTB_NOSUBDIR}
+ ${_MKSHMSG_INSTALL} ${_dtb}
+ ${_MKSHECHO} "${INSTALL_FILE} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
+ ${.OBJDIR}/${_dtb} ${DESTDIR}${DTBDIR}"
+ ${INSTALL_FILE} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
+ ${.OBJDIR}/${_dtb} ${DESTDIR}${DTBDIR}
+.endfor
+.endif
dtblist:
.if defined(DTSSUBDIR)
@echo ".${DTBINSTDIR}\t\tdtb-base-boot\tdtb" | \
${TOOL_SED} 's/\\t/ /g'
+.for _dtb in ${DTB_NOSUBDIR}
+ @echo ".${DTBDIR}/${_dtb}\t\tdtb-base-boot\tdtb" | \
+ ${TOOL_SED} 's/\\t/ /g'
+.endfor
.endif
.for _dtb in ${DTB}
@echo ".${DTBINSTDIR}/${_dtb}\t\tdtb-base-boot\tdtb" | \
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sat May 29 12:25:08 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch mac68k to Xorg server 1.20. Only available driver is wsfb(4) both
for 1.10 and 1.20, and there is no reason to stay with 1.10.
XXX
1.20 works fine on WSFB* kernels with genfb(4), whereas both 1.10 and
1.20 fail for GENERIC* kernels with macfb(4) as some mandatory ioctl's
are missing. It would be better to make genfb(4) default before netbsd-10
is branched.
To generate a diff of this commit:
cvs rdiff -u -r1.1254 -r1.1255 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1254 src/share/mk/bsd.own.mk:1.1255
--- src/share/mk/bsd.own.mk:1.1254 Thu May 27 21:02:56 2021
+++ src/share/mk/bsd.own.mk Sat May 29 12:25:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1254 2021/05/27 21:02:56 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1255 2021/05/29 12:25:08 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1581,7 +1581,6 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.if \
${MACHINE} == "alpha" || \
${MACHINE} == "amiga" || \
-${MACHINE} == "mac68k" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "vax"
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu May 27 21:02:56 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
mips has switched already.
To generate a diff of this commit:
cvs rdiff -u -r1.1253 -r1.1254 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1253 src/share/mk/bsd.own.mk:1.1254
--- src/share/mk/bsd.own.mk:1.1253 Thu May 27 16:29:24 2021
+++ src/share/mk/bsd.own.mk Thu May 27 17:02:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1253 2021/05/27 20:29:24 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1254 2021/05/27 21:02:56 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -78,7 +78,6 @@ TOOLCHAIN_MISSING?= no
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "vax" || \
-${MACHINE_MIPS64} || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_CPU} == "aarch64" || \
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu May 27 20:29:24 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
mips64 only works with gcc-10
To generate a diff of this commit:
cvs rdiff -u -r1.1252 -r1.1253 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1252 src/share/mk/bsd.own.mk:1.1253
--- src/share/mk/bsd.own.mk:1.1252 Thu May 27 13:41:28 2021
+++ src/share/mk/bsd.own.mk Thu May 27 16:29:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1252 2021/05/27 17:41:28 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1253 2021/05/27 20:29:24 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -78,6 +78,7 @@ TOOLCHAIN_MISSING?= no
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "vax" || \
+${MACHINE_MIPS64} || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_CPU} == "aarch64" || \
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu May 27 17:41:28 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch to MACHINE_ARCH i386 to include xen (thanks mlelstv)
To generate a diff of this commit:
cvs rdiff -u -r1.1251 -r1.1252 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1251 src/share/mk/bsd.own.mk:1.1252
--- src/share/mk/bsd.own.mk:1.1251 Thu May 27 13:13:20 2021
+++ src/share/mk/bsd.own.mk Thu May 27 13:41:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1251 2021/05/27 17:13:20 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1252 2021/05/27 17:41:28 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -74,12 +74,11 @@ TOOLCHAIN_MISSING?= no
#
.if ${MACHINE} == "alpha" || \
${MACHINE} == "hppa" || \
-${MACHINE} == "i386" || \
-${MACHINE} == "xen" || \
${MACHINE} == "ia64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "vax" || \
+${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "mips" || \
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu May 27 17:13:20 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch "xen" to gcc 10 too, otherwise xen kernel builds fail because they
"think" we have gcc-9 where we have gcc-10 in reality (since MACHINE=xen),
and we don't add ${GCC_NO_RETURN_LOCAL_ADDR} COPTS.in_pcb.c
To generate a diff of this commit:
cvs rdiff -u -r1.1250 -r1.1251 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1250 src/share/mk/bsd.own.mk:1.1251
--- src/share/mk/bsd.own.mk:1.1250 Thu May 27 07:24:58 2021
+++ src/share/mk/bsd.own.mk Thu May 27 13:13:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1250 2021/05/27 11:24:58 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1251 2021/05/27 17:13:20 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -75,6 +75,7 @@ TOOLCHAIN_MISSING?= no
.if ${MACHINE} == "alpha" || \
${MACHINE} == "hppa" || \
${MACHINE} == "i386" || \
+${MACHINE} == "xen" || \
${MACHINE} == "ia64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu May 27 11:24:58 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
remove dup line (thanks rillig)
To generate a diff of this commit:
cvs rdiff -u -r1.1249 -r1.1250 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1249 src/share/mk/bsd.own.mk:1.1250
--- src/share/mk/bsd.own.mk:1.1249 Thu May 27 02:58:27 2021
+++ src/share/mk/bsd.own.mk Thu May 27 07:24:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1249 2021/05/27 06:58:27 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1250 2021/05/27 11:24:58 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -425,7 +425,6 @@ MKDEPCXX= CC=${CXX:Q} ${TOOLDIR}/bin/${_
PAXCTL= ${TOOLDIR}/bin/${_TOOL_PREFIX}paxctl
TSORT= ${TOOLDIR}/bin/${_TOOL_PREFIX}tsort -q
YACC= ${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
-YACC= ${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
TOOL_AMIGAAOUT2BB= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-aout2bb
TOOL_AMIGAELF2BB= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Wed May 26 20:21:25 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add date as a tool
To generate a diff of this commit:
cvs rdiff -u -r1.1247 -r1.1248 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1247 src/share/mk/bsd.own.mk:1.1248
--- src/share/mk/bsd.own.mk:1.1247 Thu May 6 09:23:36 2021
+++ src/share/mk/bsd.own.mk Wed May 26 16:21:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1247 2021/05/06 13:23:36 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1248 2021/05/26 20:21:25 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -423,6 +423,7 @@ MKDEPCXX= CC=${CXX:Q} ${TOOLDIR}/bin/${_
PAXCTL= ${TOOLDIR}/bin/${_TOOL_PREFIX}paxctl
TSORT= ${TOOLDIR}/bin/${_TOOL_PREFIX}tsort -q
YACC= ${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
+YACC= ${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
TOOL_AMIGAAOUT2BB= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-aout2bb
TOOL_AMIGAELF2BB= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
@@ -440,6 +441,7 @@ TOOL_CTAGS= ${TOOLDIR}/bin/${_TOOL_PREF
TOOL_CTFCONVERT= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
TOOL_CTFMERGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
TOOL_CVSLATEST= ${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
+TOOL_DATE= ${TOOLDIR}/bin/${_TOOL_PREFIX}date
TOOL_DB= ${TOOLDIR}/bin/${_TOOL_PREFIX}db
TOOL_DISKLABEL= ${TOOLDIR}/bin/${_TOOL_PREFIX}disklabel
TOOL_DTC= ${TOOLDIR}/bin/${_TOOL_PREFIX}dtc
@@ -562,6 +564,7 @@ TOOL_CTAGS= ctags
TOOL_CTFCONVERT= ctfconvert
TOOL_CTFMERGE= ctfmerge
TOOL_CVSLATEST= cvslatest
+TOOL_DATE= date
TOOL_DB= db
TOOL_DISKLABEL= disklabel
TOOL_DTC= dtc
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Tue Apr 27 04:02:09 UTC 2021 Modified Files: src/share/mk: bsd.x11.mk Log Message: xorg-server 1.20.11 is now current. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.137 src/share/mk/bsd.x11.mk:1.138 --- src/share/mk/bsd.x11.mk:1.137 Sat Dec 5 22:44:57 2020 +++ src/share/mk/bsd.x11.mk Tue Apr 27 04:02:09 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.137 2020/12/05 22:44:57 mrg Exp $ +# $NetBSD: bsd.x11.mk,v 1.138 2021/04/27 04:02:09 mrg Exp $ .include @@ -134,7 +134,7 @@ XORG_SERVER_MINOR= 10 XORG_SERVER_TEENY= 6 .else XORG_SERVER_MINOR= 20 -XORG_SERVER_TEENY= 10 +XORG_SERVER_TEENY= 11 .endif XVENDORNAMESHORT= '"X.Org"'
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Apr 26 00:38:23 UTC 2021
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Revert the AFLAGS change since it affects kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.305 src/share/mk/bsd.sys.mk:1.306
--- src/share/mk/bsd.sys.mk:1.305 Sun Apr 25 10:32:20 2021
+++ src/share/mk/bsd.sys.mk Sun Apr 25 20:38:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.305 2021/04/25 14:32:20 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.306 2021/04/26 00:38:23 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -197,12 +197,10 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? --para
.if ${MACHINE_CPU} != "sh3"
COPTS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
FOPTS+= -msoft-float
-AFLAGS+= -msoft-float
.endif
.elif ${MACHINE_ARCH} == "coldfire"
COPTS+= -mhard-float
FOPTS+= -mhard-float
-AFLAGS+= -mhard-float
.endif
#.if !empty(MACHINE_ARCH:Mearmv7*)
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Apr 25 21:55:58 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
make MACHINE_MIPS a boolean not a condition
To generate a diff of this commit:
cvs rdiff -u -r1.1245 -r1.1246 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1245 src/share/mk/bsd.own.mk:1.1246
--- src/share/mk/bsd.own.mk:1.1245 Sun Apr 25 11:33:15 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 17:55:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1245 2021/04/25 15:33:15 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1246 2021/04/25 21:55:58 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -16,10 +16,14 @@ MAKECONF?= /etc/mk.conf
#
MACHINE_CPU= ${MACHINE_ARCH:C/mips.*e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
-MACHINE_MIPS64= (${MACHINE_ARCH} == "mips64el" || \
- ${MACHINE_ARCH} == "mips64eb" || \
- ${MACHINE_ARCH} == "mipsn64el" || \
- ${MACHINE_ARCH} == "mipsn64eb")
+.if (${MACHINE_ARCH} == "mips64el" || \
+ ${MACHINE_ARCH} == "mips64eb" || \
+ ${MACHINE_ARCH} == "mipsn64el" || \
+ ${MACHINE_ARCH} == "mipsn64eb")
+MACHINE_MIPS64= 1
+.else
+MACHINE_MIPS64= 0
+.endif
#
# Subdirectory used below ${RELEASEDIR} when building a release
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sun Apr 25 15:33:15 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add missing \ for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.1244 -r1.1245 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1244 src/share/mk/bsd.own.mk:1.1245
--- src/share/mk/bsd.own.mk:1.1244 Sun Apr 25 14:32:20 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 15:33:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1244 2021/04/25 14:32:20 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1245 2021/04/25 15:33:15 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1044,7 +1044,7 @@ MK${var}:= yes
# aarch64eb is not yet supported.
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
-|| ${MACHINE_MIPS64}
+|| ${MACHINE_MIPS64} \
|| ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
|| ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Apr 25 14:32:20 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk bsd.sys.mk
Log Message:
- since we are using regex already, shorten by merging arm and mips entries
- add a MACHINE_MIPS64 macro shorthand
- pass -m{soft,hard}-float to the assembler when we are passing it to the
compiler
To generate a diff of this commit:
cvs rdiff -u -r1.1243 -r1.1244 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.304 -r1.305 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1243 src/share/mk/bsd.own.mk:1.1244
--- src/share/mk/bsd.own.mk:1.1243 Sun Apr 25 04:01:54 2021
+++ src/share/mk/bsd.own.mk Sun Apr 25 10:32:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1243 2021/04/25 08:01:54 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1244 2021/04/25 14:32:20 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -14,7 +14,12 @@ MAKECONF?= /etc/mk.conf
#
# CPU model, derived from MACHINE_ARCH
#
-MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
+MACHINE_CPU= ${MACHINE_ARCH:C/mips.*e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/e?arm.*/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
+
+MACHINE_MIPS64= (${MACHINE_ARCH} == "mips64el" || \
+ ${MACHINE_ARCH} == "mips64eb" || \
+ ${MACHINE_ARCH} == "mipsn64el" || \
+ ${MACHINE_ARCH} == "mipsn64eb")
#
# Subdirectory used below ${RELEASEDIR} when building a release
@@ -1039,7 +1044,7 @@ MK${var}:= yes
# aarch64eb is not yet supported.
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
-|| ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+|| ${MACHINE_MIPS64}
|| ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
|| ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
@@ -1053,7 +1058,7 @@ MKCOMPATTESTS:= no
MKCOMPATX11:= no
.endif
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+.if ${MACHINE_MIPS64} \
|| (${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc")
MKCOMPATMODULES?= yes
.else
@@ -1063,7 +1068,7 @@ MKCOMPATMODULES:= no
#
# These platforms use softfloat by default.
#
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
MKSOFTFLOAT?= yes
.endif
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.304 src/share/mk/bsd.sys.mk:1.305
--- src/share/mk/bsd.sys.mk:1.304 Mon Nov 9 11:15:05 2020
+++ src/share/mk/bsd.sys.mk Sun Apr 25 10:32:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.304 2020/11/09 16:15:05 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.305 2021/04/25 14:32:20 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -197,10 +197,12 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? --para
.if ${MACHINE_CPU} != "sh3"
COPTS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :}
FOPTS+= -msoft-float
+AFLAGS+= -msoft-float
.endif
.elif ${MACHINE_ARCH} == "coldfire"
COPTS+= -mhard-float
FOPTS+= -mhard-float
+AFLAGS+= -mhard-float
.endif
#.if !empty(MACHINE_ARCH:Mearmv7*)
@@ -220,7 +222,7 @@ CFLAGS+= -Wa,-Av8plus
.endif
.if !defined(NOGCCERROR)
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+.if ${MACHINE_MIPS64}
CPUFLAGS+= -Wa,--fatal-warnings
.endif
.endif
@@ -229,8 +231,7 @@ CPUFLAGS+= -Wa,--fatal-warnings
#CFLAGS+= -mips64 -mtune=sb1
#.endif
-#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
-#(defined(MKPIC) && ${MKPIC} == "no")
+#.if ${MACHINE_MIPS64} && defined(MKPIC) && ${MKPIC} == "no"
#CPUFLAGS+= -mno-abicalls -fno-PIC
#.endif
CFLAGS+= ${CPUFLAGS}
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Apr 18 20:32:49 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch hppa to gcc 10
To generate a diff of this commit:
cvs rdiff -u -r1.1241 -r1.1242 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1241 src/share/mk/bsd.own.mk:1.1242
--- src/share/mk/bsd.own.mk:1.1241 Sat Apr 17 09:39:33 2021
+++ src/share/mk/bsd.own.mk Sun Apr 18 20:32:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1241 2021/04/17 09:39:33 mlelstv Exp $
+# $NetBSD: bsd.own.mk,v 1.1242 2021/04/18 20:32:49 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -65,6 +65,7 @@ TOOLCHAIN_MISSING?= no
#
.if ${MACHINE} == "alpha" || \
${MACHINE_ARCH} == "x86_64" || \
+${MACHINE} == "hppa" || \
${MACHINE} == "ia64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
CVS commit: src/share/mk
Module Name:src
Committed By: mlelstv
Date: Sat Apr 17 09:39:33 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use GCC10 for all amd64 including XEN kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.1240 -r1.1241 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1240 src/share/mk/bsd.own.mk:1.1241
--- src/share/mk/bsd.own.mk:1.1240 Sat Apr 17 04:07:16 2021
+++ src/share/mk/bsd.own.mk Sat Apr 17 09:39:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1240 2021/04/17 04:07:16 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1241 2021/04/17 09:39:33 mlelstv Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -64,7 +64,7 @@ TOOLCHAIN_MISSING?= no
# What GCC is used?
#
.if ${MACHINE} == "alpha" || \
-${MACHINE} == "amd64" || \
+${MACHINE_ARCH} == "x86_64" || \
${MACHINE} == "ia64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Apr 12 04:18:38 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add GCC_NO_IMPLICIT_FALLTHRU, GCC_NO_MAYBE_UNINITIALIZED, and
GCC_NO_RETURN_LOCAL_ADDR.
To generate a diff of this commit:
cvs rdiff -u -r1.1238 -r1.1239 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1238 src/share/mk/bsd.own.mk:1.1239
--- src/share/mk/bsd.own.mk:1.1238 Sat Apr 10 00:35:24 2021
+++ src/share/mk/bsd.own.mk Mon Apr 12 04:18:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1238 2021/04/10 00:35:24 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1239 2021/04/12 04:18:38 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -859,9 +859,12 @@ NOPROFILE= # defined
GCC_NO_FORMAT_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-truncation :}
GCC_NO_FORMAT_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-overflow :}
GCC_NO_STRINGOP_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-stringop-overflow :}
+GCC_NO_IMPLICIT_FALLTHRU= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}
GCC_NO_STRINGOP_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-truncation :}
GCC_NO_CAST_FUNCTION_TYPE= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-cast-function-type :}
-GCC_NO_ADDR_OF_PACKED_MEMBER= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=address-of-packed-member :}
+GCC_NO_ADDR_OF_PACKED_MEMBER= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-address-of-packed-member :}
+GCC_NO_MAYBE_UNINITIALIZED= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :}
+GCC_NO_RETURN_LOCAL_ADDR= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-return-local-addr :}
#
# Clang warnings
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Apr 10 00:35:25 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch HAVE_GCC=9 to gcc.old.
To generate a diff of this commit:
cvs rdiff -u -r1.1237 -r1.1238 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1237 src/share/mk/bsd.own.mk:1.1238
--- src/share/mk/bsd.own.mk:1.1237 Wed Mar 31 06:35:35 2021
+++ src/share/mk/bsd.own.mk Sat Apr 10 00:35:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1237 2021/03/31 06:35:35 simonb Exp $
+# $NetBSD: bsd.own.mk,v 1.1238 2021/04/10 00:35:24 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -75,9 +75,9 @@ MKGCCCMDS?= no
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
-.if ${HAVE_GCC} == 8
+.if ${HAVE_GCC} == 9
EXTERNAL_GCC_SUBDIR?= gcc.old
-.elif ${HAVE_GCC} == 9
+.elif ${HAVE_GCC} == 10
EXTERNAL_GCC_SUBDIR?= gcc
.else
EXTERNAL_GCC_SUBDIR?= /does/not/exist
CVS commit: src/share/mk
Module Name:src Committed By: simonb Date: Wed Mar 31 06:35:35 UTC 2021 Modified Files: src/share/mk: bsd.own.mk Log Message: Reenable kernel modules for MIPS now that they work. To generate a diff of this commit: cvs rdiff -u -r1.1236 -r1.1237 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1236 src/share/mk/bsd.own.mk:1.1237 --- src/share/mk/bsd.own.mk:1.1236 Sun Mar 7 10:42:26 2021 +++ src/share/mk/bsd.own.mk Wed Mar 31 06:35:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1236 2021/03/07 10:42:26 rin Exp $ +# $NetBSD: bsd.own.mk,v 1.1237 2021/03/31 06:35:35 simonb Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -833,10 +833,6 @@ MKGDB.riscv64= no MKKMOD.or1k= no MKKMOD.riscv32= no MKKMOD.riscv64= no -MKKMOD.mipsel= no -MKKMOD.mipseb= no -MKKMOD.mips64el=no -MKKMOD.mips64eb=no # No profiling for or1k (yet) MKPROFILE.or1k= no
CVS commit: src/share/mk
Module Name:src
Committed By: simonb
Date: Mon Mar 29 05:22:50 UTC 2021
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
On MIPS if we compile C files as N64, compile assembly with the same ABI.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.75 src/share/mk/bsd.kmodule.mk:1.76
--- src/share/mk/bsd.kmodule.mk:1.75 Tue Mar 23 13:22:40 2021
+++ src/share/mk/bsd.kmodule.mk Mon Mar 29 05:22:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.75 2021/03/23 13:22:40 simonb Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.76 2021/03/29 05:22:49 simonb Exp $
# We are not building this with PIE
MKPIE=no
@@ -57,9 +57,11 @@ CFLAGS+= -fno-pic
CFLAGS+= -fPIC -Wa,-fno-pic
.elif ${MACHINE_ARCH} == "mips64eb" && !defined(BSD_MK_COMPAT_FILE)
CFLAGS+= -mabi=64
+AFLAGS+= -mabi=64
LDFLAGS+= -Wl,-m,elf64btsmip
.elif ${MACHINE_ARCH} == "mips64el" && !defined(BSD_MK_COMPAT_FILE)
CFLAGS+= -mabi=64
+AFLAGS+= -mabi=64
LDFLAGS+= -Wl,-m,elf64ltsmip
.endif
CVS commit: src/share/mk
Module Name:src Committed By: simonb Date: Sat Mar 27 02:46:46 UTC 2021 Modified Files: src/share/mk: bsd.hostprog.mk Log Message: Make columns nicely aligned. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.hostprog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.hostprog.mk diff -u src/share/mk/bsd.hostprog.mk:1.83 src/share/mk/bsd.hostprog.mk:1.84 --- src/share/mk/bsd.hostprog.mk:1.83 Sat Apr 4 01:35:22 2020 +++ src/share/mk/bsd.hostprog.mk Sat Mar 27 02:46:45 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.83 2020/04/04 01:35:22 christos Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.84 2021/03/27 02:46:45 simonb Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include @@ -7,71 +7,71 @@ # Basic targets # Default values -LIBATF_C?= /usr/lib/libatf-c.a -LIBATF_CXX?= /usr/lib/libatf-c++.a -LIBBLUETOOTH?= /usr/lib/libbluetooth.a -LIBBZ2?= /usr/lib/libbz2.a -LIBC?= /usr/lib/libc.a -LIBCOMPAT?= /usr/lib/libcompat.a -LIBCRYPT?= /usr/lib/libcrypt.a -LIBCURSES?= /usr/lib/libcurses.a -LIBC_PIC?= /usr/lib/libc_pic.a -LIBC_SO?= /usr/lib/libc.so -LIBDBM?= /usr/lib/libdbm.a -LIBDES?= /usr/lib/libdes.a -LIBEDIT?= /usr/lib/libedit.a -LIBEVENT?= /usr/lib/libevent.a +LIBATF_C?= /usr/lib/libatf-c.a +LIBATF_CXX?= /usr/lib/libatf-c++.a +LIBBLUETOOTH?= /usr/lib/libbluetooth.a +LIBBZ2?= /usr/lib/libbz2.a +LIBC?= /usr/lib/libc.a +LIBCOMPAT?= /usr/lib/libcompat.a +LIBCRYPT?= /usr/lib/libcrypt.a +LIBCURSES?= /usr/lib/libcurses.a +LIBC_PIC?= /usr/lib/libc_pic.a +LIBC_SO?= /usr/lib/libc.so +LIBDBM?= /usr/lib/libdbm.a +LIBDES?= /usr/lib/libdes.a +LIBEDIT?= /usr/lib/libedit.a +LIBEVENT?= /usr/lib/libevent.a LIBEVENT_OPENSSL?= /usr/lib/libevent_openssl.a LIBEVENT_PTHREADS?= /usr/lib/libevent_pthreads.a -LIBEXPAT?= /usr/lib/libexpat.a -LIBFETCH?= /usr/lib/libfetch.a -LIBFORM?= /usr/lib/libform.a -LIBGCC?= /usr/lib/libgcc.a -LIBGNUCTF?= /usr/lib/libgnuctf.a -LIBGNUMALLOC?= /usr/lib/libgnumalloc.a -LIBINTL?= /usr/lib/libintl.a -LIBIPSEC?= /usr/lib/libipsec.a -LIBKVM?= /usr/lib/libkvm.a -LIBL?= /usr/lib/libl.a -LIBLUTOK?= /usr/lib/liblutok.a -LIBLZMA?= /usr/lib/liblzma.a -LIBM?= /usr/lib/libm.a -LIBMAGIC?= /usr/lib/libmagic.a -LIBMENU?= /usr/lib/libmenu.a -LIBMP?= /usr/lib/libmp.a -LIBNTP?= /usr/lib/libntp.a -LIBNVMM?= /usr/lib/libnvmm.a -LIBOBJC?= /usr/lib/libobjc.a -LIBP2K?= /usr/lib/libp2k.a -LIBPANEL?= /usr/lib/libpanel.a -LIBPC?= /usr/lib/libpc.a -LIBPCAP?= /usr/lib/libpcap.a -LIBPCI?= /usr/lib/libpci.a -LIBPLOT?= /usr/lib/libplot.a -LIBPOSIX?= /usr/lib/libposix.a -LIBPTHREAD?=/usr/lib/libpthread.a -LIBPUFFS?= /usr/lib/libpuffs.a -LIBQUOTA?= /usr/lib/libquota.a -LIBREFUSE?= /usr/lib/librefuse.a -LIBRESOLV?= /usr/lib/libresolv.a -LIBRPCSVC?= /usr/lib/librpcsvc.a -LIBRUMP?= /usr/lib/librump.a -LIBRUMPCLIENT?= /usr/lib/librumpclient.a -LIBRUMPNET?= /usr/lib/librumpnet.a -LIBRUMPRES?= /usr/lib/librumpres.a -LIBRUMPUSER?= /usr/lib/librumpuser.a -LIBRUMPVFS?= /usr/lib/librumpvfs.a -LIBSKEY?= /usr/lib/libskey.a -LIBSQLITE3?= /usr/lib/libsqlite3.a -LIBSSP?= /usr/lib/libssp.a -LIBSTDCXX?= /usr/lib/libstdc++.a -LIBSUPCXX?= /usr/lib/libsupc++.a -LIBTERMINFO?= /usr/lib/libterminfo.a -LIBUKFS?= /usr/lib/libukfs.a -LIBUTIL?= /usr/lib/libutil.a -LIBWRAP?= /usr/lib/libwrap.a -LIBY?= /usr/lib/liby.a -LIBZ?= /usr/lib/libz.a +LIBEXPAT?= /usr/lib/libexpat.a +LIBFETCH?= /usr/lib/libfetch.a +LIBFORM?= /usr/lib/libform.a +LIBGCC?= /usr/lib/libgcc.a +LIBGNUCTF?= /usr/lib/libgnuctf.a +LIBGNUMALLOC?= /usr/lib/libgnumalloc.a +LIBINTL?= /usr/lib/libintl.a +LIBIPSEC?= /usr/lib/libipsec.a +LIBKVM?= /usr/lib/libkvm.a +LIBL?= /usr/lib/libl.a +LIBLUTOK?= /usr/lib/liblutok.a +LIBLZMA?= /usr/lib/liblzma.a +LIBM?= /usr/lib/libm.a +LIBMAGIC?= /usr/lib/libmagic.a +LIBMENU?= /usr/lib/libmenu.a +LIBMP?= /usr/lib/libmp.a +LIBNTP?= /usr/lib/libntp.a +LIBNVMM?= /usr/lib/libnvmm.a +LIBOBJC?= /usr/lib/libobjc.a +LIBP2K?= /usr/lib/libp2k.a +LIBPANEL?= /usr/lib/libpanel.a +LIBPC?= /usr/lib/libpc.a +LIBPCAP?= /usr/lib/libpcap.a +LIBPCI?= /usr/lib/libpci.a +LIBPLOT?= /usr/lib/libplot.a +LIBPOSIX?= /usr/lib/libposix.a +LIBPTHREAD?= /usr/lib/libpthread.a +LIBPUFFS?= /usr/lib/libpuffs.a +LIBQUOTA?= /usr/lib/libquota.a +LIBREFUSE?= /usr/lib/librefuse.a +LIBRESOLV?= /usr/lib/libresolv.a +LIBRPCSVC?= /usr/lib/librpcsvc.a +LIBRUMP?= /usr/lib/librump.a +LIBRUMPCLIENT?= /usr/lib/librumpclient.a +LIBRUMPNET?= /usr/lib/librumpnet.a +LIBRUMPRES?= /usr/lib/librumpres.a +LIBRUMPUSER?= /usr/lib/librumpuser.a +LIBRUMPVFS?= /usr/lib/librumpvfs.a +LIBSKEY?= /usr/lib/libskey.a +LIBSQLITE3?= /usr/lib/libsqlite3.a +LIBSSP?= /usr/lib/libssp.a +LIBSTDCXX?= /usr/lib/libstdc++.a +LIBSUPCXX?= /usr/lib/libsupc++.a +LIBTERMINFO?= /usr/lib/libterminfo.a +LIBUKFS?= /usr/lib/libukfs.a +LIBUTIL?= /usr/lib/libutil.a +LIBWRAP?= /usr/lib/libwrap.a +LIBY?=
CVS commit: src/share/mk
Module Name:src Committed By: simonb Date: Wed Mar 24 04:36:57 UTC 2021 Modified Files: src/share/mk: bsd.README Log Message: Add aarch64 and sparc64 to MKZFS yes. Sort the machine names for the "Default: yes on ..." lines. To generate a diff of this commit: cvs rdiff -u -r1.415 -r1.416 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.415 src/share/mk/bsd.README:1.416 --- src/share/mk/bsd.README:1.415 Tue Nov 10 21:47:49 2020 +++ src/share/mk/bsd.README Wed Mar 24 04:36:57 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.415 2020/11/10 21:47:49 kamil Exp $ +# $NetBSD: bsd.README,v 1.416 2021/03/24 04:36:57 simonb Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -134,7 +134,7 @@ MKCATPAGES If "no", don't build or insta Default: no MKCOMPAT If "no", don't build or install the src/compat. - Default: yes on amd64/mips64/sparc64, no elsewhere. + Default: yes on amd64, mips64 and sparc64, no elsewhere. MKCOMPATTESTS If "yes", build and install the NetBSD test suite when building and installing src/compat. @@ -371,7 +371,7 @@ MKNLS If "no", don't build or install t MKNOUVEAUFIRMWARE If "yes", install the /libdata/firmware/nouveau directory, which is necessary for the nouveau DRM driver. - Default: yes on i386 and amd64, no elsewhere. + Default: yes on amd64 and i386, no elsewhere. MKNPF If "no", don't build or install the NPF and its modules. Default: yes @@ -429,7 +429,7 @@ MKPROFILE If "no", don't build or instal MKRADEONFIRMWARE If "yes", install the /libdata/firmware/radeon directory, which is necessary for the radeon DRM driver. - Default: yes on i386 and amd64, no elsewhere. + Default: yes on amd64 and i386, no elsewhere. MKRELRO If "partial", set the non-PLT GOT to read-only. If "full" also force immediate symbol binding. @@ -544,7 +544,7 @@ MKZFS If "no", do not build and install used to manage ZFS file system. Do not build zfs and solaris compatibility kernel modules. Note: ZFS requires 64bit atomic operations. - Default: yes on amd64, no elsewhere. + Default: yes on aarch64, amd64 and sparc64, no elsewhere. MKRUMP If "no", do not build and install rump related headers, libraries, and programs.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Mar 23 22:02:44 UTC 2021
Modified Files:
src/share/mk: sys.mk
Log Message:
>From Greg A. Woods:
- add LDSTATIC to all the LINK rules, replacing CPPFLAGS which should not be
used
- create new COMPILE_LINK rules that are like LINK rules but have CPPFLAGS
where appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.145 src/share/mk/sys.mk:1.146
--- src/share/mk/sys.mk:1.145 Mon Mar 22 17:52:26 2021
+++ src/share/mk/sys.mk Tue Mar 23 18:02:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.145 2021/03/22 21:52:26 christos Exp $
+# $NetBSD: sys.mk,v 1.146 2021/03/23 22:02:44 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -19,10 +19,11 @@ MV?= mv -f
AS?= as
AFLAGS?=
COMPILE.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} -c
-LINK.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${LDFLAGS}
+LINK.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${LDSTATIC} ${LDFLAGS}
_ASM_TRADITIONAL_CPP= -x assembler-with-cpp
COMPILE.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
-LINK.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${LDFLAGS}
+LINK.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${LDSTATIC} ${LDFLAGS}
+COMPILE_LINK.S?=${LINK.S} ${CPPFLAGS}
CC?= cc
.if ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
@@ -42,7 +43,8 @@ DTRACE_OPTS?= -fno-omit-frame-pointer -f
CFLAGS?= ${DBG}
LDFLAGS?=
COMPILE.c?= ${CC} ${CFLAGS} ${DTRACE_OPTS} ${CPPFLAGS} -c
-LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+LINK.c?= ${CC} ${CFLAGS} ${LDSTATIC} ${LDFLAGS}
+COMPILE_LINK.c?=${LINK.c} ${CPPFLAGS}
# C Type Format data is required for DTrace
CTFFLAGS ?= -g -L VERSION
@@ -68,12 +70,14 @@ __BUILDSEED= ${BUILDSEED}/${__INITSEED}/
_CXXSEED?= ${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
COMPILE.cc?= ${CXX} ${_CXXSEED} ${CXXFLAGS} ${DTRACE_OPTS} ${CPPFLAGS} -c
-LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
+LINK.cc?= ${CXX} ${CXXFLAGS} ${LDSTATIC} ${LDFLAGS}
+COMPILE_LINK.cc?=${LINK.cc} ${CPPFLAGS}
OBJC?= ${CC}
OBJCFLAGS?= ${CFLAGS}
COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
-LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
+LINK.m?= ${OBJC} ${OBJCFLAGS} ${LDSTATIC} ${LDFLAGS}
+LINK.m?= ${LINK.m} ${CPPFLAGS}
CPP?= cpp
CPPFLAGS?=
@@ -82,11 +86,14 @@ FC?= f77
FFLAGS?= -O
RFLAGS?=
COMPILE.f?= ${FC} ${FFLAGS} -c
-LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS}
+LINK.f?= ${FC} ${FFLAGS} ${LDSTATIC} ${LDFLAGS}
+COMPILE_LINK.f?=${LINK.f} ${CPPFLAGS}
COMPILE.F?= ${FC} ${FFLAGS} ${CPPFLAGS} -c
-LINK.F?= ${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS}
+LINK.F?= ${FC} ${FFLAGS} ${LDSTATIC} ${LDFLAGS}
+COMPILE_LINK.F?=${LINK.F} ${CPPFLAGS}
COMPILE.r?= ${FC} ${FFLAGS} ${RFLAGS} -c
-LINK.r?= ${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
+LINK.r?= ${FC} ${FFLAGS} ${RFLAGS} ${LDSTATIC} ${LDFLAGS}
+COMPILE_LINK.r?=${LINK.r}
INSTALL?= install
@@ -122,7 +129,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# C
.c:
- ${LINK.c} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.c} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.c.o:
${COMPILE.c} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -137,7 +144,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# C++
.cc .cpp .cxx .C:
- ${LINK.cc} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.cc} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.cc.o .cpp.o .cxx.o .C.o:
${COMPILE.cc} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -148,7 +155,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Fortran/Ratfor
.f:
- ${LINK.f} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.f} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.f.o:
${COMPILE.f} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -158,7 +165,7 @@ YACC.y?= ${YACC} ${YFLAGS}
rm -f ${.PREFIX}.o
.F:
- ${LINK.F} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.F} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.F.o:
${COMPILE.F} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -168,7 +175,7 @@ YACC.y?= ${YACC} ${YFLAGS}
rm -f ${.PREFIX}.o
.r:
- ${LINK.r} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.r} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.r.o:
${COMPILE.r} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -179,7 +186,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Pascal
.p:
- ${LINK.p} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.p} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.p.o:
${COMPILE.p} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -190,7 +197,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Assembly
.s:
- ${LINK.s} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
+ ${COMPILE_LINK.s} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.s.o:
${COMPILE.s} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -199,7 +206,7 @@ YACC.y?= ${YACC} ${YFLAGS}
${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
rm -f ${.PREFIX}.o
.S:
-
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Mar 22 21:52:27 UTC 2021
Modified Files:
src/share/mk: sys.mk
Log Message:
Fix the shuttle rules by defining a new EXEC_TARGET instead of re-using
OBJECT_TARGET which adds an extra .o sometimes. Noticed by Greg A. Woods
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.144 src/share/mk/sys.mk:1.145
--- src/share/mk/sys.mk:1.144 Mon Nov 9 11:15:05 2020
+++ src/share/mk/sys.mk Mon Mar 22 17:52:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.144 2020/11/09 16:15:05 christos Exp $
+# $NetBSD: sys.mk,v 1.145 2021/03/22 21:52:26 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -48,6 +48,7 @@ LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${L
CTFFLAGS ?= -g -L VERSION
CTFMFLAGS ?= -t -g -L VERSION
OBJECT_TARGET ?= -o ${.TARGET}${defined(CTFCONVERT):?.o:}
+EXEC_TARGET ?= -o ${.TARGET}
CTFCONVERT_RUN ?= ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} -o ${.TARGET} ${.TARGET}.o && rm -f ${.TARGET}.o:}
CXX?= c++
@@ -121,9 +122,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# C
.c:
- ${LINK.c} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
-# XXX: disable for now
-# ${CTFCONVERT_RUN}
+ ${LINK.c} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.c.o:
${COMPILE.c} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -138,9 +137,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# C++
.cc .cpp .cxx .C:
- ${LINK.cc} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
-# XXX: disable for now
-# ${CTFCONVERT_RUN}
+ ${LINK.cc} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.cc.o .cpp.o .cxx.o .C.o:
${COMPILE.cc} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -151,8 +148,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Fortran/Ratfor
.f:
- ${LINK.f} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.f} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.f.o:
${COMPILE.f} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -162,8 +158,7 @@ YACC.y?= ${YACC} ${YFLAGS}
rm -f ${.PREFIX}.o
.F:
- ${LINK.F} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.F} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.F.o:
${COMPILE.F} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -173,8 +168,7 @@ YACC.y?= ${YACC} ${YFLAGS}
rm -f ${.PREFIX}.o
.r:
- ${LINK.r} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.r} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.r.o:
${COMPILE.r} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -185,8 +179,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Pascal
.p:
- ${LINK.p} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.p} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.p.o:
${COMPILE.p} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -197,8 +190,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Assembly
.s:
- ${LINK.s} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.s} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.s.o:
${COMPILE.s} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -207,8 +199,7 @@ YACC.y?= ${YACC} ${YFLAGS}
${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
rm -f ${.PREFIX}.o
.S:
- ${LINK.S} ${OBJECT_TARGET} ${.IMPSRC} ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.S} ${EXEC_TARGET} ${.IMPSRC} ${LDLIBS}
.S.o:
${COMPILE.S} ${.IMPSRC} ${OBJECT_TARGET}
${CTFCONVERT_RUN}
@@ -220,8 +211,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Lex
.l:
${LEX.l} ${.IMPSRC}
- ${LINK.c} ${OBJECT_TARGET} lex.yy.c ${LDLIBS} -ll
- ${CTFCONVERT_RUN}
+ ${LINK.c} ${EXEC_TARGET} lex.yy.c ${LDLIBS} -ll
rm -f lex.yy.c
.l.c:
${LEX.l} ${.IMPSRC}
@@ -235,8 +225,7 @@ YACC.y?= ${YACC} ${YFLAGS}
# Yacc
.y:
${YACC.y} ${.IMPSRC}
- ${LINK.c} ${OBJECT_TARGET} y.tab.c ${LDLIBS}
- ${CTFCONVERT_RUN}
+ ${LINK.c} ${EXEC_TARGET} y.tab.c ${LDLIBS}
rm -f y.tab.c
.y.c:
${YACC.y} ${.IMPSRC}
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sun Mar 7 07:37:35 UTC 2021
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Build modules for PPC_OEA64 on evbppc64.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.73 src/share/mk/bsd.kmodule.mk:1.74
--- src/share/mk/bsd.kmodule.mk:1.73 Sun Mar 7 07:30:15 2021
+++ src/share/mk/bsd.kmodule.mk Sun Mar 7 07:37:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.73 2021/03/07 07:30:15 rin Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.74 2021/03/07 07:37:35 rin Exp $
# We are not building this with PIE
MKPIE=no
@@ -85,6 +85,8 @@ CPPFLAGS+= -DPPC_PCI_MACHDEP_IMPL=${DPPC
CPPFLAGS+= -DPPC_IBM4XX
. elifdef PPC_BOOKE
CPPFLAGS+= -DPPC_BOOKE
+. elif ${MACHINE_ARCH} == "powerpc64"
+CPPFLAGS+= -DPPC_OEA64
. else
CPPFLAGS+= -DPPC_OEA
. endif
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sun Mar 7 07:30:15 UTC 2021
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
whitespace --> tab. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.72 src/share/mk/bsd.kmodule.mk:1.73
--- src/share/mk/bsd.kmodule.mk:1.72 Sun Oct 18 19:57:44 2020
+++ src/share/mk/bsd.kmodule.mk Sun Mar 7 07:30:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.72 2020/10/18 19:57:44 christos Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.73 2021/03/07 07:30:15 rin Exp $
# We are not building this with PIE
MKPIE=no
@@ -78,15 +78,15 @@ PPC_INTR_IMPL=\"powerpc/intr.h\"
. ifndef PPC_PCI_MACHDEP_IMPL
PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\"
. endif
-CPPFLAGS+= -DPPC_INTR_IMPL=${PPC_INTR_IMPL}
-CPPFLAGS+= -DPPC_PCI_MACHDEP_IMPL=${DPPC_PCI_MACHDEP_IMPL}
+CPPFLAGS+= -DPPC_INTR_IMPL=${PPC_INTR_IMPL}
+CPPFLAGS+= -DPPC_PCI_MACHDEP_IMPL=${DPPC_PCI_MACHDEP_IMPL}
. ifdef PPC_IBM4XX
-CPPFLAGS+= -DPPC_IBM4XX
+CPPFLAGS+= -DPPC_IBM4XX
. elifdef PPC_BOOKE
-CPPFLAGS+= -DPPC_BOOKE
+CPPFLAGS+= -DPPC_BOOKE
. else
-CPPFLAGS+= -DPPC_OEA
+CPPFLAGS+= -DPPC_OEA
. endif
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Dec 6 14:28:34 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Move everyone to gdb-11
To generate a diff of this commit:
cvs rdiff -u -r1.1234 -r1.1235 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1234 src/share/mk/bsd.own.mk:1.1235
--- src/share/mk/bsd.own.mk:1.1234 Tue Nov 17 05:49:41 2020
+++ src/share/mk/bsd.own.mk Sun Dec 6 09:28:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1234 2020/11/17 10:49:41 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1235 2020/12/06 14:28:34 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -102,11 +102,7 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
#
# What GDB is used?
#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
HAVE_GDB?= 1100
-.else
-HAVE_GDB?= 830
-.endif
.if ${HAVE_GDB} == 1100
EXTERNAL_GDB_SUBDIR= gdb
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Dec 5 22:44:57 UTC 2020 Modified Files: src/share/mk: bsd.x11.mk Log Message: bump version for xorg-server 1.20.10. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.136 src/share/mk/bsd.x11.mk:1.137 --- src/share/mk/bsd.x11.mk:1.136 Mon Aug 10 09:23:37 2020 +++ src/share/mk/bsd.x11.mk Sat Dec 5 22:44:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.136 2020/08/10 09:23:37 mrg Exp $ +# $NetBSD: bsd.x11.mk,v 1.137 2020/12/05 22:44:57 mrg Exp $ .include @@ -134,7 +134,7 @@ XORG_SERVER_MINOR= 10 XORG_SERVER_TEENY= 6 .else XORG_SERVER_MINOR= 20 -XORG_SERVER_TEENY= 6 +XORG_SERVER_TEENY= 10 .endif XVENDORNAMESHORT= '"X.Org"'
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Tue Nov 17 10:49:41 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Set USE_XZ_SETS to yes by default for aarch64eb in the same manner as aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.1233 -r1.1234 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1233 src/share/mk/bsd.own.mk:1.1234
--- src/share/mk/bsd.own.mk:1.1233 Tue Nov 10 21:47:49 2020
+++ src/share/mk/bsd.own.mk Tue Nov 17 10:49:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1233 2020/11/10 21:47:49 kamil Exp $
+# $NetBSD: bsd.own.mk,v 1.1234 2020/11/17 10:49:41 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1495,7 +1495,7 @@ ${var}?= no
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
${MACHINE} == "sparc64" || \
- ${MACHINE_ARCH} == "aarch64")
+ ${MACHINE_CPU} == "aarch64")
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Nov 9 16:15:05 UTC 2020
Modified Files:
src/share/mk: bsd.lib.mk bsd.prog.mk bsd.sys.mk sys.mk
Log Message:
- make the CTFCONVERT command lines consistent and concise by putting all
the implementation stuff in a variable CTFCONVERT_RUN
- introduce an OBJECT_TARGET variable that contains the output object file
- when we need to run ctfconvert, go through an intermediate ${.TARGET}.o
file, instead of writing directly to ${.TARGET} and then overwriting
${.TARGET} with ctfconvert. This avoids build failures after a build
got interrupted (the "partially built from C" scourge).
To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.334 -r1.335 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.303 -r1.304 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.143 -r1.144 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.383 src/share/mk/bsd.lib.mk:1.384
--- src/share/mk/bsd.lib.mk:1.383 Mon Jun 1 10:39:14 2020
+++ src/share/mk/bsd.lib.mk Mon Nov 9 11:15:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.383 2020/06/01 14:39:14 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.384 2020/11/09 16:15:05 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -221,20 +221,16 @@ LIBSTRIPSHLIBOBJS= yes
.c.o:
${_MKTARGET_COMPILE}
- ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.c.po:
${_MKTARGET_COMPILE}
- ${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${PGFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${PGFLAGS} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -277,20 +273,16 @@ LIBSTRIPSHLIBOBJS= yes
.f.o:
${_MKTARGET_COMPILE}
- ${COMPILE.f} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.f} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPFOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.f.po:
${_MKTARGET_COMPILE}
- ${COMPILE.f} ${PROFFLAGS} ${PGFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.f} ${PROFFLAGS} ${PGFLAGS} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPFOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -312,20 +304,16 @@ LIBSTRIPSHLIBOBJS= yes
.m.o:
${_MKTARGET_COMPILE}
- ${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPOBJCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.m.po:
${_MKTARGET_COMPILE}
- ${COMPILE.m} ${PROFFLAGS} ${PGFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.m} ${PROFFLAGS} ${PGFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPOBJCOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
@@ -346,40 +334,32 @@ LIBSTRIPSHLIBOBJS= yes
.s.o:
${_MKTARGET_COMPILE}
- ${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.S.o:
${_MKTARGET_COMPILE}
- ${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} ${OBJECT_TARGET}
+ ${CTFCONVERT_RUN}
.if defined(LIBSTRIPAOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
.s.po:
${_MKTARGET_COMPILE}
- ${COMPILE.s} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ ${COMPILE.s}
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Mon Nov 9 10:19:18 UTC 2020
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Adapt for sqlite requiring pthreads now
To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.333 src/share/mk/bsd.prog.mk:1.334
--- src/share/mk/bsd.prog.mk:1.333 Fri Oct 30 08:41:58 2020
+++ src/share/mk/bsd.prog.mk Mon Nov 9 10:19:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.333 2020/10/30 08:41:58 martin Exp $
+# $NetBSD: bsd.prog.mk,v 1.334 2020/11/09 10:19:18 martin Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -226,11 +226,11 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_
LIBKRB5_LDADD+= -lkrb5 -lcom_err \
-lhx509 -lcrypto -lasn1 \
-lwind -lheimbase -lcom_err -lroken \
- -lsqlite3 -lm -lcrypt -lutil
+ -lsqlite3 -lpthread -lm -lcrypt -lutil
LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
- ${LIBSQLITE3} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
+ ${LIBSQLITE3} ${LIBM} ${LIPPTHREAD} ${LIBCRYPT} ${LIBUTIL}
.endif
# PAM applications, if linked statically, need more libraries
@@ -239,10 +239,10 @@ PAM_STATIC_LDADD+= -lssh
PAM_STATIC_DPADD+= ${LIBSSH}
.if (${MKKERBEROS} != "no")
PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
- -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lm
+ -lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lpthread -lm
PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3} \
- ${LIBM}
+ ${LIBPTHREAD} ${LIBM}
.endif
.if (${MKSKEY} != "no")
PAM_STATIC_LDADD+= -lskey
CVS commit: src/share/mk
Module Name:src
Committed By: kamil
Date: Sun Nov 8 15:19:18 UTC 2020
Modified Files:
src/share/mk: bsd.README
Log Message:
Stop mentioning the support for cat pages
To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.413 src/share/mk/bsd.README:1.414
--- src/share/mk/bsd.README:1.413 Sun Nov 8 14:52:35 2020
+++ src/share/mk/bsd.README Sun Nov 8 15:19:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.413 2020/11/08 14:52:35 kamil Exp $
+# $NetBSD: bsd.README,v 1.414 2020/11/08 15:19:18 kamil Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -350,9 +350,9 @@ MKMAN If "no", don't build or install t
Default: yes
MKMANDOC If "yes", mandoc is built as tool and used to compile
- catman or html pages. A directory can be exempted by
- defining NOMANDOC. Individual man pages are exempted
- if NOMANDOC.${target} is set to "yes".
+ html pages. A directory can be exempted by defining NOMANDOC.
+ Individual man pages are exempted if NOMANDOC.${target} is set
+ to "yes".
Default: yes
MKMANZ If not "no", compress manual pages at installation time.
@@ -459,8 +459,8 @@ MKSANITIZER if "yes", use the selected s
MKSHARE If "no", act as "MKDOC=no MKHTML=no MKINFO=no
MKMAN=no MKNLS=no".
- I.e, don't build catman pages, documentation, Info
- documentation, man pages, NLS files, ...
+ I.e, don't build documentation, Info documentation, man pages,
+ NLS files, ...
Default: yes
MKSKEY If "no", disables building of S/key authentication
@@ -717,7 +717,7 @@ BINMODE Binary mode. [555]
NONBINMODE Mode for non-executable files. [444]
-MANDIR Base path for manual installation. [/usr/share/man/cat]
+MANDIR Base path for manual installation. [/usr/share/man]
MANGRP Manual group. [wheel]
CVS commit: src/share/mk
Module Name:src
Committed By: kamil
Date: Sun Nov 8 14:55:26 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Remove the MKCATPAGES remnants
To generate a diff of this commit:
cvs rdiff -u -r1.1231 -r1.1232 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1231 src/share/mk/bsd.own.mk:1.1232
--- src/share/mk/bsd.own.mk:1.1231 Sun Nov 8 14:52:35 2020
+++ src/share/mk/bsd.own.mk Sun Nov 8 14:55:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1231 2020/11/08 14:52:35 kamil Exp $
+# $NetBSD: bsd.own.mk,v 1.1232 2020/11/08 14:55:25 kamil Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1273,7 +1273,7 @@ _MKVARS.no= \
MKARGON2 \
MKARZERO \
MKBSDGREP \
- MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
+ MKCOMPATTESTS MKCOMPATX11 MKCTF \
MKDEBUG MKDEBUGLIB MKDTB MKDTRACE \
MKEXTSRC \
MKFIRMWARE \
@@ -1350,7 +1350,6 @@ MKKYUA:= no
.endif
.if ${MKMAN} == "no"
-MKCATPAGES:= no
MKHTML:= no
.endif
@@ -1374,7 +1373,6 @@ MKOBJDIRS:= no
.endif
.if ${MKSHARE} == "no"
-MKCATPAGES:= no
MKDOC:= no
MKINFO:= no
MKHTML:= no
CVS commit: src/share/mk
Module Name:src Committed By: rin Date: Thu Nov 5 13:03:31 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: Build dtb set for aarch64eb. To generate a diff of this commit: cvs rdiff -u -r1.1229 -r1.1230 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1229 src/share/mk/bsd.own.mk:1.1230 --- src/share/mk/bsd.own.mk:1.1229 Sun Oct 25 09:06:24 2020 +++ src/share/mk/bsd.own.mk Thu Nov 5 13:03:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1229 2020/10/25 09:06:24 tsutsui Exp $ +# $NetBSD: bsd.own.mk,v 1.1230 2020/11/05 13:03:31 rin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1237,6 +1237,7 @@ MKTEGRAFIRMWARE.evbarm= yes # Only build devicetree (dtb) files on armv6, armv7, and aarch64. MKDTB.aarch64= yes +MKDTB.aarch64eb= yes MKDTB.earmv6= yes MKDTB.earmv6hf= yes MKDTB.earmv6eb= yes
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sun Oct 25 09:06:24 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch alpha to USE_XZ_SETS=no, i.e. using gzip for installation sets.
Ok'ed by martin@ in PR/55751. Maybe worth to pullup to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.1228 -r1.1229 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1228 src/share/mk/bsd.own.mk:1.1229
--- src/share/mk/bsd.own.mk:1.1228 Sun Oct 18 19:58:02 2020
+++ src/share/mk/bsd.own.mk Sun Oct 25 09:06:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1228 2020/10/18 19:58:02 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1229 2020/10/25 09:06:24 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1494,7 +1494,6 @@ ${var}?= no
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
${MACHINE} == "sparc64" || \
- ${MACHINE} == "alpha" || \
${MACHINE_ARCH} == "aarch64")
USE_XZ_SETS?= yes
.else
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Oct 18 19:58:02 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
provide a no-addr-of-packed-member for both clang and gcc
To generate a diff of this commit:
cvs rdiff -u -r1.1227 -r1.1228 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1227 src/share/mk/bsd.own.mk:1.1228
--- src/share/mk/bsd.own.mk:1.1227 Sat Oct 17 03:40:21 2020
+++ src/share/mk/bsd.own.mk Sun Oct 18 15:58:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1227 2020/10/17 07:40:21 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1228 2020/10/18 19:58:02 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -872,6 +872,13 @@ GCC_NO_CAST_FUNCTION_TYPE= ${${ACTIVE_CC
GCC_NO_ADDR_OF_PACKED_MEMBER= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=address-of-packed-member :}
#
+# Clang warnings
+#
+CLANG_NO_ADDR_OF_PACKED_MEMBER= ${${ACTIVE_CC} == "clang" :? -Wno-error=address-of-packed-member :}
+
+NO_ADDR_OF_PACKED_MEMBER= ${CLANG_NO_ADDR_OF_PACKED_MEMBER} ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+
+#
# The ia64 port is incomplete.
#
MKGDB.ia64= no
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Oct 18 19:57:44 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Handle the no-addr-of-packed-member only for the files that need it, not
globally.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.71 src/share/mk/bsd.kmodule.mk:1.72
--- src/share/mk/bsd.kmodule.mk:1.71 Wed Sep 9 22:34:13 2020
+++ src/share/mk/bsd.kmodule.mk Sun Oct 18 15:57:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.71 2020/09/10 02:34:13 rin Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.72 2020/10/18 19:57:44 christos Exp $
# We are not building this with PIE
MKPIE=no
@@ -31,8 +31,7 @@ CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -i
CPPFLAGS+= -isystem ${S}/../common/include
CPPFLAGS+= -D_KERNEL -D_MODULE -DSYSCTL_INCLUDE_DESCR
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-error=constant-conversion
# XXX until the kernel is fixed again...
CFLAGS+= -fno-strict-aliasing -Wno-pointer-sign
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Oct 17 07:40:21 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: turn off kernel modules on mips since they don't work yet, and we build 2 or 3 versions of them. To generate a diff of this commit: cvs rdiff -u -r1.1226 -r1.1227 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1226 src/share/mk/bsd.own.mk:1.1227 --- src/share/mk/bsd.own.mk:1.1226 Fri Oct 16 06:55:36 2020 +++ src/share/mk/bsd.own.mk Sat Oct 17 07:40:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1226 2020/10/16 06:55:36 nia Exp $ +# $NetBSD: bsd.own.mk,v 1.1227 2020/10/17 07:40:21 mrg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -833,10 +833,14 @@ MKGDB.or1k= no MKGDB.riscv32= no MKGDB.riscv64= no -# No kernel modules for or1k (yet) +# No kernel modules for or1k, riscv or mips (yet) MKKMOD.or1k= no MKKMOD.riscv32= no MKKMOD.riscv64= no +MKKMOD.mipsel= no +MKKMOD.mipseb= no +MKKMOD.mips64el=no +MKKMOD.mips64eb=no # No profiling for or1k (yet) MKPROFILE.or1k= no
CVS commit: src/share/mk
Module Name:src
Committed By: nia
Date: Fri Oct 16 06:55:36 UTC 2020
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
Log Message:
share/mk: Define some missing X11 libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/share/mk/bsd.README
cvs rdiff -u -r1.1225 -r1.1226 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.331 -r1.332 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.411 src/share/mk/bsd.README:1.412
--- src/share/mk/bsd.README:1.411 Sun Jul 26 09:22:43 2020
+++ src/share/mk/bsd.README Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.411 2020/07/26 09:22:43 rillig Exp $
+# $NetBSD: bsd.README,v 1.412 2020/10/16 06:55:36 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1803,8 +1803,11 @@ DPADD Additional dependencies for the p
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
LIBXCB?= ${DESTDIR}/usr/X11R7/lib/libxcb.a
+ LIBXCOMPOSITE?= ${DESTDIR}/usr/X11R7/lib/libXcomposite.a
+ LIBXDAMAGE?= ${DESTDIR}/usr/X11R7/lib/libXdamage.a
LIBXDMCP?= ${DESTDIR}/usr/X11R7/lib/libXdmcp.a
LIBXEXT?= ${DESTDIR}/usr/X11R7/lib/libXext.a
+ LIBXFIXES?= ${DESTDIR}/usr/X11R7/lib/libXfixes.a
LIBXFONT2?= ${DESTDIR}/usr/X11R7/lib/libXfont2.a
LIBXFONT?= ${DESTDIR}/usr/X11R7/lib/libXfont.a
LIBXFT?= ${DESTDIR}/usr/X11R7/lib/libXft.a
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1225 src/share/mk/bsd.own.mk:1.1226
--- src/share/mk/bsd.own.mk:1.1225 Fri Oct 9 23:58:50 2020
+++ src/share/mk/bsd.own.mk Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1225 2020/10/09 23:58:50 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1226 2020/10/16 06:55:36 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1572,7 +1572,7 @@ HAVE_XORG_GLAMOR?= no
.for _dir in \
xtrans fontconfig freetype evieext mkfontscale bdftopcf \
xorg-cf-files imake xbiff xkeyboard-config \
- xbitmaps appres xeyes xev xedit sessreg pixman \
+ xcompmgr xbitmaps appres xeyes xev xedit sessreg pixman \
beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
glu glw mesa-demos MesaGLUT MesaLib MesaLib.old MesaLib7 \
ico iceauth listres lndir \
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.331 src/share/mk/bsd.prog.mk:1.332
--- src/share/mk/bsd.prog.mk:1.331 Mon Jun 15 01:57:31 2020
+++ src/share/mk/bsd.prog.mk Fri Oct 16 06:55:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.331 2020/06/15 01:57:31 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.332 2020/10/16 06:55:36 nia Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -259,7 +259,7 @@ PAM_STATIC_DPADD=
_X11LIBLIST= dps fntstubs fontcache fontconfig fontenc freetype FS GL GLU \
ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
-Xxf86misc Xxf86vm
+Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
.for _lib in ${_X11LIBLIST}
.ifndef LIB${_lib:tu}
CVS commit: src/share/mk
Module Name:src Committed By: rin Date: Fri Oct 9 23:58:50 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: Build GDB for aarch64eb; it works just fine as far as I can see. To generate a diff of this commit: cvs rdiff -u -r1.1224 -r1.1225 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1224 src/share/mk/bsd.own.mk:1.1225 --- src/share/mk/bsd.own.mk:1.1224 Fri Oct 9 05:41:16 2020 +++ src/share/mk/bsd.own.mk Fri Oct 9 23:58:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1224 2020/10/09 05:41:16 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.1225 2020/10/09 23:58:50 rin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -829,8 +829,6 @@ MKGCC:= no MKGCC:= no .endif -# No GDB support for aarch64eb -MKGDB.aarch64eb=no MKGDB.or1k= no MKGDB.riscv32= no MKGDB.riscv64= no
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri Oct 9 05:41:16 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch powerpc, sh3, vax and m68k to GCC 9. that's everyone.
thanks espcially to rin@ for testing and fixing issues.
To generate a diff of this commit:
cvs rdiff -u -r1.1223 -r1.1224 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1223 src/share/mk/bsd.own.mk:1.1224
--- src/share/mk/bsd.own.mk:1.1223 Fri Oct 9 04:19:43 2020
+++ src/share/mk/bsd.own.mk Fri Oct 9 05:41:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1223 2020/10/09 04:19:43 macallan Exp $
+# $NetBSD: bsd.own.mk,v 1.1224 2020/10/09 05:41:16 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,10 +63,6 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_CPU} == "powerpc" || ${MACHINE_CPU} == "sh3" || \
-${MACHINE_CPU} == "m68k" || ${MACHINE} == "vax"
-HAVE_GCC?= 8
-.endif
HAVE_GCC?= 9
#
CVS commit: src/share/mk
Module Name:src
Committed By: macallan
Date: Fri Oct 9 04:19:43 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
build Xorg server on hppa
To generate a diff of this commit:
cvs rdiff -u -r1.1222 -r1.1223 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1222 src/share/mk/bsd.own.mk:1.1223
--- src/share/mk/bsd.own.mk:1.1222 Sat Sep 26 17:49:50 2020
+++ src/share/mk/bsd.own.mk Fri Oct 9 04:19:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1222 2020/09/26 17:49:50 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1223 2020/10/09 04:19:43 macallan Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1311,6 +1311,7 @@ MKSLJIT= yes
${MACHINE} == "hpcarm" || \
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
+${MACHINE} == "hppa" || \
${MACHINE} == "i386" || \
${MACHINE} == "ibmnws" || \
${MACHINE} == "iyonix" || \
CVS commit: src/share/mk
Module Name:src
Committed By: kamil
Date: Wed Sep 23 23:39:18 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch GDB on i386 to 1100
Confirmed to build and work.
To generate a diff of this commit:
cvs rdiff -u -r1.1220 -r1.1221 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1220 src/share/mk/bsd.own.mk:1.1221
--- src/share/mk/bsd.own.mk:1.1220 Sun Sep 20 14:42:29 2020
+++ src/share/mk/bsd.own.mk Wed Sep 23 23:39:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1220 2020/09/20 14:42:29 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1221 2020/09/23 23:39:18 kamil Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -106,7 +106,7 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
#
# What GDB is used?
#
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
HAVE_GDB?= 1100
.else
HAVE_GDB?= 830
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Sep 20 14:42:29 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch amd64 to gdb-11
To generate a diff of this commit:
cvs rdiff -u -r1.1219 -r1.1220 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1219 src/share/mk/bsd.own.mk:1.1220
--- src/share/mk/bsd.own.mk:1.1219 Tue Sep 15 05:32:31 2020
+++ src/share/mk/bsd.own.mk Sun Sep 20 10:42:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1219 2020/09/15 09:32:31 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1220 2020/09/20 14:42:29 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -106,9 +106,13 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
#
# What GDB is used?
#
+.if ${MACHINE_ARCH} == "x86_64"
+HAVE_GDB?= 1100
+.else
HAVE_GDB?= 830
+.endif
-.if ${HAVE_GDB} == 1000
+.if ${HAVE_GDB} == 1100
EXTERNAL_GDB_SUBDIR= gdb
.elif ${HAVE_GDB} == 830
EXTERNAL_GDB_SUBDIR= gdb.old
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Tue Sep 15 09:32:31 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
reverse HAVE_GCC test, and list remaining GCC 8 platforms:
- powerpc
- sh3
- m68k
- vax
To generate a diff of this commit:
cvs rdiff -u -r1.1218 -r1.1219 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1218 src/share/mk/bsd.own.mk:1.1219
--- src/share/mk/bsd.own.mk:1.1218 Tue Sep 15 09:27:25 2020
+++ src/share/mk/bsd.own.mk Tue Sep 15 09:32:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1218 2020/09/15 09:27:25 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1219 2020/09/15 09:32:31 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,16 +63,11 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
-${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || \
-${MACHINE} == "ia64" || \
-${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
-${MACHINE_CPU} == "hppa" || ${MACHINE_CPU} == "mips" || \
-${MACHINE_CPU} == "riscv"
-HAVE_GCC?= 9
-.else
+.if ${MACHINE_CPU} == "powerpc" || ${MACHINE_CPU} == "sh3" || \
+${MACHINE_CPU} == "m68k" || ${MACHINE} == "vax"
HAVE_GCC?= 8
.endif
+HAVE_GCC?= 9
#
# Platforms that can't run a modern GCC natively
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Sep 15 04:54:41 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
make everyone use gdb.old
To generate a diff of this commit:
cvs rdiff -u -r1.1216 -r1.1217 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1216 src/share/mk/bsd.own.mk:1.1217
--- src/share/mk/bsd.own.mk:1.1216 Mon Sep 14 15:00:28 2020
+++ src/share/mk/bsd.own.mk Tue Sep 15 00:54:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1216 2020/09/14 19:00:28 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1217 2020/09/15 04:54:41 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -111,9 +111,9 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
#
HAVE_GDB?= 830
-.if ${HAVE_GDB} == 830
+.if ${HAVE_GDB} == 1000
EXTERNAL_GDB_SUBDIR= gdb
-.elif ${HAVE_GDB} == 801
+.elif ${HAVE_GDB} == 830
EXTERNAL_GDB_SUBDIR= gdb.old
.else
EXTERNAL_GDB_SUBDIR= /does/not/exist
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Mon Sep 14 19:00:28 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch hppa to gcc 9.
Summary for 883 test programs:
7487 passed test cases.
644 failed test cases.
51 expected failed test cases.
582 skipped test cases.
To generate a diff of this commit:
cvs rdiff -u -r1.1215 -r1.1216 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1215 src/share/mk/bsd.own.mk:1.1216
--- src/share/mk/bsd.own.mk:1.1215 Mon Sep 14 00:11:45 2020
+++ src/share/mk/bsd.own.mk Mon Sep 14 19:00:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1215 2020/09/14 00:11:45 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1216 2020/09/14 19:00:28 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -65,7 +65,8 @@ TOOLCHAIN_MISSING?= no
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
-${MACHINE_CPU} == "riscv" || ${MACHINE} == "ia64"
+${MACHINE_CPU} == "riscv" || ${MACHINE} == "ia64" || \
+${MACHINE_CPU} == "hppa"
HAVE_GCC?= 9
.else
HAVE_GCC?= 8
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Sep 14 00:11:45 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch m68k and sh3 to binutils 2.34. testing sun3 in tme
and landisk in gxemul shows them both to work as well as
binutils 2.31.
that's binutils 2.34 for everyone now.
To generate a diff of this commit:
cvs rdiff -u -r1.1214 -r1.1215 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1214 src/share/mk/bsd.own.mk:1.1215
--- src/share/mk/bsd.own.mk:1.1214 Sun Sep 13 23:33:21 2020
+++ src/share/mk/bsd.own.mk Mon Sep 14 00:11:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1214 2020/09/13 23:33:21 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1215 2020/09/14 00:11:45 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -95,9 +95,6 @@ MKGCCCMDS?= no
#
# What binutils is used?
#
-.if ${MACHINE_CPU} == "sh3" || ${MACHINE_CPU} == "m68k"
-HAVE_BINUTILS?= 231
-.endif
HAVE_BINUTILS?= 234
.if ${HAVE_BINUTILS} == 234
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Sep 13 23:33:21 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
fix syntax errors in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.1213 -r1.1214 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1213 src/share/mk/bsd.own.mk:1.1214
--- src/share/mk/bsd.own.mk:1.1213 Sun Sep 13 23:32:04 2020
+++ src/share/mk/bsd.own.mk Sun Sep 13 23:33:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1213 2020/09/13 23:32:04 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1214 2020/09/13 23:33:21 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -64,7 +64,7 @@ TOOLCHAIN_MISSING?= no
# What GCC is used?
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
-${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" ||
+${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
${MACHINE_CPU} == "riscv" || ${MACHINE} == "ia64"
HAVE_GCC?= 9
.else
@@ -95,7 +95,7 @@ MKGCCCMDS?= no
#
# What binutils is used?
#
-.if ${MACHINE_CPU} == "sh3" ${MACHINE_CPU} == "m68k"
+.if ${MACHINE_CPU} == "sh3" || ${MACHINE_CPU} == "m68k"
HAVE_BINUTILS?= 231
.endif
HAVE_BINUTILS?= 234
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Sep 13 20:59:18 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch vax and ia64 to binutils 2.34. reverse the list and leave
the remaining m68k (untested), riscv (riscv64 ld is missing emulations
for 32 bit targets), and sh3 (untested).
To generate a diff of this commit:
cvs rdiff -u -r1.1211 -r1.1212 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1211 src/share/mk/bsd.own.mk:1.1212
--- src/share/mk/bsd.own.mk:1.1211 Sun Sep 13 02:37:32 2020
+++ src/share/mk/bsd.own.mk Sun Sep 13 20:59:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1211 2020/09/13 02:37:32 kamil Exp $
+# $NetBSD: bsd.own.mk,v 1.1212 2020/09/13 20:59:18 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -92,6 +92,36 @@ MKGCCCMDS?= no
.endif
#
+# What binutils is used?
+#
+.if ${MACHINE_CPU} == "sh3" || ${MACHINE_CPU} == "riscv" || \
+${MACHINE_CPU} == "m68k"
+HAVE_BINUTILS?= 231
+.endif
+HAVE_BINUTILS?= 234
+
+.if ${HAVE_BINUTILS} == 234
+EXTERNAL_BINUTILS_SUBDIR= binutils
+.elif ${HAVE_BINUTILS} == 231
+EXTERNAL_BINUTILS_SUBDIR= binutils.old
+.else
+EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
+.endif
+
+#
+# What GDB is used?
+#
+HAVE_GDB?= 830
+
+.if ${HAVE_GDB} == 830
+EXTERNAL_GDB_SUBDIR= gdb
+.elif ${HAVE_GDB} == 801
+EXTERNAL_GDB_SUBDIR= gdb.old
+.else
+EXTERNAL_GDB_SUBDIR= /does/not/exist
+.endif
+
+#
# What OpenSSL is used?
#
HAVE_OPENSSL?= 11
@@ -172,41 +202,6 @@ USE_SSP?= yes
.endif
#
-# What GDB is used?
-#
-HAVE_GDB?= 830
-
-.if ${HAVE_GDB} == 830
-EXTERNAL_GDB_SUBDIR= gdb
-.elif ${HAVE_GDB} == 801
-EXTERNAL_GDB_SUBDIR= gdb.old
-.else
-EXTERNAL_GDB_SUBDIR= /does/not/exist
-.endif
-
-#
-# What binutils is used?
-#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
-${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
-${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64" || \
-${MACHINE} == "sun2" || ${MACHINE} == "alpha" || \
-${MACHINE_CPU} == "mips" || ${MACHINE} == "sparc"
-HAVE_BINUTILS?= 234
-.else
-HAVE_BINUTILS?= 231
-.endif
-
-.if ${HAVE_BINUTILS} == 234
-EXTERNAL_BINUTILS_SUBDIR= binutils
-.elif ${HAVE_BINUTILS} == 231
-EXTERNAL_BINUTILS_SUBDIR= binutils.old
-.else
-EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
-.endif
-
-#
# What version of jemalloc we use (100 is the one
# built-in to libc from 2005 (pre version 3).
#
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Sep 10 06:02:30 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch sparc to binutils 2.34. tested on an ss20.
To generate a diff of this commit:
cvs rdiff -u -r1.1207 -r1.1208 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1207 src/share/mk/bsd.own.mk:1.1208
--- src/share/mk/bsd.own.mk:1.1207 Mon Sep 7 10:19:02 2020
+++ src/share/mk/bsd.own.mk Thu Sep 10 06:02:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1207 2020/09/07 10:19:02 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1208 2020/09/10 06:02:30 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -161,7 +161,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE} == "sun2" || ${MACHINE} == "alpha" || \
-${MACHINE_CPU} == "mips"
+${MACHINE_CPU} == "mips" || ${MACHINE} == "sparc"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Thu Sep 10 02:34:13 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Turn off -mpltseq for kernel modules on powerpc for GCC >= 9.
Otherwise, object files compiled with -mlongcall contain relocation types
referring PLT, which our in-kernel linker cannot handle.
This ends up with failure in kernel module load with
``kobj_reloc: unexpected relocation type 31'' (31 == R_PPC_PLT16_HA here).
See descriptions for -mlongcall in gcc(1) of GCC9 for more details.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.70 src/share/mk/bsd.kmodule.mk:1.71
--- src/share/mk/bsd.kmodule.mk:1.70 Sun Sep 6 07:20:28 2020
+++ src/share/mk/bsd.kmodule.mk Thu Sep 10 02:34:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.70 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.71 2020/09/10 02:34:13 rin Exp $
# We are not building this with PIE
MKPIE=no
@@ -51,6 +51,7 @@ CFLAGS+= -fno-common -fno-unwind-tables
CFLAGS+= -mlong-calls -mno-space-regs -mfast-indirect-calls
.elif ${MACHINE_CPU} == "powerpc"
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mlongcall :}
+CFLAGS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -mno-pltseq :}
.elif ${MACHINE_CPU} == "vax"
CFLAGS+= -fno-pic
.elif ${MACHINE_CPU} == "riscv"
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Sep 5 13:38:43 UTC 2020
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
disable -Wabi for GCC 9.
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.302 src/share/mk/bsd.sys.mk:1.303
--- src/share/mk/bsd.sys.mk:1.302 Fri Jul 3 16:12:16 2020
+++ src/share/mk/bsd.sys.mk Sat Sep 5 13:38:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.302 2020/07/03 16:12:16 maxv Exp $
+# $NetBSD: bsd.sys.mk,v 1.303 2020/09/05 13:38:43 mrg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -103,7 +103,7 @@ CFLAGS+= -Wcast-qual -Wwrite-strings
CFLAGS+= -Wextra -Wno-unused-parameter
# Readd -Wno-sign-compare to override -Wextra with clang
CFLAGS+= -Wno-sign-compare
-.if "${ACTIVE_CC}" == "gcc" && ${HAVE_GCC} != "8"
+.if "${ACTIVE_CC}" == "gcc" && ${HAVE_GCC} < 8
# XXX: Won't warn about anything. -Wabi warns about differences from
# the most up-to-date ABI, which in g++ 8 is used by default.
CXXFLAGS+= -Wabi
CVS commit: src/share/mk
Module Name:src
Committed By: jakllsch
Date: Wed Sep 2 15:17:19 UTC 2020
Modified Files:
src/share/mk: bsd.endian.mk
Log Message:
Teach bsd.endian.mk about aarch64eb
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/mk/bsd.endian.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.endian.mk
diff -u src/share/mk/bsd.endian.mk:1.22 src/share/mk/bsd.endian.mk:1.23
--- src/share/mk/bsd.endian.mk:1.22 Fri Sep 19 17:45:42 2014
+++ src/share/mk/bsd.endian.mk Wed Sep 2 15:17:19 2020
@@ -1,11 +1,11 @@
-# $NetBSD: bsd.endian.mk,v 1.22 2014/09/19 17:45:42 matt Exp $
+# $NetBSD: bsd.endian.mk,v 1.23 2020/09/02 15:17:19 jakllsch Exp $
.if !defined(_BSD_ENDIAN_MK_)
_BSD_ENDIAN_MK_=1
.include
-.if ${MACHINE_ARCH} == "aarch64" || \
+.if (!empty(MACHINE_ARCH:Maarch64*) && empty(MACHINE_ARCH:Maarch64eb)) || \
${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "arm" || \
(!empty(MACHINE_ARCH:Mearm*) && empty(MACHINE_ARCH:Mearm*eb)) || \
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Aug 20 03:08:07 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
make GCC 8 consumers to use gcc.old.
To generate a diff of this commit:
cvs rdiff -u -r1.1204 -r1.1205 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1204 src/share/mk/bsd.own.mk:1.1205
--- src/share/mk/bsd.own.mk:1.1204 Sun Aug 16 06:43:05 2020
+++ src/share/mk/bsd.own.mk Thu Aug 20 03:08:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1204 2020/08/16 06:43:05 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1205 2020/08/20 03:08:07 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -75,9 +75,9 @@ MKGCCCMDS?= no
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
-.if ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 8
EXTERNAL_GCC_SUBDIR?= gcc.old
-.elif ${HAVE_GCC} == 8
+.elif ${HAVE_GCC} == 9
EXTERNAL_GCC_SUBDIR?= gcc
.else
EXTERNAL_GCC_SUBDIR?= /does/not/exist
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Aug 16 06:43:05 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch netbsd/m68k to GCC 8.
special thanks to rin@ for fixing many things and figuring out
what was the major issue (STACK_BOUNDARY.)
To generate a diff of this commit:
cvs rdiff -u -r1.1203 -r1.1204 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1203 src/share/mk/bsd.own.mk:1.1204
--- src/share/mk/bsd.own.mk:1.1203 Tue Aug 11 09:51:57 2020
+++ src/share/mk/bsd.own.mk Sun Aug 16 06:43:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1203 2020/08/11 09:51:57 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1204 2020/08/16 06:43:05 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,9 +63,6 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_CPU} == "m68k"
-HAVE_GCC?= 7
-.endif
HAVE_GCC?= 8
#
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Aug 9 21:13:38 UTC 2020
Modified Files:
src/share/mk: bsd.host.mk
Log Message:
Expose 64 bit fileystems API's on Linux and make the default FS API 64 bits
Should unbreak newfs's of fs's, using the tool version of newfs.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/mk/bsd.host.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.host.mk
diff -u src/share/mk/bsd.host.mk:1.4 src/share/mk/bsd.host.mk:1.5
--- src/share/mk/bsd.host.mk:1.4 Sun Feb 25 13:53:23 2018
+++ src/share/mk/bsd.host.mk Sun Aug 9 17:13:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.host.mk,v 1.4 2018/02/25 18:53:23 chs Exp $
+# $NetBSD: bsd.host.mk,v 1.5 2020/08/09 21:13:38 christos Exp $
.if !defined(_BSD_HOST_MK_)
_BSD_HOST_MK_=1
@@ -65,6 +65,10 @@ HOST_MKDEP?= CC=${HOST_CC:Q} mkdep
HOST_MKDEPCXX?= CC=${HOST_CXX:Q} mkdep
.endif
+.if ${HOST_OSTYPE:MLinux*}
+HOST_CPPFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+.endif
+
.if ${NEED_OWN_INSTALL_TARGET} != "no"
HOST_INSTALL_FILE?= ${INSTALL} ${COPY} ${PRESERVE} ${RENAME}
HOST_INSTALL_DIR?= ${INSTALL} -d
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Mon Jul 27 08:26:09 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Don't define _LKM. LKMs are dead. Long live modules.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.68 src/share/mk/bsd.kmodule.mk:1.69
--- src/share/mk/bsd.kmodule.mk:1.68 Mon May 11 10:21:24 2020
+++ src/share/mk/bsd.kmodule.mk Mon Jul 27 08:26:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.68 2020/05/11 10:21:24 skrll Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.69 2020/07/27 08:26:09 skrll Exp $
# We are not building this with PIE
MKPIE=no
@@ -29,7 +29,7 @@ MKLDSCRIPT?= no
CFLAGS+= -ffreestanding ${COPTS}
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -isystem $S -isystem $S/arch
CPPFLAGS+= -isystem ${S}/../common/include
-CPPFLAGS+= -D_KERNEL -D_LKM -D_MODULE -DSYSCTL_INCLUDE_DESCR
+CPPFLAGS+= -D_KERNEL -D_MODULE -DSYSCTL_INCLUDE_DESCR
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
CVS commit: src/share/mk
Module Name:src Committed By: rillig Date: Sun Jul 26 09:22:43 UTC 2020 Modified Files: src/share/mk: bsd.README Log Message: share/mk/bsd.README: fix typo To generate a diff of this commit: cvs rdiff -u -r1.410 -r1.411 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.410 src/share/mk/bsd.README:1.411 --- src/share/mk/bsd.README:1.410 Mon Jul 13 07:22:51 2020 +++ src/share/mk/bsd.README Sun Jul 26 09:22:43 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.410 2020/07/13 07:22:51 mrg Exp $ +# $NetBSD: bsd.README,v 1.411 2020/07/26 09:22:43 rillig Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -94,7 +94,7 @@ TOOL_xxx A tool that is provided as part TOOL_xxx variables should refer to tools that are already installed on the host system. -The following variables that control how things are made/installed that +The following variables control how things are made/installed that are not set by default. These should not be set by Makefiles; they're for the user to define in MAKECONF (see , below, or mk.conf(5)) or on the make(1) command line:
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Tue Jul 21 14:42:44 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch x68k to HAVE_XORG_SERVER_VER=120.
Confirmed both color "Graph" VRAM and mono "Text" VRAM servers on XM6i.
To generate a diff of this commit:
cvs rdiff -u -r1.1201 -r1.1202 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1201 src/share/mk/bsd.own.mk:1.1202
--- src/share/mk/bsd.own.mk:1.1201 Mon Jul 20 14:24:13 2020
+++ src/share/mk/bsd.own.mk Tue Jul 21 14:42:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1201 2020/07/20 14:24:13 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1202 2020/07/21 14:42:44 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1520,8 +1520,7 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
${MACHINE} == "mac68k" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "sgimips" || \
-${MACHINE} == "vax" || \
-${MACHINE} == "x68k"
+${MACHINE} == "vax"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Mon Jul 20 14:24:13 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch ports using MI wsfb drivers to HAVE_XORG_SERVER_VER=120.
Xorg wsfb servers from 1.20 for dreamcast (16bpp), hp300 (8bpp), and
luna68k (1bpp) work fine even on NetBSD 9.0, and zaurus is also
confirmed working.
Discussed with mrg@ and macallan@ on tech-x11:
https://mail-index.netbsd.org/tech-x11/2020/07/thread1.html#002098
To generate a diff of this commit:
cvs rdiff -u -r1.1200 -r1.1201 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1200 src/share/mk/bsd.own.mk:1.1201
--- src/share/mk/bsd.own.mk:1.1200 Sat Jul 4 21:02:16 2020
+++ src/share/mk/bsd.own.mk Mon Jul 20 14:24:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1200 2020/07/04 21:02:16 chs Exp $
+# $NetBSD: bsd.own.mk,v 1.1201 2020/07/20 14:24:13 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1517,17 +1517,11 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.if \
${MACHINE} == "alpha" || \
${MACHINE} == "amiga" || \
-${MACHINE} == "ews4800mips" || \
-${MACHINE} == "hpcarm" || \
-${MACHINE} == "hpcmips" || \
-${MACHINE} == "hpcsh" || \
${MACHINE} == "mac68k" || \
${MACHINE} == "netwinder" || \
-${MACHINE} == "newsmips" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "vax" || \
-${MACHINE} == "x68k" || \
-${MACHINE} == "zaurus"
+${MACHINE} == "x68k"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Mon Jul 20 13:55:08 UTC 2020
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
Fix typos in ${X11INCS.DIX} include paths. PR/55500
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.134 src/share/mk/bsd.x11.mk:1.135
--- src/share/mk/bsd.x11.mk:1.134 Sun Feb 23 10:28:16 2020
+++ src/share/mk/bsd.x11.mk Mon Jul 20 13:55:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.134 2020/02/23 10:28:16 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.135 2020/07/20 13:55:08 tsutsui Exp $
.include
@@ -46,8 +46,8 @@ X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTE
X11FLAGS.DIX= -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
-DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
-DHAVE_XORG_CONFIG_H
-X11INCS.DIX= -I${X11INCSDIR}/freetype2 \
- -I${X11INCSDIR}/pixman-1 \
+X11INCS.DIX= -I${X11INCDIR}/freetype2 \
+ -I${X11INCDIR}/pixman-1 \
-I$(X11SRCDIR.xorg-server)/include \
-I$(X11SRCDIR.xorg-server)/Xext \
-I$(X11SRCDIR.xorg-server)/composite \
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Mon Jul 13 07:22:51 UTC 2020 Modified Files: src/share/mk: bsd.README Log Message: MKLLVMRT is automatically enabled on x86 and arm64, not mesa18+. To generate a diff of this commit: cvs rdiff -u -r1.409 -r1.410 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.409 src/share/mk/bsd.README:1.410 --- src/share/mk/bsd.README:1.409 Thu Jul 2 10:22:28 2020 +++ src/share/mk/bsd.README Mon Jul 13 07:22:51 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.409 2020/07/02 10:22:28 jmcneill Exp $ +# $NetBSD: bsd.README,v 1.410 2020/07/13 07:22:51 mrg Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -342,7 +342,7 @@ MKLLVMRT If "yes", build the LLVM PIC li various Mesa backend and the native JIT of the target architecture, if supported. (Radeon R300 and newer, LLVMPIPE for most.) - Default: no, enabled automatically with HAVE_MESA_VER=18. + Default: no, enabled automatically with X11 on x86 and aarch64. MKLVM If "no", don't build or install the logical volume manager and device mapper tools and libraries
CVS commit: src/share/mk
Module Name:src
Committed By: maxv
Date: Fri Jul 3 16:12:16 UTC 2020
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Enable trace-cmp.
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.301 src/share/mk/bsd.sys.mk:1.302
--- src/share/mk/bsd.sys.mk:1.301 Fri May 15 19:07:01 2020
+++ src/share/mk/bsd.sys.mk Fri Jul 3 16:12:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.301 2020/05/15 19:07:01 maxv Exp $
+# $NetBSD: bsd.sys.mk,v 1.302 2020/07/03 16:12:16 maxv Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -237,7 +237,7 @@ CFLAGS+= ${CPUFLAGS}
AFLAGS+= ${CPUFLAGS}
.if ${KCOV:U0} > 0
-KCOVFLAGS= -fsanitize-coverage=trace-pc
+KCOVFLAGS= -fsanitize-coverage=trace-pc,trace-cmp
.for f in subr_kcov.c subr_asan.c subr_csan.c subr_msan.c ubsan.c
KCOVFLAGS.${f}= # empty
.endfor
CVS commit: src/share/mk
Module Name:src
Committed By: jmcneill
Date: Thu Jul 2 10:22:28 UTC 2020
Modified Files:
src/share/mk: bsd.README
Log Message:
Document OBJMACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.408 -r1.409 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.408 src/share/mk/bsd.README:1.409
--- src/share/mk/bsd.README:1.408 Sun Jun 21 13:29:05 2020
+++ src/share/mk/bsd.README Thu Jul 2 10:22:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.408 2020/06/21 13:29:05 lukem Exp $
+# $NetBSD: bsd.README,v 1.409 2020/07/02 10:22:28 jmcneill Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1525,6 +1525,9 @@ OBJMACHINE If this is set but MAKEOBJDIR
object directories or links named "obj.${MACHINE}";
otherwise, just creates ones named "obj".
+OBJMACHINE_ARCH If set with OBJMACHINE, creates object directories or
+ links named "obj.${MACHINE}-${MACHINE_ARCH}".
+
USR_OBJMACHINE If set, and the current directory is a subdirectory of
${BSDSRCDIR}, create object directory in the
corresponding subdirectory of ${BSDOBJDIR}.${MACHINE};
CVS commit: src/share/mk
Module Name:src
Committed By: lukem
Date: Wed Jul 1 07:38:29 UTC 2020
Modified Files:
src/share/mk: bsd.dep.mk
Log Message:
bsd.dep.mk: fix "make tags" (again)
[repeat revision 1.85]
Fix "make tags" to actually build a tags file:
- Use !commands() instead of !target(), so that the rule actually works
- Write to ${.OBJDIR}/tags for read-only source (don't know why ${.TARGET}
isn't sufficient).
- Only match *.[cly] from ${.ALLSRCS} - just excluding *.h causes failures
because of ${targ}: subdir-${targ} in bsd.subdir.mk.
Thanks to uwe@ for assistance.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/share/mk/bsd.dep.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.86 src/share/mk/bsd.dep.mk:1.87
--- src/share/mk/bsd.dep.mk:1.86 Mon Jun 22 01:04:26 2020
+++ src/share/mk/bsd.dep.mk Wed Jul 1 07:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.86 2020/06/22 01:04:26 lukem Exp $
+# $NetBSD: bsd.dep.mk,v 1.87 2020/07/01 07:38:29 lukem Exp $
# Basic targets
realdepend: beforedepend .depend afterdepend
@@ -94,16 +94,16 @@ _MKDEP_FILEFLAGS=
# Clean rules
.if defined(SRCS) && !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} tags ${CLEANDEPEND}
.endif
# Custom rules
-.if !target(tags)
+.if !commands(tags)
tags: ${SRCS}
.if defined(SRCS) && !empty(SRCS)
${_MKTARGET_CREATE}
- -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
- ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
+ -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:M*.[cly]} | \
+ ${TOOL_SED} "s;\${.CURDIR}/;;" > ${.OBJDIR}/tags
.endif
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: lukem
Date: Mon Jun 22 01:04:26 UTC 2020
Modified Files:
src/share/mk: bsd.dep.mk
Log Message:
bsd.dep.mk: revert 1.85 (for now)
Revert my recent 1.85 revision that fixed "make tags". It causes too
much build breakage elsewhere in the tree that needs to be resolved first.
Issues include:
- Directories using TESTS_CXX with .cpp and .cxx extension instead of the
default .cc extension (see bsd.prog.mk). Most of these have been fixed.
- external/gpl3/gcc build of .cc files. (No idea what's wrong there).
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/share/mk/bsd.dep.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.85 src/share/mk/bsd.dep.mk:1.86
--- src/share/mk/bsd.dep.mk:1.85 Sun Jun 21 03:39:21 2020
+++ src/share/mk/bsd.dep.mk Mon Jun 22 01:04:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.85 2020/06/21 03:39:21 lukem Exp $
+# $NetBSD: bsd.dep.mk,v 1.86 2020/06/22 01:04:26 lukem Exp $
# Basic targets
realdepend: beforedepend .depend afterdepend
@@ -94,16 +94,16 @@ _MKDEP_FILEFLAGS=
# Clean rules
.if defined(SRCS) && !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
.endif
# Custom rules
-.if !commands(tags)
+.if !target(tags)
tags: ${SRCS}
.if defined(SRCS) && !empty(SRCS)
${_MKTARGET_CREATE}
- -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:M*.[cly]} | \
- ${TOOL_SED} "s;\${.CURDIR}/;;" > ${.OBJDIR}/tags
+ -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
+ ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
.endif
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: lukem
Date: Sun Jun 21 13:29:05 UTC 2020
Modified Files:
src/share/mk: bsd.README
Log Message:
document PROGS and PROGS_CXX, and default c++ SRCS
To generate a diff of this commit:
cvs rdiff -u -r1.407 -r1.408 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.407 src/share/mk/bsd.README:1.408
--- src/share/mk/bsd.README:1.407 Mon Jun 15 01:57:31 2020
+++ src/share/mk/bsd.README Sun Jun 21 13:29:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.407 2020/06/15 01:57:31 christos Exp $
+# $NetBSD: bsd.README,v 1.408 2020/06/21 13:29:05 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1645,8 +1645,16 @@ PROG_CXX If defined, the name of the pro
PROGNAME The name that the above program will be installed as, if
different from ${PROG}.
+PROGS Multiple programs to build from a single directory.
+ Defaults to PROG. For each program ${_P} in ${PROGS},
+ uses SRCS.${_P}, defaulting to ${_P}.c.
+
+PROGS_CXX Multiple C++ programs to build from a single directory.
+ Defaults to PROG_CXX. For each program ${_P} in ${PROGS_CXX},
+ uses SRCS.${_P}, defaulting to ${_P}.cc.
+
SRCS List of source files to build the program. If SRCS is not
- defined, it's assumed to be ${PROG}.c.
+ defined, it's assumed to be ${PROG}.c or ${PROG_CXX}.cc.
DPSRCS List of source files which are needed for generating
dependencies, but are not needed in ${SRCS}.
CVS commit: src/share/mk
Module Name:src
Committed By: lukem
Date: Sun Jun 21 03:39:21 UTC 2020
Modified Files:
src/share/mk: bsd.dep.mk
Log Message:
bsd.dep.mk: fix "make tags"
Fix "make tags" to actually build a tags file:
- Use !commands() instead of !target(), so that the rule actually works
- Write to ${.OBJDIR}/tags for read-only source (don't know why ${.TARGET}
isn't sufficient).
- Only match *.[cly] from ${.ALLSRCS} - just excluding *.h causes failures
because of ${targ}: subdir-${targ} in bsd.subdir.mk.
Thanks to uwe@ for assistance.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/share/mk/bsd.dep.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.84 src/share/mk/bsd.dep.mk:1.85
--- src/share/mk/bsd.dep.mk:1.84 Mon Jan 21 21:11:54 2019
+++ src/share/mk/bsd.dep.mk Sun Jun 21 03:39:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.84 2019/01/21 21:11:54 christos Exp $
+# $NetBSD: bsd.dep.mk,v 1.85 2020/06/21 03:39:21 lukem Exp $
# Basic targets
realdepend: beforedepend .depend afterdepend
@@ -94,16 +94,16 @@ _MKDEP_FILEFLAGS=
# Clean rules
.if defined(SRCS) && !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} tags ${CLEANDEPEND}
.endif
# Custom rules
-.if !target(tags)
+.if !commands(tags)
tags: ${SRCS}
.if defined(SRCS) && !empty(SRCS)
${_MKTARGET_CREATE}
- -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
- ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
+ -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:M*.[cly]} | \
+ ${TOOL_SED} "s;\${.CURDIR}/;;" > ${.OBJDIR}/tags
.endif
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Sat Jun 6 22:06:42 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
sun2 and vax have no native TLS support, so avoid using modern jemalloc
as it has a couple of nasty race conditions when using TSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1198 -r1.1199 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1198 src/share/mk/bsd.own.mk:1.1199
--- src/share/mk/bsd.own.mk:1.1198 Tue Jun 2 14:26:01 2020
+++ src/share/mk/bsd.own.mk Sat Jun 6 22:06:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1198 2020/06/02 14:26:01 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1199 2020/06/06 22:06:42 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -181,7 +181,11 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
# What version of jemalloc we use (100 is the one
# built-in to libc from 2005 (pre version 3).
#
+.if ${MACHINE_ARCH} == "vax" || ${MACHINE} == "sun2"
+HAVE_JEMALLOC?= 100
+.else
HAVE_JEMALLOC?= 510
+.endif
.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
CVS commit: src/share/mk
Module Name:src
Committed By: jmcneill
Date: Tue Jun 2 14:26:01 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Set USE_XZ_SETS for evbarm-aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.1197 -r1.1198 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1197 src/share/mk/bsd.own.mk:1.1198
--- src/share/mk/bsd.own.mk:1.1197 Fri May 29 01:20:43 2020
+++ src/share/mk/bsd.own.mk Tue Jun 2 14:26:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1197 2020/05/29 01:20:43 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1198 2020/06/02 14:26:01 jmcneill Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1451,7 +1451,8 @@ ${var}?= no
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
${MACHINE} == "sparc64" || \
- ${MACHINE} == "alpha")
+ ${MACHINE} == "alpha" || \
+ ${MACHINE_ARCH} == "aarch64")
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Jun 1 14:39:14 UTC 2020
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
Log Message:
1. if ${LIBISPRIVATE} == "pic", create _pic.a so that we can embed the library
to another shared object
2. Don't compare ${LIBISPRIVATE} to "yes", because there are 3 places in
Makefiles which set it to empty (this was a bug)
3. For private libraries, don't create .so* files
To generate a diff of this commit:
cvs rdiff -u -r1.405 -r1.406 src/share/mk/bsd.README
cvs rdiff -u -r1.382 -r1.383 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.405 src/share/mk/bsd.README:1.406
--- src/share/mk/bsd.README:1.405 Sat May 30 16:47:59 2020
+++ src/share/mk/bsd.README Mon Jun 1 10:39:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.405 2020/05/30 20:47:59 christos Exp $
+# $NetBSD: bsd.README,v 1.406 2020/06/01 14:39:14 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1342,6 +1342,8 @@ LIBISMODULE If not "no", install as ${LI
LIBISPRIVATE If not "no", act as "MKDEBUGLIB=no MKLINT=no MKPIC=no
MKPROFILE=no", and don't install the (.a) library.
This is useful for "build only" helper libraries.
+ If set to "pic", then a _pic.a library is also produced,
+ so that it can be incorporated into other shared objects.
Default: no
LIBISCXX If not "no", Use ${CXX} instead of ${CC} to link
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.382 src/share/mk/bsd.lib.mk:1.383
--- src/share/mk/bsd.lib.mk:1.382 Sat May 30 15:51:32 2020
+++ src/share/mk/bsd.lib.mk Mon Jun 1 10:39:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.382 2020/05/30 19:51:32 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.383 2020/06/01 14:39:14 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -30,7 +30,7 @@ MKLINT:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
-. elif ${MKPICLIB} == "no"
+. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
MKPROFILE:= no
@@ -118,6 +118,7 @@ print-shlib-teeny:
@false
.endif
+.if ${LIBISPRIVATE} == "no"
.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR)# {
.if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR)
.if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY)
@@ -129,6 +130,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB
SHLIB_FULLVERSION=${SHLIB_MAJOR}
.endif
.endif # }
+.endif
# add additional suffixes not exported.
# .po is used for profiling object files.
@@ -170,7 +172,7 @@ MKSHLIBOBJS= no
# We only add -g to the shared library objects
# because we don't currently split .a archives.
CSHLIBFLAGS+= -g
-.if ${LIBISPRIVATE} == "yes"
+.if ${LIBISPRIVATE} != "no"
CFLAGS+= -g
.endif
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sat May 30 19:51:32 UTC 2020
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Allow LIBISPRIVATE to build a pic version of itself for embedding into
other shared libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.381 -r1.382 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.381 src/share/mk/bsd.lib.mk:1.382
--- src/share/mk/bsd.lib.mk:1.381 Sun May 10 02:38:24 2020
+++ src/share/mk/bsd.lib.mk Sat May 30 15:51:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.381 2020/05/10 06:38:24 maxv Exp $
+# $NetBSD: bsd.lib.mk,v 1.382 2020/05/30 19:51:32 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -30,7 +30,7 @@ MKLINT:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
-. else
+. elif ${MKPICLIB} == "no"
MKPIC:= no
. endif
MKPROFILE:= no
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri May 29 01:20:43 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
remove useless MACHINE_ARCH == sh3 check for GCC 8.
To generate a diff of this commit:
cvs rdiff -u -r1.1196 -r1.1197 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1196 src/share/mk/bsd.own.mk:1.1197
--- src/share/mk/bsd.own.mk:1.1196 Fri May 29 00:14:07 2020
+++ src/share/mk/bsd.own.mk Fri May 29 01:20:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1196 2020/05/29 00:14:07 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1197 2020/05/29 01:20:43 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,8 +63,7 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_ARCH} == "sh3" || \
-${MACHINE_CPU} == "m68k"
+.if ${MACHINE_CPU} == "m68k"
HAVE_GCC?= 7
.endif
HAVE_GCC?= 8
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri May 29 00:14:07 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch vax to GCC 8. testing in simh shows the same set of bugs.
To generate a diff of this commit:
cvs rdiff -u -r1.1195 -r1.1196 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1195 src/share/mk/bsd.own.mk:1.1196
--- src/share/mk/bsd.own.mk:1.1195 Wed May 27 10:53:18 2020
+++ src/share/mk/bsd.own.mk Fri May 29 00:14:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1195 2020/05/27 10:53:18 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1196 2020/05/29 00:14:07 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,8 +63,7 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE} == "vax" || \
-${MACHINE_ARCH} == "sh3" || \
+.if ${MACHINE_ARCH} == "sh3" || \
${MACHINE_CPU} == "m68k"
HAVE_GCC?= 7
.endif
CVS commit: src/share/mk
Module Name:src Committed By: jmcneill Date: Wed May 27 10:53:18 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: Set MKDTB=yes for armv6 To generate a diff of this commit: cvs rdiff -u -r1.1194 -r1.1195 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1194 src/share/mk/bsd.own.mk:1.1195 --- src/share/mk/bsd.own.mk:1.1194 Wed May 27 06:06:37 2020 +++ src/share/mk/bsd.own.mk Wed May 27 10:53:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1194 2020/05/27 06:06:37 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.1195 2020/05/27 10:53:18 jmcneill Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1195,8 +1195,12 @@ MKRADEONFIRMWARE.aarch64= yes # Only install the tegra firmware on evbarm. MKTEGRAFIRMWARE.evbarm= yes -# Only build devicetree (dtb) files on armv7 and aarch64. +# Only build devicetree (dtb) files on armv6, armv7, and aarch64. MKDTB.aarch64= yes +MKDTB.earmv6= yes +MKDTB.earmv6hf= yes +MKDTB.earmv6eb= yes +MKDTB.earmv6hfeb= yes MKDTB.earmv7= yes MKDTB.earmv7hf= yes MKDTB.earmv7eb= yes
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Wed May 27 06:06:38 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch alpha to GCC 8. tested by rin@, same atf result as with GCC 7.
thanks rin! only vax, sh3 and m68k left.
To generate a diff of this commit:
cvs rdiff -u -r1.1193 -r1.1194 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1193 src/share/mk/bsd.own.mk:1.1194
--- src/share/mk/bsd.own.mk:1.1193 Tue May 26 19:29:59 2020
+++ src/share/mk/bsd.own.mk Wed May 27 06:06:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1193 2020/05/26 19:29:59 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1194 2020/05/27 06:06:37 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,8 +63,7 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE} == "alpha" || \
-${MACHINE} == "vax" || \
+.if ${MACHINE} == "vax" || \
${MACHINE_ARCH} == "sh3" || \
${MACHINE_CPU} == "m68k"
HAVE_GCC?= 7
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue May 26 19:29:59 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Move sun2 and alpha to new binutils
To generate a diff of this commit:
cvs rdiff -u -r1.1192 -r1.1193 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1192 src/share/mk/bsd.own.mk:1.1193
--- src/share/mk/bsd.own.mk:1.1192 Sun May 24 17:09:49 2020
+++ src/share/mk/bsd.own.mk Tue May 26 15:29:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1192 2020/05/24 21:09:49 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1193 2020/05/26 19:29:59 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -165,7 +165,8 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
-${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64"
+${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64" || \
+${MACHINE} == "sun2" || ${MACHINE} == "alpha"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sun May 24 21:09:49 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add GNU_ARCH for earmv5hf{,eb}.
To generate a diff of this commit:
cvs rdiff -u -r1.1191 -r1.1192 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1191 src/share/mk/bsd.own.mk:1.1192
--- src/share/mk/bsd.own.mk:1.1191 Wed May 20 15:43:29 2020
+++ src/share/mk/bsd.own.mk Sun May 24 21:09:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1191 2020/05/20 15:43:29 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1192 2020/05/24 21:09:49 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -868,7 +868,9 @@ GNU_ARCH.earmhfeb=armeb
GNU_ARCH.earmv4=armv4
GNU_ARCH.earmv4eb=armv4eb
GNU_ARCH.earmv5=arm
+GNU_ARCH.earmv5hf=arm
GNU_ARCH.earmv5eb=armeb
+GNU_ARCH.earmv5hfeb=armeb
GNU_ARCH.earmv6=armv6
GNU_ARCH.earmv6hf=armv6
GNU_ARCH.earmv6eb=armv6eb
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun May 24 19:58:02 UTC 2020
Modified Files:
src/share/mk: bsd.README bsd.prog.mk
Log Message:
Add libuv
To generate a diff of this commit:
cvs rdiff -u -r1.403 -r1.404 src/share/mk/bsd.README
cvs rdiff -u -r1.328 -r1.329 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.403 src/share/mk/bsd.README:1.404
--- src/share/mk/bsd.README:1.403 Mon May 18 17:19:35 2020
+++ src/share/mk/bsd.README Sun May 24 15:58:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.403 2020/05/18 21:19:35 jmcneill Exp $
+# $NetBSD: bsd.README,v 1.404 2020/05/24 19:58:02 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1758,6 +1758,7 @@ DPADD Additional dependencies for the p
LIBUNBOUND?= ${DESTDIR}/usr/lib/libunbound.a
LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a
LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
+ LIBUV?= ${DESTDIR}/usr/lib/libuv.a
LIBWIND?= ${DESTDIR}/usr/lib/libwind.a
LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a
LIBY?= ${DESTDIR}/usr/lib/liby.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.328 src/share/mk/bsd.prog.mk:1.329
--- src/share/mk/bsd.prog.mk:1.328 Sat Apr 4 09:33:14 2020
+++ src/share/mk/bsd.prog.mk Sun May 24 15:58:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.328 2020/04/04 13:33:14 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.329 2020/05/24 19:58:02 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -208,6 +208,7 @@ _LIBLIST=\
unbound \
usbhid \
util \
+ uv \
wind \
wrap \
y \
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed May 20 15:43:29 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch sparc64 to binutils 2.34
To generate a diff of this commit:
cvs rdiff -u -r1.1190 -r1.1191 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1190 src/share/mk/bsd.own.mk:1.1191
--- src/share/mk/bsd.own.mk:1.1190 Tue May 19 08:07:44 2020
+++ src/share/mk/bsd.own.mk Wed May 20 15:43:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1190 2020/05/19 08:07:44 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1191 2020/05/20 15:43:29 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -165,7 +165,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
-${MACHINE_ARCH} == "hppa"
+${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Tue May 19 08:59:36 UTC 2020
Modified Files:
src/share/mk: bsd.dtb.mk
Log Message:
Fix dtblist; our echo(1) does not interpret \t.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/mk/bsd.dtb.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dtb.mk
diff -u src/share/mk/bsd.dtb.mk:1.1 src/share/mk/bsd.dtb.mk:1.2
--- src/share/mk/bsd.dtb.mk:1.1 Mon May 18 21:19:35 2020
+++ src/share/mk/bsd.dtb.mk Tue May 19 08:59:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dtb.mk,v 1.1 2020/05/18 21:19:35 jmcneill Exp $
+# $NetBSD: bsd.dtb.mk,v 1.2 2020/05/19 08:59:36 rin Exp $
.include
.include
@@ -74,10 +74,12 @@ dtbinstall: dtb
dtblist:
.if defined(DTSSUBDIR)
- @echo ".${DTBINSTDIR}\t\tdtb-base-boot\tdtb"
+ @echo ".${DTBINSTDIR}\t\tdtb-base-boot\tdtb" | \
+ ${TOOL_SED} 's/\\t/ /g'
.endif
.for _dtb in ${DTB}
- @echo ".${DTBINSTDIR}/${_dtb}\t\tdtb-base-boot\tdtb"
+ @echo ".${DTBINSTDIR}/${_dtb}\t\tdtb-base-boot\tdtb" | \
+ ${TOOL_SED} 's/\\t/ /g'
.endfor
clean: .PHONY
CVS commit: src/share/mk
Module Name:src Committed By: rin Date: Tue May 19 08:07:44 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: Try to fix fallout from addition of dtb.tgz; MKDTB was added to both _MKVARS.yes and _MKVARS.no. Remove it from the former. To generate a diff of this commit: cvs rdiff -u -r1.1189 -r1.1190 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1189 src/share/mk/bsd.own.mk:1.1190 --- src/share/mk/bsd.own.mk:1.1189 Mon May 18 21:19:35 2020 +++ src/share/mk/bsd.own.mk Tue May 19 08:07:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1189 2020/05/18 21:19:35 jmcneill Exp $ +# $NetBSD: bsd.own.mk,v 1.1190 2020/05/19 08:07:44 rin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1090,7 +1090,7 @@ _MKVARS.yes= \ MKBINUTILS \ MKBSDTAR \ MKCOMPLEX MKCVS MKCXX \ - MKDOC MKDTB MKDTC \ + MKDOC MKDTC \ MKDYNAMICROOT \ MKGCC MKGDB MKGROFF \ MKHESIOD MKHTML \
CVS commit: src/share/mk
Module Name:src
Committed By: maxv
Date: Fri May 15 19:07:01 UTC 2020
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Don't add KCOV instrumentation on top of the KUBSAN instrumentation,
this is useless and too bloated.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.300 src/share/mk/bsd.sys.mk:1.301
--- src/share/mk/bsd.sys.mk:1.300 Sat Apr 4 07:03:57 2020
+++ src/share/mk/bsd.sys.mk Fri May 15 19:07:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.300 2020/04/04 07:03:57 maxv Exp $
+# $NetBSD: bsd.sys.mk,v 1.301 2020/05/15 19:07:01 maxv Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -238,7 +238,7 @@ AFLAGS+= ${CPUFLAGS}
.if ${KCOV:U0} > 0
KCOVFLAGS= -fsanitize-coverage=trace-pc
-.for f in subr_kcov.c subr_asan.c subr_csan.c subr_msan.c
+.for f in subr_kcov.c subr_asan.c subr_csan.c subr_msan.c ubsan.c
KCOVFLAGS.${f}= # empty
.endfor
CFLAGS+= ${KCOVFLAGS.${.IMPSRC:T}:U${KCOVFLAGS}}
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Mon May 11 10:21:24 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Update the list of hppa options to build working kernel modules.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.67 src/share/mk/bsd.kmodule.mk:1.68
--- src/share/mk/bsd.kmodule.mk:1.67 Sat May 2 09:15:30 2020
+++ src/share/mk/bsd.kmodule.mk Mon May 11 10:21:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.67 2020/05/02 09:15:30 rin Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.68 2020/05/11 10:21:24 skrll Exp $
# We are not building this with PIE
MKPIE=no
@@ -47,7 +47,7 @@ CFLAGS+= -march=armv8-a+nofp+nosimd
.elif ${MACHINE_CPU} == "arm"
CFLAGS+= -fno-common -fno-unwind-tables
.elif ${MACHINE_CPU} == "hppa"
-CFLAGS+= -mlong-calls
+CFLAGS+= -mlong-calls -mno-space-regs -mfast-indirect-calls
.elif ${MACHINE_CPU} == "powerpc"
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mlongcall :}
.elif ${MACHINE_CPU} == "vax"
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Tue May 5 20:47:39 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch hppa to new binutils (2.34)
To generate a diff of this commit:
cvs rdiff -u -r1.1187 -r1.1188 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1187 src/share/mk/bsd.own.mk:1.1188
--- src/share/mk/bsd.own.mk:1.1187 Mon Apr 27 03:15:12 2020
+++ src/share/mk/bsd.own.mk Tue May 5 20:47:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1187 2020/04/27 03:15:12 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1188 2020/05/05 20:47:38 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -164,7 +164,8 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
-${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm"
+${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
+${MACHINE_ARCH} == "hppa"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Sat May 2 19:46:58 UTC 2020 Modified Files: src/share/mk: bsd.README Log Message: document MKCOMPATMODULES To generate a diff of this commit: cvs rdiff -u -r1.401 -r1.402 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.401 src/share/mk/bsd.README:1.402 --- src/share/mk/bsd.README:1.401 Sat Apr 4 19:54:06 2020 +++ src/share/mk/bsd.README Sat May 2 15:46:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.401 2020/04/04 23:54:06 christos Exp $ +# $NetBSD: bsd.README,v 1.402 2020/05/02 19:46:58 christos Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -144,6 +144,9 @@ MKCOMPATX11 If "yes", build and instal building and installing src/compat. Default: no +MKCOMPATMODULES If "no", don't build compat modules (xen, etc.) + Default: yes + MKCOMPLEX If "no", don't build libm support for Default: yes
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sat May 2 09:15:30 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Fix previous; add missing .kmod.debug to realall.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.66 src/share/mk/bsd.kmodule.mk:1.67
--- src/share/mk/bsd.kmodule.mk:1.66 Fri May 1 22:23:00 2020
+++ src/share/mk/bsd.kmodule.mk Sat May 2 09:15:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.66 2020/05/01 22:23:00 christos Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.67 2020/05/02 09:15:30 rin Exp $
# We are not building this with PIE
MKPIE=no
@@ -114,7 +114,7 @@ PROGDEBUG:= ${PROG}.debug
.endif
# Build rules
-realall: ${PROG}
+realall: ${PROG} ${PROGDEBUG}
OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Fri May 1 22:23:00 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Install .kmod.debug files for kernel crash debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.65 src/share/mk/bsd.kmodule.mk:1.66
--- src/share/mk/bsd.kmodule.mk:1.65 Sat Apr 4 19:19:08 2020
+++ src/share/mk/bsd.kmodule.mk Fri May 1 18:23:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.65 2020/04/04 23:19:08 christos Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.66 2020/05/01 22:23:00 christos Exp $
# We are not building this with PIE
MKPIE=no
@@ -12,9 +12,9 @@ CFLAGS+= -g
CTFFLAGS= -L VERSION
CTFMFLAGS= -t -L VERSION
# Keep symbols if built with "-g"
-.if !empty(COPTS:M*-g*)
-CTFFLAGS+= -g
-CTFMFLAGS+= -g
+.if !empty(COPTS:M*-g*) || ${MKDEBUG:Uno} == "yes"
+CTFFLAGS+= -g
+CTFMFLAGS+=-g
.endif
.endif
@@ -108,6 +108,10 @@ KMODSCRIPT= ${KMODSCRIPTSRC}
.endif
PROG?= ${KMOD}.kmod
+.if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${PROG}) && \
+empty(SRCS:M*.sh)
+PROGDEBUG:= ${PROG}.debug
+.endif
# Build rules
realall: ${PROG}
@@ -169,55 +173,76 @@ ${PROG}: ${OBJS} ${DPADD} ${KMODSCRIPT}
${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS}
.endif
+.if defined(PROGDEBUG)
+${PROGDEBUG}: ${PROG}
+ ${_MKTARGET_CREATE}
+ ( ${OBJCOPY} --only-keep-debug ${PROG} ${PROGDEBUG} \
+ && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
+ --add-gnu-debuglink=${PROGDEBUG} ${PROG} \
+ ) || (rm -f ${PROGDEBUG}; false)
+.endif
+
# Install rules
.if !target(kmodinstall)
.if !defined(KMODULEDIR)
.if ${KERNEL_DIR:Uno} == "yes"
-KMODULEDIR= ${DESTDIR}/netbsd/modules/${KMOD}
-_INST_DIRS= ${DESTDIR}/netbsd
-_INST_DIRS+= ${DESTDIR}/netbsd/modules
-_INST_DIRS+= ${DESTDIR}/netbsd/modules/${KMOD}
+_INST_DIRS= /netbsd
+_INST_DIRS+= /netbsd/modules
+KMODULEDIR= /netbsd/modules/${KMOD}
.else
# Ensure these are recorded properly in METALOG on unprived installes:
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh -k
KMODULEARCHDIR?= ${MACHINE}
-_INST_DIRS= ${DESTDIR}/stand/${KMODULEARCHDIR}
-_INST_DIRS+= ${DESTDIR}/stand/${KMODULEARCHDIR}/${_OSRELEASE}
-_INST_DIRS+= ${DESTDIR}/stand/${KMODULEARCHDIR}/${_OSRELEASE}/modules
-KMODULEDIR= ${DESTDIR}/stand/${KMODULEARCHDIR}/${_OSRELEASE}/modules/${KMOD}
+_INST_DIRS= /stand/${KMODULEARCHDIR}
+_INST_DIRS+= /stand/${KMODULEARCHDIR}/${_OSRELEASE}
+_INST_DIRS+= /stand/${KMODULEARCHDIR}/${_OSRELEASE}/modules
+KMODULEDIR= /stand/${KMODULEARCHDIR}/${_OSRELEASE}/modules/${KMOD}
.endif
.endif
-_PROG:= ${KMODULEDIR}/${PROG} # installed path
+_INST_DIRS+= ${KMODULEDIR}
+_PROG:= ${DESTDIR}${KMODULEDIR}/${PROG} # installed path
+
+.if defined(PROGDEBUG)
+.for i in ${_INST_DIRS}
+_DEBUG_INST_DIRS += ${DEBUGDIR}${i}
+.endfor
+_INST_DIRS += ${_DEBUG_INST_DIRS}
+_PROGDEBUG:= ${DESTDIR}${DEBUGDIR}${KMODULEDIR}/${PROG}.debug
+.endif
+
+.for _P P in ${_PROG} ${PROG} ${_PROGDEBUG} ${PROGDEBUG}
.if ${MKUPDATE} == "no"
-${_PROG}! ${PROG} # install rule
-.if !defined(BUILD) && !make(all) && !make(${PROG})
-${_PROG}! .MADE # no build at install
+${_P}! ${P} # install rule
+.if !defined(BUILD) && !make(all) && !make(${P})
+${_P}! .MADE # no build at install
.endif
.else
-${_PROG}: ${PROG} # install rule
-.if !defined(BUILD) && !make(all) && !make(${PROG})
-${_PROG}: .MADE # no build at install
+${_P}: ${P} # install rule
+.if !defined(BUILD) && !make(all) && !make(${P})
+${_P}: .MADE # no build at install
.endif
.endif
${_MKTARGET_INSTALL}
dirs=${_INST_DIRS:Q}; \
for d in $$dirs; do \
- ${INSTALL_DIR} $$d; \
+ ${INSTALL_DIR} ${DESTDIR}$$d; \
done
- ${INSTALL_DIR} ${KMODULEDIR}
${INSTALL_FILE} -o ${KMODULEOWN} -g ${KMODULEGRP} -m ${KMODULEMODE} \
${.ALLSRC} ${.TARGET}
-kmodinstall:: ${_PROG}
+kmodinstall:: ${_P}
.PHONY: kmodinstall
-.PRECIOUS: ${_PROG}# keep if install fails
+.PRECIOUS: ${_P}# keep if install fails
+.endfor
-.undef _PROG
+.undef _PPROG
+.undef _PPROGDEBUG
.endif # !target(kmodinstall)
# Clean rules
CLEANFILES+= a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${LOBJS}
+CLEANFILES+= ${PROGDEBUG}
CLEANFILES+= ${PROG}.map
.if ${MKLDSCRIPT} == "yes"
CLEANFILES+= kldscript
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Apr 27 03:15:12 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
invert the GCC 7/8 conditional.
only alpha, vax, m68k and sh3 are still on GCC 7.
To generate a diff of this commit:
cvs rdiff -u -r1.1186 -r1.1187 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1186 src/share/mk/bsd.own.mk:1.1187
--- src/share/mk/bsd.own.mk:1.1186 Sun Apr 26 22:06:01 2020
+++ src/share/mk/bsd.own.mk Mon Apr 27 03:15:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1186 2020/04/26 22:06:01 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1187 2020/04/27 03:15:12 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,22 +63,13 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE} == "amd64" || \
-${MACHINE} == "i386" || \
-${MACHINE} == "ia64" || \
-${MACHINE} == "sparc" || \
-${MACHINE} == "sparc64" || \
-${MACHINE_CPU} == "aarch64" || \
-${MACHINE_CPU} == "arm" || \
-${MACHINE_CPU} == "mips" || \
-${MACHINE_CPU} == "powerpc" || \
-${MACHINE_CPU} == "powerpc64" || \
-${MACHINE_CPU} == "riscv" || \
-${MACHINE_CPU} == "hppa"
-HAVE_GCC?= 8
-.else
+.if ${MACHINE} == "alpha" || \
+${MACHINE} == "vax" || \
+${MACHINE_ARCH} == "sh3" || \
+${MACHINE_CPU} == "m68k"
HAVE_GCC?= 7
.endif
+HAVE_GCC?= 8
#
# Platforms that can't run a modern GCC natively
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Apr 26 22:06:01 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch mips to GCC 8.
To generate a diff of this commit:
cvs rdiff -u -r1.1185 -r1.1186 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1185 src/share/mk/bsd.own.mk:1.1186
--- src/share/mk/bsd.own.mk:1.1185 Sun Apr 26 20:13:43 2020
+++ src/share/mk/bsd.own.mk Sun Apr 26 22:06:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1185 2020/04/26 20:13:43 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1186 2020/04/26 22:06:01 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -70,6 +70,7 @@ TOOLCHAIN_MISSING?= no
${MACHINE} == "sparc64" || \
${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "arm" || \
+${MACHINE_CPU} == "mips" || \
${MACHINE_CPU} == "powerpc" || \
${MACHINE_CPU} == "powerpc64" || \
${MACHINE_CPU} == "riscv" || \
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Apr 26 20:13:43 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch hppa to gcc 8
To generate a diff of this commit:
cvs rdiff -u -r1.1184 -r1.1185 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1184 src/share/mk/bsd.own.mk:1.1185
--- src/share/mk/bsd.own.mk:1.1184 Thu Apr 23 19:24:53 2020
+++ src/share/mk/bsd.own.mk Sun Apr 26 20:13:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1184 2020/04/23 19:24:53 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1185 2020/04/26 20:13:43 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -72,7 +72,8 @@ TOOLCHAIN_MISSING?= no
${MACHINE_CPU} == "arm" || \
${MACHINE_CPU} == "powerpc" || \
${MACHINE_CPU} == "powerpc64" || \
-${MACHINE_CPU} == "riscv"
+${MACHINE_CPU} == "riscv" || \
+${MACHINE_CPU} == "hppa"
HAVE_GCC?= 8
.else
HAVE_GCC?= 7
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu Apr 23 19:24:53 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Swirch arm to the new binutils
To generate a diff of this commit:
cvs rdiff -u -r1.1183 -r1.1184 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1183 src/share/mk/bsd.own.mk:1.1184
--- src/share/mk/bsd.own.mk:1.1183 Wed Apr 15 19:10:27 2020
+++ src/share/mk/bsd.own.mk Thu Apr 23 15:24:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1183 2020/04/15 23:10:27 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1184 2020/04/23 19:24:53 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -170,7 +170,8 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
# What binutils is used?
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"
+${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
+${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Wed Apr 15 23:10:27 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
need more ||
To generate a diff of this commit:
cvs rdiff -u -r1.1182 -r1.1183 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1182 src/share/mk/bsd.own.mk:1.1183
--- src/share/mk/bsd.own.mk:1.1182 Wed Apr 15 19:09:28 2020
+++ src/share/mk/bsd.own.mk Wed Apr 15 19:10:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1182 2020/04/15 23:09:28 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1183 2020/04/15 23:10:27 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -169,7 +169,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
# What binutils is used?
#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"
HAVE_BINUTILS?= 234
.else
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Wed Apr 15 23:09:28 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
fix backslash
To generate a diff of this commit:
cvs rdiff -u -r1.1181 -r1.1182 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1181 src/share/mk/bsd.own.mk:1.1182
--- src/share/mk/bsd.own.mk:1.1181 Wed Apr 15 17:28:08 2020
+++ src/share/mk/bsd.own.mk Wed Apr 15 19:09:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1181 2020/04/15 21:28:08 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1182 2020/04/15 23:09:28 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -170,7 +170,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
# What binutils is used?
#
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
-${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" \
+${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"
HAVE_BINUTILS?= 234
.else
HAVE_BINUTILS?= 231
