CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 23:26:20 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist/src: locking.h Log Message: avoid redefining xmalloc and xfree. this file defines them with a parameter, but Xthreads.h (which comes from xorgproto) only defines them as names, causing conflicting definitions. fixes build with libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/locking.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 23:26:20 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist/src: locking.h Log Message: avoid redefining xmalloc and xfree. this file defines them with a parameter, but Xthreads.h (which comes from xorgproto) only defines them as names, causing conflicting definitions. fixes build with libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/locking.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/src/locking.h diff -u xsrc/external/mit/libX11/dist/src/locking.h:1.1.1.5 xsrc/external/mit/libX11/dist/src/locking.h:1.2 --- xsrc/external/mit/libX11/dist/src/locking.h:1.1.1.5 Tue Apr 27 06:10:57 2021 +++ xsrc/external/mit/libX11/dist/src/locking.h Sun Feb 5 23:26:20 2023 @@ -34,8 +34,12 @@ in this Software without prior written a #ifndef _X_locking_H_ #define _X_locking_H_ +#ifndef xmalloc #define xmalloc(s) Xmalloc(s) +#endif +#ifndef xfree #define xfree(s) Xfree(s) +#endif #include #include #include
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 22:58:21 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11: Xlibint.h xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: ChkIfEv.c IfEvent.c PeekIfEv.c PutBEvent.c locking.c Log Message: merge libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c \ xsrc/external/mit/libX11/dist/src/PeekIfEv.c \ xsrc/external/mit/libX11/dist/src/PutBEvent.c \ xsrc/external/mit/libX11/dist/src/locking.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 22:58:21 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11: Xlibint.h xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: ChkIfEv.c IfEvent.c PeekIfEv.c PutBEvent.c locking.c Log Message: merge libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c \ xsrc/external/mit/libX11/dist/src/PeekIfEv.c \ xsrc/external/mit/libX11/dist/src/PutBEvent.c \ xsrc/external/mit/libX11/dist/src/locking.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 22:57:35 UTC 2023 Update of /cvsroot/xsrc/external/mit/libX11/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4393 Log Message: initial import of libX11-1.8.4 Status: Vendor Tag: xorg Release Tags: libX11-1-8-4 U xsrc/external/mit/libX11/dist/compile C xsrc/external/mit/libX11/dist/configure U xsrc/external/mit/libX11/dist/AUTHORS U xsrc/external/mit/libX11/dist/x11.pc.in U xsrc/external/mit/libX11/dist/README.md U xsrc/external/mit/libX11/dist/Makefile.in U xsrc/external/mit/libX11/dist/COPYING U xsrc/external/mit/libX11/dist/docbook.am C xsrc/external/mit/libX11/dist/ChangeLog C xsrc/external/mit/libX11/dist/configure.ac U xsrc/external/mit/libX11/dist/depcomp U xsrc/external/mit/libX11/dist/install-sh U xsrc/external/mit/libX11/dist/Makefile.am U xsrc/external/mit/libX11/dist/missing C xsrc/external/mit/libX11/dist/aclocal.m4 U xsrc/external/mit/libX11/dist/test-driver U xsrc/external/mit/libX11/dist/INSTALL U xsrc/external/mit/libX11/dist/x11-xcb.pc.in U xsrc/external/mit/libX11/dist/ltmain.sh U xsrc/external/mit/libX11/dist/config.guess U xsrc/external/mit/libX11/dist/cpprules.in U xsrc/external/mit/libX11/dist/config.sub U xsrc/external/mit/libX11/dist/include/Makefile.in U xsrc/external/mit/libX11/dist/include/Makefile.am U xsrc/external/mit/libX11/dist/include/X11/ImUtil.h U xsrc/external/mit/libX11/dist/include/X11/Xregion.h U xsrc/external/mit/libX11/dist/include/X11/cursorfont.h U xsrc/external/mit/libX11/dist/include/X11/Xlib.h U xsrc/external/mit/libX11/dist/include/X11/Xresource.h U xsrc/external/mit/libX11/dist/include/X11/XlibConf.h.in U xsrc/external/mit/libX11/dist/include/X11/Xlib-xcb.h U xsrc/external/mit/libX11/dist/include/X11/Xlocale.h C xsrc/external/mit/libX11/dist/include/X11/Xlibint.h U xsrc/external/mit/libX11/dist/include/X11/XKBlib.h U xsrc/external/mit/libX11/dist/include/X11/Xcms.h U xsrc/external/mit/libX11/dist/include/X11/Xutil.h U xsrc/external/mit/libX11/dist/include/X11/extensions/XKBgeom.h U xsrc/external/mit/libX11/dist/man/XGetPointerControl.man U xsrc/external/mit/libX11/dist/man/XDefineCursor.man U xsrc/external/mit/libX11/dist/man/XUngrabKey.man U xsrc/external/mit/libX11/dist/man/WhitePixel.man U xsrc/external/mit/libX11/dist/man/XDeleteModifiermapEntry.man U xsrc/external/mit/libX11/dist/man/XCheckTypedWindowEvent.man U xsrc/external/mit/libX11/dist/man/XwcDrawImageString.man U xsrc/external/mit/libX11/dist/man/XQueryTextExtents16.man U xsrc/external/mit/libX11/dist/man/XFillRectangle.man U xsrc/external/mit/libX11/dist/man/XUnlockDisplay.man U xsrc/external/mit/libX11/dist/man/XSelectionEvent.man U xsrc/external/mit/libX11/dist/man/XSetBackground.man U xsrc/external/mit/libX11/dist/man/XSelectInput.man U xsrc/external/mit/libX11/dist/man/BitmapPad.man U xsrc/external/mit/libX11/dist/man/XSizeHints.man U xsrc/external/mit/libX11/dist/man/XMapEvent.man U xsrc/external/mit/libX11/dist/man/DefaultDepthOfScreen.man U xsrc/external/mit/libX11/dist/man/XQueryBestSize.man U xsrc/external/mit/libX11/dist/man/XcmsStoreColor.man U xsrc/external/mit/libX11/dist/man/XTextWidth16.man U xsrc/external/mit/libX11/dist/man/XVisibilityEvent.man U xsrc/external/mit/libX11/dist/man/XFreeFontInfo.man U xsrc/external/mit/libX11/dist/man/XrmPutStringResource.man U xsrc/external/mit/libX11/dist/man/IsKeypadKey.man U xsrc/external/mit/libX11/dist/man/XrmStringToQuarkList.man U xsrc/external/mit/libX11/dist/man/XScreenNumberOfScreen.man U xsrc/external/mit/libX11/dist/man/XSetEventQueueOwner.man U xsrc/external/mit/libX11/dist/man/XSetWMIconName.man U xsrc/external/mit/libX11/dist/man/XrmInitialize.man U xsrc/external/mit/libX11/dist/man/XCopyGC.man U xsrc/external/mit/libX11/dist/man/XSetWindowAttributes.man U xsrc/external/mit/libX11/dist/man/XFetchBuffer.man U xsrc/external/mit/libX11/dist/man/XGetPointerMapping.man U xsrc/external/mit/libX11/dist/man/XConfigureEvent.man U xsrc/external/mit/libX11/dist/man/XVisualIDFromVisual.man U xsrc/external/mit/libX11/dist/man/IsFunctionKey.man U xsrc/external/mit/libX11/dist/man/XRemoveFromSaveSet.man U xsrc/external/mit/libX11/dist/man/XSetWindowBackground.man U xsrc/external/mit/libX11/dist/man/XrmPermStringToQuark.man U xsrc/external/mit/libX11/dist/man/XCreateRegion.man U xsrc/external/mit/libX11/dist/man/DefaultGCOfScreen.man U xsrc/external/mit/libX11/dist/man/XPropertyEvent.man U xsrc/external/mit/libX11/dist/man/XFreeFontSet.man U xsrc/external/mit/libX11/dist/man/XKeymapEvent.man U xsrc/external/mit/libX11/dist/man/XIMOfIC.man U xsrc/external/mit/libX11/dist/man/XDestroyWindowEvent.man U xsrc/external/mit/libX11/dist/man/XRotateBuffers.man U xsrc/external/mit/libX11/dist/man/XCreateBitmapFromData.man U xsrc/external/mit/libX11/dist/man/XCopyColormapAndFree.man U xsrc/external/mit/libX11/dist/man/Xutf8DrawText.man U xsrc/external/mit/libX11/dist/man/XGetXCBConnection.man U xsrc/external/mit/libX11/dist/man/XDeleteProperty.man U
CVS import: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 22:57:35 UTC 2023 Update of /cvsroot/xsrc/external/mit/libX11/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4393 Log Message: initial import of libX11-1.8.4 Status: Vendor Tag: xorg Release Tags: libX11-1-8-4 U xsrc/external/mit/libX11/dist/compile C xsrc/external/mit/libX11/dist/configure U xsrc/external/mit/libX11/dist/AUTHORS U xsrc/external/mit/libX11/dist/x11.pc.in U xsrc/external/mit/libX11/dist/README.md U xsrc/external/mit/libX11/dist/Makefile.in U xsrc/external/mit/libX11/dist/COPYING U xsrc/external/mit/libX11/dist/docbook.am C xsrc/external/mit/libX11/dist/ChangeLog C xsrc/external/mit/libX11/dist/configure.ac U xsrc/external/mit/libX11/dist/depcomp U xsrc/external/mit/libX11/dist/install-sh U xsrc/external/mit/libX11/dist/Makefile.am U xsrc/external/mit/libX11/dist/missing C xsrc/external/mit/libX11/dist/aclocal.m4 U xsrc/external/mit/libX11/dist/test-driver U xsrc/external/mit/libX11/dist/INSTALL U xsrc/external/mit/libX11/dist/x11-xcb.pc.in U xsrc/external/mit/libX11/dist/ltmain.sh U xsrc/external/mit/libX11/dist/config.guess U xsrc/external/mit/libX11/dist/cpprules.in U xsrc/external/mit/libX11/dist/config.sub U xsrc/external/mit/libX11/dist/include/Makefile.in U xsrc/external/mit/libX11/dist/include/Makefile.am U xsrc/external/mit/libX11/dist/include/X11/ImUtil.h U xsrc/external/mit/libX11/dist/include/X11/Xregion.h U xsrc/external/mit/libX11/dist/include/X11/cursorfont.h U xsrc/external/mit/libX11/dist/include/X11/Xlib.h U xsrc/external/mit/libX11/dist/include/X11/Xresource.h U xsrc/external/mit/libX11/dist/include/X11/XlibConf.h.in U xsrc/external/mit/libX11/dist/include/X11/Xlib-xcb.h U xsrc/external/mit/libX11/dist/include/X11/Xlocale.h C xsrc/external/mit/libX11/dist/include/X11/Xlibint.h U xsrc/external/mit/libX11/dist/include/X11/XKBlib.h U xsrc/external/mit/libX11/dist/include/X11/Xcms.h U xsrc/external/mit/libX11/dist/include/X11/Xutil.h U xsrc/external/mit/libX11/dist/include/X11/extensions/XKBgeom.h U xsrc/external/mit/libX11/dist/man/XGetPointerControl.man U xsrc/external/mit/libX11/dist/man/XDefineCursor.man U xsrc/external/mit/libX11/dist/man/XUngrabKey.man U xsrc/external/mit/libX11/dist/man/WhitePixel.man U xsrc/external/mit/libX11/dist/man/XDeleteModifiermapEntry.man U xsrc/external/mit/libX11/dist/man/XCheckTypedWindowEvent.man U xsrc/external/mit/libX11/dist/man/XwcDrawImageString.man U xsrc/external/mit/libX11/dist/man/XQueryTextExtents16.man U xsrc/external/mit/libX11/dist/man/XFillRectangle.man U xsrc/external/mit/libX11/dist/man/XUnlockDisplay.man U xsrc/external/mit/libX11/dist/man/XSelectionEvent.man U xsrc/external/mit/libX11/dist/man/XSetBackground.man U xsrc/external/mit/libX11/dist/man/XSelectInput.man U xsrc/external/mit/libX11/dist/man/BitmapPad.man U xsrc/external/mit/libX11/dist/man/XSizeHints.man U xsrc/external/mit/libX11/dist/man/XMapEvent.man U xsrc/external/mit/libX11/dist/man/DefaultDepthOfScreen.man U xsrc/external/mit/libX11/dist/man/XQueryBestSize.man U xsrc/external/mit/libX11/dist/man/XcmsStoreColor.man U xsrc/external/mit/libX11/dist/man/XTextWidth16.man U xsrc/external/mit/libX11/dist/man/XVisibilityEvent.man U xsrc/external/mit/libX11/dist/man/XFreeFontInfo.man U xsrc/external/mit/libX11/dist/man/XrmPutStringResource.man U xsrc/external/mit/libX11/dist/man/IsKeypadKey.man U xsrc/external/mit/libX11/dist/man/XrmStringToQuarkList.man U xsrc/external/mit/libX11/dist/man/XScreenNumberOfScreen.man U xsrc/external/mit/libX11/dist/man/XSetEventQueueOwner.man U xsrc/external/mit/libX11/dist/man/XSetWMIconName.man U xsrc/external/mit/libX11/dist/man/XrmInitialize.man U xsrc/external/mit/libX11/dist/man/XCopyGC.man U xsrc/external/mit/libX11/dist/man/XSetWindowAttributes.man U xsrc/external/mit/libX11/dist/man/XFetchBuffer.man U xsrc/external/mit/libX11/dist/man/XGetPointerMapping.man U xsrc/external/mit/libX11/dist/man/XConfigureEvent.man U xsrc/external/mit/libX11/dist/man/XVisualIDFromVisual.man U xsrc/external/mit/libX11/dist/man/IsFunctionKey.man U xsrc/external/mit/libX11/dist/man/XRemoveFromSaveSet.man U xsrc/external/mit/libX11/dist/man/XSetWindowBackground.man U xsrc/external/mit/libX11/dist/man/XrmPermStringToQuark.man U xsrc/external/mit/libX11/dist/man/XCreateRegion.man U xsrc/external/mit/libX11/dist/man/DefaultGCOfScreen.man U xsrc/external/mit/libX11/dist/man/XPropertyEvent.man U xsrc/external/mit/libX11/dist/man/XFreeFontSet.man U xsrc/external/mit/libX11/dist/man/XKeymapEvent.man U xsrc/external/mit/libX11/dist/man/XIMOfIC.man U xsrc/external/mit/libX11/dist/man/XDestroyWindowEvent.man U xsrc/external/mit/libX11/dist/man/XRotateBuffers.man U xsrc/external/mit/libX11/dist/man/XCreateBitmapFromData.man U xsrc/external/mit/libX11/dist/man/XCopyColormapAndFree.man U xsrc/external/mit/libX11/dist/man/Xutf8DrawText.man U xsrc/external/mit/libX11/dist/man/XGetXCBConnection.man U xsrc/external/mit/libX11/dist/man/XDeleteProperty.man U
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: mrg Date: Sun Feb 5 22:42:39 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm: autoconf.c src/sys/arch/evbarm/fdt: fdt_machdep.c src/sys/arch/evbarm/include: types.h Log Message: fix root detection on evbarm when raid is involved there are several problems solved in this change: - lots of work was re-done when we already have determined the device booted from, so several new early returns introduced if booted_device has been set - due to the lack of cpu_bootconf(), raidframe softroot would override "root=xxx" on the boot command line (note that platforms that use eg, device_register() to detect the boot device are not affected by this issue as they find the boot device much earlier.) - in the new cpu_bootconf(), switch the order of the platform boot-config with the set_root_device() call. this avoids a problem where "root=xxx" is checked after automated methods, and is thus ignored. - in fdt_detect_root_device(), remove the code to add "root=xxx"" string to the boot_args[] that would be later parsed by the set_root_device() call, and simply set booted_device and, for mbr installs, booted_partition directly. also, for any successful call, perform an early return. - define __HAVE_CPU_BOOTCONF so early boot calls cpu_bootconf(). tested on: - rockpro64 booting from emmc, sata (big, and little endian) - rockpro64 loading kernel from msdos partition - rockpro64 booting from network (fails to auto-detect, with or without this change) - quartz64 booting from nvme - lx2k booting from nvme XXX: pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/evbarm/autoconf.c cvs rdiff -u -r1.99 -r1.100 src/sys/arch/evbarm/fdt/fdt_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: mrg
Date: Sun Feb 5 22:42:39 UTC 2023
Modified Files:
src/sys/arch/evbarm/evbarm: autoconf.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/evbarm/include: types.h
Log Message:
fix root detection on evbarm when raid is involved
there are several problems solved in this change:
- lots of work was re-done when we already have determined the
device booted from, so several new early returns introduced
if booted_device has been set
- due to the lack of cpu_bootconf(), raidframe softroot would
override "root=xxx" on the boot command line (note that
platforms that use eg, device_register() to detect the boot
device are not affected by this issue as they find the
boot device much earlier.)
- in the new cpu_bootconf(), switch the order of the platform
boot-config with the set_root_device() call. this avoids a
problem where "root=xxx" is checked after automated methods,
and is thus ignored.
- in fdt_detect_root_device(), remove the code to add "root=xxx""
string to the boot_args[] that would be later parsed by the
set_root_device() call, and simply set booted_device and, for
mbr installs, booted_partition directly. also, for any
successful call, perform an early return.
- define __HAVE_CPU_BOOTCONF so early boot calls cpu_bootconf().
tested on:
- rockpro64 booting from emmc, sata (big, and little endian)
- rockpro64 loading kernel from msdos partition
- rockpro64 booting from network (fails to auto-detect, with or
without this change)
- quartz64 booting from nvme
- lx2k booting from nvme
XXX: pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/evbarm/autoconf.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/include/types.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/arch/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.23 src/sys/arch/evbarm/evbarm/autoconf.c:1.24
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.23 Sat Dec 19 21:54:00 2020
+++ src/sys/arch/evbarm/evbarm/autoconf.c Sun Feb 5 22:42:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2023/02/05 22:42:39 mrg Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
@@ -108,6 +108,9 @@ set_root_device(void)
char *ptr, *end, *buf;
size_t len;
+ if (booted_device)
+ return;
+
if (boot_args == NULL)
return;
@@ -118,7 +121,7 @@ set_root_device(void)
return;
/* NUL-terminate string, get_bootconf_option doesn't */
- for (end=ptr; *end != '\0'; ++end) {
+ for (end = ptr; *end != '\0'; ++end) {
if (*end == ' ' || *end == '\t') {
break;
}
@@ -144,16 +147,25 @@ set_root_device(void)
#endif
/*
- * Set up the root device from the boot args
+ * Set up the root device from the boot args.
+ *
+ * cpu_bootconf() is called before RAIDframe root detection,
+ * and cpu_rootconf() is called after.
*/
void
-cpu_rootconf(void)
+cpu_bootconf(void)
{
#ifndef MEMORY_DISK_IS_ROOT
+ set_root_device();
if (evbarm_cpu_rootconf)
(*evbarm_cpu_rootconf)();
- set_root_device();
#endif
+}
+
+void
+cpu_rootconf(void)
+{
+ cpu_bootconf();
aprint_normal("boot device: %s\n",
booted_device != NULL ? device_xname(booted_device) : "");
rootconf();
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.100
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99 Fri Nov 4 10:51:17 2022
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Feb 5 22:42:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.99 2022/11/04 10:51:17 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.100 2023/02/05 22:42:39 mrg Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.99 2022/11/04 10:51:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.100 2023/02/05 22:42:39 mrg Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -741,16 +741,10 @@ delay(u_int us)
static void
fdt_detect_root_device(device_t dev)
{
- struct mbr_sector mbr;
- uint8_t buf[DEV_BSIZE];
- uint8_t hash[16];
- const uint8_t *rhash;
- char rootarg[64];
- struct vnode *vp;
- MD5_CTX md5ctx;
int error, len;
- size_t resid;
- u_int part;
+
+ if (booted_device)
+ return;
const int chosen = OF_finddevice("/chosen");
if (chosen < 0)
@@ -758,6 +752,14 @@ fdt_detect_root_device(device_t dev)
if (of_hasprop(chosen, "netbsd,mbr") &&
CVS commit: src/etc/iscsi
Module Name:src Committed By: mlelstv Date: Sun Feb 5 21:20:15 UTC 2023 Modified Files: src/etc/iscsi: Makefile Log Message: With MKISCSI we need all files. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/etc/iscsi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/iscsi
Module Name:src
Committed By: mlelstv
Date: Sun Feb 5 21:20:15 UTC 2023
Modified Files:
src/etc/iscsi: Makefile
Log Message:
With MKISCSI we need all files.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/etc/iscsi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/iscsi/Makefile
diff -u src/etc/iscsi/Makefile:1.6 src/etc/iscsi/Makefile:1.7
--- src/etc/iscsi/Makefile:1.6 Sun Feb 5 13:39:42 2023
+++ src/etc/iscsi/Makefile Sun Feb 5 21:20:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/02/05 13:39:42 mlelstv Exp $
+# $NetBSD: Makefile,v 1.7 2023/02/05 21:20:14 mlelstv Exp $
.include
@@ -10,7 +10,7 @@ FILESMODE_volumes= 0644
# userland iSCSI initiator and target
.if ${MKISCSI} != "no"
-CONFIGFILES= auths targets
+CONFIGFILES+= auths targets
FILESMODE_auths= 0600
FILESMODE_targets= 0644
CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Sun Feb 5 21:18:05 UTC 2023
Modified Files:
src/sys/kern: subr_prf.c
Log Message:
avoid pserialize usage in early boot
there are DEBUG-only aprint_normal() calls early in eg, ksyms
setup that may happen before eg curcpu() is setup. this is the
case in sparc64, where it sets up ksyms as early as it can so
that DDB has symbols early, which is before the curcpu() setup
is created, and thus the calls to pserialize_read_enter() and
pserialize_read_exit() attempt to access unmapped cpu_info and
due to being so early, the system faults to the prom.
simply use "cold" to determine whether to skip these pserialize
calls or not.
ok riastradh
XXX: pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/kern/subr_prf.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/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.196 src/sys/kern/subr_prf.c:1.197
--- src/sys/kern/subr_prf.c:1.196 Mon Oct 31 09:14:18 2022
+++ src/sys/kern/subr_prf.c Sun Feb 5 21:18:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.196 2022/10/31 09:14:18 simonb Exp $ */
+/* $NetBSD: subr_prf.c,v 1.197 2023/02/05 21:18:05 mrg Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.196 2022/10/31 09:14:18 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.197 2023/02/05 21:18:05 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -401,6 +401,7 @@ putone(int c, int flags, struct tty *tp)
{
struct tty *ctp;
int s;
+ bool do_ps = cold;
ctp = NULL; /* XXX gcc i386 -Os */
@@ -408,7 +409,8 @@ putone(int c, int flags, struct tty *tp)
* Ensure whatever constty points to can't go away while we're
* trying to use it.
*/
- s = pserialize_read_enter();
+ if (__predict_true(do_ps))
+ s = pserialize_read_enter();
if (panicstr)
atomic_store_relaxed(, NULL);
@@ -429,7 +431,8 @@ putone(int c, int flags, struct tty *tp)
if ((flags & TOCONS) && ctp == NULL && c != '\0')
(*v_putc)(c);
- pserialize_read_exit(s);
+ if (__predict_true(do_ps))
+ pserialize_read_exit(s);
}
static void
CVS commit: src/sys/kern
Module Name:src Committed By: mrg Date: Sun Feb 5 21:18:05 UTC 2023 Modified Files: src/sys/kern: subr_prf.c Log Message: avoid pserialize usage in early boot there are DEBUG-only aprint_normal() calls early in eg, ksyms setup that may happen before eg curcpu() is setup. this is the case in sparc64, where it sets up ksyms as early as it can so that DDB has symbols early, which is before the curcpu() setup is created, and thus the calls to pserialize_read_enter() and pserialize_read_exit() attempt to access unmapped cpu_info and due to being so early, the system faults to the prom. simply use "cold" to determine whether to skip these pserialize calls or not. ok riastradh XXX: pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/kern/subr_prf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 17:23:01 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Log Message: tests/lint: fix source directory for looking up the .exp-ln files To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/tests/usr.bin/xlint/lint1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Feb 5 17:23:01 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: Makefile
Log Message:
tests/lint: fix source directory for looking up the .exp-ln files
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/tests/usr.bin/xlint/lint1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.139 src/tests/usr.bin/xlint/lint1/Makefile:1.140
--- src/tests/usr.bin/xlint/lint1/Makefile:1.139 Sun Feb 5 16:11:56 2023
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Feb 5 17:23:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2023/02/05 16:11:56 rillig Exp $
+# $NetBSD: Makefile,v 1.140 2023/02/05 17:23:01 rillig Exp $
NOMAN= # defined
@@ -17,7 +17,7 @@ archsubdir.sh:
@echo archsubdir=${ARCHSUBDIR} >${.TARGET}
FILESDIR= ${TESTSDIR}
-FILES+= ${:!cd ${FILESDIR} && echo *.c *.exp-ln!}
+FILES+= ${:!cd ${.CURDIR} && echo *.c *.exp-ln!}
FILES+= check-expect.lua
# Note: only works for adding tests.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Feb 5 16:11:56 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: Makefile
Log Message:
tests/lint1: the redundantly listed files contained .exp-ln as well
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/tests/usr.bin/xlint/lint1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.138 src/tests/usr.bin/xlint/lint1/Makefile:1.139
--- src/tests/usr.bin/xlint/lint1/Makefile:1.138 Sun Feb 5 15:11:19 2023
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Feb 5 16:11:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2023/02/05 15:11:19 rillig Exp $
+# $NetBSD: Makefile,v 1.139 2023/02/05 16:11:56 rillig Exp $
NOMAN= # defined
@@ -17,7 +17,7 @@ archsubdir.sh:
@echo archsubdir=${ARCHSUBDIR} >${.TARGET}
FILESDIR= ${TESTSDIR}
-FILES+= ${:!cd ${FILESDIR} && echo *.c!}
+FILES+= ${:!cd ${FILESDIR} && echo *.c *.exp-ln!}
FILES+= check-expect.lua
# Note: only works for adding tests.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 16:11:56 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Log Message: tests/lint1: the redundantly listed files contained .exp-ln as well To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/tests/usr.bin/xlint/lint1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Feb 5 15:11:19 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: Makefile
Log Message:
tests/lint: fix resolving of wildcards in builds from other directories
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/tests/usr.bin/xlint/lint1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.137 src/tests/usr.bin/xlint/lint1/Makefile:1.138
--- src/tests/usr.bin/xlint/lint1/Makefile:1.137 Sun Feb 5 12:36:56 2023
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Feb 5 15:11:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2023/02/05 12:36:56 rillig Exp $
+# $NetBSD: Makefile,v 1.138 2023/02/05 15:11:19 rillig Exp $
NOMAN= # defined
@@ -17,7 +17,7 @@ archsubdir.sh:
@echo archsubdir=${ARCHSUBDIR} >${.TARGET}
FILESDIR= ${TESTSDIR}
-FILES+= ${:!echo *.c!}
+FILES+= ${:!cd ${FILESDIR} && echo *.c!}
FILES+= check-expect.lua
# Note: only works for adding tests.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 15:11:19 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Log Message: tests/lint: fix resolving of wildcards in builds from other directories To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/tests/usr.bin/xlint/lint1/Makefile 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 Feb 5 14:53:38 UTC 2023 Modified Files: src/share/mk: bsd.own.mk Log Message: switch the remainder to binutils 2.39 To generate a diff of this commit: cvs rdiff -u -r1.1305 -r1.1306 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: Sun Feb 5 14:53:38 UTC 2023
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch the remainder to binutils 2.39
To generate a diff of this commit:
cvs rdiff -u -r1.1305 -r1.1306 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.1305 src/share/mk/bsd.own.mk:1.1306
--- src/share/mk/bsd.own.mk:1.1305 Sat Feb 4 11:34:36 2023
+++ src/share/mk/bsd.own.mk Sun Feb 5 09:53:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1305 2023/02/04 16:34:36 wiz Exp $
+# $NetBSD: bsd.own.mk,v 1.1306 2023/02/05 14:53:38 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -98,24 +98,7 @@ MKGCCCMDS?= no
#
# What binutils is used?
#
-.if \
-${MACHINE_ARCH:Maarch64*} || \
-${MACHINE_ARCH} == "alpha" || \
-${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "m68k" || \
-${MACHINE_ARCH} == "mipsel" || \
-${MACHINE_ARCH:Msparc*} || \
-${MACHINE_ARCH} == "x86_64" || \
-${MACHINE_ARCH} == "vax" || \
-${MACHINE_CPU} == "hppa" || \
-${MACHINE_CPU} == "powerpc" || \
-${MACHINE_CPU} == "riscv" || \
-${MACHINE_CPU} == "sh3" || \
-${MACHINE} == "sun2"
HAVE_BINUTILS?= 239
-.else
-HAVE_BINUTILS?= 234
-.endif
.if ${HAVE_BINUTILS} == 239
EXTERNAL_BINUTILS_SUBDIR= binutils
CVS commit: src/etc/iscsi
Module Name:src Committed By: mlelstv Date: Sun Feb 5 13:39:42 UTC 2023 Modified Files: src/etc/iscsi: Makefile Log Message: Fix build without MKISCSI To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/etc/iscsi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/iscsi
Module Name:src
Committed By: mlelstv
Date: Sun Feb 5 13:39:42 UTC 2023
Modified Files:
src/etc/iscsi: Makefile
Log Message:
Fix build without MKISCSI
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/iscsi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/iscsi/Makefile
diff -u src/etc/iscsi/Makefile:1.5 src/etc/iscsi/Makefile:1.6
--- src/etc/iscsi/Makefile:1.5 Fri Feb 3 15:59:04 2023
+++ src/etc/iscsi/Makefile Sun Feb 5 13:39:42 2023
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.5 2023/02/03 15:59:04 mlelstv Exp $
+# $NetBSD: Makefile,v 1.6 2023/02/05 13:39:42 mlelstv Exp $
.include
+# kernel iSCSI initiator
+CONFIGFILES= volumes
+FILESDIR= /etc/iscsi
+FILESMODE_volumes= 0644
+
+# userland iSCSI initiator and target
.if ${MKISCSI} != "no"
-CONFIGFILES= auths targets volumes
-FILESDIR= /etc/iscsi
+CONFIGFILES= auths targets
FILESMODE_auths= 0600
FILESMODE_targets= 0644
.endif
+
.include
.include
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 13:06:36 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: README.md Log Message: tests/lint: update instructions for adding a new test The redundant variable 'FILES' no longer needs up be updated. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.bin/xlint/lint1/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/README.md diff -u src/usr.bin/xlint/lint1/README.md:1.10 src/usr.bin/xlint/lint1/README.md:1.11 --- src/usr.bin/xlint/lint1/README.md:1.10 Sat Jan 21 21:14:38 2023 +++ src/usr.bin/xlint/lint1/README.md Sun Feb 5 13:06:36 2023 @@ -1,4 +1,4 @@ -[//]: # ($NetBSD: README.md,v 1.10 2023/01/21 21:14:38 rillig Exp $) +[//]: # ($NetBSD: README.md,v 1.11 2023/02/05 13:06:36 rillig Exp $) # Introduction @@ -224,7 +224,7 @@ They do this by placing `expect` comment The comment `/* expect+1: ... */` expects a diagnostic to be generated for the code 1 line below, `/* expect-5: ... */` expects a diagnostic to be generated for the code 5 lines above. -Each `expect` comment must be in a single line. +An `expect` comment cannot span multiple lines. At the start and the end of the comment, the placeholder `...` stands for an arbitrary sequence of characters. There may be other code or comments in the same line of the `.c` file. @@ -237,8 +237,7 @@ Most other tests focus on a single featu 1. Run `make add-test NAME=test_name`. 2. Run `cd ../../../tests/usr.bin/xlint/lint1`. -3. Sort the `FILES` lines in `Makefile`. -4. Make the test generate the desired diagnostics. -5. Run `./accept.sh test_name` until it no longer complains. -6. Run `cd ../../..`. -7. Run `cvs commit distrib/sets/lists/tests/mi tests/usr.bin/xlint`. +3. Make the test generate the desired diagnostics. +4. Run `./accept.sh test_name` until it no longer complains. +5. Run `cd ../../..`. +6. Run `cvs commit distrib/sets/lists/tests/mi tests/usr.bin/xlint`.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 13:06:36 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: README.md Log Message: tests/lint: update instructions for adding a new test The redundant variable 'FILES' no longer needs up be updated. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.bin/xlint/lint1/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Feb 5 13:01:28 UTC 2023
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: d_c99_init.c
Removed Files:
src/tests/usr.bin/xlint/lint1: d_c99_recursive_init.c d_nolimit_init.c
Log Message:
tests/lint: merge tests for initialization
To generate a diff of this commit:
cvs rdiff -u -r1.1251 -r1.1252 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.43 -r1.44 src/tests/usr.bin/xlint/lint1/d_c99_init.c
cvs rdiff -u -r1.5 -r0 src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c
cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/xlint/lint1/d_nolimit_init.c
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1251 src/distrib/sets/lists/tests/mi:1.1252
--- src/distrib/sets/lists/tests/mi:1.1251 Sun Feb 5 12:25:11 2023
+++ src/distrib/sets/lists/tests/mi Sun Feb 5 13:01:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1251 2023/02/05 12:25:11 rillig Exp $
+# $NetBSD: mi,v 1.1252 2023/02/05 13:01:28 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6453,7 +6453,7 @@
./usr/tests/usr.bin/xlint/lint1/d_c99_init.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_init.exp tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_struct_init.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_union_cast.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp tests-obsolete obsolete,atf
@@ -6503,7 +6503,7 @@
./usr/tests/usr.bin/xlint/lint1/d_long_double_int.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_long_double_int.exp tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_nested_structs.c tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/d_nolimit_init.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_nolimit_init.c tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_packed_structs.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_pr_22119.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_pr_22119.exp tests-obsolete obsolete,atf
Index: src/tests/usr.bin/xlint/lint1/d_c99_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.43 src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.44
--- src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.43 Sun Feb 5 12:25:11 2023
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.c Sun Feb 5 13:01:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_init.c,v 1.43 2023/02/05 12:25:11 rillig Exp $ */
+/* $NetBSD: d_c99_init.c,v 1.44 2023/02/05 13:01:28 rillig Exp $ */
# 3 "d_c99_init.c"
/*
@@ -144,6 +144,20 @@ struct point point_with_mixed_designator
.x = 3,
};
+/*
+ * Before cgram.y 1.230 from 2021-06-20, the grammar allowed either of the
+ * operators '.' or '->' to be used for the designators and had extra code
+ * to ensure that only '.' was actually used.
+ */
+struct point origin = {
+.x = 0,
+/* expect+1: error: syntax error '->' [249] */
+->y = 0,
+};
+
+/* Ensure that the parser can recover from the parse error. */
+struct point pythagoras = { 3, 4 };
+
int array_with_designator[] = {
111,
/* expect+1: error: syntax error 'designator '.member' is only for struct/union' [249] */
@@ -492,6 +506,11 @@ const char string_initialized_with_brace
"initializer",
};
+// An array of unknown size containing strings.
+char weekday_names[][4] = {
+"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
+
/* nested struct/union initialization */
struct outer {
int i;
@@ -532,3 +551,14 @@ struct offset_and_data offset_and_data =
(unsigned long)&(((struct offset_and_data *)0)->data),
0,
};
+
+// The size of the array is determined by the maximum index, not by the last
+// one mentioned.
+int arr_11[] = { [10] = 10, [0] = 0 };
+typedef int ctassert_11[-(int)(sizeof(arr_11) / sizeof(arr_11[0]))];
+/* expect-1: error: negative array dimension (-11) [20] */
+
+// Without an explicit subscript designator, the subscript counts up.
+int arr_3[] = { [1] = 1, [0] = 0, 1, 2 };
+typedef int ctassert_3[-(int)(sizeof(arr_3) / sizeof(arr_3[0]))];
+/* expect-1: error: negative array dimension (-3) [20] */
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Feb 5 13:01:28 UTC 2023 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: d_c99_init.c Removed Files: src/tests/usr.bin/xlint/lint1: d_c99_recursive_init.c d_nolimit_init.c Log Message: tests/lint: merge tests for initialization To generate a diff of this commit: cvs rdiff -u -r1.1251 -r1.1252 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.43 -r1.44 src/tests/usr.bin/xlint/lint1/d_c99_init.c cvs rdiff -u -r1.5 -r0 src/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/xlint/lint1/d_nolimit_init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Feb 5 12:45:22 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #65 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Feb 5 12:45:22 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #65 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.27 src/doc/CHANGES-10.0:1.1.2.28 --- src/doc/CHANGES-10.0:1.1.2.27 Wed Feb 1 19:00:10 2023 +++ src/doc/CHANGES-10.0 Sun Feb 5 12:45:22 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.27 2023/02/01 19:00:10 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.28 2023/02/05 12:45:22 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -759,3 +759,10 @@ sys/arch/vax/boot/Makefile.inc 1.19 vax: make bootloader work on 8MB VAXen. [tsutsui, ticket #64] +external/gpl3/gcc/usr.bin/Makefile.inc 1.35 + + Reduce debug info build for GCC binaries for MKDEBUG builds, + this results in noticably faster builds and lower disk space + requirements. + [mrg, ticket #65] +
CVS commit: [netbsd-10] src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: martin
Date: Sun Feb 5 12:44:40 UTC 2023
Modified Files:
src/external/gpl3/gcc/usr.bin [netbsd-10]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by mrg in ticket #65):
external/gpl3/gcc/usr.bin/Makefile.inc: revision 1.35
for MKDEBUG builds, set CXXFLAGS += -g1 for all GCC binaries.
reduces the size of a non-x11 i386 build by 38% - 992MiB -> 612MiB,
and likely similar reductions elsewhere. it also reduced the build
time by about 3%, perhaps from less IO to write and less data to
compress. for amd64, the size was reduced 1137MiB -> 741MiB, about
35%, though i don't have timing guesses here.
note that these are sizes of .gz not .xz (i enable pigz for my
builds), and this probably has a much greater benefit for xz builds
as the sets creation phase is much slower there.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.2.1 src/external/gpl3/gcc/usr.bin/Makefile.inc
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/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.34 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.34.2.1
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.34 Wed Dec 15 13:28:29 2021
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Sun Feb 5 12:44:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.34 2021/12/15 13:28:29 christos Exp $
+# $NetBSD: Makefile.inc,v 1.34.2.1 2023/02/05 12:44:40 martin Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -43,6 +43,11 @@ NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcomp
CXXFLAGS+= -std=gnu++98
+# Reduce debugging for these extremely large objects.
+.if ${MKDEBUG:Uno} != "no"
+CXXFLAGS+= -g1
+.endif
+
GNUHOSTDIST= ${DIST}
BUILD_PREFIX= ${C_BUILD_PREFIX}
CVS commit: [netbsd-10] src/external/gpl3/gcc/usr.bin
Module Name:src Committed By: martin Date: Sun Feb 5 12:44:40 UTC 2023 Modified Files: src/external/gpl3/gcc/usr.bin [netbsd-10]: Makefile.inc Log Message: Pull up following revision(s) (requested by mrg in ticket #65): external/gpl3/gcc/usr.bin/Makefile.inc: revision 1.35 for MKDEBUG builds, set CXXFLAGS += -g1 for all GCC binaries. reduces the size of a non-x11 i386 build by 38% - 992MiB -> 612MiB, and likely similar reductions elsewhere. it also reduced the build time by about 3%, perhaps from less IO to write and less data to compress. for amd64, the size was reduced 1137MiB -> 741MiB, about 35%, though i don't have timing guesses here. note that these are sizes of .gz not .xz (i enable pigz for my builds), and this probably has a much greater benefit for xz builds as the sets creation phase is much slower there. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.2.1 src/external/gpl3/gcc/usr.bin/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Feb 5 12:36:56 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: Makefile
Log Message:
tests/lint: remove redundancy from Makefile
The list of test files is already kept in distrib/sets/lists/tests/mi.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/tests/usr.bin/xlint/lint1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.136 src/tests/usr.bin/xlint/lint1/Makefile:1.137
--- src/tests/usr.bin/xlint/lint1/Makefile:1.136 Sun Feb 5 12:25:11 2023
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Feb 5 12:36:56 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.136 2023/02/05 12:25:11 rillig Exp $
+# $NetBSD: Makefile,v 1.137 2023/02/05 12:36:56 rillig Exp $
NOMAN= # defined
-MAX_MESSAGE= 350 # see lint1/err.c
.include
@@ -18,159 +17,9 @@ archsubdir.sh:
@echo archsubdir=${ARCHSUBDIR} >${.TARGET}
FILESDIR= ${TESTSDIR}
-FILES+= c11_atomic.c
-FILES+= c11_generic_expression.c
-FILES+= c90.c
-FILES+= c99_atomic.c
-FILES+= c99_bool_strict_suppressed.c
-FILES+= d_alignof.c
-FILES+= d_bltinoffsetof.c
-FILES+= d_c99_anon_struct.c
-FILES+= d_c99_anon_union.c
-FILES+= d_c99_bool.c
-FILES+= d_c99_bool_strict.c
-FILES+= d_c99_bool_strict_syshdr.c
-FILES+= d_c99_complex_num.c
-FILES+= d_c99_complex_split.c
-FILES+= d_c99_compound_literal_comma.c
-FILES+= d_c99_decls_after_stmt.c
-FILES+= d_c99_flex_array_packed.c
-FILES+= d_c99_for_loops.c
-FILES+= d_c99_func.c
-FILES+= d_c99_init.c
-FILES+= d_c99_nested_struct.c
-FILES+= d_c99_recursive_init.c
-FILES+= d_c99_struct_init.c
-FILES+= d_c99_union_cast.c
-FILES+= d_c99_union_init1.c
-FILES+= d_c99_union_init2.c
-FILES+= d_c99_union_init3.c
-FILES+= d_c99_union_init4.c
-FILES+= d_c99_union_init5.c
-FILES+= d_c9x_array_init.c
-FILES+= d_cast_fun_array_param.c
-FILES+= d_cast_lhs.c
-FILES+= d_cast_typeof.c
-FILES+= d_compound_literals1.c
-FILES+= d_compound_literals2.c
-FILES+= d_constant_conv1.c
-FILES+= d_constant_conv2.c
-FILES+= d_cvt_constant.c
-FILES+= d_cvt_in_ternary.c
-FILES+= d_decl_old_style_arguments.c
-FILES+= d_ellipsis_in_switch.c
-FILES+= d_fold_test.c
-FILES+= d_gcc_compound_statements1.c
-FILES+= d_gcc_compound_statements2.c
-FILES+= d_gcc_compound_statements3.c
-FILES+= d_gcc_extension.c
-FILES+= d_gcc_func.c
-FILES+= d_gcc_variable_array_init.c
-FILES+= d_incorrect_array_size.c
-FILES+= d_init_array_using_string.c
-FILES+= d_init_pop_member.c
-FILES+= d_lint_assert.c
-FILES+= d_long_double_int.c
-FILES+= d_nested_structs.c
-FILES+= d_nolimit_init.c
-FILES+= d_packed_structs.c
-FILES+= d_pr_22119.c
-FILES+= d_return_type.c
-FILES+= d_struct_init_nested.c
-FILES+= d_type_conv1.c
-FILES+= d_type_conv2.c
-FILES+= d_type_conv3.c
-FILES+= d_typefun.c
-FILES+= d_typename_as_var.c
-FILES+= d_zero_sized_arrays.c
-FILES+= decl.c
-FILES+= decl_arg.c
-FILES+= decl_direct_abstract.c
-FILES+= decl_enum.c
-FILES+= decl_enum_c90.c
-FILES+= decl_struct_c90.c
-FILES+= decl_struct_member.c
-FILES+= emit.c
-FILES+= emit.exp-ln
-FILES+= emit_lp64.c
-FILES+= emit_lp64.exp-ln
-FILES+= expr_binary.c
-FILES+= expr_binary_trad.c
-FILES+= expr_cast.c
-FILES+= expr_fold.c
-FILES+= expr_fold_strict_bool.c
-FILES+= expr_precedence.c
-FILES+= expr_promote.c
-FILES+= expr_promote.exp-ln
-FILES+= expr_promote_trad.c
-FILES+= expr_promote_trad.exp-ln
-FILES+= expr_range.c
-FILES+= expr_sizeof.c
-FILES+= feat_stacktrace.c
-FILES+= gcc_attribute.c
-FILES+= gcc_attribute_aligned.c
-FILES+= gcc_attribute_enum.c
-FILES+= gcc_attribute_func.c
-FILES+= gcc_attribute_label.c
-FILES+= gcc_attribute_stmt.c
-FILES+= gcc_attribute_type.c
-FILES+= gcc_attribute_var.c
-FILES+= gcc_bit_field_types.c
-FILES+= gcc_builtin_alloca.c
-FILES+= gcc_builtin_overflow.c
-FILES+= gcc_cast_union.c
-FILES+= gcc_init_compound_literal.c
-FILES+= gcc_stmt_asm.c
-FILES+= gcc_typeof.c
-FILES+= gcc_typeof_after_statement.c
-FILES+= init.c
-FILES+= init_braces.c
-FILES+= init_c90.c
-FILES+= lex_char.c
-FILES+= lex_char_uchar.c
-FILES+= lex_comment.c
-FILES+= lex_floating.c
-FILES+= lex_integer.c
-FILES+= lex_integer_binary.c
-FILES+= lex_integer_ilp32.c
-FILES+= lex_string.c
-FILES+= lex_whitespace.c
-FILES+= lex_wide_char.c
-FILES+= lex_wide_string.c
-FILES+= ${MSG_FILES}
-FILES+= msg_000_c90.c
-FILES+= msg_001_c90.c
-FILES+= msg_132_ilp32.c
-FILES+= msg_132_lp64.c
-FILES+= msg_230_uchar.c
-FILES+= msg_259_c90.c
-FILES+= msg_259_ilp32.c
-FILES+= msg_272_c90.c
-FILES+= op_colon.c
-FILES+= op_shl_lp64.c
-FILES+= parse_init_declarator.c
-FILES+= parse_stmt_error.c
-FILES+= parse_stmt_iter_error.c
-FILES+= parse_type_name.c
-FILES+= platform_ilp32.c
-FILES+= platform_int.c
-FILES+= platform_ldbl128.c
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 12:36:56 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Log Message: tests/lint: remove redundancy from Makefile The list of test files is already kept in distrib/sets/lists/tests/mi. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/tests/usr.bin/xlint/lint1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Feb 5 12:25:11 UTC 2023 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile d_c99_init.c lex_integer_ilp32.c Removed Files: src/tests/usr.bin/xlint/lint1: c99_init_array.c c99_init_designator.c d_c9x_recursive_init.c d_cast_init.c d_cast_init2.c Log Message: tests/lint: remove redundant tests The names of the tests were misleading: 'recursive' should have been 'nested', and the interesting topic in the 'cast' tests was not the cast but the pointer dereference. To generate a diff of this commit: cvs rdiff -u -r1.1250 -r1.1251 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.135 -r1.136 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/xlint/lint1/c99_init_array.c \ src/tests/usr.bin/xlint/lint1/d_cast_init2.c cvs rdiff -u -r1.2 -r0 src/tests/usr.bin/xlint/lint1/c99_init_designator.c cvs rdiff -u -r1.42 -r1.43 src/tests/usr.bin/xlint/lint1/d_c99_init.c cvs rdiff -u -r1.4 -r0 src/tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c cvs rdiff -u -r1.5 -r0 src/tests/usr.bin/xlint/lint1/d_cast_init.c cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/lex_integer_ilp32.c 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1250 src/distrib/sets/lists/tests/mi:1.1251 --- src/distrib/sets/lists/tests/mi:1.1250 Mon Jan 30 19:51:33 2023 +++ src/distrib/sets/lists/tests/mi Sun Feb 5 12:25:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1250 2023/01/30 19:51:33 christos Exp $ +# $NetBSD: mi,v 1.1251 2023/02/05 12:25:11 rillig Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6424,9 +6424,9 @@ ./usr/tests/usr.bin/xlint/lint1/c99_atomic.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.exp tests-obsolete obsolete -./usr/tests/usr.bin/xlint/lint1/c99_init_array.c tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/c99_init_array.c tests-obsolete obsolete,atf ./usr/tests/usr.bin/xlint/lint1/c99_init_array.exp tests-obsolete obsolete,atf -./usr/tests/usr.bin/xlint/lint1/c99_init_designator.c tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/c99_init_designator.c tests-obsolete obsolete,atf ./usr/tests/usr.bin/xlint/lint1/c99_init_designator.exp tests-obsolete obsolete,atf ./usr/tests/usr.bin/xlint/lint1/check-expect.lua tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_alignof.c tests-usr.bin-tests compattestfile,atf @@ -6463,10 +6463,10 @@ ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init4.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init5.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_c9x_array_init.c tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c tests-obsolete obsolete,atf ./usr/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/d_cast_init.c tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/xlint/lint1/d_cast_init2.c tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/xlint/lint1/d_cast_init.c tests-obsolete obsolete,atf +./usr/tests/usr.bin/xlint/lint1/d_cast_init2.c tests-obsolete obsolete,atf ./usr/tests/usr.bin/xlint/lint1/d_cast_lhs.c tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/xlint/lint1/d_cast_lhs.exp tests-obsolete obsolete,atf ./usr/tests/usr.bin/xlint/lint1/d_cast_typeof.c tests-usr.bin-tests compattestfile,atf Index: src/tests/usr.bin/xlint/lint1/Makefile diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.135 src/tests/usr.bin/xlint/lint1/Makefile:1.136 --- src/tests/usr.bin/xlint/lint1/Makefile:1.135 Sun Jan 29 17:02:09 2023 +++ src/tests/usr.bin/xlint/lint1/Makefile Sun Feb 5 12:25:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2023/01/29 17:02:09 rillig Exp $ +# $NetBSD: Makefile,v 1.136 2023/02/05 12:25:11 rillig Exp $ NOMAN= # defined MAX_MESSAGE= 350 # see lint1/err.c @@ -23,8 +23,6 @@ FILES+= c11_generic_expression.c FILES+= c90.c FILES+= c99_atomic.c FILES+= c99_bool_strict_suppressed.c -FILES+= c99_init_array.c -FILES+= c99_init_designator.c FILES+= d_alignof.c FILES+= d_bltinoffsetof.c FILES+= d_c99_anon_struct.c @@ -50,10 +48,7 @@ FILES+= d_c99_union_init3.c FILES+= d_c99_union_init4.c FILES+= d_c99_union_init5.c FILES+= d_c9x_array_init.c -FILES+= d_c9x_recursive_init.c FILES+= d_cast_fun_array_param.c -FILES+=
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Feb 5 12:25:11 UTC 2023 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile d_c99_init.c lex_integer_ilp32.c Removed Files: src/tests/usr.bin/xlint/lint1: c99_init_array.c c99_init_designator.c d_c9x_recursive_init.c d_cast_init.c d_cast_init2.c Log Message: tests/lint: remove redundant tests The names of the tests were misleading: 'recursive' should have been 'nested', and the interesting topic in the 'cast' tests was not the cast but the pointer dereference. To generate a diff of this commit: cvs rdiff -u -r1.1250 -r1.1251 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.135 -r1.136 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/xlint/lint1/c99_init_array.c \ src/tests/usr.bin/xlint/lint1/d_cast_init2.c cvs rdiff -u -r1.2 -r0 src/tests/usr.bin/xlint/lint1/c99_init_designator.c cvs rdiff -u -r1.42 -r1.43 src/tests/usr.bin/xlint/lint1/d_c99_init.c cvs rdiff -u -r1.4 -r0 src/tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c cvs rdiff -u -r1.5 -r0 src/tests/usr.bin/xlint/lint1/d_cast_init.c cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/lex_integer_ilp32.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Feb 5 10:57:48 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_complex_split.c
gcc_attribute_type.c gcc_attribute_var.c
gcc_typeof_after_statement.c
Log Message:
tests/lint: clean up
The .exp files are no longer kept under version control, so there's no
reason anymore to forcefully trigger a warning or an error.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c
cvs rdiff -u -r1.4 -r1.5 \
src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.11 src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.12
--- src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.11 Wed Jun 22 19:23:18 2022
+++ src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c Sun Feb 5 10:57:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_complex_split.c,v 1.11 2022/06/22 19:23:18 rillig Exp $ */
+/* $NetBSD: d_c99_complex_split.c,v 1.12 2023/02/05 10:57:48 rillig Exp $ */
# 3 "d_c99_complex_split.c"
/*
@@ -74,15 +74,6 @@ set_complex_only_imag(double im)
sink(c); /* XXX: may be used before set */
}
-/* Just to keep the .exp file alive. */
-void
-trigger_warning(double _Complex c)
-{
- c += 1.0;
- /* expect+1: error: operands of '|' have incompatible types 'double _Complex' and 'double _Complex' [107] */
- return c | c;
-}
-
void
precedence_cast_expression(void)
{
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c:1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c:1.4
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c:1.3 Thu Aug 25 19:03:48 2022
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c Sun Feb 5 10:57:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_attribute_type.c,v 1.3 2022/08/25 19:03:48 rillig Exp $ */
+/* $NetBSD: gcc_attribute_type.c,v 1.4 2023/02/05 10:57:48 rillig Exp $ */
# 3 "gcc_attribute_type.c"
/*
@@ -25,7 +25,3 @@ struct attribute_before_keyword {
unsigned char len[2];
unsigned long magic;
};
-
-/* just to trigger _some_ error, to keep the .exp file */
-/* expect+1: error: syntax error ';' [249] */
-__attribute__((syntax_error));
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.6 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.7
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.6 Thu Aug 25 19:03:48 2022
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c Sun Feb 5 10:57:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_attribute_var.c,v 1.6 2022/08/25 19:03:48 rillig Exp $ */
+/* $NetBSD: gcc_attribute_var.c,v 1.7 2023/02/05 10:57:48 rillig Exp $ */
# 3 "gcc_attribute_var.c"
/*
@@ -69,7 +69,3 @@ attribute_after_array_brackets(
)
{
}
-
-/* just to trigger _some_ error, to keep the .exp file */
-/* expect+1: error: syntax error ';' [249] */
-__attribute__((syntax_error));
Index: src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c:1.4 src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c:1.5
--- src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c:1.4 Wed Jun 22 19:23:18 2022
+++ src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c Sun Feb 5 10:57:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_typeof_after_statement.c,v 1.4 2022/06/22 19:23:18 rillig Exp $ */
+/* $NetBSD: gcc_typeof_after_statement.c,v 1.5 2023/02/05 10:57:48 rillig Exp $ */
# 3 "gcc_typeof_after_statement.c"
/*
@@ -16,7 +16,3 @@ example(void **ptr)
ret;
});
}
-
-/* Just to keep the .exp file. */
-/* expect+1: warning: static function 'unused' declared but not defined [290] */
-static void unused(void);
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Feb 5 10:57:48 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: d_c99_complex_split.c gcc_attribute_type.c gcc_attribute_var.c gcc_typeof_after_statement.c Log Message: tests/lint: clean up The .exp files are no longer kept under version control, so there's no reason anymore to forcefully trigger a warning or an error. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/gcc_attribute_type.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c cvs rdiff -u -r1.4 -r1.5 \ src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
