* Negative #if's are harder to read as they don't tell exactly what arch

  something applies to.  So change #ifndef to an explicit list of defines.
* Treate sparc64 and ia64 as 64-bit platforms, which means larger roots.
* sparc64 should halt back to the firmware, not reset.
* sparc64 doesn't need to play MS-DOS/BIOS partition crap games.

Reviewed by:	jake

1 files changed, 5 insertions, 5 deletions

diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index f40f3aef3c6e..bf4518dcbf2b 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -59,7 +59,7 @@
 /*
  * Minimum partition sizes
  */
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
 #define ROOT_MIN_SIZE			40
 #else
 #define ROOT_MIN_SIZE			30
@@ -679,7 +679,7 @@ clear_wins(void)
     print_label_chunks();
 }
 
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__sparc64__)
 
 /*
  * If there isn't a freebsd chunk already (i.e. there is no label),
@@ -712,7 +712,7 @@ diskLabel(Device *dev)
     PartInfo *p, *oldp;
     PartType type;
     Device **devs;
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__sparc64__)
     int i;
 #endif
     WINDOW *w = savescr();
@@ -729,7 +729,7 @@ diskLabel(Device *dev)
     }
     labeling = TRUE;
     keypad(stdscr, TRUE);
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__sparc64__)
     for (i = 0; devs[i]; i++) {
 	maybe_dedicate((Disk*) devs[i]->private);
     }
@@ -1381,7 +1381,7 @@ diskLabelNonInteractive(Device *dev)
 	d = dev->private;
     else
 	d = devs[0]->private;
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__sparc64__)
     maybe_dedicate(d);
 #endif
     record_label_chunks(devs, dev);