6 files changed, 11 insertions, 11 deletions

diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 702ea5de9b25..93050f734ee5 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -234,7 +234,7 @@ getBootMgr(char *dname, u_char **bootipl, size_t *bootipl_size,
 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 @@ diskPartitionWrite(dialogMenuItem *self)
     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);
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index dbc138e3c27a..fa13b80babff 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -223,7 +223,7 @@ static Distribution XF86ServerDistTable[] = {
     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
@@ -233,7 +233,7 @@ static Distribution XF86ServerDistTable[] = {
     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
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 1a4dee18144b..2a0e0beb7d30 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -807,7 +807,7 @@ installFixupBase(dialogMenuItem *self)
 
     /* 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");
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 798fb5f3f800..bf97140966a1 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -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
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 16ac0bd9e6a6..183f1a7c062b 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1418,7 +1418,7 @@ DMenu MenuInstallCustom = {
       { NULL } },
 };
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__amd64__)
 #ifdef PC98
 /* IPL type menu */
 DMenu MenuIPLType = {
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index cf535750125c..264dc402af8c 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -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		BootMgr;		/* Which boot manager to use 			*/
 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