Module Name: src
Committed By: christos
Date: Sun Mar 30 15:20:54 UTC 2014
Modified Files:
src/sys/arch/mvme68k/conf: Makefile.mvme68k
src/sys/arch/mvme68k/include: loadfile_machdep.h
src/sys/arch/mvme68k/stand/bootst: dev_tape.c
Log Message:
fixes for gcc-4.8 (John D. Baker)
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mvme68k/conf/Makefile.mvme68k
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/include/loadfile_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mvme68k/stand/bootst/dev_tape.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/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.62 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.63
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.62 Fri Jan 21 10:59:07 2011
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k Sun Mar 30 11:20:54 2014
@@ -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
Index: src/sys/arch/mvme68k/include/loadfile_machdep.h
diff -u src/sys/arch/mvme68k/include/loadfile_machdep.h:1.5 src/sys/arch/mvme68k/include/loadfile_machdep.h:1.6
--- src/sys/arch/mvme68k/include/loadfile_machdep.h:1.5 Mon Apr 28 16:23:29 2008
+++ src/sys/arch/mvme68k/include/loadfile_machdep.h Sun Mar 30 11:20:54 2014
@@ -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
Index: src/sys/arch/mvme68k/stand/bootst/dev_tape.c
diff -u src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.12 src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.13
--- src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.12 Sun Jul 17 16:54:44 2011
+++ src/sys/arch/mvme68k/stand/bootst/dev_tape.c Sun Mar 30 11:20:54 2014
@@ -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;
}
