Index: sys/arch/hp300/stand/common/devopen.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/stand/common/devopen.c,v
retrieving revision 1.11
diff -p -u -r1.11 devopen.c
--- sys/arch/hp300/stand/common/devopen.c	10 Aug 2014 07:40:49 -0000	1.11
+++ sys/arch/hp300/stand/common/devopen.c	7 Mar 2018 19:17:21 -0000
@@ -188,11 +188,12 @@ devparse(const char *fname, int *dev, in
 		int temp;
 
 		/* isolate device */
-		for (s = (char *)fname; *s != ':' && !isdigit(*s); s++);
+		for (s = (char *)fname; *s != ':' && !isdigit(*s); s++)
+			;
 	
-			/* lookup device and get index */
-			if ((*dev = devlookup(fname, s - fname)) < 0)
-				goto baddev;
+		/* lookup device and get index */
+		if ((*dev = devlookup(fname, s - fname)) < 0)
+			goto baddev;
 
 		/* isolate unit */
 		if ((temp = atoi(s)) > 255)
Index: sys/arch/luna68k/dev/lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/dev/lcd.c,v
retrieving revision 1.8
diff -p -u -r1.8 lcd.c
--- sys/arch/luna68k/dev/lcd.c	9 Mar 2017 14:05:58 -0000	1.8
+++ sys/arch/luna68k/dev/lcd.c	7 Mar 2018 19:17:21 -0000
@@ -214,9 +214,8 @@ lcdioctl(dev_t dev, u_long cmd, void *ad
 	case LCDMOVE:
 	case LCDSEEK:
 	case LCDRESTORE:
-	if ((flag & FWRITE) == 0)
-		return EACCES;
-		break;
+		if ((flag & FWRITE) == 0)
+			return EACCES;
 	}
 
 	switch (cmd) {
Index: sys/arch/mvme68k/conf/Makefile.mvme68k
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/conf/Makefile.mvme68k,v
retrieving revision 1.66
diff -p -u -r1.66 Makefile.mvme68k
--- sys/arch/mvme68k/conf/Makefile.mvme68k	6 Sep 2015 02:17:31 -0000	1.66
+++ sys/arch/mvme68k/conf/Makefile.mvme68k	7 Mar 2018 19:17:21 -0000
@@ -40,9 +40,9 @@ CMACHFLAGS=	-m68030
 .endif
 .else
 .if empty(IDENT:M-DMVME147) && empty(IDENT:M-DMVME162) && empty(IDENT:M-DMVME167)
-CMACHFLAGS=	-m68060 -Wa,-march=68030 -Wa,-mcpu=68030 -Wa,-m68851
+CMACHFLAGS=	-m68060 -Wa,-march=68030 -Wa,-m68030 -Wa,-mcpu=68030 -Wa,-m68851
 .else
-CMACHFLAGS=	-m68020-60 -Wa,-mcpu=68030 -Wa,-m68851
+CMACHFLAGS=	-m68020-60 -Wa,-m68030 -Wa,-mcpu=68030 -Wa,-m68851
 .endif
 .endif
 CFLAGS+=	${CMACHFLAGS} -msoft-float
Index: sys/arch/mvme68k/dev/sbic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/dev/sbic.c,v
retrieving revision 1.34
diff -p -u -r1.34 sbic.c
--- sys/arch/mvme68k/dev/sbic.c	24 Mar 2014 19:52:27 -0000	1.34
+++ sys/arch/mvme68k/dev/sbic.c	7 Mar 2018 19:17:21 -0000
@@ -1682,8 +1682,8 @@ sbicintr(struct sbic_softc *dev)
 		if (i == SBIC_STATE_RUNNING) {
 			GET_SBIC_asr(regs, asr);
 
-		if (asr & SBIC_ASR_LCI)
-			printf("sbicgo: LCI asr:%02x csr:%02x\n", asr, csr);
+			if (asr & SBIC_ASR_LCI)
+				printf("sbicgo: LCI asr:%02x csr:%02x\n", asr, csr);
 
 			if (asr & SBIC_ASR_INT)
 				GET_SBIC_csr(regs, csr);
Index: sys/arch/mvme68k/stand/sboot/le_poll.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/sboot/le_poll.c,v
retrieving revision 1.5
diff -p -u -r1.5 le_poll.c
--- sys/arch/mvme68k/stand/sboot/le_poll.c	12 Jan 2008 09:54:33 -0000	1.5
+++ sys/arch/mvme68k/stand/sboot/le_poll.c	7 Mar 2018 19:17:21 -0000
@@ -239,7 +239,7 @@ int le_put(u_char *pkt, size_t len)
 	if (ler1->ler1_rdp & LE_C0_ERR) {
 		if ((ler1->ler1_rdp &
 		    (LE_C0_BABL|LE_C0_CERR|LE_C0_MISS|LE_C0_MERR)) !=
-		    LE_C0_CERR)
+		    LE_C0_CERR) {
 			printf("le_put: xmit error, buf %d\n",
 			    le_softc.next_tmd);
 			le_error("le_put(xmit error)", ler1);
@@ -248,7 +248,7 @@ int le_put(u_char *pkt, size_t len)
 #if 0
 		(le_softc.next_tmd == (LETBUF - 1)) ? 0 : le_softc.next_tmd + 1;
 #endif
-		if (tmd->tmd1_bits & LE_T1_ERR) {
+		if (tmd->tmd1_bits & LE_T1_ERR)
 			printf("le0: transmit error, error = 0x%x\n",
 			    tmd->tmd3);
 		return -1;
Index: sys/arch/next68k/next68k/nextrom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/next68k/nextrom.c,v
retrieving revision 1.25
diff -p -u -r1.25 nextrom.c
--- sys/arch/next68k/next68k/nextrom.c	11 Aug 2012 01:21:04 -0000	1.25
+++ sys/arch/next68k/next68k/nextrom.c	7 Mar 2018 19:17:21 -0000
@@ -155,7 +155,10 @@ next68k_bootargs(unsigned char **args)
 	 */
 
 	reloc_end = end + NEXT_RAMBASE;
+#pragma GCC push_options
+#pragma GCC diagnostic ignored "-Warray-bounds"
 	reloc_elfmag = ELFMAG + NEXT_RAMBASE;
+#pragma GCC pop_options
 	ehdr = (void *)reloc_end;
 
 	for (i = 0; i < SELFMAG; i++) {
Index: sys/arch/next68k/stand/boot/en.c
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/stand/boot/en.c,v
retrieving revision 1.18
diff -p -u -r1.18 en.c
--- sys/arch/next68k/stand/boot/en.c	23 Jan 2015 03:36:58 -0000	1.18
+++ sys/arch/next68k/stand/boot/en.c	7 Mar 2018 19:17:21 -0000
@@ -247,9 +247,10 @@ en_put(struct iodesc *desc, void *pkt, s
 #if 01
 			DPRINTF(("en_put: DMA state = 0x%x.\n", state));
 #endif
-			if (state & (DMACSR_COMPLETE|DMACSR_BUSEXC))
+			if (state & (DMACSR_COMPLETE|DMACSR_BUSEXC)) {
 				txdma->dd_csr = DMACSR_RESET | DMACSR_CLRCOMPLETE;
 				break;
+			}
 		}
 
 		txs = er->txstat;