From fa6af7ab3eed1a53d0df517fc2c374fd886c6e63 Mon Sep 17 00:00:00 2001
From: dfr <dfr@FreeBSD.org>
Date: Fri, 29 Sep 2000 13:36:47 +0000
Subject: Add ia64 support.

---
 sys/kern/md5c.c             | 2 +-
 sys/sys/mount.h             | 2 +-
 sys/sys/param.h             | 2 +-
 sys/sys/systm.h             | 2 +-
 usr.sbin/config/config.h    | 1 +
 usr.sbin/config/config.y    | 3 +++
 usr.sbin/config/main.c      | 1 +
 usr.sbin/config/mkoptions.c | 1 +
 8 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index 700d589..258996e 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -44,7 +44,7 @@
 #define memcpy(x,y,z)	bcopy(y, x, z)
 #endif
 
-#if defined(__i386__) || defined(__alpha__)
+#if defined(__i386__) || defined(__alpha__) || defined(__ia64__)
 #define Encode memcpy
 #define Decode memcpy
 #else /* __i386__ */
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 14cad4c..c7c0e93 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -70,7 +70,7 @@ struct fid {
 #ifdef __i386__
 #define	MNAMELEN	80	/* length of buffer for returned name */
 #endif
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__ia64__)
 #define	MNAMELEN	72	/* length of buffer for returned name */
 #endif
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 9e08e7b..43b0938 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -214,7 +214,7 @@
  * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
  * MAXALLOCSIZE must be a power of two.
  */
-#if defined(__alpha__)
+#if defined(__alpha__) || defined(__ia64__)
 #define MINBUCKET	5		/* 5 => min allocation of 32 bytes */
 #else
 #define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index bd4cda6..3c5c5b8 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -247,7 +247,7 @@ void		splx __P((intrmask_t ipl));
 void		splz __P((void));
 #endif /* __i386__ */
 
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__ia64__)
 #include <machine/ipl.h>
 #endif
 
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 3964211..d63569b 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -99,6 +99,7 @@ char	*machinename;
 #define	MACHINE_I386	1
 #define MACHINE_PC98	2
 #define MACHINE_ALPHA	3
+#define MACHINE_IA64	4
 
 /*
  * For each machine, a set of CPU's may be specified as supported.
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 5d12b9d..a0352b5 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -120,6 +120,9 @@ Config_spec:
 		} else if (!strcmp($2, "alpha")) {
 			machine = MACHINE_ALPHA;
 			machinename = "alpha";
+		} else if (!strcmp($2, "ia64")) {
+			machine = MACHINE_IA64;
+			machinename = "ia64";
 		} else
 			yyerror("Unknown machine type");
 	      } |
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 318d0d5..d803325 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -168,6 +168,7 @@ main(int argc, char **argv)
 	case MACHINE_I386:
 	case MACHINE_PC98:
 	case MACHINE_ALPHA:
+	case MACHINE_IA64:
 		break;
 
 	default:
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 25bbecc..da0fba4 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -59,6 +59,7 @@ static	struct users {
 	{ 8, 2, 512 },			/* MACHINE_I386 */
 	{ 8, 2, 512 },			/* MACHINE_PC98 */
 	{ 8, 2, 512 },			/* MACHINE_ALPHA */
+	{ 8, 2, 512 },			/* MACHINE_IA64 */
 };
 #define	NUSERS	(sizeof (users) / sizeof (users[0]))
 
-- 
cgit v1.1