PERFORCE change 31510 for review

[David E. O'Brien]

http://perforce.freebsd.org/chv.cgi?CH=31510

Change 31510 by obrien at obrien_trang on 2003/05/20 01:00:31

	First pass at setting the arch #ifdef's for Hammer.

Affected files ...

.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#8 edit
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#5 edit
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#10 edit
.. //depot/projects/hammer/usr.sbin/sysinstall/label.c#7 edit
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#8 edit
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#6 edit

Differences ...

==== //depot/projects/hammer/usr.sbin/sysinstall/disks.c#8 (text+ko) ====

@@ -234,7 +234,7 @@
 static void
 getBootMgr(char *dname, u_char **bootCode, size_t *bootCodeSize)
 {
-#ifdef __i386__	/* only meaningful on x86 */
+#if defined(__i386__) || defined(__amd64__)	/* only meaningful on x86 */
     static u_char *mbr, *boot0;
     static size_t mbr_size, boot0_size;
     char str[80];
@@ -847,14 +847,14 @@
     for (i = 0; devs[i]; i++) {
 	Disk *d = (Disk *)devs[i]->private;
 	static u_char *boot1;
-#if defined(__i386__) || defined(__ia64__)
+#if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
 	static u_char *boot2;
 #endif
 
 	if (!devs[i]->enabled)
 	    continue;
 
-#if defined(__i386__) || defined(__ia64__)
+#if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
 	if (!boot1) boot1 = bootalloc("boot1", NULL);
 	if (!boot2) boot2 = bootalloc("boot2", NULL);
 	Set_Boot_Blocks(d, boot1, boot2);

==== //depot/projects/hammer/usr.sbin/sysinstall/dist.c#5 (text+ko) ====

@@ -224,7 +224,7 @@
     DTE_TARBALL("XAGX",	 &XF86ServerDists, XF86_SERVER_AGX,    "/usr/X11R6"),
 #endif
     DTE_TARBALL("XI128", &XF86ServerDists, XF86_SERVER_I128,   "/usr/X11R6"),
-#ifdef __i386__
+#if defined(__i386__) || defined(__amd64__)
     DTE_TARBALL("XMa8",	 &XF86ServerDists, XF86_SERVER_MACH8,  "/usr/X11R6"),
     DTE_TARBALL("XMa32", &XF86ServerDists, XF86_SERVER_MACH32, "/usr/X11R6"),
 #endif
@@ -234,7 +234,7 @@
     DTE_TARBALL("XS3",	 &XF86ServerDists, XF86_SERVER_S3,     "/usr/X11R6"),
     DTE_TARBALL("XS3V",	 &XF86ServerDists, XF86_SERVER_S3V,    "/usr/X11R6"),
     DTE_TARBALL("XSVGA", &XF86ServerDists, XF86_SERVER_SVGA,   "/usr/X11R6"),
-#ifdef __i386__
+#if defined(__i386__) || defined(__amd64__)
     DTE_TARBALL("XVG16", &XF86ServerDists, XF86_SERVER_VGA16,  "/usr/X11R6"),
     DTE_TARBALL("XW32",	 &XF86ServerDists, XF86_SERVER_W32,    "/usr/X11R6"),
 #endif

==== //depot/projects/hammer/usr.sbin/sysinstall/install.c#10 (text+ko) ====

@@ -807,7 +807,7 @@
 
     /* All of this is done only as init, just to be safe */
     if (RunningAsInit) {
-#ifdef __i386__
+#if defined(__i386__) || defined(__amd64__)
 	if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
 	    if (!kstat || !OnVTY)
 		fprintf(fp, "# -- sysinstall generated deltas -- #\n");

==== //depot/projects/hammer/usr.sbin/sysinstall/label.c#7 (text+ko) ====

@@ -59,7 +59,7 @@
 /*
  * Minimum partition sizes
  */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
 #define ROOT_MIN_SIZE			128
 #else
 #define ROOT_MIN_SIZE			118

==== //depot/projects/hammer/usr.sbin/sysinstall/menus.c#8 (text+ko) ====

@@ -1420,7 +1420,7 @@
       { NULL } },
 };
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__amd64__)
 #ifdef PC98
 /* IPL type menu */
 DMenu MenuIPLType = {

==== //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#6 (text+ko) ====

@@ -54,12 +54,12 @@
 
 /*** Defines ***/
 
-#if defined(__i386__) || defined(__alpha__) || defined(__ia64__)
+#if defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__amd64__)
 #define	WITH_SYSCONS
 #define	WITH_MICE
 #endif
 
-#if defined(__i386__) || defined(__ia64__)
+#if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
 #define	WITH_SLICES
 #endif
 
@@ -421,7 +421,7 @@
 extern int		StatusLine;		/* Where to print our status messages		*/
 extern DMenu		MenuInitial;		/* Initial installation menu			*/
 extern DMenu		MenuFixit;		/* Fixit repair menu				*/
-#ifdef __i386__
+#if defined(__i386__) || defined(__amd64__)
 #ifdef PC98
 extern DMenu		MenuIPLType;		/* Type of IPL to write on the disk		*/
 #else