From 732772c7011a4d51329d719dd8bb11e516d55141 Mon Sep 17 00:00:00 2001
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 19 Jul 2011 12:41:57 +0000
Subject: [PATCH] On 64 bit architectures size_t is 8 bytes, thus it should use
 an 8 bytes storage. Fix the sintrcnt/sintrnames specification.

No MFC is previewed for this patch.

Reported, reviewed and tested by:	marcel
Approved by:	re (kib)
---
 sys/ia64/ia64/locore.S          | 4 ++--
 sys/mips/mips/exception.S       | 8 ++++++++
 sys/powerpc/aim/locore64.S      | 4 ++--
 sys/sparc64/sparc64/exception.S | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sys/ia64/ia64/locore.S b/sys/ia64/ia64/locore.S
index d4c1190f5d83..f79ca68f37ca 100644
--- a/sys/ia64/ia64/locore.S
+++ b/sys/ia64/ia64/locore.S
@@ -207,13 +207,13 @@ intr_n = 1
 	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 * 8
 
 	.text
 	// in0:	image base
diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S
index ed7554bc7c03..6eafbdcc640e 100644
--- a/sys/mips/mips/exception.S
+++ b/sys/mips/mips/exception.S
@@ -1140,13 +1140,21 @@ END(MipsFPTrap)
 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
 
 
 /*
diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S
index 9a54b79a4cdd..64e4e628e9dc 100644
--- a/sys/powerpc/aim/locore64.S
+++ b/sys/powerpc/aim/locore64.S
@@ -91,13 +91,13 @@ GLOBAL(esym)
 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
diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S
index fa2f2d5cfd47..222ddeadd21b 100644
--- a/sys/sparc64/sparc64/exception.S
+++ b/sys/sparc64/sparc64/exception.S
@@ -375,13 +375,13 @@ END(rsf_fatal)
 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