summaryrefslogtreecommitdiffstats
path: root/sbin/disklabel
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-03-11 04:20:37 +0000
committerobrien <obrien@FreeBSD.org>2002-03-11 04:20:37 +0000
commit960cf2a9753904e37546652a19c858e30761a871 (patch)
tree90bbf34ebb19787394d9ffbc16062c0ab9275946 /sbin/disklabel
parent3a71779f4de4d423cf03a6c4170053e267fb9287 (diff)
downloadFreeBSD-src-960cf2a9753904e37546652a19c858e30761a871.zip
FreeBSD-src-960cf2a9753904e37546652a19c858e30761a871.tar.gz
* Support the Sparc64.
* Do not default to any particular platform. Require that we explicitly support a particular platform.
Diffstat (limited to 'sbin/disklabel')
-rw-r--r--sbin/disklabel/disklabel.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index d496bcf..d8a333f 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -89,14 +89,12 @@ static const char rcsid[] =
#define BIG_NEWFS_FRAG 4096U
#define BIG_NEWFS_CPG 64U
-#ifdef tahoe
-#define NUMBOOT 0
-#else
-#if defined(__alpha__) || defined(hp300) || defined(hp800)
+#if defined(__i386__) || defined(__ia64__)
+#define NUMBOOT 2
+#elif defined(__alpha__) || defined(__sparc64__)
#define NUMBOOT 1
#else
-#define NUMBOOT 2
-#endif
+#error I do not know about this architecture.
#endif
void makelabel __P((char *, char *, struct disklabel *));
@@ -640,7 +638,7 @@ makebootarea(boot, dp, f)
/*
* Strange rules:
- * 1. One-piece bootstrap (hp300/hp800)
+ * 1. One-piece bootstrap (alpha/sparc64)
* up to d_bbsize bytes of ``xxboot'' go in bootarea, the rest
* is remembered and written later following the bootarea.
* 2. Two-piece bootstraps (vax/i386?/mips?)
OpenPOWER on IntegriCloud