Enable building with MKDEBUG and MKDEBUGLIB

The way these options work is by creating files that contain debugging
symbols and stashing them in a dedicated set. The minix-debug set has
been created for this purpose, but it will probably have to be refined
since it has been tested only with the default options with an i386
cross-build.

LSC: Amended to support many combination of MKDEBUG, MKDEBUGLIB, with
     and without X11, for both intel and arm.

Change-Id: I2901952e8229938f9ac79c8656484acf704ccd9b

distrib/sets/lists/minix-base/mi

@@ -441,7 +441,7 @@
 ./usr/bin/pkgin_cd                                      minix-base
 ./usr/bin/pkgin_sets                                    minix-base
 ./usr/bin/playwave                                      minix-base
-./usr/bin/postinstall                                   minix-base	obsolete
+./usr/bin/postinstall                                   minix-base      obsolete
 ./usr/bin/pr                                            minix-base
 ./usr/bin/pr_routes                                     minix-base
 ./usr/bin/prep                                          minix-base
@@ -927,7 +927,7 @@
 ./usr/lib/pkgconfig/openssl.pc                          minix-base      crypto
 ./usr/lib/pkgconfig/sqlite3.pc                          minix-base
 ./usr/lib/pkgconfig/zlib.pc                             minix-base
-./usr/lib/pwdauth                                       minix-base	obsolete
+./usr/lib/pwdauth                                       minix-base      obsolete
 ./usr/lib/security                                      minix-base
 ./usr/libdata                                           minix-base
 ./usr/libdata/debug                                     minix-base
@@ -935,6 +935,7 @@
 ./usr/libdata/debug/lib                                 minix-base
 ./usr/libdata/debug/libexec                             minix-base
 ./usr/libdata/debug/sbin                                minix-base
+./usr/libdata/debug/service                             minix-base
 ./usr/libdata/debug/usr                                 minix-base
 ./usr/libdata/debug/usr/bin                             minix-base
 ./usr/libdata/debug/usr/games                           minix-base
@@ -943,6 +944,10 @@
 ./usr/libdata/debug/usr/libexec                         minix-base
 ./usr/libdata/debug/usr/mdec                            minix-base
 ./usr/libdata/debug/usr/sbin                            minix-base
+./usr/libdata/debug/usr/tests/minix-posix               minix-base
+./usr/libdata/debug/usr/tests/minix-posix/blocktest     minix-base
+./usr/libdata/debug/usr/tests/minix-posix/ddekit        minix-base
+./usr/libdata/debug/usr/tests/minix-posix/rmibtest      minix-base
 ./usr/libexec                                           minix-base
 ./usr/libexec/atf-check                                 minix-base      atf
 ./usr/libexec/blacklistd-helper                         minix-base

distrib/sets/lists/minix-debug/md.evbarm

@@ -0,0 +1,25 @@
+#
+# Sorted using sort_set.pl in releasetools.
+# to add an entry simply add it at the end of the
+# file and run
+# ../../../../releasetools/sort_set.pl < mi > out
+# mv out mi
+#
+./usr/lib/libclkconf_g.a                                minix-debug     debuglib
+./usr/lib/libgpio_g.a                                   minix-debug     debuglib
+./usr/lib/libi2cdriver_g.a                              minix-debug     debuglib
+./usr/libdata/debug/service/bmp085.debug                minix-debug     debug
+./usr/libdata/debug/service/cat24c256.debug             minix-debug     debug
+./usr/libdata/debug/service/emmc.debug                  minix-debug     debug
+./usr/libdata/debug/service/fb.debug                    minix-debug     debug
+./usr/libdata/debug/service/gpio.debug                  minix-debug     debug
+./usr/libdata/debug/service/i2c.debug                   minix-debug     debug
+./usr/libdata/debug/service/lan8710a.debug              minix-debug     debug
+./usr/libdata/debug/service/mmc.debug                   minix-debug     debug
+./usr/libdata/debug/service/sht21.debug                 minix-debug     debug
+./usr/libdata/debug/service/tda19988.debug              minix-debug     debug
+./usr/libdata/debug/service/tps65217.debug              minix-debug     debug
+./usr/libdata/debug/service/tps65950.debug              minix-debug     debug
+./usr/libdata/debug/service/tsl2550.debug               minix-debug     debug
+./usr/libdata/debug/service/usbd.debug                  minix-debug     debug
+./usr/libdata/debug/usr/bin/eepromread.debug            minix-debug     debug

distrib/sets/lists/minix-debug/md.i386

@@ -0,0 +1,46 @@
+#
+# Sorted using sort_set.pl in releasetools.
+# to add an entry simply add it at the end of the
+# file and run
+# ../../../../releasetools/sort_set.pl < mi > out
+# mv out mi
+#
+./usr/lib/libhgfs_g.a                                   minix-debug     debuglib
+./usr/lib/libm387_g.a                                   minix-debug     debuglib
+./usr/lib/libvassert_g.a                                minix-debug     debuglib
+./usr/lib/libvboxfs_g.a                                 minix-debug     debuglib
+./usr/lib/libvirtio_g.a                                 minix-debug     debuglib
+./usr/libdata/debug/service/3c90x.debug                 minix-debug     debug
+./usr/libdata/debug/service/acpi.debug                  minix-debug     debug
+./usr/libdata/debug/service/ahci.debug                  minix-debug     debug
+./usr/libdata/debug/service/amddev.debug                minix-debug     debug
+./usr/libdata/debug/service/at_wini.debug               minix-debug     debug
+./usr/libdata/debug/service/atl2.debug                  minix-debug     debug
+./usr/libdata/debug/service/dec21140A.debug             minix-debug     debug
+./usr/libdata/debug/service/dp8390.debug                minix-debug     debug
+./usr/libdata/debug/service/dpeth.debug                 minix-debug     debug
+./usr/libdata/debug/service/e1000.debug                 minix-debug     debug
+./usr/libdata/debug/service/es1370.debug                minix-debug     debug
+./usr/libdata/debug/service/es1371.debug                minix-debug     debug
+./usr/libdata/debug/service/fbd.debug                   minix-debug     debug
+./usr/libdata/debug/service/filter.debug                minix-debug     debug
+./usr/libdata/debug/service/floppy.debug                minix-debug     debug
+./usr/libdata/debug/service/fxp.debug                   minix-debug     debug
+./usr/libdata/debug/service/hgfs.debug                  minix-debug     debug
+./usr/libdata/debug/service/lance.debug                 minix-debug     debug
+./usr/libdata/debug/service/pci.debug                   minix-debug     debug
+./usr/libdata/debug/service/pckbd.debug                 minix-debug     debug
+./usr/libdata/debug/service/printer.debug               minix-debug     debug
+./usr/libdata/debug/service/rtl8139.debug               minix-debug     debug
+./usr/libdata/debug/service/rtl8169.debug               minix-debug     debug
+./usr/libdata/debug/service/sb16.debug                  minix-debug     debug
+./usr/libdata/debug/service/ti1225.debug                minix-debug     debug
+./usr/libdata/debug/service/vbfs.debug                  minix-debug     debug
+./usr/libdata/debug/service/vbox.debug                  minix-debug     debug
+./usr/libdata/debug/service/virtio_blk.debug            minix-debug     debug
+./usr/libdata/debug/service/virtio_net.debug            minix-debug     debug
+./usr/libdata/debug/usr/lib/libm387.so.0.1.debug        minix-debug     debug
+./usr/libdata/debug/usr/tests/minix-posix/test47.debug  minix-debug     debug
+./usr/libdata/debug/usr/tests/minix-posix/test51.debug  minix-debug     debug
+./usr/libdata/debug/usr/tests/minix-posix/test57.debug  minix-debug     debug
+./usr/libdata/debug/usr/tests/minix-posix/test62.debug  minix-debug     debug

distrib/sets/lists/xdebug/md.i386

@@ -43,27 +43,27 @@
 ./usr/X11R7/lib/modules/extensions/libGLcore_g.a	-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		-unknown-	obsolete
-./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libmfb_g.a		-unknown-	obsolete
-./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libxtrap_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/fonts/libfreetype_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/fonts/libtype1_g.a		-unknown-	obsolete
-./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	debuglib,xorg,obsolete
-./usr/X11R7/lib/modules/libint10_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libint10_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libpcidata_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libscanpci_g.a			-unknown-	obsolete
-./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg
-./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg
+#./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libxf1bpp_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libxf4bpp_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		-unknown-	obsolete
@@ -103,7 +103,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr128_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr200_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr300_dri.so.0.debug	obsolete		xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug	obsolete		xorg,obsolete
+#./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libs3v_dri.so.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libsavage_dri.so.0.debug	obsolete		xorg,obsolete
@@ -117,7 +117,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug	-unknown-		xorg,debug
+#./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/s3v_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/savage_dri.so.0.debug	-unknown-		obsolete
@@ -187,8 +187,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmware_drv.so.11.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmwlegacy_drv.so.11.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug	obsolete		obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	obsolete		xorg,obsolete
+#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	obsolete		xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	obsolete		xorg,obsolete
+#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug	-unknown-		xorg,debug
@@ -216,8 +216,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.13.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmwlegacy_drv.so.11.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug	-unknown-		obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	-unknown-		xorg,debug
+#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	-unknown-		xorg,debug
+#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug	-unknown-		xorg,debug

distrib/sets/lists/xdebug/mi

@@ -127,9 +127,9 @@
 ./usr/X11R7/lib/libxcb-property_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-randr_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-record_g.a			-unknown-	debuglib,xorg,compatx11file
-./usr/X11R7/lib/libxcb-render-util_g.a			-unknown-	debuglib,xorg,compatx11file
+#./usr/X11R7/lib/libxcb-render-util_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-render_g.a			-unknown-	debuglib,xorg,compatx11file
-./usr/X11R7/lib/libxcb-reply_g.a			-unknown-	debuglib,xorg,compatx11file
+#./usr/X11R7/lib/libxcb-reply_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-res_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-screensaver_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-shape_g.a			-unknown-	debuglib,xorg,compatx11file
@@ -410,5 +410,6 @@
 ./usr/libdata/debug/usr/X11R7/bin/xwd.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/xwininfo.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/xwud.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	-unknown-	debug,xorg
+#./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-		debug,xorg
+#./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-		debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/makekeys.debug        minix-debug     debug,xorg

distrib/sets/lists/xdebug/shl.mi

@@ -128,9 +128,9 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug	-unknown-		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug	-unknown-	xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug	-unknown-	#xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-render.so.0.1.debug	-unknown-		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug	-unknown-		xorg,debug,compatx11file
+#./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-res.so.0.1.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-screensaver.so.0.1.debug	-unknown-	xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-shape.so.0.1.debug	-unknown-		xorg,debug,compatx11file
@@ -147,10 +147,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug		-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug		-unknown-		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-	xorg,debug
+#./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	-unknown-	xorg,debug
+#./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=i386
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	obsolete	obsolete,xorg,debug,!machine=i386,!machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	obsolete	obsolete,xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	-unknown-	xorg,debug
+#./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	-unknown-	xorg,debug

distrib/sets/sets.subr

@@ -148,7 +148,7 @@ if [ "${MKDEBUG}" = "no" -a "${MKDEBUGLIB}" = "no" ]; then
 	debugset=""
 	xdebugset=""
 else
-	debugset="debug"
+	debugset="minix-debug"
 	xdebugset="xdebug"
 fi
 # Determine lib type. Do this first so stlib also gets set.
@@ -163,7 +163,7 @@ if [ "${MKPIC}" = "no" ]; then
 	shlib=no
 fi
 # LSC for Minix
-nlists="minix-base minix-comp minix-games minix-kernel minix-man $testset"
+nlists="minix-base minix-comp minix-games minix-kernel minix-man $testset $debugset"
 #nlists="base comp $debugset etc games man misc $modset $testset text"
 xlists="xbase xcomp $xdebugset xetc xfont xserver"
 extlists="extbase extcomp extetc"

etc/Makefile

@@ -497,7 +497,7 @@ OBSOLETE.files=		base comp etc games man misc text
 OBSOLETE.files=		minix-base minix-comp minix-games minix-kernel minix-man
 .endif # !defined(__MINIX)
 .if ${MKDEBUG} != "no"
-OBSOLETE.files+=	debug
+OBSOLETE.files+=	minix-debug
 .endif
 .if ${MKKMOD} != "no"
 OBSOLETE.files+=	modules

etc/mtree/NetBSD.dist.base

@@ -134,6 +134,7 @@
 ./usr/libdata/debug/lib
 ./usr/libdata/debug/libexec
 ./usr/libdata/debug/sbin
+./usr/libdata/debug/service
 ./usr/libdata/debug/usr
 ./usr/libdata/debug/usr/bin
 ./usr/libdata/debug/usr/games
@@ -142,6 +143,11 @@
 ./usr/libdata/debug/usr/libexec
 ./usr/libdata/debug/usr/mdec
 ./usr/libdata/debug/usr/sbin
+./usr/libdata/debug/usr/tests
+./usr/libdata/debug/usr/tests/minix-posix
+./usr/libdata/debug/usr/tests/minix-posix/blocktest
+./usr/libdata/debug/usr/tests/minix-posix/ddekit
+./usr/libdata/debug/usr/tests/minix-posix/rmibtest
 ./usr/libexec
 ./usr/log
 ./usr/man

external/mit/xorg/lib/libXt/Makefile

@@ -31,6 +31,9 @@ CPPFLAGS+=	${X11FLAGS.THREADLIB}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
 .if defined(__MINIX)
 CPPFLAGS+=	-DUSE_SNPRINTF -DLIBXT -I.
+.if ${MKDEBUGLIB:Uno} == "yes"
+CWARNFLAGS+=-Wno-format
+.endif
 .else
 CPPFLAGS+=	-DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
 .endif #  defined(__MINIX)

external/mit/xorg/lib/libxkbui/Makefile

@@ -19,5 +19,10 @@ LIBDPLIBS=	X11	${.CURDIR}/../libX11/dynamic \
 
 PKGCONFIG=	xkbui
 
+.if defined(__MINIX)
+.if ${MKDEBUGLIB:Uno} == "yes"
+CWARNFLAGS+=-Wno-format
+.endif
+.endif # defined(__MINIX)
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>

minix/lib/libasyn/asyn_wait.c

@@ -1,11 +1,10 @@
 /*	asyn_wait() - wait for asynch operations	Author: Kees J. Bot
  *								7 Jul 1997
  */
-#define DEBUG 0
 
 #include "asyn.h"
 #include <time.h>
-#if DEBUG
+#ifdef DEBUG
 #include <stdio.h>
 #endif
 
@@ -57,7 +56,7 @@ int asyn_wait(asynchio_t *asyn, int flags, struct timeval *to)
 		t.tv_usec= 0;
 	}
 
-#if DEBUG
+#ifdef DEBUG
 	{
 		int op;
 
@@ -80,7 +79,7 @@ int asyn_wait(asynchio_t *asyn, int flags, struct timeval *to)
 	r= select(FD_SETSIZE, &asyn->asyn_fdset[SEL_READ],
 				&asyn->asyn_fdset[SEL_WRITE],
 				&asyn->asyn_fdset[SEL_EXCEPT], to);
-#if DEBUG
+#ifdef DEBUG
 	fprintf(stderr, " (%d) ", r);
 #endif
 	if (r > 0) {
@@ -95,7 +94,7 @@ int asyn_wait(asynchio_t *asyn, int flags, struct timeval *to)
 				if (FD_ISSET(fd, fdsetp)) {
 					asyn->asyn_afd[fd].afd_state[op]=
 								PENDING;
-#if DEBUG
+#ifdef DEBUG
 					fprintf(stderr, "%d%c", fd, "rwx"[op]);
 #endif
 				}
@@ -107,7 +106,7 @@ int asyn_wait(asynchio_t *asyn, int flags, struct timeval *to)
 		/* If nothing happened then let the time boundary slip a bit. */
 		if (tbound < TBOUND_MAX) tbound <<= 1;
 	}
-#if DEBUG
+#ifdef DEBUG
 	fputc('\n', stderr);
 #endif
 

minix/lib/libc/sys/Makefile.inc

@@ -30,9 +30,9 @@ SRCS+= kernel_utils.c sprofile.c stack_utils.c _mcontext.c
 
 # Emulation for missing lchown/lchmod/lchflags
 OBJS+= lchflags.o lchmod.o lchown.o
-lchflags.o lchflags.pico lchflags.bc: ${NETBSDSRCDIR}/tools/compat/lchflags.c
+lchflags.go lchflags.o lchflags.pico lchflags.bc: ${NETBSDSRCDIR}/tools/compat/lchflags.c
-lchmod.o lchmod.pico lchmod.bc: ${NETBSDSRCDIR}/tools/compat/lchmod.c
+lchmod.go lchmod.o lchmod.pico lchmod.bc: ${NETBSDSRCDIR}/tools/compat/lchmod.c
-lchown.o lchown.pico lchown.bc: ${NETBSDSRCDIR}/tools/compat/lchown.c
+lchown.go lchown.o lchown.pico lchown.bc: ${NETBSDSRCDIR}/tools/compat/lchown.c
 
 .include "${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/sys/Makefile.inc"
 .include "${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/Makefile.inc"

minix/lib/libminc/Makefile

@@ -52,6 +52,7 @@ CPPFLAGS.strtol.c+=	-I${NETBSDSRCDIR}/sys
 .for f in \
 	errno.o printf.o strerror.o subr_prf.o
 ${f} ${f:C/\.o/.bc/}:	${LIBSADIR}/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBSADIR}/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -82,6 +83,7 @@ CPPFLAGS.subr_prf.c+= -DLIBSA_PRINTF_WIDTH_SUPPORT
 .for f in \
 	kputc.o sys_diagctl.o
 ${f} ${f:C/\.o/.bc/}:	${LIBSYSDIR}/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBSYSDIR}/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -99,6 +101,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	bswap64.o rb.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCDIR}/gen/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/gen/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -113,6 +116,7 @@ CPPFLAGS.rb.c+=		-D_LIBC
 .for f in \
 	sha2.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCDIR}/hash/sha2/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/hash/sha2/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -130,6 +134,7 @@ CPPFLAGS.sha2.c+=	-I${NETBSDSRCDIR}/sys
 	udivmoddi4.o divsi3.o modsi3.o divmoddi4.o \
 	divmodsi4.o udivmodsi4.o #qdivrem.o lshldi3.o 
 ${f} ${f:C/\.o/.bc/}:	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/builtins/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/builtins/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -150,6 +155,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	random.o strtoul.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCDIR}/stdlib/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/stdlib/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -165,6 +171,7 @@ CPPFLAGS.strtoul.c+=	-I${NETBSDSRCDIR}/sys
 .for f in \
 	strcasecmp.o strcspn.o strncasecmp.o strnlen.o strlcat.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCDIR}/string/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/string/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -194,6 +201,7 @@ CLEANFILES+=	errlist.c
 	getprogname.o setprogname.o execle.o sleep.o time.o \
 	ctype_.o tolower_.o toupper_.o usleep.o waitpid.o sigsetops.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCDIR}/gen/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/gen/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -211,6 +219,7 @@ CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale
 .for f in \
 	read_tsc_64.o fslib.o itoa.o oneC_sum.o
 ${f} ${f:C/\.o/.bc/}:	${LIBMINIXCDIR}/gen/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBMINIXCDIR}/gen/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -223,6 +232,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	initfini.o stack_protector.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCDIR}/misc/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/misc/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -237,6 +247,7 @@ CPPFLAGS.stack_protector.c+= -Dxprintf=printf
 .for f in \
 	regcomp.o regerror.o regexec.o regfree.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCDIR}/regex/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/regex/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -251,6 +262,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 	ldiv.o malloc.o setenv.o \
 	reallocarr.o _rand48.o lrand48.o srand48.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCDIR}/stdlib/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/stdlib/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -273,6 +285,7 @@ SECTIONIFY.malloc.c+= -sectionify-no-override \
 .for f in \
 	strdup.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCDIR}/string/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/string/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -291,6 +304,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 	stat.o stime.o svrctl.o syscall.o __sysctl.o _ucontext.o umask.o \
 	unlink.o wait4.o write.o
 ${f} ${f:C/\.o/.bc/}:	${LIBMINIXCDIR}/sys/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBMINIXCDIR}/sys/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -303,6 +317,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	brksize.o _do_kernel_call_intr.o ipc_minix_kerninfo.o _ipc.o ucontext.o
 ${f} ${f:C/\.o/.bc/}:	${LIBMINIXCARCHDIR}/sys/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBMINIXCARCHDIR}/sys/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -315,6 +330,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	localtime.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCDIR}/time/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/time/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 

minix/lib/libminc/arch/earm/Makefile.libc.inc

@@ -5,28 +5,28 @@
 
 .for f in \
 	memchr.o
-${f}:	${LIBCOMMONCDIR}/string/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/string/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
 
 .for f in \
 	lshldi3.o
-${f}:	${LIBCOMMONCDIR}/quad/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/quad/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
 
 .for f in \
 	byte_swap_2.o byte_swap_4.o 
-${f}:	${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
 
 .for f in \
 	__aeabi_idiv0.o __aeabi_ldiv0.o
-${f}:	${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
@@ -36,7 +36,7 @@ CPPFLAGS.__aeabi_ldiv0.c+= -D_STANDALONE -I${NETBSDSRCDIR}/sys
 
 #.for f in \
 #	__aeabi_ldivmod.o __aeabi_uldivmod.o
-#${f}:	${LIBCOMMONCARCHDIR}/quad/${f:C/\.o/.S/}
+#${f} ${f:C/\.o/.go/}:	${LIBCOMMONCARCHDIR}/quad/${f:C/\.o/.S/}
 #OBJS+=	${f}
 #CLEANFILES+= ${f}
 #.endfor
@@ -45,7 +45,7 @@ CPPFLAGS.__aeabi_ldiv0.c+= -D_STANDALONE -I${NETBSDSRCDIR}/sys
 	memcmp.o memcpy.o memmove.o memset.o \
 	strcat.o strchr.o strcmp.o strcpy.o strlcpy.o strlen.o strncpy.o \
 	strncmp.o strrchr.o strcpy_arm.o
-${f}:	${LIBCOMMONCARCHDIR}/string/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCARCHDIR}/string/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
@@ -58,7 +58,7 @@ CPPFLAGS.strcpy_arm.S+= -DSTRLCPY -D_LIBC
 #
 .for f in \
 	alloca.o
-${f}:	${LIBCARCHDIR}/gen/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCARCHDIR}/gen/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
@@ -72,14 +72,14 @@ CLEANFILES+= ${f}
 	__aeabi_dcmpun.o __aeabi_fcmpun.o
 CPPFLAGS.${f:C/\.o/.c/}+= -I${LIBCARCHDIR}/softfloat -I${LIBCDIR}/softfloat
 CPPFLAGS.${f:C/\.o/.c/}+= -DSOFTFLOAT_FOR_GCC
-${f}:	${LIBCARCHDIR}/softfloat/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCARCHDIR}/softfloat/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
 
 .for f in \
 	aeabi_uidivmod.o aeabi_ldivmod.o aeabi_uldivmod.o aeabi_idivmod.o
-${f}:	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/builtins/arm/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist/lib/builtins/arm/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
@@ -89,7 +89,7 @@ CLEANFILES+= ${f}
 	fpgetsticky.o fpsetsticky.o
 CPPFLAGS.${f:C/\.o/.c/}+= -I${LIBCARCHDIR}/softfloat -I${LIBCDIR}/softfloat
 CPPFLAGS.${f:C/\.o/.c/}+= -DSOFTFLOAT_FOR_GCC
-${f}:	${LIBCDIR}/softfloat/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/softfloat/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor
@@ -99,7 +99,7 @@ SOFTFLOAT_BITS?=64
 	softfloat.o
 CPPFLAGS.${f:C/\.o/.c/}+= -I${LIBCARCHDIR}/softfloat -I${LIBCDIR}/softfloat
 CPPFLAGS.${f:C/\.o/.c/}+= -DSOFTFLOAT_FOR_GCC
-${f}:	${LIBCDIR}/softfloat/bits${SOFTFLOAT_BITS}/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCDIR}/softfloat/bits${SOFTFLOAT_BITS}/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 .endfor

minix/lib/libminc/arch/i386/Makefile.libc.inc

@@ -5,6 +5,7 @@
 .for f in \
 	strlcpy.o strncpy.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCDIR}/string/${f:C/\.o/.c/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCDIR}/string/${f:C/\.o/.c/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -19,6 +20,7 @@ CPPFLAGS.strlcpy.c+=		-D_LIBC
 .for f in \
 	byte_swap_2.o byte_swap_4.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCARCHDIR}/gen/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -33,6 +35,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 	strcat.o strchr.o strcmp.o strcpy.o strlen.o \
 	strrchr.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCOMMONCARCHDIR}/string/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCOMMONCARCHDIR}/string/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -49,6 +52,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	alloca.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCARCHDIR}/gen/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCARCHDIR}/gen/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 
@@ -61,6 +65,7 @@ CLEANFILES+= ${f:C/\.o/.bc/}
 .for f in \
 	strncmp.o
 ${f} ${f:C/\.o/.bc/}:	${LIBCARCHDIR}/string/${f:C/\.o/.S/}
+${f} ${f:C/\.o/.go/}:	${LIBCARCHDIR}/string/${f:C/\.o/.S/}
 OBJS+=	${f}
 CLEANFILES+= ${f}
 

minix/lib/libsys/asynsend.c

@@ -19,8 +19,6 @@ static asynmsg_t msgtable[ASYN_NR];
 static int first_slot = 0, next_slot = 0;
 static int initialized = 0;
 
-#define DEBUG 0
-
 /*===========================================================================*
  *				asynsend3				     *
  *===========================================================================*/
@@ -56,7 +54,7 @@ int fl;
 	if ((flags & (AMF_VALID|AMF_DONE)) == (AMF_VALID|AMF_DONE)) {
 		/* Marked in use by us (VALID) and processed by the kernel */
 		if (msgtable[first_slot].result != OK) {
-#if DEBUG
+#ifdef DEBUG
 			printf("asynsend: found entry %d with error %d\n",
 				first_slot, msgtable[first_slot].result);
 #endif
@@ -94,7 +92,7 @@ int fl;
 			if (msgtable[src_ind].result == OK)
 				continue;
 			else {
-#if DEBUG
+#ifdef DEBUG
 				printf(
 				 "asynsend: found entry %d with error %d\n",
 					src_ind, msgtable[src_ind].result);
@@ -107,7 +105,7 @@ int fl;
 
 
 		/* Copy/move in use entry */
-#if DEBUG
+#ifdef DEBUG
 		printf("asynsend: copying entry %d to %d\n", src_ind, dst_ind);
 #endif
 		if (src_ind != dst_ind) msgtable[dst_ind] = msgtable[src_ind];

minix/lib/libsys/pci_dev_name.c

@@ -39,7 +39,7 @@ char *pci_dev_name(u16_t vid, u16_t did)
 
 	if (m.m_type == ENOENT)
 	{
-#if DEBUG
+#ifdef DEBUG
 		printf("pci_dev_name: got no name\n");
 #endif
 		return NULL;	/* No name for this device */
@@ -51,7 +51,7 @@ char *pci_dev_name(u16_t vid, u16_t did)
 					 * terminated.
 					 */
 
-#if DEBUG
+#ifdef DEBUG
 	printf("pci_dev_name: got name %s\n", name);
 #endif
 	return name;

minix/lib/libsys/pci_first_dev.c

@@ -26,7 +26,7 @@ u16_t *didp;
 		*devindp= m.m1_i1;
 		*vidp= m.m1_i2;
 		*didp= m.m1_i3;
-#if DEBUG
+#ifdef DEBUG
 		printf("pci_first_dev: got device %d, %04x/%04x\n", 
 			*devindp, *vidp, *didp);
 #endif
@@ -35,7 +35,7 @@ u16_t *didp;
 	if (m.m_type != 0)
 		panic("pci_first_dev: got bad reply from PCI: %d", m.m_type);
 
-#if DEBUG
+#ifdef DEBUG
 	printf("pci_first_dev: got nothing\n");
 #endif
 	return 0;

share/mk/bsd.own.mk

@@ -24,6 +24,7 @@ INFOGRP?=	operator
 DOCGRP?=	operator
 LOCALEGRP?=	operator
 NLSGRP?=	operator
+DEBUGGRP?=	operator
 
 MKKYUA?=	yes
 MKMCLINKER?=	no