CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Tue Jul 16 21:10:16 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch arm to new binutils (2.42) To generate a diff of this commit: cvs rdiff -u -r1.1391 -r1.1392 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.
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Tue Jul 16 21:10:16 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch arm to new binutils (2.42)
To generate a diff of this commit:
cvs rdiff -u -r1.1391 -r1.1392 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.1391 src/share/mk/bsd.own.mk:1.1392
--- src/share/mk/bsd.own.mk:1.1391 Mon Jul 15 08:37:59 2024
+++ src/share/mk/bsd.own.mk Tue Jul 16 21:10:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1391 2024/07/15 08:37:59 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1392 2024/07/16 21:10:16 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -119,6 +119,7 @@ MKGCCCMDS?= no
#
.if \
${MACHINE_CPU} == "aarch64" || \
+${MACHINE_CPU} == "arm" || \
${MACHINE_CPU} == "hppa" || \
${MACHINE_CPU} == "mips" || \
${MACHINE_CPU} == "riscv" || \
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Mon Jul 15 08:37:59 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch hppa to new binutils (2.42)
To generate a diff of this commit:
cvs rdiff -u -r1.1390 -r1.1391 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.1390 src/share/mk/bsd.own.mk:1.1391
--- src/share/mk/bsd.own.mk:1.1390 Sun Jul 14 09:54:07 2024
+++ src/share/mk/bsd.own.mk Mon Jul 15 08:37:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1390 2024/07/14 09:54:07 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1391 2024/07/15 08:37:59 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -119,6 +119,7 @@ MKGCCCMDS?= no
#
.if \
${MACHINE_CPU} == "aarch64" || \
+${MACHINE_CPU} == "hppa" || \
${MACHINE_CPU} == "mips" || \
${MACHINE_CPU} == "riscv" || \
${MACHINE_ARCH} == "x86_64"
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Mon Jul 15 08:37:59 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch hppa to new binutils (2.42) To generate a diff of this commit: cvs rdiff -u -r1.1390 -r1.1391 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.
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Jul 14 09:54:07 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch aarch64 (evbarm64) to new binutils (2.42)
To generate a diff of this commit:
cvs rdiff -u -r1.1389 -r1.1390 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.1389 src/share/mk/bsd.own.mk:1.1390
--- src/share/mk/bsd.own.mk:1.1389 Sun Jul 14 06:43:11 2024
+++ src/share/mk/bsd.own.mk Sun Jul 14 09:54:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1389 2024/07/14 06:43:11 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1390 2024/07/14 09:54:07 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -118,6 +118,7 @@ MKGCCCMDS?= no
# What binutils is used?
#
.if \
+${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "mips" || \
${MACHINE_CPU} == "riscv" || \
${MACHINE_ARCH} == "x86_64"
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Sun Jul 14 09:54:07 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch aarch64 (evbarm64) to new binutils (2.42) To generate a diff of this commit: cvs rdiff -u -r1.1389 -r1.1390 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.
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Jul 14 06:43:11 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch RISC-V to new binutils (2.42)
To generate a diff of this commit:
cvs rdiff -u -r1.1388 -r1.1389 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.1388 src/share/mk/bsd.own.mk:1.1389
--- src/share/mk/bsd.own.mk:1.1388 Sat Jul 13 03:38:12 2024
+++ src/share/mk/bsd.own.mk Sun Jul 14 06:43:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1388 2024/07/13 03:38:12 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1389 2024/07/14 06:43:11 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -119,6 +119,7 @@ MKGCCCMDS?= no
#
.if \
${MACHINE_CPU} == "mips" || \
+${MACHINE_CPU} == "riscv" || \
${MACHINE_ARCH} == "x86_64"
HAVE_BINUTILS?= 242
.else
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Sun Jul 14 06:43:11 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch RISC-V to new binutils (2.42) To generate a diff of this commit: cvs rdiff -u -r1.1388 -r1.1389 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.
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sat Jul 13 03:38:12 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: Switch mips to binutils 2.42
There is no new regression observed for brief tests on OCTEON ({,n}64eb)
as well as on MIPSSIM{,64} (all ABI combinations).
Let us see what happens for PR toolchain/57241; I've never reproduced
this failure locally. It may be precisely host-environment dependent,
and therefore very hard to track :(
To generate a diff of this commit:
cvs rdiff -u -r1.1387 -r1.1388 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.1387 src/share/mk/bsd.own.mk:1.1388
--- src/share/mk/bsd.own.mk:1.1387 Wed Jul 10 07:46:16 2024
+++ src/share/mk/bsd.own.mk Sat Jul 13 03:38:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1387 2024/07/10 07:46:16 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1388 2024/07/13 03:38:12 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -118,6 +118,7 @@ MKGCCCMDS?= no
# What binutils is used?
#
.if \
+${MACHINE_CPU} == "mips" || \
${MACHINE_ARCH} == "x86_64"
HAVE_BINUTILS?= 242
.else
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Sat Jul 13 03:38:12 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: Switch mips to binutils 2.42
There is no new regression observed for brief tests on OCTEON ({,n}64eb)
as well as on MIPSSIM{,64} (all ABI combinations).
Let us see what happens for PR toolchain/57241; I've never reproduced
this failure locally. It may be precisely host-environment dependent,
and therefore very hard to track :(
To generate a diff of this commit:
cvs rdiff -u -r1.1387 -r1.1388 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Wed Jul 10 07:46:16 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch amd64 to binutils-2.42
To generate a diff of this commit:
cvs rdiff -u -r1.1386 -r1.1387 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.1386 src/share/mk/bsd.own.mk:1.1387
--- src/share/mk/bsd.own.mk:1.1386 Tue Jul 9 04:20:34 2024
+++ src/share/mk/bsd.own.mk Wed Jul 10 03:46:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1386 2024/07/09 08:20:34 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1387 2024/07/10 07:46:16 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -117,7 +117,12 @@ MKGCCCMDS?= no
#
# What binutils is used?
#
+.if \
+${MACHINE_ARCH} == "x86_64"
+HAVE_BINUTILS?= 242
+.else
HAVE_BINUTILS?= 239
+.endif
.if ${HAVE_BINUTILS} == 242
EXTERNAL_BINUTILS_SUBDIR= binutils
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Wed Jul 10 07:46:16 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: switch amd64 to binutils-2.42 To generate a diff of this commit: cvs rdiff -u -r1.1386 -r1.1387 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.
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Tue Jul 9 08:20:34 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: Fix MKCOMPAT=no build for mipsn64e[bl]
To generate a diff of this commit:
cvs rdiff -u -r1.1385 -r1.1386 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.1385 src/share/mk/bsd.own.mk:1.1386
--- src/share/mk/bsd.own.mk:1.1385 Sun Jun 30 15:56:08 2024
+++ src/share/mk/bsd.own.mk Tue Jul 9 08:20:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1385 2024/06/30 15:56:08 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1386 2024/07/09 08:20:34 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1592,7 +1592,7 @@ OBJECT_FMTS=
OBJECT_FMTS+= elf32
.endif
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH:M*64*} != ""
-. if !(${MKCOMPAT:Uyes} == "no" && ${MACHINE_CPU} == "mips")
+. if !(${MKCOMPAT:Uyes} == "no" && ${MACHINE_ARCH:Mmips64*} != "")
OBJECT_FMTS+= elf64
. endif
.endif
CVS commit: src/share/mk
Module Name:src Committed By: rin Date: Tue Jul 9 08:20:34 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: bsd.own.mk: Fix MKCOMPAT=no build for mipsn64e[bl] To generate a diff of this commit: cvs rdiff -u -r1.1385 -r1.1386 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Jul 4 21:48:19 UTC 2024
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
bump xorg-server version.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 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.157 src/share/mk/bsd.x11.mk:1.158
--- src/share/mk/bsd.x11.mk:1.157 Wed Jul 3 09:37:05 2024
+++ src/share/mk/bsd.x11.mk Thu Jul 4 21:48:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.157 2024/07/03 09:37:05 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.158 2024/07/04 21:48:19 mrg Exp $
.include
@@ -133,7 +133,7 @@ XORG_VERSION_CURRENT="(((${XORG_SERVER_M
.else
XORG_SERVER_MAJOR= 21
XORG_SERVER_MINOR= 1
-XORG_SERVER_TEENY= 9
+XORG_SERVER_TEENY= 13
XORG_VERSION_CURRENT="((1000) + ((${XORG_SERVER_MAJOR}) * 10) + ((${XORG_SERVER_MINOR}) * 1000) + ${XORG_SERVER_TEENY})"
.endif
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Thu Jul 4 21:48:19 UTC 2024 Modified Files: src/share/mk: bsd.x11.mk Log Message: bump xorg-server version. To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Wed Jul 3 09:37:05 UTC 2024
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
avoid an error in the previous with unexpected inputs.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 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.156 src/share/mk/bsd.x11.mk:1.157
--- src/share/mk/bsd.x11.mk:1.156 Wed Jul 3 09:24:04 2024
+++ src/share/mk/bsd.x11.mk Wed Jul 3 09:37:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.156 2024/07/03 09:24:04 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.157 2024/07/03 09:37:05 mrg Exp $
.include
@@ -451,10 +451,14 @@ _X11MANTRANSFORMS_BOTH=\
XCONFIGFILEMAN 'xorg.conf(5)' \
xlocaledir ${X11LIBDIR}/locale \
xorgversion ${XORGVERSION:C/ /%/gW} \
- PACKAGE_STRING ${PACKAGE_STRING} \
XSERVERNAME Xorg \
xservername Xorg
+.if !empty(PACKAGE_STRING)
+_X11MANTRANSFORMS_BOTH+=\
+ PACKAGE_STRING ${PACKAGE_STRING}
+.endif
+
.for __def__ __value__ in ${_X11MANTRANSFORMS_BOTH}
_X11MANTRANSFORM+= \
__${__def__}__ ${__value__} \
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Wed Jul 3 09:37:05 UTC 2024 Modified Files: src/share/mk: bsd.x11.mk Log Message: avoid an error in the previous with unexpected inputs. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Wed Jul 3 09:24:04 UTC 2024
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
add some more transformations for man pages, needed by new appres.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 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.155 src/share/mk/bsd.x11.mk:1.156
--- src/share/mk/bsd.x11.mk:1.155 Thu May 9 06:34:51 2024
+++ src/share/mk/bsd.x11.mk Wed Jul 3 09:24:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.155 2024/05/09 06:34:51 nia Exp $
+# $NetBSD: bsd.x11.mk,v 1.156 2024/07/03 09:24:04 mrg Exp $
.include
@@ -149,6 +149,20 @@ PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PA
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
+_CONFIGURE_PATH=
+.if exists(${X11SRCDIR.${PROG}}/configure)
+_CONFIGURE_PATH=${X11SRCDIR.${PROG}}/configure
+.elif exists(${X11SRCDIR.${LIB}}/configure)
+_CONFIGURE_PATH=${X11SRCDIR.${LIB}}/configure
+.endif
+
+.if exists(${_CONFIGURE_PATH})
+_PRINT_PACKAGE_STRING= ${TOOL_AWK} -F= '/^PACKAGE_STRING=/ { print $$2 }' \
+ ${_CONFIGURE_PATH}
+PACKAGE_STRING!= ${_PRINT_PACKAGE_STRING}
+.else
+PACKAGE_STRING= "X11 program"
+.endif
# Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other
# things. Transformed from the "CppSedMagic" macro from "Imake.rules".
@@ -412,13 +426,16 @@ _X11MANTRANSFORM= \
_X11MANTRANSFORMS_BOTH=\
${X11EXTRAMANTRANSFORMS_BOTH} \
appmansuffix 1 \
+ APP_MAN_SUFFIX 1 \
LIB_MAN_SUFFIX 3 \
libmansuffix 3 \
oslibmansuffix 3 \
drivermansuffix 4 \
filemansuffix 5 \
+ MISC_MAN_SUFFIX 7 \
miscmansuffix 7 \
adminmansuffix 8 \
+ XORG_MAN_PAGE "X Version 11" \
logdir /var/log \
sysconfdir /etc \
apploaddir ${X11ROOTDIR}/lib/X11/app-defaults \
@@ -434,6 +451,7 @@ _X11MANTRANSFORMS_BOTH=\
XCONFIGFILEMAN 'xorg.conf(5)' \
xlocaledir ${X11LIBDIR}/locale \
xorgversion ${XORGVERSION:C/ /%/gW} \
+ PACKAGE_STRING ${PACKAGE_STRING} \
XSERVERNAME Xorg \
xservername Xorg
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Wed Jul 3 09:24:04 UTC 2024 Modified Files: src/share/mk: bsd.x11.mk Log Message: add some more transformations for man pages, needed by new appres. To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Jun 30 15:56:08 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch everyone to binutils.old
To generate a diff of this commit:
cvs rdiff -u -r1.1384 -r1.1385 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.1384 src/share/mk/bsd.own.mk:1.1385
--- src/share/mk/bsd.own.mk:1.1384 Sat Jun 29 19:25:28 2024
+++ src/share/mk/bsd.own.mk Sun Jun 30 11:56:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1384 2024/06/29 23:25:28 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1385 2024/06/30 15:56:08 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -119,9 +119,9 @@ MKGCCCMDS?= no
#
HAVE_BINUTILS?= 239
-.if ${HAVE_BINUTILS} == 239
+.if ${HAVE_BINUTILS} == 242
EXTERNAL_BINUTILS_SUBDIR= binutils
-.elif ${HAVE_BINUTILS} == 234
+.elif ${HAVE_BINUTILS} == 239
EXTERNAL_BINUTILS_SUBDIR= binutils.old
.else
EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Sun Jun 30 15:56:08 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: switch everyone to binutils.old To generate a diff of this commit: cvs rdiff -u -r1.1384 -r1.1385 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Jun 29 23:25:29 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch powerpc and mips to GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.1383 -r1.1384 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.1383 src/share/mk/bsd.own.mk:1.1384
--- src/share/mk/bsd.own.mk:1.1383 Sat Jun 22 23:26:37 2024
+++ src/share/mk/bsd.own.mk Sat Jun 29 23:25:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1383 2024/06/22 23:26:37 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1384 2024/06/29 23:25:28 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -78,6 +78,8 @@ TOOLCHAIN_MISSING?= no
.if \
${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "arm" || \
+${MACHINE_CPU} == "mips" || \
+${MACHINE_CPU} == "powerpc" || \
${MACHINE_CPU} == "riscv" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "i386" || \
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Jun 29 23:25:29 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: switch powerpc and mips to GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.1383 -r1.1384 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.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Fri Jun 28 21:58:24 UTC 2024
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
Log Message:
bsd.lib.mk: Resolve VERSION_MAP like a target prerequisite.
Not sure what I did before to make ${${VERSION_MAP}:P} fail to work;
can't reproduce it any more!
PR lib/58376
To generate a diff of this commit:
cvs rdiff -u -r1.448 -r1.449 src/share/mk/bsd.README
cvs rdiff -u -r1.406 -r1.407 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.448 src/share/mk/bsd.README:1.449
--- src/share/mk/bsd.README:1.448 Fri Jun 28 20:45:26 2024
+++ src/share/mk/bsd.README Fri Jun 28 21:58:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.448 2024/06/28 20:45:26 riastradh Exp $
+# $NetBSD: bsd.README,v 1.449 2024/06/28 21:58:24 riastradh Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1014,11 +1014,8 @@ LIB_EXPSYM File listing all symbols expe
from the actual ones with `make update-symbols'.
VERSION_MAP Path to an ld version script to use when linking the
- library. If a relative path, interpreted relative to
- the object directory; use ${.CURDIR}/foo.map if foo.map
- is in the source directory. Interpretation of relative
- path may be changed later to search .PATH like target
- prerequisites.
+ library. Resolved from .PATH like a target
+ prerequisite.
The include file includes the file named "../Makefile.inc"
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.406 src/share/mk/bsd.lib.mk:1.407
--- src/share/mk/bsd.lib.mk:1.406 Fri Jun 28 20:45:26 2024
+++ src/share/mk/bsd.lib.mk Fri Jun 28 21:58:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.406 2024/06/28 20:45:26 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.407 2024/06/28 21:58:24 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -615,36 +615,15 @@ LIBCC:= ${CC}
# VERSION_MAP
#
# Path to an ld version script to use when linking the library.
-# If a relative path, interpreted relative to the object
-# directory; use ${.CURDIR}/foo.map if foo.map is in the source
-# directory. Interpretation of relative path may be changed
-# later to search .PATH like target prerequisites.
+# Resolved from .PATH like a target prerequisite.
#
-# Implemented by adding -Wl,--version-script=${VERSION_MAP} to
-# LDFLAGS.
+# Implemented by adding -Wl,--version-script=${${VERSION_MAP}:P}
+# to LDFLAGS, and by adding ${VERSION_MAP} to DPADD to make it a
+# target prerequisite so :P works.
#
.if !empty(VERSION_MAP)
-# It is tempting to use the make :P modifier here so that you can just
-# write
-#
-# VERSION_MAP= foo.map
-#
-# instead of
-#
-# VERSION_MAP= ${.CURDIR}/foo.map
-#
-# but it appears that :P works _only_ with literal names, not with
-# expansions, so while you could write
-#
-# VERSION_MAP= ${foo.map:P}
-#
-# in the makefile, we can't set
-#
-# LDFLAGS+= -Wl,--version-script=${${VERSION_MAP}:P}
-#
-# here.
DPADD+= ${VERSION_MAP}
-LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
+LDFLAGS+= -Wl,--version-script=${${VERSION_MAP}:P}
.endif
_LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Fri Jun 28 21:58:24 UTC 2024
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
Log Message:
bsd.lib.mk: Resolve VERSION_MAP like a target prerequisite.
Not sure what I did before to make ${${VERSION_MAP}:P} fail to work;
can't reproduce it any more!
PR lib/58376
To generate a diff of this commit:
cvs rdiff -u -r1.448 -r1.449 src/share/mk/bsd.README
cvs rdiff -u -r1.406 -r1.407 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.
Re: CVS commit: src/share/mk
Am 28.06.2024 um 22:45 schrieb Taylor R Campbell:
> +# It is tempting to use the make :P modifier here so that you can just
> +# write
> +#
> +#VERSION_MAP=foo.map
> +#
> +# instead of
> +#
> +#VERSION_MAP=${.CURDIR}/foo.map
> +#
> +# but it appears that :P works _only_ with literal names, not with
> +# expansions, so while you could write
> +#
> +#VERSION_MAP=${foo.map:P}
> +#
> +# in the makefile, we can't set
> +#
> +#LDFLAGS+= -Wl,--version-script=${${VERSION_MAP}:P}
> +#
> +# here.
The ':P' modifier treats a literal in the same way as an expression, so
there's no difference between ${foo.map:P} and ${${:Ufoo.map}:P}, as in
both cases the "variable name" is 'foo.map'. If you still remember how
you came to that conclusion, I'd be interested in it.
In order to make the ':P' modifier work, the "variable name" must be an
existing node in the dependency tree, at the point where the ':P'
modifier is evaluated.
Here's a demonstration:
> .MAKEFLAGS: -dv
> .PATH: /dev
> VERSION_MAP= null
> Resolve_via_Path: .PHONY .NOTMAIN ${VERSION_MAP}
> LDFLAGS+= -Wl,--version-script=${${VERSION_MAP}:P}
> LDFLAGS+= -Wl,--version-script=${null:P}
> .info ${LDFLAGS}
> .MAKEFLAGS: -dF/dev/null
> all:
The 'Resolve_via_Path' dependency line adds the VERSION_MAP file to the
dependency tree. Instead of 'Resolve_via_Path', you can choose any other
name or even leave it empty, making the line start with a "magic colon".
Roland
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Fri Jun 28 20:45:26 UTC 2024 Modified Files: src/share/mk: bsd.README bsd.lib.mk Log Message: bsd.lib.mk: New variable VERSION_MAP. This updates LDFLAGS with the right -Wl,--version-script=... argument as well as DPADD so that changing the version script causes the library to be rebuilt. Name chosen to match FreeBSD. PR lib/58376 To generate a diff of this commit: cvs rdiff -u -r1.447 -r1.448 src/share/mk/bsd.README cvs rdiff -u -r1.405 -r1.406 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.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Fri Jun 28 20:45:26 UTC 2024
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
Log Message:
bsd.lib.mk: New variable VERSION_MAP.
This updates LDFLAGS with the right -Wl,--version-script=... argument
as well as DPADD so that changing the version script causes the
library to be rebuilt.
Name chosen to match FreeBSD.
PR lib/58376
To generate a diff of this commit:
cvs rdiff -u -r1.447 -r1.448 src/share/mk/bsd.README
cvs rdiff -u -r1.405 -r1.406 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.447 src/share/mk/bsd.README:1.448
--- src/share/mk/bsd.README:1.447 Fri Apr 5 01:16:00 2024
+++ src/share/mk/bsd.README Fri Jun 28 20:45:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.447 2024/04/05 01:16:00 christos Exp $
+# $NetBSD: bsd.README,v 1.448 2024/06/28 20:45:26 riastradh Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1013,6 +1013,13 @@ LIB_EXPSYM File listing all symbols expe
During development, you can update the expected symbols
from the actual ones with `make update-symbols'.
+VERSION_MAP Path to an ld version script to use when linking the
+ library. If a relative path, interpreted relative to
+ the object directory; use ${.CURDIR}/foo.map if foo.map
+ is in the source directory. Interpretation of relative
+ path may be changed later to search .PATH like target
+ prerequisites.
+
The include file includes the file named "../Makefile.inc"
if it exists, as well as the include file .
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.405 src/share/mk/bsd.lib.mk:1.406
--- src/share/mk/bsd.lib.mk:1.405 Wed May 8 20:38:55 2024
+++ src/share/mk/bsd.lib.mk Fri Jun 28 20:45:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.405 2024/05/08 20:38:55 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.406 2024/06/28 20:45:26 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -612,6 +612,41 @@ LIBDPLIBS+= stdc++ ${.CURDIR}/../../
LIBCC:= ${CC}
.endif
+# VERSION_MAP
+#
+# Path to an ld version script to use when linking the library.
+# If a relative path, interpreted relative to the object
+# directory; use ${.CURDIR}/foo.map if foo.map is in the source
+# directory. Interpretation of relative path may be changed
+# later to search .PATH like target prerequisites.
+#
+# Implemented by adding -Wl,--version-script=${VERSION_MAP} to
+# LDFLAGS.
+#
+.if !empty(VERSION_MAP)
+# It is tempting to use the make :P modifier here so that you can just
+# write
+#
+# VERSION_MAP= foo.map
+#
+# instead of
+#
+# VERSION_MAP= ${.CURDIR}/foo.map
+#
+# but it appears that :P works _only_ with literal names, not with
+# expansions, so while you could write
+#
+# VERSION_MAP= ${foo.map:P}
+#
+# in the makefile, we can't set
+#
+# LDFLAGS+= -Wl,--version-script=${${VERSION_MAP}:P}
+#
+# here.
+DPADD+= ${VERSION_MAP}
+LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
+.endif
+
_LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}
_LDFLAGS.${_LIB}= ${LDFLAGS} ${LDFLAGS.${_LIB}}
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Jun 22 23:26:37 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: now that alpha builds with xorg-server 21 again, switch it back. To generate a diff of this commit: cvs rdiff -u -r1.1382 -r1.1383 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Jun 22 23:26:37 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
now that alpha builds with xorg-server 21 again, switch it back.
To generate a diff of this commit:
cvs rdiff -u -r1.1382 -r1.1383 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.1382 src/share/mk/bsd.own.mk:1.1383
--- src/share/mk/bsd.own.mk:1.1382 Sun Jun 16 21:48:23 2024
+++ src/share/mk/bsd.own.mk Sat Jun 22 23:26:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1382 2024/06/16 21:48:23 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1383 2024/06/22 23:26:37 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1345,7 +1345,7 @@ MKDTB.riscv64= yes
# During transition from xorg-server 1.10 to 1.20
# XXX sgimips uses XAA which is removed in 1.20, and EXA is hard
# XXX to do the same with.
-.if ${MACHINE} == "sgimips" || ${MACHINE} == "alpha"
+.if ${MACHINE} == "sgimips"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/share/mk
Module Name:src Committed By: pgoyette Date: Sun Jun 16 21:50:23 UTC 2024 Modified Files: src/share/mk: bsd.kmodule.mk Log Message: Import AFLAGS to allow processing of assembler files in modules. Prerequisite for kern/583346. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 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.
CVS commit: src/share/mk
Module Name:src
Committed By: pgoyette
Date: Sun Jun 16 21:50:23 UTC 2024
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Import AFLAGS to allow processing of assembler files in modules.
Prerequisite for kern/583346.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 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.85 src/share/mk/bsd.kmodule.mk:1.86
--- src/share/mk/bsd.kmodule.mk:1.85 Mon May 6 08:43:37 2024
+++ src/share/mk/bsd.kmodule.mk Sun Jun 16 21:50:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.85 2024/05/06 08:43:37 mrg Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.86 2024/06/16 21:50:23 pgoyette Exp $
# We are not building this with PIE
MKPIE=no
@@ -31,6 +31,7 @@ CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -i
CPPFLAGS+= -isystem ${S}/../common/include
CPPFLAGS+= -D_KERNEL -D_MODULE -DSYSCTL_INCLUDE_DESCR
CPPFLAGS+= ${${MKDTRACE:Uno} != "no" :? -DKDTRACE_HOOKS :}
+AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
CWARNFLAGS.clang+= -Wno-error=constant-conversion
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Jun 16 21:48:23 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch hppa to gcc 12
To generate a diff of this commit:
cvs rdiff -u -r1.1381 -r1.1382 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.1381 src/share/mk/bsd.own.mk:1.1382
--- src/share/mk/bsd.own.mk:1.1381 Sun Jun 16 21:19:55 2024
+++ src/share/mk/bsd.own.mk Sun Jun 16 21:48:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1381 2024/06/16 21:19:55 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1382 2024/06/16 21:48:23 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -81,6 +81,7 @@ TOOLCHAIN_MISSING?= no
${MACHINE_CPU} == "riscv" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "i386" || \
+${MACHINE} == "hppa" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "ia64" || \
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Sun Jun 16 21:48:23 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch hppa to gcc 12 To generate a diff of this commit: cvs rdiff -u -r1.1381 -r1.1382 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.
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Jun 16 21:19:55 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Style and sort MACHINE_CPU entries for GCC version conditional. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.1380 -r1.1381 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.1380 src/share/mk/bsd.own.mk:1.1381
--- src/share/mk/bsd.own.mk:1.1380 Sun Jun 16 20:22:29 2024
+++ src/share/mk/bsd.own.mk Sun Jun 16 21:19:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1380 2024/06/16 20:22:29 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1381 2024/06/16 21:19:55 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -75,9 +75,10 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_CPU} == "aarch64" || \
-${MACHINE_CPU} == "riscv" || \
+.if \
+${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "arm" || \
+${MACHINE_CPU} == "riscv" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE} == "sparc" || \
CVS commit: src/share/mk
Module Name:src Committed By: skrll Date: Sun Jun 16 21:19:55 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Style and sort MACHINE_CPU entries for GCC version conditional. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.1380 -r1.1381 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.
CVS commit: src/share/mk
Module Name:src
Committed By: hgutch
Date: Sun Jun 16 21:11:53 UTC 2024
Modified Files:
src/share/mk: bsd.info.mk
Log Message:
Simplify test for 0 byte file size
pointed out by kre@
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/share/mk/bsd.info.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.info.mk
diff -u src/share/mk/bsd.info.mk:1.44 src/share/mk/bsd.info.mk:1.45
--- src/share/mk/bsd.info.mk:1.44 Sun Jun 16 00:03:52 2024
+++ src/share/mk/bsd.info.mk Sun Jun 16 21:11:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.info.mk,v 1.44 2024/06/16 00:03:52 hgutch Exp $
+# $NetBSD: bsd.info.mk,v 1.45 2024/06/16 21:11:53 hgutch Exp $
.include
@@ -45,8 +45,7 @@ __infoinstall: .USE
@[ -f ${INFODIRFILE} ] || touch ${INFODIRFILE}; \
while ! ln ${INFODIRFILE} ${INFODIRFILE}.lock 2> /dev/null; \
do sleep 1; done; \
- [ $$(${TOOL_STAT} -qf '%z' ${INFODIRFILE}) -eq 0 ] && \
- rm -f ${INFODIRFILE} || \
+ ! [ -s ${INFODIRFILE} ] && rm -f ${INFODIRFILE} || \
${TOOL_INSTALL_INFO} -d ${INFODIRFILE} -r ${.TARGET} 2> /dev/null; \
${TOOL_INSTALL_INFO} -d ${INFODIRFILE} ${.TARGET}; \
${TOOL_SORTINFO} < ${INFODIRFILE} > ${INFODIRFILE}.tmp; \
CVS commit: src/share/mk
Module Name:src Committed By: hgutch Date: Sun Jun 16 21:11:53 UTC 2024 Modified Files: src/share/mk: bsd.info.mk Log Message: Simplify test for 0 byte file size pointed out by kre@ To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/share/mk/bsd.info.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Jun 16 20:22:30 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
alpha and xorg-server 1.20 has regressed since i last tested.
revert alpha back to 1.10 for now.
To generate a diff of this commit:
cvs rdiff -u -r1.1379 -r1.1380 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.1379 src/share/mk/bsd.own.mk:1.1380
--- src/share/mk/bsd.own.mk:1.1379 Sun Jun 16 19:21:46 2024
+++ src/share/mk/bsd.own.mk Sun Jun 16 20:22:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1379 2024/06/16 19:21:46 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1380 2024/06/16 20:22:29 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1343,7 +1343,7 @@ MKDTB.riscv64= yes
# During transition from xorg-server 1.10 to 1.20
# XXX sgimips uses XAA which is removed in 1.20, and EXA is hard
# XXX to do the same with.
-.if ${MACHINE} == "sgimips"
+.if ${MACHINE} == "sgimips" || ${MACHINE} == "alpha"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sun Jun 16 20:22:30 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: alpha and xorg-server 1.20 has regressed since i last tested. revert alpha back to 1.10 for now. To generate a diff of this commit: cvs rdiff -u -r1.1379 -r1.1380 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Jun 16 19:21:46 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
check for MACHINE_ARCH of i386/x86_64 instead of MACHINE i386/amd64.
seems to fix weird xen kernel builds where MACHINE=xen, and it would
not have the GCC-12 only warning flags present.
To generate a diff of this commit:
cvs rdiff -u -r1.1378 -r1.1379 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.1378 src/share/mk/bsd.own.mk:1.1379
--- src/share/mk/bsd.own.mk:1.1378 Sat Jun 15 20:35:14 2024
+++ src/share/mk/bsd.own.mk Sun Jun 16 19:21:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1378 2024/06/15 20:35:14 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1379 2024/06/16 19:21:46 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -78,8 +78,8 @@ TOOLCHAIN_MISSING?= no
.if ${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "riscv" || \
${MACHINE_CPU} == "arm" || \
-${MACHINE} == "amd64" || \
-${MACHINE} == "i386" || \
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_ARCH} == "i386" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "ia64" || \
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sun Jun 16 19:21:46 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: check for MACHINE_ARCH of i386/x86_64 instead of MACHINE i386/amd64. seems to fix weird xen kernel builds where MACHINE=xen, and it would not have the GCC-12 only warning flags present. To generate a diff of this commit: cvs rdiff -u -r1.1378 -r1.1379 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.
CVS commit: src/share/mk
Module Name:src
Committed By: hgutch
Date: Sun Jun 16 00:03:53 UTC 2024
Modified Files:
src/share/mk: bsd.info.mk
Log Message:
Unbreak generation of share/info/dir
install-info refuses to operate on 0 byte files. When __infoinstall
is run the first time in a build, an empty ${INFODIRFILE} is created
via touch. As install-info leaves this file untouched, we are left
with a 0 byte file at the end. For subsequent __infostall runs the
only difference is that ${INFODIRFILE} already exists as a 0 byte
file, so no new one is created.
Fix by deleting ${INFODIRFILE} in the loop (with the lock held) if it
is a 0 byte file. In this case also don't bother with calling
install-info -r.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/share/mk/bsd.info.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.info.mk
diff -u src/share/mk/bsd.info.mk:1.43 src/share/mk/bsd.info.mk:1.44
--- src/share/mk/bsd.info.mk:1.43 Mon May 1 20:22:18 2023
+++ src/share/mk/bsd.info.mk Sun Jun 16 00:03:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.info.mk,v 1.43 2023/05/01 20:22:18 christos Exp $
+# $NetBSD: bsd.info.mk,v 1.44 2024/06/16 00:03:52 hgutch Exp $
.include
@@ -45,6 +45,8 @@ __infoinstall: .USE
@[ -f ${INFODIRFILE} ] || touch ${INFODIRFILE}; \
while ! ln ${INFODIRFILE} ${INFODIRFILE}.lock 2> /dev/null; \
do sleep 1; done; \
+ [ $$(${TOOL_STAT} -qf '%z' ${INFODIRFILE}) -eq 0 ] && \
+ rm -f ${INFODIRFILE} || \
${TOOL_INSTALL_INFO} -d ${INFODIRFILE} -r ${.TARGET} 2> /dev/null; \
${TOOL_INSTALL_INFO} -d ${INFODIRFILE} ${.TARGET}; \
${TOOL_SORTINFO} < ${INFODIRFILE} > ${INFODIRFILE}.tmp; \
CVS commit: src/share/mk
Module Name:src
Committed By: hgutch
Date: Sun Jun 16 00:03:53 UTC 2024
Modified Files:
src/share/mk: bsd.info.mk
Log Message:
Unbreak generation of share/info/dir
install-info refuses to operate on 0 byte files. When __infoinstall
is run the first time in a build, an empty ${INFODIRFILE} is created
via touch. As install-info leaves this file untouched, we are left
with a 0 byte file at the end. For subsequent __infostall runs the
only difference is that ${INFODIRFILE} already exists as a 0 byte
file, so no new one is created.
Fix by deleting ${INFODIRFILE} in the loop (with the lock held) if it
is a 0 byte file. In this case also don't bother with calling
install-info -r.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/share/mk/bsd.info.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Jun 15 20:35:14 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch several ports over to GCC 12.
arm32, arm64, riscv, x86, sparc*, ia64, and alpha.
thanks for several folks help testing and fixing things, most
espcially rin@.
To generate a diff of this commit:
cvs rdiff -u -r1.1377 -r1.1378 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.1377 src/share/mk/bsd.own.mk:1.1378
--- src/share/mk/bsd.own.mk:1.1377 Sat Jun 15 20:33:05 2024
+++ src/share/mk/bsd.own.mk Sat Jun 15 20:35:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1377 2024/06/15 20:33:05 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1378 2024/06/15 20:35:14 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -75,6 +75,17 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
+.if ${MACHINE_CPU} == "aarch64" || \
+${MACHINE_CPU} == "riscv" || \
+${MACHINE_CPU} == "arm" || \
+${MACHINE} == "amd64" || \
+${MACHINE} == "i386" || \
+${MACHINE} == "sparc" || \
+${MACHINE} == "sparc64" || \
+${MACHINE} == "ia64" || \
+${MACHINE} == "alpha"
+HAVE_GCC?= 12
+.endif
HAVE_GCC?= 10
#
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Jun 15 20:35:14 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: switch several ports over to GCC 12. arm32, arm64, riscv, x86, sparc*, ia64, and alpha. thanks for several folks help testing and fixing things, most espcially rin@. To generate a diff of this commit: cvs rdiff -u -r1.1377 -r1.1378 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.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Jun 15 20:33:06 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch netwinder and alpha over to xorg-server 1.20.
the leaves sgimips as the only remaining xorg-server 1.10
consumer, and largely because it has XAA and EXA and the
sgimips drivers does not work well.
To generate a diff of this commit:
cvs rdiff -u -r1.1376 -r1.1377 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.1376 src/share/mk/bsd.own.mk:1.1377
--- src/share/mk/bsd.own.mk:1.1376 Sat Jun 8 13:03:41 2024
+++ src/share/mk/bsd.own.mk Sat Jun 15 20:33:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1376 2024/06/08 13:03:41 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1377 2024/06/15 20:33:05 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1330,10 +1330,9 @@ MKDTB.riscv32= yes
MKDTB.riscv64= yes
# During transition from xorg-server 1.10 to 1.20
-.if \
-${MACHINE} == "alpha" || \
-${MACHINE} == "netwinder" || \
-${MACHINE} == "sgimips"
+# XXX sgimips uses XAA which is removed in 1.20, and EXA is hard
+# XXX to do the same with.
+.if ${MACHINE} == "sgimips"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sat Jun 15 20:33:06 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: switch netwinder and alpha over to xorg-server 1.20. the leaves sgimips as the only remaining xorg-server 1.10 consumer, and largely because it has XAA and EXA and the sgimips drivers does not work well. To generate a diff of this commit: cvs rdiff -u -r1.1376 -r1.1377 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.
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Wed May 8 20:38:55 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: bsd.lib.mk: Use LIBC_MACHINE_ARCH/CPU if set for expected symbols. Otherwise, we get the wrong list of symbols for compat library builds, where MACHINE_ARCH/CPU is different from LIBC_MACHINE_ARCH/CPU, e.g. building compat 32-bit sparc libm on sparc64. XXX This is kinda kludgey -- `libc' seems wrong here. To generate a diff of this commit: cvs rdiff -u -r1.404 -r1.405 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.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Wed May 8 20:38:55 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
bsd.lib.mk: Use LIBC_MACHINE_ARCH/CPU if set for expected symbols.
Otherwise, we get the wrong list of symbols for compat library
builds, where MACHINE_ARCH/CPU is different from
LIBC_MACHINE_ARCH/CPU, e.g. building compat 32-bit sparc libm on
sparc64.
XXX This is kinda kludgey -- `libc' seems wrong here.
To generate a diff of this commit:
cvs rdiff -u -r1.404 -r1.405 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.404 src/share/mk/bsd.lib.mk:1.405
--- src/share/mk/bsd.lib.mk:1.404 Tue May 7 20:56:25 2024
+++ src/share/mk/bsd.lib.mk Wed May 8 20:38:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.404 2024/05/07 20:56:25 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.405 2024/05/08 20:38:55 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -660,10 +660,10 @@ ${_LIB.so.full}: ${_MAINLIBDEPS}
# If there's a file listing expected symbols, fail if the diff from it
# to the actual symbols is nonempty, and show the diff in that case.
-.if exists(${.CURDIR}/${LIB}.${MACHINE_ARCH}.expsym)
-LIB_EXPSYM?= ${LIB}.${MACHINE_ARCH}.expsym
-.elif exists(${.CURDIR}/${LIB}.${MACHINE_CPU}.expsym)
-LIB_EXPSYM?= ${LIB}.${MACHINE_CPU}.expsym
+.if exists(${.CURDIR}/${LIB}.${LIBC_MACHINE_ARCH:U${MACHINE_ARCH}}.expsym)
+LIB_EXPSYM?= ${LIB}.${LIBC_MACHINE_ARCH:U${MACHINE_ARCH}}.expsym
+.elif exists(${.CURDIR}/${LIB}.${LIBC_MACHINE_CPU:U${MACHINE_CPU}}.expsym)
+LIB_EXPSYM?= ${LIB}.${LIBC_MACHINE_CPU:U${MACHINE_CPU}}.expsym
.elif exists(${.CURDIR}/${LIB}.expsym)
LIB_EXPSYM?= ${LIB}.expsym
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Tue May 7 20:56:25 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
bsd.lib.mk: Allow MACHINE_CPU for default expsym file.
To generate a diff of this commit:
cvs rdiff -u -r1.403 -r1.404 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.403 src/share/mk/bsd.lib.mk:1.404
--- src/share/mk/bsd.lib.mk:1.403 Mon May 6 08:43:37 2024
+++ src/share/mk/bsd.lib.mk Tue May 7 20:56:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.403 2024/05/06 08:43:37 mrg Exp $
+# $NetBSD: bsd.lib.mk,v 1.404 2024/05/07 20:56:25 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -662,6 +662,8 @@ ${_LIB.so.full}: ${_MAINLIBDEPS}
# to the actual symbols is nonempty, and show the diff in that case.
.if exists(${.CURDIR}/${LIB}.${MACHINE_ARCH}.expsym)
LIB_EXPSYM?= ${LIB}.${MACHINE_ARCH}.expsym
+.elif exists(${.CURDIR}/${LIB}.${MACHINE_CPU}.expsym)
+LIB_EXPSYM?= ${LIB}.${MACHINE_CPU}.expsym
.elif exists(${.CURDIR}/${LIB}.expsym)
LIB_EXPSYM?= ${LIB}.expsym
.endif
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Tue May 7 20:56:25 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: bsd.lib.mk: Allow MACHINE_CPU for default expsym file. To generate a diff of this commit: cvs rdiff -u -r1.403 -r1.404 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.
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Sun Apr 28 08:01:04 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Turn off MKAMDGPUFIRMWARE on i386 It's too big for the i386 install media and not useful on either pre-2012 hardware or the kinds of embedded systems where i386 still thrived after 2012. (The build of the kernel parts of amdgpu on i386 is nevertheless useful for finding obscure bugs.) "go for it" riastradh To generate a diff of this commit: cvs rdiff -u -r1.1372 -r1.1373 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.1372 src/share/mk/bsd.own.mk:1.1373 --- src/share/mk/bsd.own.mk:1.1372 Wed Apr 24 20:38:24 2024 +++ src/share/mk/bsd.own.mk Sun Apr 28 08:01:04 2024 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 martin Exp $ +# $NetBSD: bsd.own.mk,v 1.1373 2024/04/28 08:01:04 nia Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1301,7 +1301,6 @@ MKRADEONFIRMWARE.x86_64= yes MKRADEONFIRMWARE.i386= yes MKRADEONFIRMWARE.aarch64= yes MKAMDGPUFIRMWARE.x86_64= yes -MKAMDGPUFIRMWARE.i386= yes # Only install the tegra firmware on evbarm. MKTEGRAFIRMWARE.evbarm= yes
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Sun Apr 28 08:01:04 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Turn off MKAMDGPUFIRMWARE on i386 It's too big for the i386 install media and not useful on either pre-2012 hardware or the kinds of embedded systems where i386 still thrived after 2012. (The build of the kernel parts of amdgpu on i386 is nevertheless useful for finding obscure bugs.) "go for it" riastradh To generate a diff of this commit: cvs rdiff -u -r1.1372 -r1.1373 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.
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 20:38:24 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Explicitly exclude VAX from new Mesa due to a gcc internal compiler error
To generate a diff of this commit:
cvs rdiff -u -r1.1371 -r1.1372 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.1371 src/share/mk/bsd.own.mk:1.1372
--- src/share/mk/bsd.own.mk:1.1371 Wed Apr 24 19:14:39 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 20:38:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1331,7 +1331,8 @@ HAVE_XORG_SERVER_VER?=120
.endif
# Newer Mesa does not build with old X server
-.if ${HAVE_XORG_SERVER_VER} != "120"
+# VAX build triggers a gcc internal error
+.if ${HAVE_XORG_SERVER_VER} != "120" || ${MACHINE} == "vax"
HAVE_MESA_VER=19
.endif
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 20:38:24 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Explicitly exclude VAX from new Mesa due to a gcc internal compiler error To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1372 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.
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 19:14:39 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Force old Mesa for all old X server builds To generate a diff of this commit: cvs rdiff -u -r1.1370 -r1.1371 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.
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 19:14:39 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Force old Mesa for all old X server builds
To generate a diff of this commit:
cvs rdiff -u -r1.1370 -r1.1371 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.1370 src/share/mk/bsd.own.mk:1.1371
--- src/share/mk/bsd.own.mk:1.1370 Wed Apr 24 07:54:53 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 19:14:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,10 +1320,18 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
-# alpha build fails due to missing X include files,
-# vax build triggers a gcc bug and dies with an internal compiler error.
-# XXX switch both to old Mesa for now.
-.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
+# During transition from xorg-server 1.10 to 1.20
+.if \
+${MACHINE} == "alpha" || \
+${MACHINE} == "netwinder" || \
+${MACHINE} == "sgimips"
+HAVE_XORG_SERVER_VER?=110
+.else
+HAVE_XORG_SERVER_VER?=120
+.endif
+
+# Newer Mesa does not build with old X server
+.if ${HAVE_XORG_SERVER_VER} != "120"
HAVE_MESA_VER=19
.endif
@@ -1676,16 +1684,6 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
-# During transition from xorg-server 1.10 to 1.20
-.if \
-${MACHINE} == "alpha" || \
-${MACHINE} == "netwinder" || \
-${MACHINE} == "sgimips"
-HAVE_XORG_SERVER_VER?=110
-.else
-HAVE_XORG_SERVER_VER?=120
-.endif
-
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 07:54:53 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch alpha and VAX back to old Mesa for now untill someone fixes
those builds with newer Mesa.
To generate a diff of this commit:
cvs rdiff -u -r1.1369 -r1.1370 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.1369 src/share/mk/bsd.own.mk:1.1370
--- src/share/mk/bsd.own.mk:1.1369 Wed Apr 24 05:20:35 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 07:54:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $
+# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,6 +1320,13 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
+# alpha build fails due to missing X include files,
+# vax build triggers a gcc bug and dies with an internal compiler error.
+# XXX switch both to old Mesa for now.
+.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
+HAVE_MESA_VER=19
+.endif
+
HAVE_MESA_VER?= 21
.if ${HAVE_MESA_VER} == 19
EXTERNAL_MESALIB_DIR?= MesaLib.old
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 07:54:53 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch alpha and VAX back to old Mesa for now untill someone fixes those builds with newer Mesa. To generate a diff of this commit: cvs rdiff -u -r1.1369 -r1.1370 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.
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Wed Apr 24 05:20:35 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM To generate a diff of this commit: cvs rdiff -u -r1.1368 -r1.1369 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.
CVS commit: src/share/mk
Module Name:src
Committed By: nia
Date: Wed Apr 24 05:20:35 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM
To generate a diff of this commit:
cvs rdiff -u -r1.1368 -r1.1369 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.1368 src/share/mk/bsd.own.mk:1.1369
--- src/share/mk/bsd.own.mk:1.1368 Tue Apr 23 03:25:39 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 05:20:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1368 2024/04/23 03:25:39 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1607,7 +1607,6 @@ ${var}?= no
# format if USE_PIGZGZIP is enabled.
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
- ${MACHINE} == "sparc64" || \
${MACHINE_ARCH:Maarch64*})
USE_XZ_SETS?= yes
.else
CVS commit: src/share/mk
Module Name:src
Committed By: jakllsch
Date: Fri Apr 12 16:28:43 UTC 2024
Modified Files:
src/share/mk: bsd.hostlib.mk
Log Message:
Filter out -Wp,-iremap,* from CPPFLAGS as is done in hostprog.mk
Seems to fix build of libnbcompat in reproducible mode on host toolchains w/o
-iremap
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.hostlib.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.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.20 src/share/mk/bsd.hostlib.mk:1.21
--- src/share/mk/bsd.hostlib.mk:1.20 Fri May 4 14:50:40 2018
+++ src/share/mk/bsd.hostlib.mk Fri Apr 12 16:28:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostlib.mk,v 1.20 2018/05/04 14:50:40 christos Exp $
+# $NetBSD: bsd.hostlib.mk,v 1.21 2024/04/12 16:28:43 jakllsch Exp $
.include
.include
@@ -47,7 +47,7 @@ CLEANFILES+= a.out [Ee]rrs mklog core *.
beforedepend:
CFLAGS:= ${HOST_CFLAGS}
-CPPFLAGS:= ${HOST_CPPFLAGS}
+CPPFLAGS:= ${HOST_CPPFLAGS:N-Wp,-iremap,*}
# Pull in related .mk logic
.include
CVS commit: src/share/mk
Module Name:src Committed By: jakllsch Date: Fri Apr 12 16:28:43 UTC 2024 Modified Files: src/share/mk: bsd.hostlib.mk Log Message: Filter out -Wp,-iremap,* from CPPFLAGS as is done in hostprog.mk Seems to fix build of libnbcompat in reproducible mode on host toolchains w/o -iremap To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.hostlib.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Thu Apr 11 19:12:11 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: fix previous. Doing assignmnents of conditionals does not work for being used as conditionals (thanks rillig@) To generate a diff of this commit: cvs rdiff -u -r1.401 -r1.402 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu Apr 11 19:12:11 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
fix previous. Doing assignmnents of conditionals does not work for being
used as conditionals (thanks rillig@)
To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 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.401 src/share/mk/bsd.lib.mk:1.402
--- src/share/mk/bsd.lib.mk:1.401 Tue Apr 9 18:37:23 2024
+++ src/share/mk/bsd.lib.mk Thu Apr 11 15:12:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.401 2024/04/09 22:37:23 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.402 2024/04/11 19:12:11 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -425,11 +425,15 @@ _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
-_BUILDSTATICLIB= ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
|| ${MAKELINKLIB} != "no" || ${MAKESTATICLIB} != "no"
+_BUILDSTATICLIB=yes
+.else
+_BUILDSTATICLIB=no
+.endif
.if defined(LIB) # {
-.if ${_BUILDSTATICLIB}
+.if ${_BUILDSTATICLIB} != "no"
_LIBS=${_LIB.a}
.else
_LIBS=
@@ -484,7 +488,7 @@ _LIBS+=${_LIB.ln}
.endif
ALLOBJS=
-.if ${_BUILDSTATICLIB}
+.if ${_BUILDSTATICLIB} != "no"
ALLOBJS+=${STOBJS}
.endif
ALLOBJS+=${POBJS} ${SOBJS}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 9 22:37:23 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Merge two identical if's and fix a logic error in them ( && instead of ||)
To generate a diff of this commit:
cvs rdiff -u -r1.400 -r1.401 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.400 src/share/mk/bsd.lib.mk:1.401
--- src/share/mk/bsd.lib.mk:1.400 Thu Apr 4 21:16:00 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 9 18:37:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.400 2024/04/05 01:16:00 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.401 2024/04/09 22:37:23 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -425,9 +425,11 @@ _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
+_BUILDSTATICLIB= ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+|| ${MAKELINKLIB} != "no" || ${MAKESTATICLIB} != "no"
+
.if defined(LIB) # {
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
- || ${MAKELINKLIB} != "no") && ${MAKESTATICLIB} != "no"
+.if ${_BUILDSTATICLIB}
_LIBS=${_LIB.a}
.else
_LIBS=
@@ -482,8 +484,7 @@ _LIBS+=${_LIB.ln}
.endif
ALLOBJS=
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
- || ${MAKELINKLIB} != "no") && ${MAKESTATICLIB} != "no"
+.if ${_BUILDSTATICLIB}
ALLOBJS+=${STOBJS}
.endif
ALLOBJS+=${POBJS} ${SOBJS}
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Apr 9 22:37:23 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: Merge two identical if's and fix a logic error in them ( && instead of ||) To generate a diff of this commit: cvs rdiff -u -r1.400 -r1.401 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.
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sun Apr 7 14:40:34 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch vax to HAVE_XORG_SERVER_VER=120.
Tested on my VAXstation 3100/m30 with smg(4).
Ok'ed by mrg@ on tech-x11@:
https://mail-index.netbsd.org/tech-x11/2024/04/thread1.html#002457
To generate a diff of this commit:
cvs rdiff -u -r1.1366 -r1.1367 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.1366 src/share/mk/bsd.own.mk:1.1367
--- src/share/mk/bsd.own.mk:1.1366 Tue Apr 2 22:41:48 2024
+++ src/share/mk/bsd.own.mk Sun Apr 7 14:40:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1366 2024/04/02 22:41:48 riastradh Exp $
+# $NetBSD: bsd.own.mk,v 1.1367 2024/04/07 14:40:34 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1674,8 +1674,7 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.if \
${MACHINE} == "alpha" || \
${MACHINE} == "netwinder" || \
-${MACHINE} == "sgimips" || \
-${MACHINE} == "vax"
+${MACHINE} == "sgimips"
HAVE_XORG_SERVER_VER?=110
.else
HAVE_XORG_SERVER_VER?=120
CVS commit: src/share/mk
Module Name:src Committed By: tsutsui Date: Sun Apr 7 14:40:34 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch vax to HAVE_XORG_SERVER_VER=120. Tested on my VAXstation 3100/m30 with smg(4). Ok'ed by mrg@ on tech-x11@: https://mail-index.netbsd.org/tech-x11/2024/04/thread1.html#002457 To generate a diff of this commit: cvs rdiff -u -r1.1366 -r1.1367 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.
CVS commit: src/share/mk
Module Name:src Committed By: tsutsui Date: Sun Apr 7 14:36:23 UTC 2024 Modified Files: src/share/mk: bsd.x11.mk Log Message: Use default X11FLAGS to build Xorg servers on vax. It looks necessary on HAVE_XORG_SERVER_VER=120. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 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.
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sun Apr 7 14:36:23 UTC 2024
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
Use default X11FLAGS to build Xorg servers on vax.
It looks necessary on HAVE_XORG_SERVER_VER=120.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 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.152 src/share/mk/bsd.x11.mk:1.153
--- src/share/mk/bsd.x11.mk:1.152 Tue Apr 2 16:17:29 2024
+++ src/share/mk/bsd.x11.mk Sun Apr 7 14:36:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.152 2024/04/02 16:17:29 christos Exp $
+# $NetBSD: bsd.x11.mk,v 1.153 2024/04/07 14:36:23 tsutsui Exp $
.include
@@ -83,8 +83,7 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
.if !(${MACHINE} == "acorn32" || \
${MACHINE} == "sun3" || \
-${MACHINE} == "x68k" || \
-${MACHINE} == "vax")
+${MACHINE} == "x68k")
# EXT_DEFINES
X11FLAGS.EXTENSION+= -DXF86VIDMODE
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Tue Apr 2 22:41:48 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: No need for MKSLJIT to be set differently from others.
- Use ?=, not =, so mk.conf setting wins.
- Write out per-architecture tabular settings, not a conditional.
- Add comments for the architectures that look like they should have
sljit but don't. (XXX Missing comments about powerpc and mips --
not sure why, is this because modules don't yet work on those
architectures, or what?)
Tidying for PR 58103: bpfjit.kmod is not built on aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.1365 -r1.1366 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.1365 src/share/mk/bsd.own.mk:1.1366
--- src/share/mk/bsd.own.mk:1.1365 Tue Apr 2 22:37:34 2024
+++ src/share/mk/bsd.own.mk Tue Apr 2 22:41:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1365 2024/04/02 22:37:34 riastradh Exp $
+# $NetBSD: bsd.own.mk,v 1.1366 2024/04/02 22:41:48 riastradh Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1336,6 +1336,21 @@ MKLLVMRT.i386= yes
MKLLVMRT.aarch64= yes
.endif
+# Just-in-time compiler for bpf, npf acceleration
+MKSLJIT.aarch64= yes
+MKSLJIT.i386= yes
+MKSLJIT.sparc= yes
+#MKSLJIT.sparc64= yes # not suppored in sljit (yet?)
+MKSLJIT.x86_64= yes
+#MKSLJIT.powerpc= yes # XXX
+#MKSLJIT.powerpc64= yes # XXX
+#MKSLJIT.mipsel= yes # XXX
+#MKSLJIT.mipseb= yes # XXX
+#MKSLJIT.mips64el= yes # XXX
+#MKSLJIT.mips64eb= yes # XXX
+#MKSLJIT.riscv32= yes # not until we update sljit
+#MKSLJIT.riscv64= yes # not until we update sljit
+
# compat with old names
MKDEBUGKERNEL?=${MKKDEBUG:Uno}
MKDEBUGTOOLS?=${MKTOOLSDEBUG:Uno}
@@ -1391,13 +1406,6 @@ _MKVARS.no= \
${var}?= ${${var}.${MACHINE_ARCH}:U${${var}.${MACHINE}:Uno}}
.endfor
-.if ${MACHINE_ARCH} == "aarch64" || \
-${MACHINE_ARCH} == "i386"|| \
-${MACHINE_ARCH} == "sparc" || \
-${MACHINE_ARCH} == "x86_64"
-MKSLJIT= yes
-.endif
-
#
# Which platforms build the xorg-server drivers (as opposed
# to just Xnest and Xvfb.)
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Tue Apr 2 22:41:48 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: bsd.own.mk: No need for MKSLJIT to be set differently from others. - Use ?=, not =, so mk.conf setting wins. - Write out per-architecture tabular settings, not a conditional. - Add comments for the architectures that look like they should have sljit but don't. (XXX Missing comments about powerpc and mips -- not sure why, is this because modules don't yet work on those architectures, or what?) Tidying for PR 58103: bpfjit.kmod is not built on aarch64. To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:18:23 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.398 -r1.399 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.398 src/share/mk/bsd.lib.mk:1.399
--- src/share/mk/bsd.lib.mk:1.398 Tue Apr 2 12:17:29 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.399 2024/04/02 16:18:23 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -16,13 +16,9 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPROFILE:= no
-.if ${LIBISMODULE} != "pic"
MKPICINSTALL:= no
-MKLINKLIB:= no
+MKPROFILE:= no
MKSTATICLIB:= no
-.endif
-_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -30,19 +26,17 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
-MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-_LINKINSTALL?= no
+MKPROFILE:= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
-_LINKINSTALL?= ${MKLINKLIB}
# Basic targets
.PHONY: checkver libinstall
@@ -737,7 +731,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -844,7 +838,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Apr 2 16:18:23 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: Back-out unintented commit. To generate a diff of this commit: cvs rdiff -u -r1.398 -r1.399 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.397 src/share/mk/bsd.lib.mk:1.398
--- src/share/mk/bsd.lib.mk:1.397 Tue Mar 26 14:38:52 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:17:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.397 2024/03/26 18:38:52 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -16,9 +16,13 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPICINSTALL:= no
MKPROFILE:= no
+.if ${LIBISMODULE} != "pic"
+MKPICINSTALL:= no
+MKLINKLIB:= no
MKSTATICLIB:= no
+.endif
+_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -26,17 +30,19 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
+MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-MKPROFILE:= no
+_LINKINSTALL?= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
+_LINKINSTALL?= ${MKLINKLIB}
# Basic targets
.PHONY: checkver libinstall
@@ -731,7 +737,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -838,7 +844,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.151 src/share/mk/bsd.x11.mk:1.152
--- src/share/mk/bsd.x11.mk:1.151 Wed Oct 25 00:37:59 2023
+++ src/share/mk/bsd.x11.mk Tue Apr 2 12:17:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.151 2023/10/25 04:37:59 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.152 2024/04/02 16:17:29 christos Exp $
.include
@@ -145,7 +145,7 @@ __XKBDEFRULES__= '"xorg"'
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Apr 1 22:23:15 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use the TOOL_GZIP we built as part of tools if available.
To generate a diff of this commit:
cvs rdiff -u -r1.1363 -r1.1364 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.1363 src/share/mk/bsd.own.mk:1.1364
--- src/share/mk/bsd.own.mk:1.1363 Sat Jan 20 03:09:13 2024
+++ src/share/mk/bsd.own.mk Mon Apr 1 18:23:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1363 2024/01/20 08:09:13 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1364 2024/04/01 22:23:14 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1612,7 +1612,11 @@ USE_XZ_SETS?= no
TOOL_GZIP= ${TOOL_PIGZ}
GZIP_N_FLAG?= -nT
.else
+.if ${USETOOLS} == "yes"
+TOOL_GZIP= ${TOOLDIR}/bin/${_TOOL_PREFIX}gzip
+.else
TOOL_GZIP= gzip
+.endif
GZIP_N_FLAG?= -n
.endif
TOOL_GZIP_N= ${TOOL_GZIP} ${GZIP_N_FLAG}
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Apr 1 22:23:15 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Use the TOOL_GZIP we built as part of tools if available. To generate a diff of this commit: cvs rdiff -u -r1.1363 -r1.1364 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.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Tue Mar 26 18:38:52 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
bsd.lib.mk: Avoid symbol check if we're not doing shared libraries.
Otherwise this fails on non-shlib builds like sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.396 -r1.397 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.396 src/share/mk/bsd.lib.mk:1.397
--- src/share/mk/bsd.lib.mk:1.396 Sat Mar 23 21:56:47 2024
+++ src/share/mk/bsd.lib.mk Tue Mar 26 18:38:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.396 2024/03/23 21:56:47 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.397 2024/03/26 18:38:52 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -656,7 +656,7 @@ LIB_EXPSYM?= ${LIB}.${MACHINE_ARCH}.exps
LIB_EXPSYM?= ${LIB}.expsym
.endif
-.if !empty(LIB_EXPSYM)
+.if !empty(LIB_EXPSYM) && ${MKPIC} != "no"
realall: ${_LIB.so.full}.diffsym
${_LIB.so.full}.diffsym: ${LIB_EXPSYM} ${_LIB.so.full}.actsym
${_MKTARGET_CREATE}
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Tue Mar 26 18:38:52 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: bsd.lib.mk: Avoid symbol check if we're not doing shared libraries. Otherwise this fails on non-shlib builds like sun2. To generate a diff of this commit: cvs rdiff -u -r1.396 -r1.397 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.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Sat Mar 23 21:56:47 UTC 2024
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
Log Message:
bsd.lib.mk: Tidy up expected symbols check a little.
Add some documentation in bsd.README.
To generate a diff of this commit:
cvs rdiff -u -r1.445 -r1.446 src/share/mk/bsd.README
cvs rdiff -u -r1.395 -r1.396 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.445 src/share/mk/bsd.README:1.446
--- src/share/mk/bsd.README:1.445 Sat Jul 22 18:50:31 2023
+++ src/share/mk/bsd.README Sat Mar 23 21:56:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.445 2023/07/22 18:50:31 lukem Exp $
+# $NetBSD: bsd.README,v 1.446 2024/03/23 21:56:47 riastradh Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -993,6 +993,20 @@ PROGDPLIBS A list of the tuples:
as well as in parent directories to cache common libraries
as a build-time optimization.
+LIB_EXPSYM File listing all symbols expected to be defined by the
+ library. Each line has a single symbol. If the symbol
+ is versioned, it is followed by `@@', if it is the
+ default version, or `@', if not, and the symbol
+ version. The lines must be sorted in LANG=C.
+
+ bsd.lib.mk checks to make sure exactly the set of
+ symbols in this file is defined when the library is
+ built; if not, the build will fail and print a diff
+ from the expected symbols to the actual symbols.
+ During development, you can update the expected symbols
+ from the actual ones with `make update-symbols'.
+
+
The include file includes the file named "../Makefile.inc"
if it exists, as well as the include file .
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.395 src/share/mk/bsd.lib.mk:1.396
--- src/share/mk/bsd.lib.mk:1.395 Wed Mar 20 13:50:37 2024
+++ src/share/mk/bsd.lib.mk Sat Mar 23 21:56:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.395 2024/03/20 13:50:37 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.396 2024/03/23 21:56:47 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -672,7 +672,7 @@ ${_LIB.so.full}.diffsym: ${LIB_EXPSYM} $
${_LIB.so.full}.actsym: ${_LIB.so.full}
${_MKTARGET_CREATE}
${NM} --dynamic --extern-only --defined-only --with-symbol-versions \
- ${_LIB.so.full} \
+ ${.ALLSRC} \
| cut -d' ' -f3 | LANG=C sort -u >${.TARGET}.tmp
${MV} ${.TARGET}.tmp ${.TARGET}
CLEANFILES+= ${_LIB.so.full}.actsym
@@ -681,7 +681,7 @@ CLEANFILES+= ${_LIB.so.full}.diffsym
CLEANFILES+= ${_LIB.so.full}.diffsym.tmp
update-symbols: .PHONY
update-symbols: ${_LIB.so.full}.actsym
- cp ${_LIB.so.full}.actsym ${.CURDIR}/${LIB}.expsym
+ cp ${.ALLSRC} ${.CURDIR}/${LIB_EXPSYM}
.endif
.if !empty(LOBJS) # {
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Sat Mar 23 21:56:47 UTC 2024 Modified Files: src/share/mk: bsd.README bsd.lib.mk Log Message: bsd.lib.mk: Tidy up expected symbols check a little. Add some documentation in bsd.README. To generate a diff of this commit: cvs rdiff -u -r1.445 -r1.446 src/share/mk/bsd.README cvs rdiff -u -r1.395 -r1.396 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.
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Wed Mar 20 13:50:37 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: bsd.lib.mk: Check expected vs actual symbols at build-time. If, for LIB=foo, you create a file foo.expsym, bsd.lib.mk will list the dynamic symbols and their versions with nm --dynamic --extern-only --defined-only --with-symbol-versions and compare the names (not addresses or types) to foo.expsym. If there are any differences, they will be printed and the build will fail. foo.expsym should be sorted with `LANG=C sort -u'. This way, you can verify changes don't inadvertently add or remove symbols. If you do want to add (or, if you're bumping the major, remove) symbols, you can verify the changes and edit the foo.expsym file accordingly. This will also help to enforce rules about symbol changes on pullups in release branches. Note that using a version map (-Wl,--version-script=...) doesn't catch symbol removal -- ld quietly ignores symbols in the version map that aren't actually defined by any object in the library. So this supplements the version map. Proposed on tech-userlevel: https://mail-index.NetBSD.org/tech-userlevel/2024/03/16/msg014264.html To generate a diff of this commit: cvs rdiff -u -r1.394 -r1.395 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.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Wed Mar 20 13:50:37 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
bsd.lib.mk: Check expected vs actual symbols at build-time.
If, for LIB=foo, you create a file foo.expsym, bsd.lib.mk will list
the dynamic symbols and their versions with
nm --dynamic --extern-only --defined-only --with-symbol-versions
and compare the names (not addresses or types) to foo.expsym. If
there are any differences, they will be printed and the build will
fail.
foo.expsym should be sorted with `LANG=C sort -u'.
This way, you can verify changes don't inadvertently add or remove
symbols. If you do want to add (or, if you're bumping the major,
remove) symbols, you can verify the changes and edit the foo.expsym
file accordingly. This will also help to enforce rules about symbol
changes on pullups in release branches.
Note that using a version map (-Wl,--version-script=...) doesn't
catch symbol removal -- ld quietly ignores symbols in the version map
that aren't actually defined by any object in the library. So this
supplements the version map.
Proposed on tech-userlevel:
https://mail-index.NetBSD.org/tech-userlevel/2024/03/16/msg014264.html
To generate a diff of this commit:
cvs rdiff -u -r1.394 -r1.395 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.394 src/share/mk/bsd.lib.mk:1.395
--- src/share/mk/bsd.lib.mk:1.394 Sat Jun 3 21:24:57 2023
+++ src/share/mk/bsd.lib.mk Wed Mar 20 13:50:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.394 2023/06/03 21:24:57 lukem Exp $
+# $NetBSD: bsd.lib.mk,v 1.395 2024/03/20 13:50:37 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -648,6 +648,42 @@ ${_LIB.so.full}: ${_MAINLIBDEPS}
${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so}.tmp
${MV} ${_LIB.so}.tmp ${_LIB.so}
+# If there's a file listing expected symbols, fail if the diff from it
+# to the actual symbols is nonempty, and show the diff in that case.
+.if exists(${.CURDIR}/${LIB}.${MACHINE_ARCH}.expsym)
+LIB_EXPSYM?= ${LIB}.${MACHINE_ARCH}.expsym
+.elif exists(${.CURDIR}/${LIB}.expsym)
+LIB_EXPSYM?= ${LIB}.expsym
+.endif
+
+.if !empty(LIB_EXPSYM)
+realall: ${_LIB.so.full}.diffsym
+${_LIB.so.full}.diffsym: ${LIB_EXPSYM} ${_LIB.so.full}.actsym
+ ${_MKTARGET_CREATE}
+ if diff -u ${.ALLSRC} >${.TARGET}.tmp; then \
+ ${MV} ${.TARGET}.tmp ${.TARGET}; \
+ else \
+ ret=$$?; \
+ cat ${.TARGET}.tmp; \
+ echo ${_LIB.so.full}: error: \
+ actual symbols differ from expected symbols >&2; \
+ exit $$ret; \
+ fi
+${_LIB.so.full}.actsym: ${_LIB.so.full}
+ ${_MKTARGET_CREATE}
+ ${NM} --dynamic --extern-only --defined-only --with-symbol-versions \
+ ${_LIB.so.full} \
+ | cut -d' ' -f3 | LANG=C sort -u >${.TARGET}.tmp
+ ${MV} ${.TARGET}.tmp ${.TARGET}
+CLEANFILES+= ${_LIB.so.full}.actsym
+CLEANFILES+= ${_LIB.so.full}.actsym.tmp
+CLEANFILES+= ${_LIB.so.full}.diffsym
+CLEANFILES+= ${_LIB.so.full}.diffsym.tmp
+update-symbols: .PHONY
+update-symbols: ${_LIB.so.full}.actsym
+ cp ${_LIB.so.full}.actsym ${.CURDIR}/${LIB}.expsym
+.endif
+
.if !empty(LOBJS) # {
LLIBS?= -lc
${_LIB.ln}: ${LOBJS}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Feb 19 20:39:38 UTC 2024
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Add a hook that adds more libraries after PROGDPLIBS
To generate a diff of this commit:
cvs rdiff -u -r1.347 -r1.348 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.347 src/share/mk/bsd.prog.mk:1.348
--- src/share/mk/bsd.prog.mk:1.347 Wed Oct 11 10:08:26 2023
+++ src/share/mk/bsd.prog.mk Mon Feb 19 15:39:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.347 2023/10/11 14:08:26 riastradh Exp $
+# $NetBSD: bsd.prog.mk,v 1.348 2024/02/19 20:39:38 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -403,6 +403,10 @@ DPADD+= ${PROGDO.${_lib}}/lib${_lib}.a
.endif
.endfor
.endif # }
+
+LDADD+=${LDADD_AFTER}
+DPADD+=${DPADD_AFTER}
+
#
# Per-program definitions and targets.
#
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Feb 19 20:39:38 UTC 2024 Modified Files: src/share/mk: bsd.prog.mk Log Message: Add a hook that adds more libraries after PROGDPLIBS To generate a diff of this commit: cvs rdiff -u -r1.347 -r1.348 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.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Feb 13 16:15:59 UTC 2024 Modified Files: src/share/mk: bsd.sys.mk Log Message: Allow overriding the language standard to something newer. To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 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.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Feb 13 16:15:59 UTC 2024
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Allow overriding the language standard to something newer.
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 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.315 src/share/mk/bsd.sys.mk:1.316
--- src/share/mk/bsd.sys.mk:1.315 Mon Nov 6 17:35:48 2023
+++ src/share/mk/bsd.sys.mk Tue Feb 13 11:15:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.315 2023/11/06 22:35:48 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.316 2024/02/13 16:15:59 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -57,7 +57,7 @@ CXXFLAGS+= ${REPROFLAGS}
# NetBSD sources use C99 style, with some GCC extensions.
# Coverity does not like -std=gnu99
-.if !defined(COVERITY_TOP_CONFIG)
+.if !defined(COVERITY_TOP_CONFIG) && empty(CFLAGS:M*-std=*)
CFLAGS+= ${${ACTIVE_CC} == "clang":? -std=gnu99 :}
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -std=gnu99 :}
CFLAGS+= ${${ACTIVE_CC} == "pcc":? -std=gnu99 :}
Re: CVS commit: src/share/mk
I would also prefer current general "virt68k", rather than specific emulators like qemu68k etc. because: - it's unlikely that someone will design and implement new virtual Ethernet/storage I/O devices for ancient architectures - we should avoid dumb copies of MD locore.s, pmap_bootstrap.c, headers, and src/distrib files etc. - even if we will support different VM implementation, we can still have multiple kernel config files in a single port, as we've merged sun3 (020 + Sun's MMU) and sun3x (030 MMU) into a single sun3 port in the past (atari and evbarm also have multiple GENERIC like config files for different archtectures) Thanks, --- Izumi Tsutsui
Re: CVS commit: src/share/mk
> On Jan 3, 2024, at 9:16 AM, Jason Thorpe wrote: > > There’s really nothing Qemu specific about it, other than Qemu version number > extraction. Let me elaborate, actually, now that I am not constrained by thumbs-only typing. It uses the generic Linux m68k “bootinfo”, which specify the machine type and address of the various devices, and provisions for how reset/halt are handled are also dealt with generically. Every Linux m68k platform uses this mechanism and I would be shocked (SHOCKED) if some hypothetical future non-Qemu m68k VirtIO platform did not support Linux natively. The Qemu version extraction is actually done with one of those “bootinfo” records. There are really only two assumptions that are made: - RAM starts at PA $., the kernel starts with the MMU disabled, and is loaded at its link address. - I/O devices start at PA $FF00., and that they can be mapped VA==PA with a TT register. The latter would be pretty easy to deal with dynamically if the situation arose. And the former would be possible to adapt to if that assumption were to suddenly not be valid. Heck, the hp300 kernel is linked at VA=$. and knows how to deal with the start of RAM varying based on how much memory is installed (whereas the end of RAM is always at the same location, at the top of the physical address space. Weirdos.) -- thorpej
Re: CVS commit: src/share/mk
There’s really nothing Qemu specific about it, other than Qemu version number extraction. -- thorpej Sent from my iPhone. > On Jan 2, 2024, at 11:03 PM, Valery Ushakov wrote: > > On Wed, Jan 03, 2024 at 02:48:06 +, Jason R Thorpe wrote: > >> Add virt68k to MACHINES.m68k. > > "virt" is too generic a name, if this is specifically a qemu version, > may be it should have been called qemu68k... Guess it's too late now. > > -uwe
Re: CVS commit: src/share/mk
On Wed, Jan 03, 2024 at 02:48:06 +, Jason R Thorpe wrote: > Add virt68k to MACHINES.m68k. "virt" is too generic a name, if this is specifically a qemu version, may be it should have been called qemu68k... Guess it's too late now. -uwe
CVS commit: src/share/mk
Module Name:src Committed By: thorpej Date: Wed Jan 3 02:59:00 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Add mvme68k to MACHINES.m68k. To generate a diff of this commit: cvs rdiff -u -r1.1361 -r1.1362 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.
CVS commit: src/share/mk
Module Name:src Committed By: thorpej Date: Wed Jan 3 02:59:00 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Add mvme68k to MACHINES.m68k. To generate a diff of this commit: cvs rdiff -u -r1.1361 -r1.1362 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.1361 src/share/mk/bsd.own.mk:1.1362 --- src/share/mk/bsd.own.mk:1.1361 Wed Jan 3 02:48:05 2024 +++ src/share/mk/bsd.own.mk Wed Jan 3 02:59:00 2024 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1361 2024/01/03 02:48:05 thorpej Exp $ +# $NetBSD: bsd.own.mk,v 1.1362 2024/01/03 02:59:00 thorpej Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -710,7 +710,7 @@ MACHINES.ia64= ia64 MACHINES.hppa= hppa MACHINES.m68000= sun2 MACHINES.m68k= amiga atari cesfic hp300 luna68k mac68k \ - news68k next68k sun3 virt68k x68k + mvme68k news68k next68k sun3 virt68k x68k MACHINES.mips= algor arc cobalt emips evbmips ews4800mips \ hpcmips mipsco newsmips pmax sbmips sgimips MACHINES.or1k= or1k
CVS commit: src/share/mk
Module Name:src Committed By: thorpej Date: Wed Jan 3 02:48:06 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Add virt68k to MACHINES.m68k. To generate a diff of this commit: cvs rdiff -u -r1.1360 -r1.1361 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.1360 src/share/mk/bsd.own.mk:1.1361 --- src/share/mk/bsd.own.mk:1.1360 Sat Sep 2 12:09:10 2023 +++ src/share/mk/bsd.own.mk Wed Jan 3 02:48:05 2024 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1360 2023/09/02 12:09:10 lukem Exp $ +# $NetBSD: bsd.own.mk,v 1.1361 2024/01/03 02:48:05 thorpej Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -710,7 +710,7 @@ MACHINES.ia64= ia64 MACHINES.hppa= hppa MACHINES.m68000= sun2 MACHINES.m68k= amiga atari cesfic hp300 luna68k mac68k \ - news68k next68k sun3 x68k + news68k next68k sun3 virt68k x68k MACHINES.mips= algor arc cobalt emips evbmips ews4800mips \ hpcmips mipsco newsmips pmax sbmips sgimips MACHINES.or1k= or1k
CVS commit: src/share/mk
Module Name:src Committed By: thorpej Date: Wed Jan 3 02:48:06 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Add virt68k to MACHINES.m68k. To generate a diff of this commit: cvs rdiff -u -r1.1360 -r1.1361 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.
CVS commit: src/share/mk
Module Name:src Committed By: wiz Date: Fri Dec 29 09:17:37 UTC 2023 Modified Files: src/share/mk: sys.mk Log Message: Update ARFLAGS for new binutils. In binutils 2.34, 'l' was a no-op. In binutils 2.39, it is used to specify library dependencies. Remove 'l' from ARFLAGS. >From Takahiro Kambe in PR 57565. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 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.148 src/share/mk/sys.mk:1.149 --- src/share/mk/sys.mk:1.148 Tue Dec 14 16:22:07 2021 +++ src/share/mk/sys.mk Fri Dec 29 09:17:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: sys.mk,v 1.148 2021/12/14 16:22:07 christos Exp $ +# $NetBSD: sys.mk,v 1.149 2023/12/29 09:17:37 wiz Exp $ # @(#)sys.mk 8.2 (Berkeley) 3/21/94 # # This file contains the basic rules for make(1) and is read first @@ -12,7 +12,7 @@ unix?= We run NetBSD. .LIBS: .a AR?= ar -ARFLAGS?= rl +ARFLAGS?= r RANLIB?= ranlib MV?= mv -f
