From 21ba1833d3f14af43126b0c23a5023591acd3262 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Mon, 24 Jun 2013 14:49:13 +0000
Subject: [PATCH] Make dwarf_eh_object is 8 words long

---
 lib/csu/arch/arm/crtbegin.S | 6 +++---
 lib/csu/common/crtbegin.c   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/csu/arch/arm/crtbegin.S b/lib/csu/arch/arm/crtbegin.S
index 85b84672ba9d..560ccbbb8911 100644
--- a/lib/csu/arch/arm/crtbegin.S
+++ b/lib/csu/arch/arm/crtbegin.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: crtbegin.S,v 1.5 2013/05/05 10:26:57 skrll Exp $	*/
+/*	$NetBSD: crtbegin.S,v 1.6 2013/06/24 14:49:13 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,7 +30,7 @@
 
 #include <arm/asm.h>
 
-RCSID("$NetBSD: crtbegin.S,v 1.5 2013/05/05 10:26:57 skrll Exp $")
+RCSID("$NetBSD: crtbegin.S,v 1.6 2013/06/24 14:49:13 matt Exp $")
 
 	.section	.ctors, "aw", %progbits
 	.p2align 2
@@ -64,7 +64,7 @@ __dso_handle:
 #endif
 
 	.local	__dwarf_eh_object
-	.comm	__dwarf_eh_object,24
+	.comm	__dwarf_eh_object,32
 	.local	__initialized
 	.comm	__initialized,1
 	.local	__finished
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
index c5c2cdaa6197..2bcca2e4fb86 100644
--- a/lib/csu/common/crtbegin.c
+++ b/lib/csu/common/crtbegin.c
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: crtbegin.c,v 1.1 2013/06/22 02:37:09 matt Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.2 2013/06/24 14:49:13 matt Exp $");
 
 typedef void (*fptr_t)(void);
 
@@ -57,7 +57,7 @@ __weakref_visible void register_frame_info(const void *, const void *)
 __weakref_visible void deregister_frame_info(const void *)
 	__weak_reference(__deregister_frame_info);
 
-static long dwarf_eh_object[6];
+static long dwarf_eh_object[8];
 static unsigned char __initialized;
 static unsigned char __finished;