diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2002-03-11 04:20:37 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-03-11 04:20:37 +0000 |
| commit | 90b8f6bab5be6dbf37fd5b0f037292d5984ef409 (patch) | |
| tree | 90bbf34ebb19787394d9ffbc16062c0ab9275946 | |
| parent | cdd530ca19abe2b4e5ba1d4ea85ca68a8e6512e0 (diff) | |
Notes
| -rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 12 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index d496bcf68dfba..d8a333fa37e92 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.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?) diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index d496bcf68dfba..d8a333fa37e92 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?) |