From 870160745375e25635748a5437f9be39ddac96a5 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 30 Mar 2014 15:20:54 +0000
Subject: [PATCH] fixes for gcc-4.8 (John D. Baker)

---
 sys/arch/mvme68k/conf/Makefile.mvme68k      | 6 +++---
 sys/arch/mvme68k/include/loadfile_machdep.h | 4 ++--
 sys/arch/mvme68k/stand/bootst/dev_tape.c    | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 6dfcc9fcdb5f..55c1914191a2 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.62 2011/01/21 15:59:07 joerg Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.63 2014/03/30 15:20:54 christos Exp $
 
 # Makefile for NetBSD
 #
@@ -40,9 +40,9 @@ CMACHFLAGS=	-m68030
 .endif
 .else
 .if empty(IDENT:M-DMVME147) && empty(IDENT:M-DMVME162) && empty(IDENT:M-DMVME167)
-CMACHFLAGS=	-m68060 -Wa,-m68030 -Wa,-m68851
+CMACHFLAGS=	-m68060 -Wa,-mcpu68030 -Wa,-m68851
 .else
-CMACHFLAGS=	-m68020-60 -Wa,-m68030 -Wa,-m68851
+CMACHFLAGS=	-m68020-60 -Wa,-mcpu68030 -Wa,-m68851
 .endif
 .endif
 CFLAGS+=	${CMACHFLAGS} -msoft-float
diff --git a/sys/arch/mvme68k/include/loadfile_machdep.h b/sys/arch/mvme68k/include/loadfile_machdep.h
index 352c277b7361..c7a3c32f419f 100644
--- a/sys/arch/mvme68k/include/loadfile_machdep.h
+++ b/sys/arch/mvme68k/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadfile_machdep.h,v 1.5 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: loadfile_machdep.h,v 1.6 2014/03/30 15:20:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 #define WARN(a)			warn a
 #define PROGRESS(a)		/* nothing */
 #define ALLOC(a)		malloc(a)
-#define DEALLOC(a, b)		free(a)
+#define DEALLOC(a, b)		free(a), __USE(b)
 #define OKMAGIC(a)		((a) == OMAGIC)
 
 #endif
diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.c b/sys/arch/mvme68k/stand/bootst/dev_tape.c
index dbe8a88db901..6e9392e24056 100644
--- a/sys/arch/mvme68k/stand/bootst/dev_tape.c
+++ b/sys/arch/mvme68k/stand/bootst/dev_tape.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dev_tape.c,v 1.12 2011/07/17 20:54:44 joerg Exp $	*/
+/*	$NetBSD: dev_tape.c,v 1.13 2014/03/30 15:20:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -114,9 +114,6 @@ tape_open(struct open_file *f, ...)
 int
 tape_close(struct open_file *f)
 {
-	struct mvmeprom_dskio *ti;
-
-	ti = f->f_devdata;
 	f->f_devdata = NULL;
 	return 0;
 }