CVS commit: xsrc/external/mit/xf86-video-ati-kms

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 07:34:43 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_kms.c
xsrc/external/mit/xf86-video-ati-kms/include: config.h

Log Message:
merge ati driver 18.1.0.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ati-kms/include/config.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/xf86-video-ati-kms/dist/src/radeon_kms.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.6 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.7
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.6	Sun Mar 11 19:43:59 2018
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c	Sun Dec 30 07:34:43 2018
@@ -212,6 +212,11 @@ static void RADEONFreeRec(ScrnInfoPtr pS
 	info->accel_state = NULL;
 	}
 
+#ifdef USE_GLAMOR
+	if (info->gbm)
+	gbm_device_destroy(info->gbm);
+#endif
+
 	pEnt = info->pEnt;
 	free(pScrn->driverPrivate);
 	pScrn->driverPrivate = NULL;
@@ -254,7 +259,7 @@ radeonShadowWindow(ScreenPtr screen, CAR
 stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
 *size = stride;
 
-return ((uint8_t *)info->front_bo->ptr + row * stride + offset);
+return ((uint8_t *)info->front_buffer->bo.radeon->ptr + row * stride + offset);
 }
 
 static void
@@ -326,7 +331,6 @@ static Bool RADEONCreateScreenResources_
 ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 RADEONInfoPtr  info   = RADEONPTR(pScrn);
 PixmapPtr pixmap;
-struct radeon_surface *surface;
 
 pScreen->CreateScreenResources = info->CreateScreenResources;
 if (!(*pScreen->CreateScreenResources)(pScreen))
@@ -360,14 +364,13 @@ static Bool RADEONCreateScreenResources_
 }
 
 if (info->dri2.enabled || info->use_glamor) {
-	if (info->front_bo) {
+	if (info->front_buffer) {
 	PixmapPtr pPix = pScreen->GetScreenPixmap(pScreen);
-	if (!radeon_set_pixmap_bo(pPix, info->front_bo))
+	if (!radeon_set_pixmap_bo(pPix, info->front_buffer))
 		return FALSE;
-	surface = radeon_get_pixmap_surface(pPix);
-	if (surface) {
-		*surface = info->front_surface;
-	}
+
+	if (info->surf_man && !info->use_glamor)
+		*radeon_get_pixmap_surface(pPix) = info->front_surface;
 	}
 }
 
@@ -523,7 +526,7 @@ radeon_scanout_flip_abort(xf86CrtcPtr cr
 RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn);
 drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
-drmmode_crtc->scanout_update_pending = FALSE;
+drmmode_crtc->scanout_update_pending = 0;
 drmmode_fb_reference(pRADEONEnt->fd, _crtc->flip_pending,
 			 NULL);
 }
@@ -538,15 +541,6 @@ radeon_scanout_flip_handler(xf86CrtcPtr 
 drmmode_fb_reference(pRADEONEnt->fd, _crtc->fb,
 			 drmmode_crtc->flip_pending);
 radeon_scanout_flip_abort(crtc, event_data);
-
-#ifdef HAVE_PRESENT_H
-if (drmmode_crtc->present_vblank_event_id) {
-	present_event_notify(drmmode_crtc->present_vblank_event_id,
-			 drmmode_crtc->present_vblank_usec,
-			 drmmode_crtc->present_vblank_msc);
-	drmmode_crtc->present_vblank_event_id = 0;
-}
-#endif
 }
 
 
@@ -608,7 +602,7 @@ radeon_prime_scanout_update_abort(xf86Cr
 {
 drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
-drmmode_crtc->scanout_update_pending = FALSE;
+drmmode_crtc->scanout_update_pending = 0;
 }
 
 void
@@ -636,7 +630,7 @@ master_has_sync_shared_pixmap(ScrnInfoPt
 {
 ScreenPtr master_screen = radeon_dirty_master(dirty);
 
-return master_screen->SyncSharedPixmap != NULL;
+return !!master_screen->SyncSharedPixmap;
 }
 
 static Bool
@@ -644,7 +638,7 @@ slave_has_sync_shared_pixmap(ScrnInfoPtr
 {
 ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
 
-return slave_screen->SyncSharedPixmap != NULL;
+return !!slave_screen->SyncSharedPixmap;
 }
 
 static void
@@ -749,7 +743,7 @@ radeon_prime_scanout_update_handler(xf86
 drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 
 radeon_prime_scanout_do_update(crtc, 0);
-drmmode_crtc->scanout_update_pending = FALSE;
+drmmode_crtc->scanout_update_pending = 0;
 }
 
 static void
@@ -790,7 +784,7 @@ radeon_prime_scanout_update(PixmapDirtyU
 	return;
 }
 
-drmmode_crtc->scanout_update_pending = TRUE;
+drmmode_crtc->scanout_update_pending = drm_queue_seq;
 }
 
 static void
@@ -848,7 +842,7 @@ radeon_prime_scanout_flip(PixmapDirtyUpd
 }
 
 drmmode_crtc->scanout_id = scanout_id;
-drmmode_crtc->scanout_update_pending = TRUE;
+drmmode_crtc->scanout_update_pending = drm_queue_seq;
 }
 
 static void
@@ -903,10 +897,10 @@ radeon_dirty_update(ScrnInfoPtr scrn)
 
 Bool
 radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
-			 PixmapPtr 

CVS import: xsrc/external/mit/xf86-video-ati-kms/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 07:33:50 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5960

Log Message:
initial import of xf86-video-ati-18.1.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-ati-18-1-0

U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog
U xsrc/external/mit/xf86-video-ati-kms/dist/missing
U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING
U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh
U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh
U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac
U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in
U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub
U xsrc/external/mit/xf86-video-ati-kms/dist/compile
U xsrc/external/mit/xf86-video-ati-kms/dist/configure
U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess
U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/README
U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp
U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL
U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am
U xsrc/external/mit/xf86-video-ati-kms/dist/conf/10-radeon.conf
U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.am
U xsrc/external/mit/xf86-video-ati-kms/dist/m4/libtool.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltversion.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltsugar.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltoptions.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/m4/lt~obsolete.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man
U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man
U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_chipset_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_exa.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_render.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_state.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_sync.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm_queue.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_videofuncs.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_misc.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor_wrappers.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipinfo_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipset_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py
U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_reg_auto.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/atimodule.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri3.c
U 

CVS commit: src/distrib/sets/lists

2018-12-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 07:26:02 UTC 2018

Modified Files:
src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.bebox md.cats
md.i386 md.macppc md.ofppc md.prep md.sgimips md.sparc md.sparc64
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.bebox md.cats
md.i386 md.macppc md.ofppc md.prep md.sgimips md.sparc md.sparc64

Log Message:
it is now called mga_drv.so.2.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.alpha \
src/distrib/sets/lists/xdebug/md.ofppc \
src/distrib/sets/lists/xdebug/md.sparc \
src/distrib/sets/lists/xdebug/md.sparc64
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xdebug/md.bebox \
src/distrib/sets/lists/xdebug/md.prep
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xdebug/md.macppc
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.sgimips
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.bebox
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xserver/md.prep
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.sparc64

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/xdebug/md.alpha
diff -u src/distrib/sets/lists/xdebug/md.alpha:1.10 src/distrib/sets/lists/xdebug/md.alpha:1.11
--- src/distrib/sets/lists/xdebug/md.alpha:1.10	Sat Aug  5 19:41:03 2017
+++ src/distrib/sets/lists/xdebug/md.alpha	Sun Dec 30 07:26:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.10 2017/08/05 19:41:03 mrg Exp $
+# $NetBSD: md.alpha,v 1.11 2018/12/30 07:26:02 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	-unknown-	xorg,debug
@@ -22,7 +22,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	-unknown-	xorg,debug
 ./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
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug	-unknown-	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.ofppc
diff -u src/distrib/sets/lists/xdebug/md.ofppc:1.10 src/distrib/sets/lists/xdebug/md.ofppc:1.11
--- src/distrib/sets/lists/xdebug/md.ofppc:1.10	Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xdebug/md.ofppc	Sun Dec 30 07:26:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.10 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.ofppc,v 1.11 2018/12/30 07:26:02 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg,obsolete
@@ -43,7 +43,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug	obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug		obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.1.debug		obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug		obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libnv_drv.so.2.debug		obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libr128_drv.so.6.debug	obsolete	xorg,obsolete
@@ -52,7 +52,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug		obsolete	xorg,obsolete
 

CVS commit: src/external/mit/xorg/server/drivers

2018-12-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 07:13:15 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile

Log Message:
updates for new mga and r128 drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13	Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile	Sun Dec 30 07:13:15 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2016/08/16 06:24:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2018/12/30 07:13:15 mrg Exp $
 
 .include 
 
@@ -7,7 +7,7 @@ DRIVER_NAME=	mga_drv
 
 SRCS=		mga_bios.c mga_dac3026.c mga_dacG.c
 SRCS+=		mga_dga.c mga_dh.c mga_driver.c mga_g450pll.c
-SRCS+=		mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
+SRCS+=		mga_hwcurs.c mga_merge.c mga_shadow.c
 SRCS+=		mga_vga.c mga_video.c mga_storm.c
 MAN=		mga.4
 

Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11	Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile	Sun Dec 30 07:13:15 2018
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.11 2016/08/16 06:24:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2018/12/30 07:13:15 mrg Exp $
 
 DRIVER=		xf86-video-r128
 DRIVER_NAME=	r128_drv
 
 SRCS=	r128_accel.c r128_cursor.c r128_driver.c r128_exa.c \
-	r128_crtc.c r128_output.c \
+	r128_exa_render.c r128_crtc.c r128_output.c \
 	r128_video.c r128_misc.c r128_probe.c r128_dri.c
 
 MAN=	r128.4



CVS commit: xsrc/external/mit/xf86-video-r128/dist/src

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 06:59:35 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c r128_exa.c

Log Message:
fix merge botch -- at least compiles now.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c

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/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.19 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.20
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.19	Sun Dec 30 06:46:48 2018
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c	Sun Dec 30 06:59:35 2018
@@ -1588,7 +1588,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int 
 
 info->useEXA = FALSE;
 #ifdef USE_EXA
-#ifndef HAVE_XAA_H
 info->useEXA = TRUE;
 #endif
 

Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c:1.3 xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c:1.4
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c:1.3	Sun Dec 30 06:46:48 2018
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c	Sun Dec 30 06:59:35 2018
@@ -440,12 +440,10 @@ R128UploadToScreenHW(PixmapPtr pDst, int
 uint32_t	*s;
 
 if (!R128GetDatatypeBpp(bpp, )) {
-R128TRACE(("R128GetDatatypeBpp failed\n"));
 	return FALSE;
 }
 
 if (!R128GetPixmapOffsetPitch(pDst, _pitch_offset)) {
-R128TRACE(("R128GetPixmapOffsetPitch dest failed\n"));
 	return FALSE;
 }
 



CVS commit: xsrc/external/mit

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 06:46:48 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-mga/dist/src: mga_bios.c mga_dac3026.c
mga_dacG.c mga_dga.c mga_dri.c mga_driver.c mga_exa.c mga_g450pll.c
mga_merge.c mga_storm.c mga_video.c
xsrc/external/mit/xf86-video-r128/dist/src: r128.h r128_driver.c
r128_exa.c r128_output.c
Removed Files:
xsrc/external/mit/xf86-video-mga/dist: README README_HALLIB
xsrc/external/mit/xf86-video-mga/dist/src: binding.h client.h
mga_halmod.c

Log Message:
merge mga 2.0.0 and r128 6.12.0 drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-mga/dist/README
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-mga/dist/README_HALLIB
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-mga/dist/src/binding.h \
xsrc/external/mit/xf86-video-mga/dist/src/client.h \
xsrc/external/mit/xf86-video-mga/dist/src/mga_halmod.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c

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/xf86-video-mga/dist/src/mga_bios.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c:1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c:1.4
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c:1.3	Sat Aug 20 00:27:21 2016
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c	Sun Dec 30 06:46:48 2018
@@ -297,7 +297,6 @@ Bool mga_read_and_process_bios( ScrnInfo
 #ifndef XSERVER_LIBPCIACCESS
 Bool pciBIOS = TRUE;
 #endif
-int rlen;
 static const unsigned expected_length[] = { 0, 64, 64, 64, 128, 128 };
 unsigned version;
 unsigned pins_len;
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c:1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c:1.4
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c:1.3	Sat Aug 20 00:27:21 2016
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c	Sun Dec 30 06:46:48 2018
@@ -15,7 +15,7 @@ static Bool MGA_OpenFramebuffer(ScrnInfo
 static Bool MGA_SetMode(ScrnInfoPtr, DGAModePtr);
 static int  MGA_GetViewport(ScrnInfoPtr);
 static void MGA_SetViewport(ScrnInfoPtr, int, int, int);
-#ifdef HAVE_XAA_H
+#ifdef USE_XAA
 static void MGA_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
 static void MGA_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
 static void MGA_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
@@ -30,7 +30,7 @@ DGAFunctionRec MGA_DGAFuncs = {
MGA_SetViewport,
MGA_GetViewport,
MGAStormSync,
-#ifdef HAVE_XAA_H
+#ifdef USE_XAA
MGA_FillRect,
MGA_BlitRect,
MGA_BlitTransRect
@@ -124,7 +124,7 @@ SECOND_PASS:
 	mode->flags = DGA_CONCURRENT_ACCESS;
 if(pixmap)
 		mode->flags |= DGA_PIXMAP_AVAILABLE;
-#ifdef HAVE_XAA_H
+#ifdef USE_XAA
 	if(!pMga->NoAccel) {
 		mode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
 		if((Bpp != 3) && (pMga->Chipset != PCI_CHIP_MGA2064))
@@ -365,7 +365,7 @@ MGA_SetViewport(
pMga->DGAViewportStatus = 0;  /* MGAAdjustFrame loops until finished */
 }
 
-#ifdef HAVE_XAA_H
+#ifdef USE_XAA
 static void 
 MGA_FillRect (
ScrnInfoPtr pScrn, 
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c:1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c:1.4
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c:1.3	Sat Aug 20 00:27:21 2016
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c	Sun Dec 30 06:46:48 2018
@@ -48,15 +48,8 @@
 #include "mga_drm.h"
 
 #define _XF86DRI_SERVER_
-#include "GL/glxtokens.h"
 #include "sarea.h"
 
-
-
-
-
-#include "GL/glxtokens.h"
-
 #include "mga_reg.h"
 #include "mga.h"
 #include "mga_macros.h"
@@ -67,224 +60,6 @@
 static 

CVS commit: src/sys/dev/mii

2018-12-29 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun Dec 30 06:40:53 UTC 2018

Modified Files:
src/sys/dev/mii: makphy.c

Log Message:
 Add 88E1512.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/mii/makphy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.47 src/sys/dev/mii/makphy.c:1.48
--- src/sys/dev/mii/makphy.c:1.47	Sun Dec 30 06:33:30 2018
+++ src/sys/dev/mii/makphy.c	Sun Dec 30 06:40:52 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: makphy.c,v 1.47 2018/12/30 06:33:30 msaitoh Exp $	*/
+/*	$NetBSD: makphy.c,v 1.48 2018/12/30 06:40:52 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.47 2018/12/30 06:33:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.48 2018/12/30 06:40:52 msaitoh Exp $");
 
 #include 
 #include 
@@ -139,6 +139,9 @@ static const struct mii_phydesc makphys[
 	{ MII_OUI_xxMARVELL,		MII_MODEL_xxMARVELL_E1149R,
 	  MII_STR_xxMARVELL_E1149R },
 
+	{ MII_OUI_xxMARVELL,		MII_MODEL_xxMARVELL_E1512,
+	  MII_STR_xxMARVELL_E1512 },
+
 	{ MII_OUI_xxMARVELL,		MII_MODEL_xxMARVELL_E1543,
 	  MII_STR_xxMARVELL_E1543 },
 



CVS commit: src/sys/dev/mii

2018-12-29 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun Dec 30 06:33:30 UTC 2018

Modified Files:
src/sys/dev/mii: makphy.c

Log Message:
- Control BMCR_PDOWN for IFM_NONE. Some chips still don't work as expected.
  It would be required to modify PSCR and/or other register.
- Set mii_media_active correctly on non-autonego mode.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/mii/makphy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.46 src/sys/dev/mii/makphy.c:1.47
--- src/sys/dev/mii/makphy.c:1.46	Fri Dec 28 06:20:32 2018
+++ src/sys/dev/mii/makphy.c	Sun Dec 30 06:33:30 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: makphy.c,v 1.46 2018/12/28 06:20:32 msaitoh Exp $	*/
+/*	$NetBSD: makphy.c,v 1.47 2018/12/30 06:33:30 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.46 2018/12/28 06:20:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.47 2018/12/30 06:33:30 msaitoh Exp $");
 
 #include 
 #include 
@@ -155,6 +155,9 @@ static const struct mii_phydesc makphys[
 	  NULL },
 };
 
+#define MAKARG_PDOWN	true	/* Power DOWN */
+#define MAKARG_PUP	false	/* Power UP */
+
 static int
 makphymatch(device_t parent, cfdata_t match, void *aux)
 {
@@ -267,6 +270,30 @@ makphy_reset(struct mii_softc *sc)
 	mii_phy_reset(sc);
 }
 
+static void
+makphy_pdown(struct mii_softc *sc, bool pdown)
+{
+	int bmcr, new;
+	bool need_reset = false;
+
+	/*
+	 * XXX
+	 * PSCR (register 16) should be modified on some chips.
+	 */
+
+	bmcr = PHY_READ(sc, MII_BMCR);
+	if (pdown)
+		new = bmcr | BMCR_PDOWN;
+	else
+		new = bmcr & ~BMCR_PDOWN;
+	if (bmcr != new)
+		need_reset = true;
+
+	if (need_reset)
+		new |= BMCR_RESET;
+	PHY_WRITE(sc, MII_BMCR, new);
+}
+
 static int
 makphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 {
@@ -302,13 +329,19 @@ makphy_service(struct mii_softc *sc, str
 		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
 			break;
 
+		/* Try to power up the PHY in case it's down */
+		if (IFM_SUBTYPE(ife->ifm_media) != IFM_NONE)
+			makphy_pdown(sc, MAKARG_PUP);
+
 		mii_phy_setmedia(sc);
 
 		/*
 		 * If autonegitation is not enabled, we need a
 		 * software reset for the settings to take effect.
 		 */
-		if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
+		if (IFM_SUBTYPE(ife->ifm_media) == IFM_NONE)
+			makphy_pdown(sc, MAKARG_PDOWN);
+		else if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
 			bmcr = PHY_READ(sc, MII_BMCR);
 			PHY_WRITE(sc, MII_BMCR, bmcr | BMCR_RESET);
 		}
@@ -354,23 +387,30 @@ makphy_status(struct mii_softc *sc)
 	if (pssr & PSSR_LINK)
 		mii->mii_media_status |= IFM_ACTIVE;
 
+	if (bmcr & BMCR_LOOP)
+		mii->mii_media_active |= IFM_LOOP;
+
 	if (bmcr & BMCR_ISO) {
 		mii->mii_media_active |= IFM_NONE;
 		mii->mii_media_status = 0;
 		return;
 	}
 
-	if (bmcr & BMCR_LOOP)
-		mii->mii_media_active |= IFM_LOOP;
-
-	/*
-	 * Check Speed and Duplex Resolved bit.
-	 * XXX Note that this bit is always 1 when autonego is not enabled.
-	 */
-	if (!(pssr & PSSR_RESOLVED)) {
-		/* Erg, still trying, I guess... */
-		mii->mii_media_active |= IFM_NONE;
-		return;
+	if ((bmcr & BMCR_AUTOEN) != 0) {
+		/*
+		 * Check Speed and Duplex Resolved bit.
+		 * Note that this bit is always 1 when autonego is not enabled.
+		 */
+		if (!(pssr & PSSR_RESOLVED)) {
+			/* Erg, still trying, I guess... */
+			mii->mii_media_active |= IFM_NONE;
+			return;
+		}
+	} else {
+		if ((pssr & PSSR_LINK) == 0) {
+			mii->mii_media_active |= IFM_NONE;
+			return;
+		}
 	}
 
 	/* XXX FIXME: Use different page for Fiber on newer chips */
@@ -387,7 +427,7 @@ makphy_status(struct mii_softc *sc)
 		case SPEED_10:
 			mii->mii_media_active |= IFM_10_T;
 			break;
-		default:
+		default: /* Undefined (reserved) value */
 			mii->mii_media_active |= IFM_NONE;
 			mii->mii_media_status = 0;
 			return;



CVS import: xsrc/external/mit/xf86-video-mga/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 06:05:29 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-mga/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv682

Log Message:
initial import of xf86-video-mga-2.0.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-mga-2-0-0

U xsrc/external/mit/xf86-video-mga/dist/COPYING
U xsrc/external/mit/xf86-video-mga/dist/compile
U xsrc/external/mit/xf86-video-mga/dist/ChangeLog
U xsrc/external/mit/xf86-video-mga/dist/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/mga_PInS.txt
U xsrc/external/mit/xf86-video-mga/dist/INSTALL
U xsrc/external/mit/xf86-video-mga/dist/config.guess
N xsrc/external/mit/xf86-video-mga/dist/README.md
U xsrc/external/mit/xf86-video-mga/dist/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/configure.ac
U xsrc/external/mit/xf86-video-mga/dist/missing
U xsrc/external/mit/xf86-video-mga/dist/depcomp
U xsrc/external/mit/xf86-video-mga/dist/ltmain.sh
U xsrc/external/mit/xf86-video-mga/dist/config.sub
U xsrc/external/mit/xf86-video-mga/dist/configure
U xsrc/external/mit/xf86-video-mga/dist/install-sh
U xsrc/external/mit/xf86-video-mga/dist/config.h.in
U xsrc/external/mit/xf86-video-mga/dist/aclocal.m4
U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/man/mga.man
U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h
C xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c
C xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c
C xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_maven.h
C xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c
U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h
U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am
C xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c
C xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c
U xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_ucode.h
C xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c
C xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
C xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h
C xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c
C xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c
U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c
U xsrc/external/mit/xf86-video-mga/dist/util/README

11 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-mga/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 06:05:33 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv14036

Log Message:
initial import of xf86-video-r128-6.12.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-12-0

U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
C xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_rop.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h

4 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS commit: xsrc/external/mit/libX11/dist/m4

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 05:45:22 UTC 2018

Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4

Log Message:
merge libX11 1.6.7.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/m4/libtool.m4

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/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.5 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.6
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.5	Tue Aug 28 05:52:12 2018
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4	Sun Dec 30 05:45:22 2018
@@ -1417,10 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
 	  x86_64-*linux*)
 	LD="${LD-ld} -m elf_x86_64"
 	;;
-	  powerpcle-*linux*)
+	  powerpcle-*linux*|powerpc64le-*linux*)
 	LD="${LD-ld} -m elf64lppc"
 	;;
-	  powerpc-*linux*)
+	  powerpc-*linux*|powerpc64-*linux*)
 	LD="${LD-ld} -m elf64ppc"
 	;;
 	  s390*-*linux*|s390*-*tpf*)



CVS import: xsrc/external/mit/libX11/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 05:44:02 UTC 2018

Update of /cvsroot/xsrc/external/mit/libX11/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2475

Log Message:
initial import of libX11-1.6.7

Status:

Vendor Tag: xorg
Release Tags:   libX11-1-6-7

U xsrc/external/mit/libX11/dist/docbook.am
U xsrc/external/mit/libX11/dist/test-driver
U xsrc/external/mit/libX11/dist/cpprules.in
U xsrc/external/mit/libX11/dist/depcomp
U xsrc/external/mit/libX11/dist/missing
U xsrc/external/mit/libX11/dist/ltmain.sh
U xsrc/external/mit/libX11/dist/install-sh
U xsrc/external/mit/libX11/dist/config.sub
U xsrc/external/mit/libX11/dist/config.guess
U xsrc/external/mit/libX11/dist/compile
U xsrc/external/mit/libX11/dist/README
U xsrc/external/mit/libX11/dist/NEWS
U xsrc/external/mit/libX11/dist/INSTALL
U xsrc/external/mit/libX11/dist/ChangeLog
U xsrc/external/mit/libX11/dist/COPYING
U xsrc/external/mit/libX11/dist/AUTHORS
U xsrc/external/mit/libX11/dist/x11.pc.in
U xsrc/external/mit/libX11/dist/x11-xcb.pc.in
U xsrc/external/mit/libX11/dist/Makefile.in
U xsrc/external/mit/libX11/dist/aclocal.m4
U xsrc/external/mit/libX11/dist/configure.ac
U xsrc/external/mit/libX11/dist/configure
U xsrc/external/mit/libX11/dist/Makefile.am
U xsrc/external/mit/libX11/dist/specs/Makefile.in
U xsrc/external/mit/libX11/dist/specs/Makefile.am
U xsrc/external/mit/libX11/dist/specs/XKB/Makefile.in
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-21.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-20.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-19.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-18.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-17.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-16.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-15.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-14.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-13.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-12.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-11.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-10.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-9.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-8.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-7.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-6.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-5.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-4.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-3.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-2.svg
U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-1.svg
U xsrc/external/mit/libX11/dist/specs/XKB/glossary.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch22.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch21.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch20.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch19.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch18.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch17.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch16.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch15.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch14.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch13.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch12.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch11.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch10.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch09.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch08.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch07.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch06.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch05.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch04.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch03.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch02.xml
U xsrc/external/mit/libX11/dist/specs/XKB/ch01.xml
U xsrc/external/mit/libX11/dist/specs/XKB/acknowledgement.xml
U xsrc/external/mit/libX11/dist/specs/XKB/xkblib.xml
U xsrc/external/mit/libX11/dist/specs/XKB/Makefile.am
U xsrc/external/mit/libX11/dist/specs/XIM/Makefile.in
U xsrc/external/mit/libX11/dist/specs/XIM/staticflow.svg
U xsrc/external/mit/libX11/dist/specs/XIM/staticflowsampleseq.svg
U xsrc/external/mit/libX11/dist/specs/XIM/sampleprotocolflow2.svg
U xsrc/external/mit/libX11/dist/specs/XIM/sampleprotocolflow1.svg
U xsrc/external/mit/libX11/dist/specs/XIM/eventflow.svg
U xsrc/external/mit/libX11/dist/specs/XIM/dynamicflow.svg
U xsrc/external/mit/libX11/dist/specs/XIM/dynamicflowsampleseq.svg
U xsrc/external/mit/libX11/dist/specs/XIM/xim.xml
U xsrc/external/mit/libX11/dist/specs/XIM/Makefile.am
U xsrc/external/mit/libX11/dist/specs/i18n/Makefile.in
U xsrc/external/mit/libX11/dist/specs/i18n/Makefile.am
U xsrc/external/mit/libX11/dist/specs/i18n/trans/Makefile.in
U xsrc/external/mit/libX11/dist/specs/i18n/trans/trans.xml
U xsrc/external/mit/libX11/dist/specs/i18n/trans/Makefile.am
U xsrc/external/mit/libX11/dist/specs/i18n/localedb/Makefile.in
U xsrc/external/mit/libX11/dist/specs/i18n/localedb/localedb.xml
U 

CVS commit: src/usr.sbin/acpitools/acpidump

2018-12-29 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun Dec 30 05:05:22 UTC 2018

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
 Fix acpi_print_string(). Treat NUL termination correctly to not to print
NUL character. For example, this change prints an OEMID "41 4d 44 00 41 4d"
with "AMD". Tested by Patrick Welche.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/acpitools/acpidump/acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.42 src/usr.sbin/acpitools/acpidump/acpi.c:1.43
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.42	Sun Dec  2 10:51:07 2018
+++ src/usr.sbin/acpitools/acpidump/acpi.c	Sun Dec 30 05:05:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.42 2018/12/02 10:51:07 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.43 2018/12/30 05:05:21 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: acpi.c,v 1.42 2018/12/02 10:51:07 msaitoh Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.43 2018/12/30 05:05:21 msaitoh Exp $");
 
 #include 
 #include 
@@ -215,6 +215,8 @@ acpi_print_string(char *s, size_t length
 
 	while (length--) {
 		c = *s++;
+		if (c == '\0')
+			return;
 		putchar(c);
 	}
 }



CVS commit: src/sys/dev/pci

2018-12-29 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun Dec 30 04:18:09 UTC 2018

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
 Accept IFM_NONE.


To generate a diff of this commit:
cvs rdiff -u -r1.611 -r1.612 src/sys/dev/pci/if_wm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.611 src/sys/dev/pci/if_wm.c:1.612
--- src/sys/dev/pci/if_wm.c:1.611	Fri Dec 21 08:29:22 2018
+++ src/sys/dev/pci/if_wm.c	Sun Dec 30 04:18:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.611 2018/12/21 08:29:22 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.612 2018/12/30 04:18:09 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.611 2018/12/21 08:29:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.612 2018/12/30 04:18:09 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -10165,6 +10165,9 @@ wm_gmii_mediachange(struct ifnet *ifp)
 		case IFM_1000_T:
 			sc->sc_ctrl |= CTRL_SPEED_1000;
 			break;
+		case IFM_NONE:
+			/* There is no specific setting for IFM_NONE */
+			break;
 		default:
 			panic("wm_gmii_mediachange: bad media 0x%x",
 			ife->ifm_media);



CVS commit: src/libexec/ld.elf_so/arch/powerpc

2018-12-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Dec 30 03:23:46 UTC 2018

Modified Files:
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c

Log Message:
- fix wrong reloc name in assert
- fix uninitialized


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.57 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.58
--- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.57	Tue Apr  3 17:10:27 2018
+++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c	Sat Dec 29 22:23:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ppc_reloc.c,v 1.57 2018/04/03 21:10:27 joerg Exp $	*/
+/*	$NetBSD: ppc_reloc.c,v 1.58 2018/12/30 03:23:46 christos Exp $	*/
 
 /*-
  * Copyright (C) 1998	Tsubai Masanari
@@ -30,7 +30,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.57 2018/04/03 21:10:27 joerg Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.58 2018/12/30 03:23:46 christos Exp $");
 #endif /* not lint */
 
 #include 
@@ -188,6 +188,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 		unsigned long	 symnum;
 
 		where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+		symnum = ELF_R_SYM(rela->r_info);
 
 		switch (ELF_R_TYPE(rela->r_info)) {
 #ifdef _LP64
@@ -199,7 +200,6 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 		case R_TYPE(DTPMOD):
 		case R_TYPE(DTPREL):
 		case R_TYPE(TPREL):
-			symnum = ELF_R_SYM(rela->r_info);
 			if (last_symnum != symnum) {
 last_symnum = symnum;
 def = _rtld_find_symdef(symnum, obj, ,
@@ -327,7 +327,7 @@ _rtld_relocate_plt_lazy(Obj_Entry *obj)
 		size_t reloff = rela - obj->pltrela;
 		Elf_Word *where = (Elf_Word *)(obj->relocbase + rela->r_offset);
 
-		assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JUMP_SLOT) ||
+		assert(ELF_R_TYPE(rela->r_info) == R_TYPE(JMP_SLOT) ||
 		   ELF_R_TYPE(rela->r_info) == R_TYPE(IRELATIVE));
 
 		if (ELF_R_TYPE(rela->r_info) == R_TYPE(IRELATIVE)) {



CVS commit: src/sys/arch/macppc/stand/bootxx

2018-12-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Dec 30 01:54:13 UTC 2018

Modified Files:
src/sys/arch/macppc/stand/bootxx: Makefile

Log Message:
no pie/sanitizers for boot code.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/stand/bootxx/Makefile

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/macppc/stand/bootxx/Makefile
diff -u src/sys/arch/macppc/stand/bootxx/Makefile:1.18 src/sys/arch/macppc/stand/bootxx/Makefile:1.19
--- src/sys/arch/macppc/stand/bootxx/Makefile:1.18	Fri Mar  2 18:15:25 2018
+++ src/sys/arch/macppc/stand/bootxx/Makefile	Sat Dec 29 20:54:13 2018
@@ -1,4 +1,8 @@
-#	$NetBSD: Makefile,v 1.18 2018/03/02 23:15:25 sevan Exp $
+#	$NetBSD: Makefile,v 1.19 2018/12/30 01:54:13 christos Exp $
+
+NOLIBCSANITIZER=
+NOSANITIZER=
+NOPIE=
 
 S!=	cd ${.CURDIR}/../../../..; pwd
 



CVS commit: src/libexec/ld.elf_so

2018-12-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Dec 30 01:48:37 UTC 2018

Modified Files:
src/libexec/ld.elf_so: reloc.c rtld.c rtld.h

Log Message:
binutils 2.31.1 can put copy relocations in the relro segment. Delay
protecting the relro segment for the main object until copy relocations
are done.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.194 -r1.195 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.135 -r1.136 src/libexec/ld.elf_so/rtld.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.113 src/libexec/ld.elf_so/reloc.c:1.114
--- src/libexec/ld.elf_so/reloc.c:1.113	Wed Oct 17 19:36:58 2018
+++ src/libexec/ld.elf_so/reloc.c	Sat Dec 29 20:48:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: reloc.c,v 1.113 2018/10/17 23:36:58 joerg Exp $	 */
+/*	$NetBSD: reloc.c,v 1.114 2018/12/30 01:48:37 christos Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.113 2018/10/17 23:36:58 joerg Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.114 2018/12/30 01:48:37 christos Exp $");
 #endif /* not lint */
 
 #include 
@@ -102,10 +102,10 @@ _rtld_do_copy_relocation(const Obj_Entry
 		return (-1);
 	}
 	srcaddr = (const void *)(srcobj->relocbase + srcsym->st_value);
-	(void)memcpy(dstaddr, srcaddr, size);
 	rdbg(("COPY %s %s %s --> src=%p dst=%p size %ld",
 	dstobj->path, srcobj->path, name, srcaddr,
 	(void *)dstaddr, (long)size));
+	(void)memcpy(dstaddr, srcaddr, size);
 	return (0);
 }
 #endif /* RTLD_INHIBIT_COPY_RELOCS */
@@ -149,6 +149,10 @@ _rtld_do_copy_relocations(const Obj_Entr
 			}
 		}
 	}
+#ifdef GNU_RELRO
+	if (_rtld_relro(dstobj, true) == -1)
+		return -1;
+#endif
 #endif /* RTLD_INHIBIT_COPY_RELOCS */
 
 	return (0);
@@ -225,18 +229,10 @@ _rtld_relocate_objects(Obj_Entry *first,
 		if (obj->pltgot != NULL)
 			_rtld_setup_pltgot(obj);
 #ifdef GNU_RELRO
-		if (obj->relro_size > 0) {
-			if (mprotect(obj->relro_page, obj->relro_size,
-			PROT_READ) == -1) {
-_rtld_error("%s: Cannot enforce relro "
-"protection: %s", obj->path,
-xstrerror(errno));
-return -1;
-			}
-		}
+		if (_rtld_relro(obj, false) == -1)
+			return -1;
 #endif
 	}
-
 	return 0;
 }
 

Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.194 src/libexec/ld.elf_so/rtld.c:1.195
--- src/libexec/ld.elf_so/rtld.c:1.194	Thu Dec 27 13:57:43 2018
+++ src/libexec/ld.elf_so/rtld.c	Sat Dec 29 20:48:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.c,v 1.194 2018/12/27 18:57:43 christos Exp $	 */
+/*	$NetBSD: rtld.c,v 1.195 2018/12/30 01:48:37 christos Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.194 2018/12/27 18:57:43 christos Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.195 2018/12/30 01:48:37 christos Exp $");
 #endif /* not lint */
 
 #include 
@@ -1746,3 +1746,22 @@ _rtld_exclusive_exit(sigset_t *mask)
 
 	sigprocmask(SIG_SETMASK, mask, NULL);
 }
+
+int
+_rtld_relro(const Obj_Entry *obj, bool wantmain)
+{
+#ifdef GNU_RELRO
+	if (obj->relro_size == 0)
+		return 0;
+	if (wantmain != (obj ==_rtld_objmain))
+		return 0;
+
+	dbg(("RELRO %s %p %lx\n", obj->path, obj->relro_page, obj->relro_size));
+	if (mprotect(obj->relro_page, obj->relro_size, PROT_READ) == -1) {
+		_rtld_error("%s: Cannot enforce relro " "protection: %s",
+		obj->path, xstrerror(errno));
+		return -1;
+	}
+#endif
+	return 0;
+}

Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.135 src/libexec/ld.elf_so/rtld.h:1.136
--- src/libexec/ld.elf_so/rtld.h:1.135	Mon Nov 26 12:40:26 2018
+++ src/libexec/ld.elf_so/rtld.h	Sat Dec 29 20:48:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.h,v 1.135 2018/11/26 17:40:26 joerg Exp $	 */
+/*	$NetBSD: rtld.h,v 1.136 2018/12/30 01:48:37 christos Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -372,6 +372,8 @@ void _rtld_shared_exit(void);
 void _rtld_exclusive_enter(sigset_t *);
 void _rtld_exclusive_exit(sigset_t *);
 
+int _rtld_relro(const Obj_Entry *, bool);
+
 /* expand.c */
 size_t _rtld_expand_path(char *, size_t, const char *, const char *,\
 const char *);



CVS commit: src

2018-12-29 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 30 00:42:48 UTC 2018

Modified Files:
src/distrib/sets/lists/base: mi
src/doc: 3RDPARTY CHANGES

Log Message:
Update to tzdata2018h (new zone Asia/Qostanay)


To generate a diff of this commit:
cvs rdiff -u -r1.1195 -r1.1196 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1580 -r1.1581 src/doc/3RDPARTY
cvs rdiff -u -r1.2475 -r1.2476 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1195 src/distrib/sets/lists/base/mi:1.1196
--- src/distrib/sets/lists/base/mi:1.1195	Wed Dec 19 13:57:44 2018
+++ src/distrib/sets/lists/base/mi	Sun Dec 30 00:42:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1195 2018/12/19 13:57:44 maxv Exp $
+# $NetBSD: mi,v 1.1196 2018/12/30 00:42:47 kre Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -5587,6 +5587,7 @@
 ./usr/share/zoneinfo/Asia/Pontianak		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Pyongyang		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Qatar			base-sys-share		share
+./usr/share/zoneinfo/Asia/Qostanay		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Qyzylorda		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Rangoon		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Riyadh		base-sys-share		share

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1580 src/doc/3RDPARTY:1.1581
--- src/doc/3RDPARTY:1.1580	Sun Dec 23 16:29:10 2018
+++ src/doc/3RDPARTY	Sun Dec 30 00:42:47 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1580 2018/12/23 16:29:10 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1581 2018/12/30 00:42:47 kre Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1411,8 +1411,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2018g / tzdata2018g
-Current Vers:	tzcode2018g / tzdata2018g
+Version:	tzcode2018g / tzdata2018h
+Current Vers:	tzcode2018h / tzdata2018h
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2475 src/doc/CHANGES:1.2476
--- src/doc/CHANGES:1.2475	Sat Dec 29 11:35:14 2018
+++ src/doc/CHANGES	Sun Dec 30 00:42:47 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2475 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2476 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -277,3 +277,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	kernel: Remove M_ALIGN, MH_ALIGN, M_COPY_PKTHDR and M_MOVE_PKTHDR.
 		[maxv 20181228]
 	kernel: Remove COMPAT_IBCS2. [maxv 20181229]
+	tzdata: Updated to 2018h. [kre 20181230]



CVS commit: src/sys/arch/evbmips/conf

2018-12-29 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Sun Dec 30 00:42:09 UTC 2018

Modified Files:
src/sys/arch/evbmips/conf: GDIUM

Log Message:
Update description, nfc


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/GDIUM

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/evbmips/conf/GDIUM
diff -u src/sys/arch/evbmips/conf/GDIUM:1.33 src/sys/arch/evbmips/conf/GDIUM:1.34
--- src/sys/arch/evbmips/conf/GDIUM:1.33	Wed Sep 19 23:22:17 2018
+++ src/sys/arch/evbmips/conf/GDIUM	Sun Dec 30 00:42:09 2018
@@ -1,6 +1,6 @@
-# $NetBSD: GDIUM,v 1.33 2018/09/19 23:22:17 rin Exp $
+# $NetBSD: GDIUM,v 1.34 2018/12/30 00:42:09 sevan Exp $
 #
-# GENERIC machine description file
+# GDIUM machine description file
 # 
 # This machine description file is used to generate the default NetBSD
 # kernel.  The generic kernel does not include all options, subsystems
@@ -22,7 +22,7 @@ include 	"arch/evbmips/conf/std.gdium"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GDIUM-$Revision: 1.33 $"
+#ident 		"GDIUM-$Revision: 1.34 $"
 
 maxusers	16
 



CVS commit: src/external/public-domain/tz/dist

2018-12-29 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 30 00:41:21 UTC 2018

Modified Files:
src/external/public-domain/tz/dist: TZDATA_VERSION

Log Message:
Merge tzdata2018h


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/public-domain/tz/dist/TZDATA_VERSION

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/public-domain/tz/dist/TZDATA_VERSION
diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.14 src/external/public-domain/tz/dist/TZDATA_VERSION:1.15
--- src/external/public-domain/tz/dist/TZDATA_VERSION:1.14	Sat Oct 27 20:27:17 2018
+++ src/external/public-domain/tz/dist/TZDATA_VERSION	Sun Dec 30 00:41:21 2018
@@ -1 +1 @@
-tzdata-2018g
+tzdata-2018h



CVS import: src/external/public-domain/tz/dist

2018-12-29 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Dec 30 00:40:53 UTC 2018

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24609

Log Message:
Import tzdata2018h from ftp://ftp.iana.org/tz/releases/tzdata2018h.tar.gz

Summary of changes in tzdata2018h (2018-12-23 17:59:32 -0800):

Qyzylorda (aka Kyzylorda) oblast in Kazakhstan moved from +06 to
+05 on 2018-12-21.  This is a zone split as Qostanay (aka
Kostanay) did not switch, so create a zone Asia/Qostanay.

Metlakatla, Alaska observes PST this winter only.

Add predictions for Iran from 2038 through 2090.

Changes to some old timestamps for Nauru (1979) Guam (1959-77),
Hong Kong (1904, 1941, 1945, 1952) (others in Pacific during WWII)

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2018H

U src/external/public-domain/tz/dist/leap-seconds.list
U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/theory.html
U src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
U src/external/public-domain/tz/dist/asia
U src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/systemv
U src/external/public-domain/tz/dist/factory
U src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/pacificnew
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/yearistype.sh
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/zoneinfo2tdf.pl
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

No conflicts created by this import



CVS commit: src/external/bsd/ipf/dist/man

2018-12-29 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Dec 29 23:06:42 UTC 2018

Modified Files:
src/external/bsd/ipf/dist/man: ipfstat.8

Log Message:
ipfstat(8): note -o option applicability, and remove redundant words.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/man/ipfstat.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ipf/dist/man/ipfstat.8
diff -u src/external/bsd/ipf/dist/man/ipfstat.8:1.3 src/external/bsd/ipf/dist/man/ipfstat.8:1.4
--- src/external/bsd/ipf/dist/man/ipfstat.8:1.3	Sun Jul 22 14:27:51 2012
+++ src/external/bsd/ipf/dist/man/ipfstat.8	Sat Dec 29 23:06:42 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipfstat.8,v 1.3 2012/07/22 14:27:51 darrenr Exp $
+.\"	$NetBSD: ipfstat.8,v 1.4 2018/12/29 23:06:42 gutteridge Exp $
 .\"
 .TH IPFSTAT 8
 .SH NAME
@@ -32,8 +32,8 @@ To run and work, it needs to be able to 
 kernel itself.  The kernel name defaults to \fB/netbsd\fP.
 .PP
 The default behaviour of \fBipfstat\fP
-is to retrieve and display the accumulated statistics which have been
-accumulated over time as the kernel has put packets through the filter.
+is to retrieve and display the statistics which have been
+accumulated as the kernel has put packets through the filter.
 .SH OPTIONS
 .TP
 .B \-6
@@ -71,14 +71,14 @@ Show groups currently configured (both a
 .TP
 .B \-h
 Show per-rule the number of times each one scores a "hit".  For use in
-combination with \fB\-i\fP.
+combination with \fB\-i\fP or \fB\-o\fP.
 .TP
 .B \-i
 Display the filter list used for the input side of the kernel IP processing.
 .TP
 .B \-I
 Swap between retrieving "inactive"/"active" filter list details.  For use
-in combination with \fB\-i\fP.
+in combination with \fB\-i\fP or \fB\-o\fP.
 .TP
 .B \-n
 Show the "rule number" for each rule as it is printed.



CVS commit: src/share/man/man4

2018-12-29 Thread Ignatios Souvatzis
Module Name:src
Committed By:   is
Date:   Sat Dec 29 20:29:46 UTC 2018

Modified Files:
src/share/man/man4: amdtemp.4

Log Message:
Document more supported CPU Famililies: Bobcat (for a while) and Puma
(recently)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/amdtemp.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/amdtemp.4
diff -u src/share/man/man4/amdtemp.4:1.11 src/share/man/man4/amdtemp.4:1.12
--- src/share/man/man4/amdtemp.4:1.11	Sat Jan 27 21:41:50 2018
+++ src/share/man/man4/amdtemp.4	Sat Dec 29 20:29:46 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: amdtemp.4,v 1.11 2018/01/27 21:41:50 pgoyette Exp $
+.\" $NetBSD: amdtemp.4,v 1.12 2018/12/29 20:29:46 is Exp $
 .\"-
 .\" Copyright (c) 2008 Christoph Egger
 .\" All rights reserved.
@@ -38,7 +38,8 @@
 The
 .Nm
 driver provides support for the on-die digital thermal sensor present
-on AMD K8, AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion CPUs.
+on AMD K8, AMD Barcelona, AMD Phenom, AMD Griffin, AMD Fusion,
+AMD Bobcat, and AMD Puma CPUs.
 .Pp
 These sensors were officially introduced in AMD K8 Revision F processors,
 and provide 0.5\(deC accuracy.
@@ -47,7 +48,8 @@ which provide two more bits for 0.25\(de
 Each core
 has two temperature sensors, and there are up to two cores per CPU socket.
 .Pp
-AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion provide 0.125\(deC
+AMD Barcelona, AMD Phenom, AMD Griffin, AMD Fusion,
+AMD Bobcat, and AMD Puma provide 0.125\(degC
 accuracy and provide one temperature sensor for each CPU socket.
 .Pp
 The



CVS commit: src/sys/arch/ia64/include

2018-12-29 Thread Sean Cole
Module Name:src
Committed By:   scole
Date:   Sat Dec 29 20:06:49 UTC 2018

Modified Files:
src/sys/arch/ia64/include: proc.h

Log Message:
fix stack size calculation


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/proc.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/ia64/include/proc.h
diff -u src/sys/arch/ia64/include/proc.h:1.9 src/sys/arch/ia64/include/proc.h:1.10
--- src/sys/arch/ia64/include/proc.h:1.9	Sun Dec  2 16:49:24 2018
+++ src/sys/arch/ia64/include/proc.h	Sat Dec 29 20:06:49 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.9 2018/12/02 16:49:24 scole Exp $	*/
+/*	$NetBSD: proc.h,v 1.10 2018/12/29 20:06:49 scole Exp $	*/
 
 #ifndef _IA64_PROC_H_
 #define _IA64_PROC_H_
@@ -41,8 +41,8 @@ struct mdproc {
 
 #define UAREA_PCB_OFFSET	(USPACE - sizeof(struct pcb))
 #define UAREA_TF_OFFSET		(UAREA_PCB_OFFSET - sizeof(struct trapframe))
-#define UAREA_SP_OFFSET		(UAREA_TF_OFFSET -16)
+#define UAREA_SP_OFFSET		(UAREA_TF_OFFSET - 16)
 #define UAREA_BSPSTORE_OFFSET	(0)
-#define UAREA_STACK_SIZE	(USPACE - UAREA_SP_OFFSET)
+#define UAREA_STACK_SIZE	(USPACE - 16 - sizeof(struct trapframe) - sizeof(struct pcb))
 
 #endif /* _IA64_PROC_H_ */



CVS commit: src/sys/arch/aarch64/aarch64

2018-12-29 Thread Alexander Nasonov
Module Name:src
Committed By:   alnsn
Date:   Sat Dec 29 19:53:38 UTC 2018

Modified Files:
src/sys/arch/aarch64/aarch64: pmapboot.c

Log Message:
pmapboot_pte_print() is only used when VERBOSE_INIT_ARM is defined.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/pmapboot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/aarch64/aarch64/pmapboot.c
diff -u src/sys/arch/aarch64/aarch64/pmapboot.c:1.2 src/sys/arch/aarch64/aarch64/pmapboot.c:1.3
--- src/sys/arch/aarch64/aarch64/pmapboot.c:1.2	Fri Oct  5 01:54:10 2018
+++ src/sys/arch/aarch64/aarch64/pmapboot.c	Sat Dec 29 19:53:38 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmapboot.c,v 1.2 2018/10/05 01:54:10 ryo Exp $	*/
+/*	$NetBSD: pmapboot.c,v 1.3 2018/12/29 19:53:38 alnsn Exp $	*/
 
 /*
  * Copyright (c) 2018 Ryo Shimizu 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmapboot.c,v 1.2 2018/10/05 01:54:10 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmapboot.c,v 1.3 2018/12/29 19:53:38 alnsn Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -139,6 +139,7 @@ pmapboot_protect(vaddr_t sva, vaddr_t ev
  * it supports only maximum 7 argument, and only '%d', '%x', and '%s' formats.
  */
 
+#ifdef VERBOSE_INIT_ARM
 static void
 pmapboot_pte_print(pt_entry_t pte, int level,
 void (*pr)(const char *, ...) __printflike(1, 2))
@@ -152,6 +153,7 @@ pmapboot_pte_print(pt_entry_t pte, int l
 	l0pde_pa(pte));
 #endif
 }
+#endif /* VERBOSE_INIT_ARM */
 
 #ifdef OPTIMIZE_TLB_CONTIG
 static inline bool



CVS commit: src/usr.sbin/screenblank

2018-12-29 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sat Dec 29 18:34:59 UTC 2018

Modified Files:
src/usr.sbin/screenblank: screenblank.1

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/screenblank/screenblank.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/screenblank/screenblank.1
diff -u src/usr.sbin/screenblank/screenblank.1:1.16 src/usr.sbin/screenblank/screenblank.1:1.17
--- src/usr.sbin/screenblank/screenblank.1:1.16	Fri Dec 28 23:53:35 2018
+++ src/usr.sbin/screenblank/screenblank.1	Sat Dec 29 18:34:59 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: screenblank.1,v 1.16 2018/12/28 23:53:35 gutteridge Exp $
+.\"	$NetBSD: screenblank.1,v 1.17 2018/12/29 18:34:59 wiz Exp $
 .\"
 .\" Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -119,8 +119,8 @@ File containing the pid of
 .Sh CAVEATS
 .Nm
 checks the access and modification times of the devices it is
-monitoring to determine activity. If the devices are on a file system
-mounted with the
+monitoring to determine activity.
+If the devices are on a file system mounted with the
 .Cm noatime
 and/or
 .Cm nodevmtime



CVS commit: src/sbin/cgdconfig

2018-12-29 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sat Dec 29 18:34:01 UTC 2018

Modified Files:
src/sbin/cgdconfig: cgdconfig.8

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sbin/cgdconfig/cgdconfig.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.43 src/sbin/cgdconfig/cgdconfig.8:1.44
--- src/sbin/cgdconfig/cgdconfig.8:1.43	Fri Dec 28 18:33:54 2018
+++ src/sbin/cgdconfig/cgdconfig.8	Sat Dec 29 18:34:01 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.43 2018/12/28 18:33:54 alnsn Exp $
+.\" $NetBSD: cgdconfig.8,v 1.44 2018/12/29 18:34:01 wiz Exp $
 .\"
 .\" Copyright (c) 2002, The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -456,9 +456,9 @@ program's execution.
 .El
 .Sh SEE ALSO
 .Xr cgd 4 ,
-.Xr disklabel 8 ,
 .Xr dk 4 ,
 .Xr fstab 5 ,
+.Xr disklabel 8 ,
 .Xr gpt 8
 .Pp
 .Dq PKCS #5 v2.0: Password-Based Cryptography Standard ,



CVS commit: src/usr.bin/kdump

2018-12-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Dec 29 18:09:32 UTC 2018

Modified Files:
src/usr.bin/kdump: setemul.c

Log Message:
ibcs2 is gone


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/kdump/setemul.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/kdump/setemul.c
diff -u src/usr.bin/kdump/setemul.c:1.30 src/usr.bin/kdump/setemul.c:1.31
--- src/usr.bin/kdump/setemul.c:1.30	Wed Dec 19 16:27:26 2018
+++ src/usr.bin/kdump/setemul.c	Sat Dec 29 18:09:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: setemul.c,v 1.30 2018/12/19 16:27:26 martin Exp $	*/
+/*	$NetBSD: setemul.c,v 1.31 2018/12/29 18:09:32 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: setemul.c,v 1.30 2018/12/19 16:27:26 martin Exp $");
+__RCSID("$NetBSD: setemul.c,v 1.31 2018/12/29 18:09:32 martin Exp $");
 #endif /* not lint */
 
 #include 
@@ -83,7 +83,6 @@ __RCSID("$NetBSD: setemul.c,v 1.30 2018/
 
 #include "../../sys/compat/netbsd32/netbsd32_syscall.h"
 #include "../../sys/compat/freebsd/freebsd_syscall.h"
-#include "../../sys/compat/ibcs2/ibcs2_syscall.h"
 #include "../../sys/compat/linux/linux_syscall.h"
 #include "../../sys/compat/linux32/linux32_syscall.h"
 #include "../../sys/compat/osf1/osf1_syscall.h"
@@ -99,7 +98,6 @@ __RCSID("$NetBSD: setemul.c,v 1.30 2018/
 
 #include "../../sys/compat/netbsd32/netbsd32_syscalls.c"
 #include "../../sys/compat/freebsd/freebsd_syscalls.c"
-#include "../../sys/compat/ibcs2/ibcs2_syscalls.c"
 #include "../../sys/compat/linux/linux_syscalls.c"
 #include "../../sys/compat/linux32/linux32_syscalls.c"
 #include "../../sys/compat/osf1/osf1_syscalls.c"
@@ -110,13 +108,11 @@ __RCSID("$NetBSD: setemul.c,v 1.30 2018/
 #include "../../sys/compat/aoutm68k/aoutm68k_syscalls.c"
 #endif
 
-#include "../../sys/compat/ibcs2/ibcs2_errno.c"
 #include "../../sys/compat/osf1/osf1_errno.c"
 #include "../../sys/compat/linux/common/linux_errno.c"
 #undef KTRACE
 
 #define SIGRTMIN	33	/* XXX */
-#include "../../sys/compat/ibcs2/ibcs2_signo.c"
 #include "../../sys/compat/osf1/osf1_signo.c"
 #include "../../sys/compat/linux/common/linux_signo.c"
 
@@ -136,10 +132,6 @@ const struct emulation emulations[] = {
 	  NULL,0,
 	  NULL,0,	0 },
 
-	{ "ibcs2",	ibcs2_syscallnames,	IBCS2_SYS_MAXSYSCALL,
-	  native_to_ibcs2_errno,	NELEM(native_to_ibcs2_errno),
-	  ibcs2_to_native_signo,	NSIG,	0 },
-
 	{ "linux",	linux_syscallnames,	LINUX_SYS_MAXSYSCALL,
 	  native_to_linux_errno,	NELEM(native_to_linux_errno),
 	  linux_to_native_signo,	NSIG,	0 },



CVS commit: src/lib/libnvmm

2018-12-29 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Dec 29 17:54:54 UTC 2018

Modified Files:
src/lib/libnvmm: libnvmm_x86.c

Log Message:
Fix the segmentation check, the limit is relative, not absolute.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libnvmm/libnvmm_x86.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.6 src/lib/libnvmm/libnvmm_x86.c:1.7
--- src/lib/libnvmm/libnvmm_x86.c:1.6	Thu Dec 27 07:22:31 2018
+++ src/lib/libnvmm/libnvmm_x86.c	Sat Dec 29 17:54:54 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: libnvmm_x86.c,v 1.6 2018/12/27 07:22:31 maxv Exp $	*/
+/*	$NetBSD: libnvmm_x86.c,v 1.7 2018/12/29 17:54:54 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -472,7 +472,7 @@ segment_apply(struct nvmm_x64_state_seg 
 		limit *= PAGE_SIZE;
 	}
 
-	if (__predict_false(*gva + seg->base + size > limit)) {
+	if (__predict_false(*gva + size > limit)) {
 		goto error;
 	}
 



CVS commit: src/sys/external/bsd/compiler_rt

2018-12-29 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Sat Dec 29 16:27:12 UTC 2018

Modified Files:
src/sys/external/bsd/compiler_rt: prepare-import.sh

Log Message:
compiler_rt: Update prepare-import.sh according to future updates

Allow: asan, msan, lsan, tsan, ubsan, xray, interception, includes,
   ubsan_minimal, fuzzer, sanitizer_common, stats, safestack.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/compiler_rt/prepare-import.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/compiler_rt/prepare-import.sh
diff -u src/sys/external/bsd/compiler_rt/prepare-import.sh:1.5 src/sys/external/bsd/compiler_rt/prepare-import.sh:1.6
--- src/sys/external/bsd/compiler_rt/prepare-import.sh:1.5	Sat Feb 27 19:12:05 2016
+++ src/sys/external/bsd/compiler_rt/prepare-import.sh	Sat Dec 29 16:27:12 2018
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.5 2016/02/27 19:12:05 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.6 2018/12/29 16:27:12 kamil Exp $
 #
 # Checkout compiler_rt into dist.
 # Run this script and check for additional files and directories to prune,
@@ -9,10 +9,9 @@ set -e
 
 cd dist
 rm -rf .svn
-rm -rf SDKs android cmake include make third_party unittests www
+rm -rf SDKs android cmake make third_party unittests www
 rm -f .arcconfig .gitignore CMakeLists.txt Makefile
-rm -rf lib/BlocksRuntime lib/asan lib/dfsan lib/interception lib/lsan lib/cfi
-rm -rf lib/msan lib/msandr lib/sanitizer_common lib/safestack lib/tsan lib/ubsan
+rm -rf lib/BlocksRuntime lib/dfsan lib/cfi
 rm -rf  lib/builtins/Darwin-excludes lib/builtins/macho_embedded
 rm -rf test/BlocksRuntime test/asan test/cfi test/dfsan test/lit.* test/lsan
 rm -rf test/msan test/sanitizer_common test/safestack test/tsan test/ubsan



CVS commit: src/distrib/sets/lists

2018-12-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Dec 29 15:56:33 UTC 2018

Modified Files:
src/distrib/sets/lists/xcomp: md.hp300
src/distrib/sets/lists/xdebug: md.hp300

Log Message:
Fix sets for hp300


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xcomp/md.hp300
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.hp300

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/xcomp/md.hp300
diff -u src/distrib/sets/lists/xcomp/md.hp300:1.5 src/distrib/sets/lists/xcomp/md.hp300:1.6
--- src/distrib/sets/lists/xcomp/md.hp300:1.5	Tue Dec 29 11:55:39 2015
+++ src/distrib/sets/lists/xcomp/md.hp300	Sat Dec 29 10:56:33 2018
@@ -1,14 +1,14 @@
-# $NetBSD: md.hp300,v 1.5 2015/12/29 16:55:39 christos Exp $
-./usr/libdata/lint/llib-ldbe.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-ldri.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-ldri2.ln	-unknown-	lint,xorg
-./usr/libdata/lint/llib-lexa.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-lextmod.ln	-unknown-	lint,xorg
-./usr/libdata/lint/llib-lfb.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-lglx.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-lrecord.ln	-unknown-	lint,xorg
-./usr/libdata/lint/llib-lshadow.ln	-unknown-	lint,xorg
-./usr/libdata/lint/llib-lshadowfb.ln	-unknown-	lint,xorg
-./usr/libdata/lint/llib-lvbe.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-lvgahw.ln	-unknown-	lint,xorg
-./usr/libdata/lint/llib-lxaa.ln		-unknown-	lint,xorg
+# $NetBSD: md.hp300,v 1.6 2018/12/29 15:56:33 christos Exp $
+./usr/libdata/lint/llib-ldbe.ln		-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-ldri.ln		-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-ldri2.ln	-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lexa.ln		-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lextmod.ln	-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lfb.ln		-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lglx.ln		-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lrecord.ln	-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lshadow.ln	-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lshadowfb.ln	-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lvbe.ln		-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lvgahw.ln	-unknown-	lint,xorg,obsolete
+./usr/libdata/lint/llib-lxaa.ln		-unknown-	lint,xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.hp300
diff -u src/distrib/sets/lists/xdebug/md.hp300:1.8 src/distrib/sets/lists/xdebug/md.hp300:1.9
--- src/distrib/sets/lists/xdebug/md.hp300:1.8	Sat Sep 24 17:57:38 2016
+++ src/distrib/sets/lists/xdebug/md.hp300	Sat Dec 29 10:56:33 2018
@@ -1,19 +1,19 @@
-# $NetBSD: md.hp300,v 1.8 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.hp300,v 1.9 2018/12/29 15:56:33 christos Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,xorg_server_ver=118,obsolete
-./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/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg,xorg_server_ver=118,obsolete
-./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg,xorg_server_ver=118,obsolete
-./usr/X11R7/lib/modules/extensions/libshadow_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/libshadowfb_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/extensions/libshadow_g.a	-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg,xorg_server_ver=118,obsolete
 

CVS commit: src/distrib/common

2018-12-29 Thread Alexander Nasonov
Module Name:src
Committed By:   alnsn
Date:   Sat Dec 29 13:09:35 UTC 2018

Modified Files:
src/distrib/common: cgdroot.rc

Log Message:
ROOT.a doesn't resolve to a useful partition, hardcode wd0a and ld0a for now.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/common/cgdroot.rc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/common/cgdroot.rc
diff -u src/distrib/common/cgdroot.rc:1.3 src/distrib/common/cgdroot.rc:1.4
--- src/distrib/common/cgdroot.rc:1.3	Sat Dec 29 01:04:38 2018
+++ src/distrib/common/cgdroot.rc	Sat Dec 29 13:09:35 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: cgdroot.rc,v 1.3 2018/12/29 01:04:38 alnsn Exp $
+#	$NetBSD: cgdroot.rc,v 1.4 2018/12/29 13:09:35 alnsn Exp $
 #
 # Copyright (c) 2013 Pierre Pronchery 
 # All rights reserved.
@@ -37,7 +37,7 @@ export EDITOR
 umask 022
 
 mounted=
-for dev in NAME=cgd.conf ROOT.a ; do
+for dev in NAME=cgd.conf /dev/wd0a /dev/ld0a ; do
 	if mount -o ro $dev /etc/cgd 2>/dev/null ; then
 		mounted=$dev
 		break



CVS commit: src/doc

2018-12-29 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Dec 29 11:35:14 UTC 2018

Modified Files:
src/doc: CHANGES

Log Message:
Note mbuf API changes, and removal of compat_ibcs2.


To generate a diff of this commit:
cvs rdiff -u -r1.2474 -r1.2475 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2474 src/doc/CHANGES:1.2475
--- src/doc/CHANGES:1.2474	Thu Dec 27 10:09:56 2018
+++ src/doc/CHANGES	Sat Dec 29 11:35:14 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2474 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2475 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -274,3 +274,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	systat(1): Extend vmstat display for better insight about bufcache.
 		[sevan 20181226]
 	arm: Support kernel crash dumps on 64 bit platforms.  [mrg 20181227]
+	kernel: Remove M_ALIGN, MH_ALIGN, M_COPY_PKTHDR and M_MOVE_PKTHDR.
+		[maxv 20181228]
+	kernel: Remove COMPAT_IBCS2. [maxv 20181229]



CVS commit: src/share/man/man7

2018-12-29 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Dec 29 11:33:00 UTC 2018

Modified Files:
src/share/man/man7: symlink.7

Log Message:
Remove reference to compat_darwin (was retired a long time ago).


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man7/symlink.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man7/symlink.7
diff -u src/share/man/man7/symlink.7:1.27 src/share/man/man7/symlink.7:1.28
--- src/share/man/man7/symlink.7:1.27	Sat Dec 29 11:30:11 2018
+++ src/share/man/man7/symlink.7	Sat Dec 29 11:33:00 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: symlink.7,v 1.27 2018/12/29 11:30:11 maxv Exp $
+.\"	$NetBSD: symlink.7,v 1.28 2018/12/29 11:33:00 maxv Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -564,7 +564,6 @@ Defaults to
 Other valid emulations are:
 .Dv aout ,
 .Dv aoutm68k ,
-.Dv darwin ,
 .Dv freebsd ,
 .Dv linux ,
 .Dv linux32 ,



CVS commit: src

2018-12-29 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Dec 29 11:30:13 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: md.vax
src/distrib/sets/lists/man: mi
src/share/man/man4: options.4
src/share/man/man7: hier.7 symlink.7
src/share/man/man8: Makefile
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
src/sys/arch/vax/conf: GENERIC VAX780 files.vax
src/sys/arch/vax/include: Makefile signal.h
src/sys/arch/vax/vax: compat_13_machdep.c compat_16_machdep.c machdep.c
sig_machdep.c subr.S
src/sys/compat: Makefile Makefile.syscall
src/sys/conf: files
src/sys/sys: ioctl.h
Removed Files:
src/share/man/man8: compat_ibcs2.8
src/sys/arch/vax/include: ibcs2_machdep.h
src/sys/arch/vax/vax: ibcs2_machdep.c
src/sys/compat/ibcs2: Makefile TODO files.ibcs2 ibcs2_dirent.h
ibcs2_errno.c ibcs2_errno.h ibcs2_exec.c ibcs2_exec.h
ibcs2_exec_coff.c ibcs2_exec_elf32.c ibcs2_exec_xout.c
ibcs2_fcntl.c ibcs2_fcntl.h ibcs2_grp.h ibcs2_ioctl.c ibcs2_ipc.c
ibcs2_misc.c ibcs2_mman.h ibcs2_mod.c ibcs2_mount.h ibcs2_pwd.h
ibcs2_signal.c ibcs2_signal.h ibcs2_signo.c ibcs2_socksys.c
ibcs2_socksys.h ibcs2_stat.c ibcs2_stat.h ibcs2_statfs.h
ibcs2_stropts.h ibcs2_syscall.h ibcs2_syscallargs.h
ibcs2_syscalls.c ibcs2_sysent.c ibcs2_sysi86.h ibcs2_termios.h
ibcs2_time.h ibcs2_timeb.h ibcs2_types.h ibcs2_unistd.h
ibcs2_ustat.h ibcs2_util.h ibcs2_utime.h ibcs2_utsname.h
ibcs2_wait.h syscalls.conf syscalls.master
src/sys/modules/compat_ibcs2: Makefile

Log Message:
Retire compat_ibcs2, as discussed on tech-kern@. FreeBSD did the same
recently.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/md.vax
cvs rdiff -u -r1.1635 -r1.1636 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.496 -r1.497 src/share/man/man4/options.4
cvs rdiff -u -r1.134 -r1.135 src/share/man/man7/hier.7
cvs rdiff -u -r1.26 -r1.27 src/share/man/man7/symlink.7
cvs rdiff -u -r1.106 -r1.107 src/share/man/man8/Makefile
cvs rdiff -u -r1.11 -r0 src/share/man/man8/compat_ibcs2.8
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.460 -r1.461 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/include/Makefile
cvs rdiff -u -r1.12 -r0 src/sys/arch/vax/include/ibcs2_machdep.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/include/signal.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vax/compat_13_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/compat_16_machdep.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/vax/vax/ibcs2_machdep.c
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/vax/sig_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/vax/subr.S
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/Makefile.syscall
cvs rdiff -u -r1.6 -r0 src/sys/compat/ibcs2/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/compat/ibcs2/TODO \
src/sys/compat/ibcs2/ibcs2_mod.c src/sys/compat/ibcs2/ibcs2_types.h
cvs rdiff -u -r1.10 -r0 src/sys/compat/ibcs2/files.ibcs2
cvs rdiff -u -r1.3 -r0 src/sys/compat/ibcs2/ibcs2_dirent.h \
src/sys/compat/ibcs2/ibcs2_statfs.h src/sys/compat/ibcs2/ibcs2_utsname.h
cvs rdiff -u -r1.9 -r0 src/sys/compat/ibcs2/ibcs2_errno.c \
src/sys/compat/ibcs2/ibcs2_util.h
cvs rdiff -u -r1.4 -r0 src/sys/compat/ibcs2/ibcs2_errno.h \
src/sys/compat/ibcs2/ibcs2_stat.h src/sys/compat/ibcs2/ibcs2_termios.h \
src/sys/compat/ibcs2/ibcs2_timeb.h src/sys/compat/ibcs2/syscalls.conf
cvs rdiff -u -r1.79 -r0 src/sys/compat/ibcs2/ibcs2_exec.c
cvs rdiff -u -r1.16 -r0 src/sys/compat/ibcs2/ibcs2_exec.h
cvs rdiff -u -r1.29 -r0 src/sys/compat/ibcs2/ibcs2_exec_coff.c \
src/sys/compat/ibcs2/ibcs2_signal.c
cvs rdiff -u -r1.17 -r0 src/sys/compat/ibcs2/ibcs2_exec_elf32.c
cvs rdiff -u -r1.18 -r0 src/sys/compat/ibcs2/ibcs2_exec_xout.c
cvs rdiff -u -r1.35 -r0 src/sys/compat/ibcs2/ibcs2_fcntl.c
cvs rdiff -u -r1.2 -r0 src/sys/compat/ibcs2/ibcs2_fcntl.h \
src/sys/compat/ibcs2/ibcs2_grp.h src/sys/compat/ibcs2/ibcs2_mount.h \
src/sys/compat/ibcs2/ibcs2_pwd.h src/sys/compat/ibcs2/ibcs2_stropts.h \
src/sys/compat/ibcs2/ibcs2_sysi86.h src/sys/compat/ibcs2/ibcs2_time.h \
src/sys/compat/ibcs2/ibcs2_unistd.h src/sys/compat/ibcs2/ibcs2_ustat.h \
src/sys/compat/ibcs2/ibcs2_utime.h src/sys/compat/ibcs2/ibcs2_wait.h
cvs rdiff -u -r1.46 -r0 src/sys/compat/ibcs2/ibcs2_ioctl.c
cvs rdiff -u -r1.27 -r0 src/sys/compat/ibcs2/ibcs2_ipc.c
cvs rdiff -u -r1.116 -r0 src/sys/compat/ibcs2/ibcs2_misc.c
cvs rdiff -u -r1.1 -r0 src/sys/compat/ibcs2/ibcs2_mman.h \

CVS commit: src/sys/arch/vax/conf

2018-12-29 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Dec 29 09:48:54 UTC 2018

Modified Files:
src/sys/arch/vax/conf: GENERIC

Log Message:
Disable compat_ibcs2, it is being retired.


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/arch/vax/conf/GENERIC

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/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.206 src/sys/arch/vax/conf/GENERIC:1.207
--- src/sys/arch/vax/conf/GENERIC:1.206	Wed Aug  1 20:04:14 2018
+++ src/sys/arch/vax/conf/GENERIC	Sat Dec 29 09:48:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.206 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: GENERIC,v 1.207 2018/12/29 09:48:54 maxv Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.206 $"
+#ident 		"GENERIC-$Revision: 1.207 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -132,7 +132,7 @@ options 	SYSVSHM
 include 	"conf/compat_netbsd09.config"
 options 	COMPAT_VAX1K	# Must be present to run pre-1.4 binaries.
 options 	COMPAT_ULTRIX
-options 	COMPAT_IBCS2	# DEC SVR.3 compatibility
+#options 	COMPAT_IBCS2	# DEC SVR.3 compatibility
 #options 	NO_INSN_EMULATE	# CPU does not lack some hardware instructions.
 
 



CVS commit: xsrc/external/mit/xf86-video-amdgpu/include

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 08:49:52 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h

Log Message:
update for 18.1.0.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-amdgpu/include/config.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/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.5 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.6
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.5	Sun Mar 11 19:20:56 2018
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h	Sat Dec 29 08:49:52 2018
@@ -88,7 +88,7 @@
 #define PACKAGE_NAME "xf86-video-amdgpu"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-amdgpu 18.0.0"
+#define PACKAGE_STRING "xf86-video-amdgpu 18.1.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-amdgpu"
@@ -97,13 +97,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "18.0.0"
+#define PACKAGE_VERSION "18.1.0"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 18
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 0
+#define PACKAGE_VERSION_MINOR 1
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -118,7 +118,7 @@
 #define USE_SYS_ENDIAN_H 1
 
 /* Version number of package */
-#define VERSION "18.0.0"
+#define VERSION "18.1.0"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE



CVS import: xsrc/external/mit/xf86-video-amdgpu/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec 29 08:47:52 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-amdgpu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27908

Log Message:
initial import of xf86-video-amdgpu-18.1.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-amdgpu-18-1-0

U xsrc/external/mit/xf86-video-amdgpu/dist/ChangeLog
U xsrc/external/mit/xf86-video-amdgpu/dist/missing
U xsrc/external/mit/xf86-video-amdgpu/dist/ltmain.sh
U xsrc/external/mit/xf86-video-amdgpu/dist/COPYING
U xsrc/external/mit/xf86-video-amdgpu/dist/README
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/install-sh
U xsrc/external/mit/xf86-video-amdgpu/dist/configure.ac
U xsrc/external/mit/xf86-video-amdgpu/dist/config.h.in
U xsrc/external/mit/xf86-video-amdgpu/dist/config.sub
U xsrc/external/mit/xf86-video-amdgpu/dist/compile
U xsrc/external/mit/xf86-video-amdgpu/dist/depcomp
U xsrc/external/mit/xf86-video-amdgpu/dist/configure
U xsrc/external/mit/xf86-video-amdgpu/dist/config.guess
U xsrc/external/mit/xf86-video-amdgpu/dist/aclocal.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/INSTALL
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/10-amdgpu.conf
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/lt~obsolete.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/libtool.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltversion.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltsugar.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltoptions.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/man/amdgpu.man
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_version.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_kms.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri3.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor_wrappers.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_misc.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_present.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/simple_list.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drv.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_sync.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.c

No conflicts created by this import