From 53d30b7a60ad19235c79d991b181d874f27a2caf Mon Sep 17 00:00:00 2001
From: fvdl <fvdl@NetBSD.org>
Date: Wed, 11 Dec 2002 14:28:46 +0000
Subject: [PATCH] Handle MBRs for x86_64.

---
 sbin/disklabel/Makefile    | 4 ++--
 sbin/disklabel/disklabel.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 6751f27af427..ad81a62f1a0d 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.44 2002/07/28 15:17:38 manu Exp $
+#	$NetBSD: Makefile,v 1.45 2002/12/11 14:28:46 fvdl Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
 
 PROG=	disklabel
@@ -7,7 +7,7 @@ MAN=	disklabel.5 disklabel.8
 LDADD+= -lutil
 DPADD+= ${LIBUTIL}
 
-.if (${MACHINE} == "i386")
+.if (${MACHINE} == "i386" || ${MACHINE} == "x86_64")
 # recognize old partition ID for a while
 CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
 # use MBR partition info
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index e51725b850a9..8b8c792f73c6 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.c,v 1.109 2002/12/05 22:59:25 jonb Exp $	*/
+/*	$NetBSD: disklabel.c,v 1.110 2002/12/11 14:28:46 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
 static char sccsid[] = "@(#)disklabel.c	8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: disklabel.c,v 1.109 2002/12/05 22:59:25 jonb Exp $");
+__RCSID("$NetBSD: disklabel.c,v 1.110 2002/12/11 14:28:46 fvdl Exp $");
 #endif
 #endif	/* not lint */
 
@@ -657,7 +657,7 @@ readmbr(int f)
 		return (0);
 	}
 
-#if !defined(__i386__)
+#if !defined(__i386__) && !defined(__x86_64__)
 	/* avoid alignment error */
 	memcpy(mbr, &mbr[MBR_PARTOFF], NMBRPART * sizeof(*dp));
 	dp = (struct mbr_partition *)mbr;