Index: sys/powerpc/aim/locore64.S
===================================================================
--- sys/powerpc/aim/locore64.S	(revision 224207)
+++ sys/powerpc/aim/locore64.S	(working copy)
@@ -91,13 +91,13 @@
 GLOBAL(intrnames)
 	.space	INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 GLOBAL(sintrnames)
-	.word	INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+	.quad	INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 
 	.align 4
 GLOBAL(intrcnt)
 	.space	INTRCNT_COUNT * 4 * 2
 GLOBAL(sintrcnt)
-	.word	INTRCNT_COUNT * 4 * 2
+	.quad	INTRCNT_COUNT * 4 * 2
 
 	.text
 	.globl	btext
Index: sys/sparc64/sparc64/exception.S
===================================================================
--- sys/sparc64/sparc64/exception.S	(revision 224207)
+++ sys/sparc64/sparc64/exception.S	(working copy)
@@ -375,13 +375,13 @@
 intrnames:
 	.space	IV_MAX * (MAXCOMLEN + 1)
 sintrnames:
-	.word	IV_MAX * (MAXCOMLEN + 1)
+	.quad	IV_MAX * (MAXCOMLEN + 1)
 
 	.globl	intrcnt, sintrcnt
 intrcnt:
 	.space	IV_MAX * 8
 sintrcnt:
-	.word	IV_MAX * 8
+	.quad	IV_MAX * 8
 
 	.text
 
Index: sys/ia64/ia64/locore.S
===================================================================
--- sys/ia64/ia64/locore.S	(revision 224207)
+++ sys/ia64/ia64/locore.S	(working copy)
@@ -207,13 +207,13 @@
 	intr_n = intr_n + 1
 .endr
 EXPORT(sintrnames)
-	.word INTRCNT_COUNT * INTRNAME_LEN
+	data8 INTRCNT_COUNT * INTRNAME_LEN
 
 	.align 8
 EXPORT(intrcnt)
 	.fill INTRCNT_COUNT, 8, 0
 EXPORT(sintrcnt)
-	.word INTRCNT_COUNT
+	data8 INTRCNT_COUNT
 
 	.text
 	// in0:	image base
Index: sys/mips/mips/exception.S
===================================================================
--- sys/mips/mips/exception.S	(revision 224207)
+++ sys/mips/mips/exception.S	(working copy)
@@ -1140,13 +1140,21 @@
 intrnames:
 	.space  INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 sintrnames:
+#ifdef __mips_n64
+	.quad  INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+#else
 	.word  INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+#endif
 
 	.align	4
 intrcnt:
 	.space  INTRCNT_COUNT * 4 * 2
 sintrcnt:
+#ifdef __mips_n64
+	.quad  INTRCNT_COUNT * 4 * 2
+#else
 	.word  INTRCNT_COUNT * 4 * 2
+#endif
 
 
 /*