Module Name: src
Committed By: matt
Date: Fri Aug 24 16:37:45 UTC 2012
Modified Files:
src/lib/csu/arch/arm: crtbegin.S
Log Message:
Fix code around __register_frame_info (fixes core dumps)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/arm/crtbegin.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/arm/crtbegin.S
diff -u src/lib/csu/arch/arm/crtbegin.S:1.2 src/lib/csu/arch/arm/crtbegin.S:1.3
--- src/lib/csu/arch/arm/crtbegin.S:1.2 Sat Aug 11 07:25:13 2012
+++ src/lib/csu/arch/arm/crtbegin.S Fri Aug 24 16:37:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.S,v 1.2 2012/08/11 07:25:13 matt Exp $ */
+/* $NetBSD: crtbegin.S,v 1.3 2012/08/24 16:37:45 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.2 2012/08/11 07:25:13 matt Exp $")
+RCSID("$NetBSD: crtbegin.S,v 1.3 2012/08/24 16:37:45 matt Exp $")
.section .ctors, "aw", %progbits
.p2align 2
@@ -211,14 +211,12 @@ __do_global_ctors_aux:
cmp ip, #0
beq 1f
- ldr r2, .L__EH_FRAME_LIST__
- ldr r3, .L__dwarf_eh_object
+ ldr r0, .L__EH_FRAME_LIST__
+ ldr r1, .L__dwarf_eh_object
#ifdef PIC
- add r2, r2, r7 /* object addr = got addr + offset */
- add r3, r3, r7 /* object addr = got addr + offset */
+ add r0, r0, r7 /* object addr = got addr + offset */
+ add r1, r1, r7 /* object addr = got addr + offset */
#endif
- ldr r0, [r2]
- ldr r1, [r3]
#ifdef _ARM_ARCH_4T
blx ip
