diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
index f486536113..c1ec729d81 100644
--- a/src/include/port/bsdi.h
+++ b/src/include/port/bsdi.h
@@ -1,10 +1,14 @@
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 #define NEED_I386_TAS_ASM
+typedef unsigned char slock_t;
+#endif
+#if defined(__ia64)
+typedef unsigned int slock_t;
 #endif
 #if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
+typedef unsigned char slock_t;
 #endif
 
 #define HAS_TEST_AND_SET
 
-typedef unsigned char slock_t;
diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
index 7729fa5b9b..386584e9a3 100644
--- a/src/include/port/freebsd.h
+++ b/src/include/port/freebsd.h
@@ -1,9 +1,14 @@
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 #define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
 
+#if defined(__ia64)
+#define HAS_TEST_AND_SET
+typedef unsigned int slock_t;
+#endif
+
 #if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h
index 7729fa5b9b..386584e9a3 100644
--- a/src/include/port/netbsd.h
+++ b/src/include/port/netbsd.h
@@ -1,9 +1,14 @@
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 #define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
 
+#if defined(__ia64)
+#define HAS_TEST_AND_SET
+typedef unsigned int slock_t;
+#endif
+
 #if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h
index 7729fa5b9b..386584e9a3 100644
--- a/src/include/port/openbsd.h
+++ b/src/include/port/openbsd.h
@@ -1,9 +1,14 @@
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 #define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
 
+#if defined(__ia64)
+#define HAS_TEST_AND_SET
+typedef unsigned int slock_t;
+#endif
+
 #if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index 7aa2370443..b4f1e30605 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -6,7 +6,12 @@
 
 #define USE_UNIVEL_CC
 
+#if defined(__ia64)
+typedef unsigned int slock_t;
+#else
 typedef unsigned char slock_t;
+#endif
+
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index 16c85b9fa4..b81fbc47b1 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -7,7 +7,12 @@
  ***************************************/
 #define USE_UNIVEL_CC
 
+#if defined(__ia64)
+typedef unsigned int slock_t;
+#else
 typedef unsigned char slock_t;
+#endif
+
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index da02084c69..734c2ef0fa 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -10,7 +10,12 @@
  ***************************************/
 #define USE_UNIVEL_CC
 
+#if defined(__ia64)
+typedef unsigned int slock_t;
+#else
 typedef unsigned char slock_t;
+#endif
+
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321