CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Feb 22 02:47:27 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
enable isl support for GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.110 src/tools/gcc/Makefile:1.111
--- src/tools/gcc/Makefile:1.110 Thu Feb 22 02:40:21 2024
+++ src/tools/gcc/Makefile Thu Feb 22 02:47:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2024/02/22 02:40:21 mrg Exp $
+# $NetBSD: Makefile,v 1.111 2024/02/22 02:47:26 mrg Exp $
.include
@@ -35,7 +35,6 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-bugurl=http://www.NetBSD.org/support/send-pr.html \
--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
--with-system-zlib \
- --without-isl \
--enable-__cxa_atexit \
--enable-libstdcxx-time=rt \
--enable-libstdcxx-threads \
@@ -58,12 +57,21 @@ COMMON_CONFIGURE_ARGS+= --enable-fix-cor
COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new
.endif
+# We nabled isl support for GCC 12. Move into normal segment when
+# removing GCC 10.
+.if ${HAVE_GCC} < 12
+ISL_CONFIGURE_ARGS+= --without-isl
+.else
+ISL_CONFIGURE_ARGS+= --with-isl=${TOOLDIR}
+.endif
+
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
CONFIGURE_ARGS+= \
--with-sysroot=${DESTDIR} \
--with-mpc=${TOOLDIR} \
--with-mpfr=${TOOLDIR} \
--with-gmp=${TOOLDIR} \
+ ${ISL_CONFIGURE_ARGS} \
--disable-nls \
${MULTILIB_ARGS} \
${SOFTFLOAT_ARGS} \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Feb 22 02:47:27 UTC 2024 Modified Files: src/tools/gcc: Makefile Log Message: enable isl support for GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Feb 22 02:40:21 UTC 2024 Modified Files: src/tools/gcc: Makefile Log Message: Include the local NetBSD GCC version so that bumps to it trigger rebuilds unfortunately, this will cause one rebuild to get the new name. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Feb 22 02:40:21 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
Include the local NetBSD GCC version so that bumps to it trigger rebuilds
unfortunately, this will cause one rebuild to get the new name.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.109 src/tools/gcc/Makefile:1.110
--- src/tools/gcc/Makefile:1.109 Sat Oct 7 12:12:58 2023
+++ src/tools/gcc/Makefile Thu Feb 22 02:40:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2023/10/07 12:12:58 rin Exp $
+# $NetBSD: Makefile,v 1.110 2024/02/22 02:40:21 mrg Exp $
.include
@@ -267,16 +267,21 @@ PREV_GCC=
CLEANFILES+= PREV_GCC
+# Include the local NetBSD GCC version so that bumps to it trigger rebuilds.
+NETBSD_GCC_VERSION_NOSPACE= ${NETBSD_GCC_VERSION:S/ /-/gW}
+
realall realdepend: .MAKE
-.if !empty(PREV_GCC) && "${PREV_GCC}" != "${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}"
+.if !empty(PREV_GCC) && "${PREV_GCC}" != "${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}-${NETBSD_GCC_VERSION_NOSPACE}"
@echo "*** WARNING: GCC has changed version?"
@echo "*** PREV_GCC '${PREV_GCC}'"
- @echo "*** != EXTERNAL_GCC_SUBDIR-HAVE_GCC '${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}'"
+ @echo "*** NETBSD_GCC_VERSION_NOSPACE '${NETBSD_GCC_VERSION_NOSPACE}'"
+ @echo "*** != EXTERNAL_GCC_SUBDIR-HAVE_GCC-NETBSD_GCC_VERSION_NOSPACE:"
+ @echo "*** != '${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}-${NETBSD_GCC_VERSION_NOSPACE}'"
@echo "*** Cleaning mis-matched tools/gcc"
rm -f PREV_GCC
(cd ${.CURDIR} && ${MAKE} cleandir)
.endif
- echo ${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC} >PREV_GCC
+ echo ${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}-${NETBSD_GCC_VERSION_NOSPACE} >PREV_GCC
clean: clean.native
clean.native:
CVS commit: src/sbin/newfs
Module Name:src Committed By: mrg Date: Thu Feb 22 02:11:29 UTC 2024 Modified Files: src/sbin/newfs: mkfs.c Log Message: if the window size works but is 0, assume it didn't work and use 80. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sbin/newfs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs
Module Name:src
Committed By: mrg
Date: Thu Feb 22 02:11:29 UTC 2024
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
if the window size works but is 0, assume it didn't work and use 80.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.135 src/sbin/newfs/mkfs.c:1.136
--- src/sbin/newfs/mkfs.c:1.135 Wed Jul 5 10:58:58 2023
+++ src/sbin/newfs/mkfs.c Thu Feb 22 02:11:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.135 2023/07/05 10:58:58 riastradh Exp $ */
+/* $NetBSD: mkfs.c,v 1.136 2024/02/22 02:11:29 mrg Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: mkfs.c,v 1.135 2023/07/05 10:58:58 riastradh Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.136 2024/02/22 02:11:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -672,7 +672,8 @@ mkfs(const char *fsys, int fi, int fo,
fld_width = verbosity < 4 ? 1 : snprintf(NULL, 0, "%" PRIu64,
(uint64_t)FFS_FSBTODB(, cgsblock(, sblock.fs_ncg-1)));
/* Get terminal width */
- if (ioctl(fileno(stdout), TIOCGWINSZ, ) == 0)
+ if (ioctl(fileno(stdout), TIOCGWINSZ, ) == 0 &&
+ winsize.ws_col != 0)
max_cols = winsize.ws_col;
else
max_cols = 80;
CVS commit: src/external/mit/isl/dist
Module Name:src Committed By: mrg Date: Thu Feb 22 02:10:30 UTC 2024 Modified Files: src/external/mit/isl/dist: Makefile.in Log Message: apply some NetBSD_DISABLED_* To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/isl/dist/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/isl/dist
Module Name:src Committed By: mrg Date: Thu Feb 22 02:10:30 UTC 2024 Modified Files: src/external/mit/isl/dist: Makefile.in Log Message: apply some NetBSD_DISABLED_* To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/isl/dist/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/isl/dist/Makefile.in diff -u src/external/mit/isl/dist/Makefile.in:1.1.1.1 src/external/mit/isl/dist/Makefile.in:1.2 --- src/external/mit/isl/dist/Makefile.in:1.1.1.1 Fri Dec 29 22:07:40 2023 +++ src/external/mit/isl/dist/Makefile.in Thu Feb 22 02:10:30 2024 @@ -1652,8 +1652,12 @@ $(top_builddir)/config.status: $(top_src $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_configure: $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_aclocal.m4: $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): @@ -1665,6 +1669,8 @@ stamp-h1: $(srcdir)/isl_config.h.in $(to @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status isl_config.h $(srcdir)/isl_config.h.in: $(am__configure_deps) + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_isl_config.h.in: ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 22 01:13:43 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi Log Message: new tool To generate a diff of this commit: cvs rdiff -u -r1.1332 -r1.1333 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.428 -r1.429 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1770 -r1.1771 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1332 src/distrib/sets/lists/base/mi:1.1333 --- src/distrib/sets/lists/base/mi:1.1332 Wed Feb 21 19:58:49 2024 +++ src/distrib/sets/lists/base/mi Wed Feb 21 20:13:42 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1332 2024/02/22 00:58:49 christos Exp $ +# $NetBSD: mi,v 1.1333 2024/02/22 01:13:42 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1477,6 +1477,7 @@ ./usr/sbin/dig base-obsolete obsolete ./usr/sbin/diskpartbase-sysutil-bin ./usr/sbin/dnsquerybase-obsolete obsolete +./usr/sbin/dnssec-cdsbase-bind-bin ./usr/sbin/dnssec-dsfromkey base-bind-bin ./usr/sbin/dnssec-importkey base-bind-bin ./usr/sbin/dnssec-keyfromlabel base-bind-bin Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.428 src/distrib/sets/lists/debug/mi:1.429 --- src/distrib/sets/lists/debug/mi:1.428 Wed Feb 21 19:58:49 2024 +++ src/distrib/sets/lists/debug/mi Wed Feb 21 20:13:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.428 2024/02/22 00:58:49 christos Exp $ +# $NetBSD: mi,v 1.429 2024/02/22 01:13:43 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1089,6 +1089,7 @@ ./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug ./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug ./usr/libdata/debug/usr/sbin/diskpart.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/dnssec-cds.debug comp-bind-debug debug ./usr/libdata/debug/usr/sbin/dnssec-dsfromkey.debug comp-bind-debug debug ./usr/libdata/debug/usr/sbin/dnssec-importkey.debug comp-bind-debug debug ./usr/libdata/debug/usr/sbin/dnssec-keyfromlabel.debug comp-bind-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1770 src/distrib/sets/lists/man/mi:1.1771 --- src/distrib/sets/lists/man/mi:1.1770 Wed Feb 21 19:58:49 2024 +++ src/distrib/sets/lists/man/mi Wed Feb 21 20:13:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1770 2024/02/22 00:58:49 christos Exp $ +# $NetBSD: mi,v 1.1771 2024/02/22 01:13:43 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -147,6 +147,7 @@ ./usr/share/man/cat1/dns-sd.0 man-mdns-catman mdns,.cat ./usr/share/man/cat1/dnskeygen.0 man-obsolete obsolete ./usr/share/man/cat1/dnsquery.0 man-obsolete obsolete +./usr/share/man/cat1/dnssec-cds.0 man-bind-catman .cat ./usr/share/man/cat1/dnssec-dsfromkey.0 man-bind-catman .cat ./usr/share/man/cat1/dnssec-importkey.0 man-bind-catman .cat ./usr/share/man/cat1/dnssec-keyfromlabel.0 man-bind-catman .cat @@ -3638,6 +3639,7 @@ ./usr/share/man/html1/dirname.html man-util-htmlman html ./usr/share/man/html1/dirs.html man-util-htmlman html ./usr/share/man/html1/dns-sd.html man-mdns-htmlman mdns,html +./usr/share/man/html1/dnssec-cds.html man-bind-htmlman html ./usr/share/man/html1/dnssec-dsfromkey.html man-bind-htmlman html ./usr/share/man/html1/dnssec-importkey.html man-bind-htmlman html ./usr/share/man/html1/dnssec-keyfromlabel.html man-bind-htmlman html @@ -6743,6 +6745,7 @@ ./usr/share/man/man1/dns-sd.1 man-mdns-man mdns,.man ./usr/share/man/man1/dnskeygen.1 man-obsolete obsolete ./usr/share/man/man1/dnsquery.1 man-obsolete obsolete +./usr/share/man/man1/dnssec-cds.1 man-bind-man .man ./usr/share/man/man1/dnssec-dsfromkey.1 man-bind-man .man ./usr/share/man/man1/dnssec-importkey.1 man-bind-man .man ./usr/share/man/man1/dnssec-keyfromlabel.1 man-bind-man .man
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 22 01:13:43 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi Log Message: new tool To generate a diff of this commit: cvs rdiff -u -r1.1332 -r1.1333 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.428 -r1.429 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1770 -r1.1771 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/bin/dnssec/dnssec-cds
Module Name:src Committed By: christos Date: Thu Feb 22 01:10:55 UTC 2024 Added Files: src/external/mpl/bind/bin/dnssec/dnssec-cds: Makefile Log Message: new Makefile To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/bin/dnssec/dnssec-cds
Module Name:src
Committed By: christos
Date: Thu Feb 22 01:10:55 UTC 2024
Added Files:
src/external/mpl/bind/bin/dnssec/dnssec-cds: Makefile
Log Message:
new Makefile
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile
diff -u /dev/null src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile:1.1
--- /dev/null Wed Feb 21 20:10:55 2024
+++ src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile Wed Feb 21 20:10:54 2024
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2024/02/22 01:10:54 christos Exp $
+
+BASE= ${.CURDIR:T}
+MAN=${BASE}.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include
CVS commit: src/external/mpl/bind/bin/dnssec
Module Name:src Committed By: christos Date: Thu Feb 22 01:10:37 UTC 2024 Modified Files: src/external/mpl/bind/bin/dnssec: Makefile Log Message: new tool To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/dnssec/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/bin/dnssec
Module Name:src Committed By: christos Date: Thu Feb 22 01:10:37 UTC 2024 Modified Files: src/external/mpl/bind/bin/dnssec: Makefile Log Message: new tool To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/dnssec/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mpl/bind/bin/dnssec/Makefile diff -u src/external/mpl/bind/bin/dnssec/Makefile:1.1 src/external/mpl/bind/bin/dnssec/Makefile:1.2 --- src/external/mpl/bind/bin/dnssec/Makefile:1.1 Sun Aug 12 09:02:25 2018 +++ src/external/mpl/bind/bin/dnssec/Makefile Wed Feb 21 20:10:37 2024 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:25 christos Exp $ +# $NetBSD: Makefile,v 1.2 2024/02/22 01:10:37 christos Exp $ -SUBDIR= dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen dnssec-signzone \ - dnssec-settime dnssec-revoke dnssec-verify dnssec-importkey +SUBDIR= dnssec-cds dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen \ +dnssec-signzone dnssec-settime dnssec-revoke dnssec-verify dnssec-importkey .include "Makefile.inc"
CVS commit: src/external/mpl/bind/bin/tools
Module Name:src
Committed By: christos
Date: Thu Feb 22 00:59:45 UTC 2024
Modified Files:
src/external/mpl/bind/bin/tools: Makefile
Added Files:
src/external/mpl/bind/bin/tools/mdig: Makefile
src/external/mpl/bind/bin/tools/named-rrchecker: Makefile
Log Message:
add mdig and named-rrchecker
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/tools/mdig/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mpl/bind/bin/tools/named-rrchecker/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/bin/tools/Makefile
diff -u src/external/mpl/bind/bin/tools/Makefile:1.1 src/external/mpl/bind/bin/tools/Makefile:1.2
--- src/external/mpl/bind/bin/tools/Makefile:1.1 Sun Aug 12 09:02:26 2018
+++ src/external/mpl/bind/bin/tools/Makefile Wed Feb 21 19:59:44 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+# $NetBSD: Makefile,v 1.2 2024/02/22 00:59:44 christos Exp $
-SUBDIR= arpaname named-journalprint nsec3hash
+SUBDIR= arpaname mdig named-journalprint named-rrchecker nsec3hash
.include "Makefile.inc"
Added files:
Index: src/external/mpl/bind/bin/tools/mdig/Makefile
diff -u /dev/null src/external/mpl/bind/bin/tools/mdig/Makefile:1.1
--- /dev/null Wed Feb 21 19:59:45 2024
+++ src/external/mpl/bind/bin/tools/mdig/Makefile Wed Feb 21 19:59:44 2024
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2024/02/22 00:59:44 christos Exp $
+
+BASE= ${.CURDIR:T}
+BINDIR= /usr/bin
+
+.include "${.CURDIR}/../Makefile.inc"
+
+foo:
+ echo x${BINDIR}x
+
+.include
Index: src/external/mpl/bind/bin/tools/named-rrchecker/Makefile
diff -u /dev/null src/external/mpl/bind/bin/tools/named-rrchecker/Makefile:1.1
--- /dev/null Wed Feb 21 19:59:45 2024
+++ src/external/mpl/bind/bin/tools/named-rrchecker/Makefile Wed Feb 21 19:59:45 2024
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2024/02/22 00:59:45 christos Exp $
+
+BASE= ${.CURDIR:T}
+BINDIR= /usr/sbin
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include
CVS commit: src/external/mpl/bind/bin/tools
Module Name:src Committed By: christos Date: Thu Feb 22 00:59:45 UTC 2024 Modified Files: src/external/mpl/bind/bin/tools: Makefile Added Files: src/external/mpl/bind/bin/tools/mdig: Makefile src/external/mpl/bind/bin/tools/named-rrchecker: Makefile Log Message: add mdig and named-rrchecker To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/tools/Makefile cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/tools/mdig/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mpl/bind/bin/tools/named-rrchecker/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 22 00:58:49 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi Log Message: add new bind tools To generate a diff of this commit: cvs rdiff -u -r1.1331 -r1.1332 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.427 -r1.428 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1769 -r1.1770 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1331 src/distrib/sets/lists/base/mi:1.1332 --- src/distrib/sets/lists/base/mi:1.1331 Sat Jan 27 16:06:09 2024 +++ src/distrib/sets/lists/base/mi Wed Feb 21 19:58:49 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1331 2024/01/27 21:06:09 riastradh Exp $ +# $NetBSD: mi,v 1.1332 2024/02/22 00:58:49 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -716,6 +716,7 @@ ./usr/bin/md2 base-util-bin ./usr/bin/md4 base-util-bin ./usr/bin/md5 base-util-bin +./usr/bin/mdig base-bind-bin ./usr/bin/merge base-util-bin ./usr/bin/mesg base-util-bin ./usr/bin/midiplaybase-audio-bin @@ -1618,6 +1619,7 @@ ./usr/sbin/named-checkconf base-bind-bin ./usr/sbin/named-checkzone base-bind-bin ./usr/sbin/named-compilezone base-bind-bin +./usr/sbin/named-rrchecker base-bind-bin ./usr/sbin/named-journalprint base-bind-bin ./usr/sbin/named.reloadbase-obsolete obsolete ./usr/sbin/named.restart base-obsolete obsolete Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.427 src/distrib/sets/lists/debug/mi:1.428 --- src/distrib/sets/lists/debug/mi:1.427 Wed Feb 21 17:53:47 2024 +++ src/distrib/sets/lists/debug/mi Wed Feb 21 19:58:49 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.427 2024/02/21 22:53:47 christos Exp $ +# $NetBSD: mi,v 1.428 2024/02/22 00:58:49 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -673,6 +673,7 @@ ./usr/libdata/debug/usr/bin/makeinfo.debug comp-texinfo-debug debug ./usr/libdata/debug/usr/bin/man.debug comp-man-debug debug ./usr/libdata/debug/usr/bin/mandoc.debug comp-mdocml-debug debug +./usr/libdata/debug/usr/bin/mdig.debug comp-bind-debug debug ./usr/libdata/debug/usr/bin/menuc.debug comp-c-debug debug ./usr/libdata/debug/usr/bin/merge.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/mesg.debug comp-util-debug debug @@ -1199,6 +1200,7 @@ ./usr/libdata/debug/usr/sbin/named-checkconf.debug comp-bind-bin debug ./usr/libdata/debug/usr/sbin/named-checkzone.debug comp-bind-bin debug ./usr/libdata/debug/usr/sbin/named-journalprint.debug comp-bind-bin debug +./usr/libdata/debug/usr/sbin/named-rrchecker.debug comp-bind-bin debug ./usr/libdata/debug/usr/sbin/named.debug comp-bind-bin debug ./usr/libdata/debug/usr/sbin/ncdcs.debug comp-sysutil-root binutils,debug ./usr/libdata/debug/usr/sbin/ndbootd.debug comp-bootserver-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1769 src/distrib/sets/lists/man/mi:1.1770 --- src/distrib/sets/lists/man/mi:1.1769 Wed Feb 21 17:53:48 2024 +++ src/distrib/sets/lists/man/mi Wed Feb 21 19:58:49 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1769 2024/02/21 22:53:48 christos Exp $ +# $NetBSD: mi,v 1.1770 2024/02/22 00:58:49 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -330,6 +330,7 @@ ./usr/share/man/cat1/md2.0 man-util-catman .cat ./usr/share/man/cat1/md4.0 man-util-catman .cat ./usr/share/man/cat1/md5.0 man-util-catman .cat +./usr/share/man/cat1/mdig.0 man-bind-catman .cat ./usr/share/man/cat1/merge.0 man-util-catman .cat ./usr/share/man/cat1/mesg.0 man-util-catman .cat ./usr/share/man/cat1/midiplay.0 man-audio-catman .cat @@ -368,6 +369,7 @@ ./usr/share/man/cat1/named-checkzone.0 man-bind-catman .cat ./usr/share/man/cat1/named-compilezone.0 man-bind-catman .cat ./usr/share/man/cat1/named-journalprint.0 man-bind-catman .cat +./usr/share/man/cat1/named-rrchecker.0 man-bind-catman .cat ./usr/share/man/cat1/nbsvtool.0 man-crypto-catman .cat ./usr/share/man/cat1/nc.0 man-netutil-catman .cat ./usr/share/man/cat1/netgroup.0 man-nis-catman .cat @@ -3806,6 +3808,7 @@ ./usr/share/man/html1/md2.html man-util-htmlman html ./usr/share/man/html1/md4.html man-util-htmlman html ./usr/share/man/html1/md5.html man-util-htmlman html +./usr/share/man/html1/mdig.html man-bind-htmlman html ./usr/share/man/html1/merge.html man-util-htmlman html ./usr/share/man/html1/mesg.html man-util-htmlman html ./usr/share/man/html1/midiplay.html man-audio-htmlman html @@ -3843,6
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 22 00:58:49 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi Log Message: add new bind tools To generate a diff of this commit: cvs rdiff -u -r1.1331 -r1.1332 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.427 -r1.428 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1769 -r1.1770 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: andvar
Date: Wed Feb 21 23:23:06 UTC 2024
Modified Files:
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/vax/vax: ka650.c
Log Message:
Add 0x prefix before hex physmem in couple more places.
For netwinder move physmem arg to new line to keep line <80 symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/vax/ka650.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.92 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.93
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.92 Mon May 23 19:52:34 2022
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Wed Feb 21 23:23:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.92 2022/05/23 19:52:34 andvar Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.93 2024/02/21 23:23:06 andvar Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.92 2022/05/23 19:52:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.93 2024/02/21 23:23:06 andvar Exp $");
#include "opt_ddb.h"
@@ -472,8 +472,8 @@ initarm(void *arg)
physmem = (physical_end - physical_start) / PAGE_SIZE;
/* Tell the user about the memory */
- printf("physmemory: %"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: 0x%"PRIxPSIZE" pages at 0x%08lx -> 0x%08lx\n",
+ physmem, physical_start, physical_end - 1);
/*
* Okay, we need to allocate some fixed page tables to get the
Index: src/sys/arch/vax/vax/ka650.c
diff -u src/sys/arch/vax/vax/ka650.c:1.38 src/sys/arch/vax/vax/ka650.c:1.39
--- src/sys/arch/vax/vax/ka650.c:1.38 Fri Mar 31 08:38:13 2017
+++ src/sys/arch/vax/vax/ka650.c Wed Feb 21 23:23:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ka650.c,v 1.38 2017/03/31 08:38:13 msaitoh Exp $ */
+/* $NetBSD: ka650.c,v 1.39 2024/02/21 23:23:06 andvar Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ka650.c,v 1.38 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka650.c,v 1.39 2024/02/21 23:23:06 andvar Exp $");
#include
#include
@@ -106,7 +106,7 @@ ka650_conf(void)
ka650setcache(CACHEON);
if (ctob(physmem) > ka650merr_ptr->merr_qbmbr) {
- printf("physmem(%"PRIxPSIZE") > qbmbr(0x%x)\n",
+ printf("physmem(0x%"PRIxPSIZE") > qbmbr(0x%x)\n",
ctob(physmem), (int)ka650merr_ptr->merr_qbmbr);
panic("qbus map unprotected");
}
CVS commit: src/sys/arch
Module Name:src Committed By: andvar Date: Wed Feb 21 23:23:06 UTC 2024 Modified Files: src/sys/arch/netwinder/netwinder: netwinder_machdep.c src/sys/arch/vax/vax: ka650.c Log Message: Add 0x prefix before hex physmem in couple more places. For netwinder move physmem arg to new line to keep line <80 symbols. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 \ src/sys/arch/netwinder/netwinder/netwinder_machdep.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/vax/ka650.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Feb 21 22:55:29 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind. To generate a diff of this commit: cvs rdiff -u -r1.1988 -r1.1989 src/doc/3RDPARTY cvs rdiff -u -r1.3040 -r1.3041 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Feb 21 22:55:29 UTC 2024 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind. To generate a diff of this commit: cvs rdiff -u -r1.1988 -r1.1989 src/doc/3RDPARTY cvs rdiff -u -r1.3040 -r1.3041 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1988 src/doc/3RDPARTY:1.1989 --- src/doc/3RDPARTY:1.1988 Tue Feb 20 07:42:57 2024 +++ src/doc/3RDPARTY Wed Feb 21 17:55:29 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1988 2024/02/20 12:42:57 simonb Exp $ +# $NetBSD: 3RDPARTY,v 1.1989 2024/02/21 22:55:29 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -120,8 +120,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.16.42/MPL -Current Vers: 9.16.342/MPL 9.19.14/MPL +Version: 9.18.24/MPL +Current Vers: 9.18.24/MPL 9.19.14/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3040 src/doc/CHANGES:1.3041 --- src/doc/CHANGES:1.3040 Sat Feb 17 13:33:25 2024 +++ src/doc/CHANGES Wed Feb 21 17:55:29 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3040 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3041 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -282,3 +282,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: tzcode: Updated to 2024a. [christos 20240217] nsd: Import 4.8.0. [christos 20240217] unbound(8): Import 1.19.1. [christos 20240217] + bind: Import 9.18.24 [christos 20240221]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Feb 21 22:53:48 UTC 2024 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/man: mi Log Message: changes for new bind. XXX: removing lint libraries where lint does not work anymore is temporary. To generate a diff of this commit: cvs rdiff -u -r1.975 -r1.976 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2453 -r1.2454 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.426 -r1.427 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.337 -r1.338 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1768 -r1.1769 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.975 src/distrib/sets/lists/base/shl.mi:1.976 --- src/distrib/sets/lists/base/shl.mi:1.975 Sat Feb 17 13:32:19 2024 +++ src/distrib/sets/lists/base/shl.mi Wed Feb 21 17:53:47 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.975 2024/02/17 18:32:19 christos Exp $ +# $NetBSD: shl.mi,v 1.976 2024/02/21 22:53:47 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -232,8 +232,8 @@ ./usr/lib/libbfd.so.18base-sys-shlib compatfile,binutils=239 ./usr/lib/libbfd.so.18.0 base-sys-shlib compatfile,binutils=239 ./usr/lib/libbind9.sobase-bind-shlib compatfile -./usr/lib/libbind9.so.20 base-bind-shlib compatfile -./usr/lib/libbind9.so.20.0 base-bind-shlib compatfile +./usr/lib/libbind9.so.21 base-bind-shlib compatfile +./usr/lib/libbind9.so.21.0 base-bind-shlib compatfile ./usr/lib/libblacklist.so base-obsolete obsolete,compatfile ./usr/lib/libblocklist.so base-sys-shlib compatfile ./usr/lib/libblocklist.so.0 base-sys-shlib compatfile @@ -296,8 +296,8 @@ ./usr/lib/libdm.so.0base-sys-shlib compatfile ./usr/lib/libdm.so.0.0base-sys-shlib compatfile ./usr/lib/libdns.sobase-bind-shlib compatfile -./usr/lib/libdns.so.20base-bind-shlib compatfile -./usr/lib/libdns.so.20.0 base-bind-shlib compatfile +./usr/lib/libdns.so.21base-bind-shlib compatfile +./usr/lib/libdns.so.21.0 base-bind-shlib compatfile ./usr/lib/libdns_sd.sobase-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0 base-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib compatfile,mdns @@ -373,17 +373,17 @@ ./usr/lib/libipsec.so.3base-net-shlib compatfile ./usr/lib/libipsec.so.3.0 base-net-shlib compatfile ./usr/lib/libirs.sobase-bind-shlib compatfile -./usr/lib/libirs.so.20base-bind-shlib compatfile -./usr/lib/libirs.so.20.0 base-bind-shlib compatfile +./usr/lib/libirs.so.21base-bind-shlib compatfile +./usr/lib/libirs.so.21.0 base-bind-shlib compatfile ./usr/lib/libisc.sobase-bind-shlib compatfile -./usr/lib/libisc.so.20base-bind-shlib compatfile -./usr/lib/libisc.so.20.0 base-bind-shlib compatfile +./usr/lib/libisc.so.21base-bind-shlib compatfile +./usr/lib/libisc.so.21.0 base-bind-shlib compatfile ./usr/lib/libisccc.sobase-bind-shlib compatfile -./usr/lib/libisccc.so.20 base-bind-shlib compatfile -./usr/lib/libisccc.so.20.0 base-bind-shlib compatfile +./usr/lib/libisccc.so.21 base-bind-shlib compatfile +./usr/lib/libisccc.so.21.0 base-bind-shlib compatfile ./usr/lib/libisccfg.sobase-bind-shlib compatfile -./usr/lib/libisccfg.so.20 base-bind-shlib compatfile -./usr/lib/libisccfg.so.20.0 base-bind-shlib compatfile +./usr/lib/libisccfg.so.21 base-bind-shlib compatfile +./usr/lib/libisccfg.so.21.0 base-bind-shlib compatfile ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2base-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile @@ -464,8 +464,8 @@ ./usr/lib/libnpf.so.0base-npf-shlib npf,compatfile ./usr/lib/libnpf.so.0.1base-npf-shlib npf,compatfile ./usr/lib/libns.sobase-bind-shlib compatfile -./usr/lib/libns.so.20base-bind-shlib compatfile -./usr/lib/libns.so.20.0base-bind-shlib compatfile +./usr/lib/libns.so.21base-bind-shlib compatfile +./usr/lib/libns.so.21.0base-bind-shlib compatfile ./usr/lib/libnvmm.sobase-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0base-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0.1 base-sys-shlib nvmm,pic Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2453 src/distrib/sets/lists/comp/mi:1.2454 --- src/distrib/sets/lists/comp/mi:1.2453 Fri Jan 26 14:27:29 2024 +++ src/distrib/sets/lists/comp/mi Wed Feb 21 17:53:47 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2453 2024/01/26 19:27:29 nros Exp $ +# $NetBSD: mi,v 1.2454 2024/02/21 22:53:47 christos Exp $ # # Note: don't delete entries
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Feb 21 22:53:48 UTC 2024 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/man: mi Log Message: changes for new bind. XXX: removing lint libraries where lint does not work anymore is temporary. To generate a diff of this commit: cvs rdiff -u -r1.975 -r1.976 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2453 -r1.2454 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.426 -r1.427 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.337 -r1.338 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1768 -r1.1769 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Wed Feb 21 20:31:57 UTC 2024
Modified Files:
src/usr.sbin/sysinst: main.c
Log Message:
Defer deletion of any color menu options untill the final menu (in the
selected language) has been loaded.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.32 src/usr.sbin/sysinst/main.c:1.33
--- src/usr.sbin/sysinst/main.c:1.32 Sun Dec 17 18:46:42 2023
+++ src/usr.sbin/sysinst/main.c Wed Feb 21 20:31:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2023/12/17 18:46:42 martin Exp $ */
+/* $NetBSD: main.c,v 1.33 2024/02/21 20:31:57 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -288,8 +288,6 @@ main(int argc, char **argv)
if (has_colors()) {
start_color();
do_coloring(clr_arg.fg,clr_arg.bg);
- } else {
- remove_color_options();
}
msg_window(mainwin);
@@ -310,6 +308,10 @@ main(int argc, char **argv)
get_kb_encoding();
init_lang();
+ /* remove some invalid menu entries */
+ if (!has_colors())
+ remove_color_options();
+
/* Menu processing */
if (partman_go)
partman(NULL);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Wed Feb 21 20:31:57 UTC 2024 Modified Files: src/usr.sbin/sysinst: main.c Log Message: Defer deletion of any color menu options untill the final menu (in the selected language) has been loaded. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: macallan
Date: Wed Feb 21 13:24:40 UTC 2024
Modified Files:
src/sys/arch/hppa/dev: gftfb.c
Log Message:
avoid one more instance of unnecessary blitter stalling
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/gftfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/dev/gftfb.c
diff -u src/sys/arch/hppa/dev/gftfb.c:1.5 src/sys/arch/hppa/dev/gftfb.c:1.6
--- src/sys/arch/hppa/dev/gftfb.c:1.5 Wed Feb 21 13:04:01 2024
+++ src/sys/arch/hppa/dev/gftfb.c Wed Feb 21 13:24:40 2024
@@ -1,9 +1,10 @@
-/* $NetBSD: gftfb.c,v 1.5 2024/02/21 13:04:01 macallan Exp $ */
+/* $NetBSD: gftfb.c,v 1.6 2024/02/21 13:24:40 macallan Exp $ */
/* $OpenBSD: sti_pci.c,v 1.7 2009/02/06 22:51:04 miod Exp $ */
/*
* Copyright (c) 2006, 2007 Miodrag Vallat.
+ ^ 2024 Michael Lorenz
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +20,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/*
+ * a native driver for HP Visualize EG PCI graphics cards
+ * STI portions are from Miodrag Vallat's sti_pci.c
+ */
+
#include
#include
#include
@@ -974,15 +980,17 @@ gftfb_bitblt(void *cookie, int xs, int y
bus_space_tag_t memt = rom->memt;
bus_space_handle_t memh = rom->regh[2];
- gftfb_wait(sc);
- bus_space_write_stream_4(memt, memh, NGLE_REG_10, 0x13a01000);
+ if (sc->sc_hwmode != HW_BLIT) {
+ gftfb_wait(sc);
+ bus_space_write_stream_4(memt, memh, NGLE_REG_10, 0x13a01000);
+ sc->sc_hwmode = HW_BLIT;
+ }
gftfb_wait_fifo(sc, 5);
bus_space_write_stream_4(memt, memh, NGLE_REG_14, ((rop << 8) & 0xf00) | 0x2300);
bus_space_write_stream_4(memt, memh, NGLE_REG_13, 0xff);
bus_space_write_stream_4(memt, memh, NGLE_REG_24, (xs << 16) | ys);
bus_space_write_stream_4(memt, memh, NGLE_REG_7, (wi << 16) | he);
bus_space_write_stream_4(memt, memh, NGLE_REG_25, (xd << 16) | yd);
- sc->sc_hwmode = HW_BLIT;
}
static void
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: macallan Date: Wed Feb 21 13:24:40 UTC 2024 Modified Files: src/sys/arch/hppa/dev: gftfb.c Log Message: avoid one more instance of unnecessary blitter stalling To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/gftfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: macallan
Date: Wed Feb 21 13:04:01 UTC 2024
Modified Files:
src/sys/arch/hppa/dev: gftfb.c
Log Message:
keep track of hw settings for blitter, fill of fb access to avoid unnecessary
register writes
while there, remove some accidentially left in debug goop
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/gftfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/dev/gftfb.c
diff -u src/sys/arch/hppa/dev/gftfb.c:1.4 src/sys/arch/hppa/dev/gftfb.c:1.5
--- src/sys/arch/hppa/dev/gftfb.c:1.4 Tue Feb 20 15:54:44 2024
+++ src/sys/arch/hppa/dev/gftfb.c Wed Feb 21 13:04:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gftfb.c,v 1.4 2024/02/20 15:54:44 macallan Exp $ */
+/* $NetBSD: gftfb.c,v 1.5 2024/02/21 13:04:01 macallan Exp $ */
/* $OpenBSD: sti_pci.c,v 1.7 2009/02/06 22:51:04 miod Exp $ */
@@ -76,7 +76,10 @@ struct gftfb_softc {
u_char sc_cmap_red[256];
u_char sc_cmap_green[256];
u_char sc_cmap_blue[256];
- uint32_t sc_reg10;
+ uint32_t sc_hwmode;
+#define HW_FB 0
+#define HW_FILL 1
+#define HW_BLIT 2
glyphcache sc_gc;
};
@@ -645,6 +648,7 @@ gftfb_setup_fb(struct gftfb_softc *sc)
bus_space_write_stream_4(memt, memh, NGLE_REG_14, 0x83000300);
gftfb_wait(sc);
bus_space_write_1(memt, memh, NGLE_REG_16b1, 1);
+ sc->sc_hwmode = HW_FB;
}
void
@@ -654,7 +658,7 @@ gftfb_setup(struct gftfb_softc *sc)
bus_space_tag_t memt = rom->memt;
bus_space_handle_t memh = rom->regh[2];
- sc->sc_reg10 = 0;
+ sc->sc_hwmode = HW_FB;
/* set Bt458 read mask register to all planes */
gftfb_wait(sc);
@@ -674,6 +678,10 @@ gftfb_setup(struct gftfb_softc *sc)
bus_space_write_stream_4(memt, memh, NGLE_REG_6, 0x);
bus_space_write_stream_4(memt, memh, NGLE_REG_9,
(sc->sc_scr.scr_cfg.scr_width << 16) | sc->sc_scr.scr_cfg.scr_height);
+ /*
+ * blit into offscreen memory to force flush previous - apparently
+ * some chips have a bug this works around
+ */
bus_space_write_stream_4(memt, memh, NGLE_REG_6, 0x0500);
bus_space_write_stream_4(memt, memh, NGLE_REG_9, 0x00040001);
@@ -682,6 +690,7 @@ gftfb_setup(struct gftfb_softc *sc)
gftfb_setup_fb(sc);
+ /* make sure video output is enabled */
gftfb_wait(sc);
bus_space_write_stream_4(memt, memh, NGLE_REG_21,
bus_space_read_stream_4(memt, memh, NGLE_REG_21) | 0x0a00);
@@ -741,7 +750,7 @@ gftfb_ioctl(void *v, void *vs, u_long cm
sc->sc_mode = new_mode;
if(new_mode == WSDISPLAYIO_MODE_EMUL) {
gftfb_setup(sc);
-if (0) gftfb_restore_palette(sc);
+gftfb_restore_palette(sc);
glyphcache_wipe(>sc_gc);
gftfb_rectfill(sc, 0, 0, sc->sc_width,
sc->sc_height, ms->scr_ri.ri_devcmap[
@@ -932,19 +941,22 @@ gftfb_rectfill(struct gftfb_softc *sc, i
bus_space_tag_t memt = rom->memt;
bus_space_handle_t memh = rom->regh[2];
- gftfb_wait_fifo(sc, 5);
- /* transfer data */
- bus_space_write_stream_4(memt, memh, NGLE_REG_8, 0x);
+ if (sc->sc_hwmode != HW_FILL) {
+ gftfb_wait_fifo(sc, 4);
+ /* transfer data */
+ bus_space_write_stream_4(memt, memh, NGLE_REG_8, 0x);
+ /* plane mask */
+ bus_space_write_stream_4(memt, memh, NGLE_REG_13, 0xff);
+ /* bitmap op */
+ bus_space_write_stream_4(memt, memh, NGLE_REG_14,
+ IBOvals(RopSrc, 0, BitmapExtent08, 0, DataDynamic, MaskOtc, 0, 0));
+ /* dst bitmap access */
+ bus_space_write_stream_4(memt, memh, NGLE_REG_11,
+ BA(IndexedDcd, Otc32, OtsIndirect, AddrLong, 0, BINapp0I, 0));
+ sc->sc_hwmode = HW_FILL;
+ }
+ gftfb_wait_fifo(sc, 3);
bus_space_write_stream_4(memt, memh, NGLE_REG_35, bg);
- /* plane mask */
- bus_space_write_stream_4(memt, memh, NGLE_REG_13, 0xff);
- /* bitmap op */
- bus_space_write_stream_4(memt, memh, NGLE_REG_14,
- IBOvals(RopSrc, 0, BitmapExtent08, 0, DataDynamic, MaskOtc, 0, 0));
- /* dst bitmap access */
- bus_space_write_stream_4(memt, memh, NGLE_REG_11,
- BA(IndexedDcd, Otc32, OtsIndirect, AddrLong, 0, BINapp0I, 0));
- gftfb_wait_fifo(sc, 2);
/* dst XY */
bus_space_write_stream_4(memt, memh, NGLE_REG_6, (x << 16) | y);
/* len XY start */
@@ -970,6 +982,7 @@ gftfb_bitblt(void *cookie, int xs, int y
bus_space_write_stream_4(memt, memh, NGLE_REG_24, (xs << 16) | ys);
bus_space_write_stream_4(memt, memh, NGLE_REG_7, (wi << 16) | he);
bus_space_write_stream_4(memt, memh, NGLE_REG_25, (xd << 16) | yd);
+ sc->sc_hwmode = HW_BLIT;
}
static void
@@ -1065,7 +1078,7 @@ gftfb_putchar(void *cookie, int row, int
if (rv == GC_OK)
return;
- gftfb_setup_fb(sc);
+ if (sc->sc_hwmode != HW_FB) gftfb_setup_fb(sc);
sc->sc_putchar(cookie, row, col, c, attr);
if (rv == GC_ADD)
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: macallan Date: Wed Feb 21 13:04:01 UTC 2024 Modified Files: src/sys/arch/hppa/dev: gftfb.c Log Message: keep track of hw settings for blitter, fill of fb access to avoid unnecessary register writes while there, remove some accidentially left in debug goop To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/gftfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/igc
Module Name:src
Committed By: msaitoh
Date: Wed Feb 21 12:39:39 UTC 2024
Modified Files:
src/sys/dev/pci/igc: if_igc.c igc_defines.h
Log Message:
igc(4): Print EtrackID.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/igc/if_igc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/igc/igc_defines.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.12 src/sys/dev/pci/igc/if_igc.c:1.13
--- src/sys/dev/pci/igc/if_igc.c:1.12 Wed Feb 21 12:34:06 2024
+++ src/sys/dev/pci/igc/if_igc.c Wed Feb 21 12:39:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.13 2024/02/21 12:39:39 msaitoh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.13 2024/02/21 12:39:39 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_igc.h"
@@ -3850,7 +3850,7 @@ igc_print_devinfo(struct igc_softc *sc)
struct igc_hw *hw = >hw;
struct igc_phy_info *phy = >phy;
u_int oui, model, rev;
- uint16_t id1, id2, nvm_ver, phy_ver;
+ uint16_t id1, id2, nvm_ver, phy_ver, etk_lo, etk_hi;
char descr[MII_MAX_DESCR_LEN];
/* Print PHY Info */
@@ -3873,10 +3873,15 @@ igc_print_devinfo(struct igc_softc *sc)
phy->ops.read_reg(hw, 0x1e, _ver);
aprint_normal(", PHY FW version 0x%04hx\n", phy_ver);
- /* Get NVM version */
+ /* NVM version */
hw->nvm.ops.read(hw, NVM_VERSION, 1, _ver);
- aprint_normal_dev(dev, "ROM image version %x.%02x\n",
+ /* EtrackID */
+ hw->nvm.ops.read(hw, NVM_ETKID_LO, 1, _lo);
+ hw->nvm.ops.read(hw, NVM_ETKID_HI, 1, _hi);
+
+ aprint_normal_dev(dev,
+ "NVM image version %x.%02x, EtrackID %04hx%04hx\n",
(nvm_ver & NVM_VERSION_MAJOR) >> NVM_VERSION_MAJOR_SHIFT,
- (nvm_ver & NVM_VERSION_MINOR));
+ nvm_ver & NVM_VERSION_MINOR, etk_hi, etk_lo);
}
Index: src/sys/dev/pci/igc/igc_defines.h
diff -u src/sys/dev/pci/igc/igc_defines.h:1.2 src/sys/dev/pci/igc/igc_defines.h:1.3
--- src/sys/dev/pci/igc/igc_defines.h:1.2 Wed Oct 4 07:35:27 2023
+++ src/sys/dev/pci/igc/igc_defines.h Wed Feb 21 12:39:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: igc_defines.h,v 1.2 2023/10/04 07:35:27 rin Exp $ */
+/* $NetBSD: igc_defines.h,v 1.3 2024/02/21 12:39:39 msaitoh Exp $ */
/* $OpenBSD: igc_defines.h,v 1.1 2021/10/31 14:52:57 patrick Exp $ */
/*-
@@ -982,6 +982,8 @@
#define NVM_CFG0x0012
#define NVM_ALT_MAC_ADDR_PTR 0x0037
#define NVM_CHECKSUM_REG 0x003F
+#define NVM_ETKID_LO 0x0042
+#define NVM_ETKID_HI 0x0043
#define IGC_NVM_CFG_DONE_PORT_0 0x04 /* MNG config cycle done */
#define IGC_NVM_CFG_DONE_PORT_1 0x08 /* ...for second port */
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: msaitoh Date: Wed Feb 21 12:39:39 UTC 2024 Modified Files: src/sys/dev/pci/igc: if_igc.c igc_defines.h Log Message: igc(4): Print EtrackID. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/igc/if_igc.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/igc/igc_defines.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/igc
Module Name:src
Committed By: msaitoh
Date: Wed Feb 21 12:34:06 UTC 2024
Modified Files:
src/sys/dev/pci/igc: if_igc.c
Log Message:
igc(4): Modify dmesg output of PHY and NVM info.
- Print PHY info first and then print NVM info.
- Remove debug output.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/igc/if_igc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.11 src/sys/dev/pci/igc/if_igc.c:1.12
--- src/sys/dev/pci/igc/if_igc.c:1.11 Thu Feb 8 09:59:35 2024
+++ src/sys/dev/pci/igc/if_igc.c Wed Feb 21 12:34:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.11 2024/02/08 09:59:35 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.11 2024/02/08 09:59:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_igc.h"
@@ -3862,23 +3862,21 @@ igc_print_devinfo(struct igc_softc *sc)
rev = MII_REV(id2);
mii_get_descr(descr, sizeof(descr), oui, model);
if (descr[0])
- aprint_normal_dev(dev, "PHY: %s, rev. %d\n",
+ aprint_normal_dev(dev, "PHY: %s, rev. %d",
descr, rev);
else
aprint_normal_dev(dev,
- "PHY OUI 0x%06x, model 0x%04x, rev. %d\n",
+ "PHY OUI 0x%06x, model 0x%04x, rev. %d",
oui, model, rev);
+ /* PHY FW version */
+ phy->ops.read_reg(hw, 0x1e, _ver);
+ aprint_normal(", PHY FW version 0x%04hx\n", phy_ver);
+
/* Get NVM version */
hw->nvm.ops.read(hw, NVM_VERSION, 1, _ver);
- /* Get PHY FW version */
- phy->ops.read_reg(hw, 0x1e, _ver);
-
- aprint_normal_dev(dev, "ROM image version %x.%02x",
+ aprint_normal_dev(dev, "ROM image version %x.%02x\n",
(nvm_ver & NVM_VERSION_MAJOR) >> NVM_VERSION_MAJOR_SHIFT,
(nvm_ver & NVM_VERSION_MINOR));
- aprint_debug("(0x%04hx)", nvm_ver);
-
- aprint_normal(", PHY FW version 0x%04hx\n", phy_ver);
}
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: msaitoh Date: Wed Feb 21 12:34:06 UTC 2024 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): Modify dmesg output of PHY and NVM info. - Print PHY info first and then print NVM info. - Remove debug output. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/igc/if_igc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 21 12:23:52 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c Log Message: wm(4): Fix upper 16bit of Image Unique ID(EtrackID). Don't override uid1 variable while reading option ROM version to print Image Unique ID correctly. To generate a diff of this commit: cvs rdiff -u -r1.797 -r1.798 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Feb 21 12:23:52 UTC 2024
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Fix upper 16bit of Image Unique ID(EtrackID).
Don't override uid1 variable while reading option ROM version
to print Image Unique ID correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.797 -r1.798 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.797 src/sys/dev/pci/if_wm.c:1.798
--- src/sys/dev/pci/if_wm.c:1.797 Mon Jan 29 06:24:51 2024
+++ src/sys/dev/pci/if_wm.c Wed Feb 21 12:23:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.798 2024/02/21 12:23:52 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.798 2024/02/21 12:23:52 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -15364,16 +15364,17 @@ printver:
/* Option ROM Version */
if ((off != 0x) && (off != 0x)) {
int rv;
+ uint16_t oid0, oid1;
off += NVM_COMBO_VER_OFF;
- rv = wm_nvm_read(sc, off + 1, 1, );
- rv |= wm_nvm_read(sc, off, 1, );
- if ((rv == 0) && (uid0 != 0) && (uid0 != 0x)
- && (uid1 != 0) && (uid1 != 0x)) {
+ rv = wm_nvm_read(sc, off + 1, 1, );
+ rv |= wm_nvm_read(sc, off, 1, );
+ if ((rv == 0) && (oid0 != 0) && (oid0 != 0x)
+ && (oid1 != 0) && (oid1 != 0x)) {
/* 16bits */
-major = uid0 >> 8;
-build = (uid0 << 8) | (uid1 >> 8);
-patch = uid1 & 0x00ff;
+major = oid0 >> 8;
+build = (oid0 << 8) | (oid1 >> 8);
+patch = oid1 & 0x00ff;
aprint_verbose(", option ROM Version %d.%d.%d",
major, build, patch);
}
CVS commit: src/external/gpl3/gcc/lib
Module Name:src Committed By: mrg Date: Wed Feb 21 09:06:57 UTC 2024 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3: Makefile src/external/gpl3/gcc/lib/libsupc++: Makefile.common Log Message: build the C++20 sstream-inst.cc. fixes link errors in libreoffice reported by rjs on current-users. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile cvs rdiff -u -r1.20 -r1.21 \ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Wed Feb 21 09:06:57 UTC 2024
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile.common
Log Message:
build the C++20 sstream-inst.cc.
fixes link errors in libreoffice reported by rjs on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/gpl3/gcc/lib/libsupc++/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.54 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.55
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.54 Tue Aug 1 05:57:57 2023
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Wed Feb 21 09:06:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2023/08/01 05:57:57 mrg Exp $
+# $NetBSD: Makefile,v 1.55 2024/02/21 09:06:56 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -161,7 +161,8 @@ BUILDSYMLINKS+= \
codecvt 98 11 \
cow-string-inst 11 17 \
ostream-inst 11 17 \
- string-inst 11 17
+ string-inst 11 17 \
+ sstream-inst 11 20
BUILDSYMLINKS+= \
${GLIBCXX_SRCDIR}/src/c++${_V1}/${_N}.cc c${_V1}-${_N}.cc
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.20 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.21
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.20 Fri Jul 22 07:09:25 2022
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Wed Feb 21 09:06:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2022/07/22 07:09:25 mrg Exp $
+# $NetBSD: Makefile.common,v 1.21 2024/02/21 09:06:56 mrg Exp $
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
@@ -18,20 +18,24 @@ LIBSTDCXX_MACHINE_ARCH=${GCC_MACHINE_ARC
# Deal with renamed sources. Needs to match a loop in libstdc++-v3/Makefile.
BUILD_CPP98_SOURCES= ${G_CPP98_SOURCES:Ncodecvt.cc} \
c98-codecvt.cc
-BUILD_CPP11_SOURCES= ${G_CPP11_SOURCES:Ncodecvt.cc:Ncow-string-inst.cc:Nostream-inst.cc:Nstring-inst.cc} \
+BUILD_CPP11_SOURCES= ${G_CPP11_SOURCES:Ncodecvt.cc:Ncow-string-inst.cc:Nostream-inst.cc:Nstring-inst.cc:Nsstream-inst.cc} \
c11-codecvt.cc \
c11-cow-string-inst.cc \
c11-ostream-inst.cc \
- c11-string-inst.cc
+ c11-string-inst.cc \
+ c11-sstream-inst.cc
BUILD_CPP17_SOURCES= ${G_CPP17_SOURCES:Ncow-string-inst.cc:Nostream-inst.cc:Nstring-inst.cc} \
c17-cow-string-inst.cc \
c17-ostream-inst.cc \
c17-string-inst.cc
+BUILD_CPP20_SOURCES= ${G_CPP20_SOURCES:Nsstream-inst.cc} \
+ c20-sstream-inst.cc
LIBSTDCXXSRCS= ${G_SRC_SOURCES} \
${BUILD_CPP98_SOURCES} \
${BUILD_CPP11_SOURCES} \
- ${BUILD_CPP17_SOURCES}
+ ${BUILD_CPP17_SOURCES} \
+ ${BUILD_CPP20_SOURCES}
# XXX XXX dir.o doesn't have stuff properly, leave it out for now
#LIBSTDCXXSRCS+= ${G_FILESYSTEM_SOURCES}
@@ -94,6 +98,10 @@ COPTS.${_f}+= -std=gnu++1z
COPTS.${_f}+= -std=gnu++17 -fimplicit-templates
.endfor
+.for _f in ${BUILD_CPP20_SOURCES}
+COPTS.${_f}+= -std=gnu++20 -fimplicit-templates
+.endfor
+
.for _f in dir ops fs_dir fs_ops cow-fs_dir cow-fs_ops
${_f}.o ${_f}.d ${_f}.pico ${_f}.po: bits/largefile-config.h
.endfor
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 21 08:24:46 UTC 2024
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
fetch G_CPP20_SOURCES.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.117 src/tools/gcc/mknative-gcc:1.118
--- src/tools/gcc/mknative-gcc:1.117 Mon Jul 31 01:48:37 2023
+++ src/tools/gcc/mknative-gcc Wed Feb 21 08:24:46 2024
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.117 2023/07/31 01:48:37 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.118 2024/02/21 08:24:46 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -251,8 +251,9 @@ get_libstdcxx_v3 () {
getvars $_PLATFORM/libstdc++-v3/Makefile \
port_specific_symbol_files
getvars $_PLATFORM/libstdc++-v3/src/Makefile \
- cxx17_sources \
cxx11_sources \
+ cxx17_sources \
+ cxx20_sources \
cxx98_sources
# libsupc++
@@ -271,6 +272,9 @@ get_libstdcxx_v3 () {
getvars $_PLATFORM/libstdc++-v3/src/c++17/Makefile \
libc__17convenience_la_SOURCES | \
sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
+ getvars $_PLATFORM/libstdc++-v3/src/c++20/Makefile \
+ libc__20convenience_la_SOURCES | \
+ sed -e 's/^G_libc__20convenience_la_SOURCES=/G_CPP20_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
libc__11convenience_la_SOURCES | \
sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Feb 21 08:24:46 UTC 2024 Modified Files: src/tools/gcc: mknative-gcc Log Message: fetch G_CPP20_SOURCES. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
