[src/netbsd-7]: src/usr.sbin/installboot/arch Pull up following revision(s) (...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f2e1b45cc78b
branches:  netbsd-7
changeset: 798709:f2e1b45cc78b
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 14 16:41:30 2014 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #323):
        usr.sbin/installboot/arch/vax.c: revision 1.18
Use VAX_LABELOFFSET here; It needs to be the machine-specific one. Thanks
to gcc-4.8 for discovering the bug and to Atari for having a LABELOFFSET of
516 > 512 :-)
XXX: Perhaps we should put all those constants in <sys/bootblock.h> instead
of spreading them around.

diffstat:

 usr.sbin/installboot/arch/vax.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r cf6148438b2a -r f2e1b45cc78b usr.sbin/installboot/arch/vax.c
--- a/usr.sbin/installboot/arch/vax.c   Sun Dec 14 16:36:32 2014 +0000
+++ b/usr.sbin/installboot/arch/vax.c   Sun Dec 14 16:41:30 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vax.c,v 1.17 2013/06/16 19:05:00 martin Exp $  */
+/*     $NetBSD: vax.c,v 1.17.6.1 2014/12/14 16:41:30 martin Exp $      */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: vax.c,v 1.17 2013/06/16 19:05:00 martin Exp $");
+__RCSID("$NetBSD: vax.c,v 1.17.6.1 2014/12/14 16:41:30 martin Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -88,6 +88,8 @@
 
 #include "installboot.h"
 
+#define        VAX_LABELOFFSET         64
+
 #ifndef __CTASSERT
 #define        __CTASSERT(X)
 #endif
@@ -210,12 +212,12 @@
 
        /*
         * Copy disklabel from old boot block to new.
-        * Assume everything between LABELOFFSET and the start of
+        * Assume everything between VAX_LABELOFFSET and the start of
         * the param block is scratch area and can be copied over.
         */
-       memcpy(bootstrapbuf+LABELOFFSET,
-           oldbb+LABELOFFSET,
-           offsetof(struct vax_boot_block,bb_magic1)-LABELOFFSET);
+       memcpy(bootstrapbuf + VAX_LABELOFFSET,
+           oldbb + VAX_LABELOFFSET,
+           offsetof(struct vax_boot_block,bb_magic1) - VAX_LABELOFFSET);
 
        /* point to bootblock at begining of bootstrap */
        bb = (struct vax_boot_block*)bootstrapbuf;