Module Name: src
Committed By: matt
Date: Tue Jun 25 00:30:07 UTC 2013
Modified Files:
src/lib/csu/arch/vax: Makefile.inc crtbegin.S crtend.S
Log Message:
Use .long not .word
Use _ENTRY
[with these changes, the crtstuff passes its ATF tests.]
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/vax/Makefile.inc \
src/lib/csu/arch/vax/crtbegin.S
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/vax/crtend.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/vax/Makefile.inc
diff -u src/lib/csu/arch/vax/Makefile.inc:1.2 src/lib/csu/arch/vax/Makefile.inc:1.3
--- src/lib/csu/arch/vax/Makefile.inc:1.2 Fri Jun 21 15:54:08 2013
+++ src/lib/csu/arch/vax/Makefile.inc Tue Jun 25 00:30:07 2013
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/06/21 15:54:08 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/06/25 00:30:07 matt Exp $
-CPPFLAGS+= -DELFSIZE=32
+CPPFLAGS+= -I${ARCHDIR}
Index: src/lib/csu/arch/vax/crtbegin.S
diff -u src/lib/csu/arch/vax/crtbegin.S:1.2 src/lib/csu/arch/vax/crtbegin.S:1.3
--- src/lib/csu/arch/vax/crtbegin.S:1.2 Mon Jun 24 14:49:55 2013
+++ src/lib/csu/arch/vax/crtbegin.S Tue Jun 25 00:30:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.S,v 1.2 2013/06/24 14:49:55 matt Exp $ */
+/* $NetBSD: crtbegin.S,v 1.3 2013/06/25 00:30:07 matt Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,17 +30,17 @@
#include <vax/asm.h>
-RCSID("$NetBSD: crtbegin.S,v 1.2 2013/06/24 14:49:55 matt Exp $")
+RCSID("$NetBSD: crtbegin.S,v 1.3 2013/06/25 00:30:07 matt Exp $")
.section .ctors, "aw", @progbits
.p2align 2
__CTOR_LIST__: /* symbol is not used */
- .word -1
+ .long -1
.section .dtors, "aw", @progbits
.p2align 2
__DTOR_LIST__:
- .word -1
+ .long -1
.section .eh_frame, "a", @progbits
.p2align 2
@@ -58,9 +58,9 @@ __JCR_LIST__:
.hidden __dso_handle
__dso_handle:
#ifdef SHARED
- .word __dso_handle
+ .long __dso_handle
#else
- .word 0
+ .long 0
#endif
.local __dwarf_eh_object
@@ -80,9 +80,7 @@ __dso_handle:
* needed.
*/
- .type __do_global_dtors_aux, @function
-__do_global_dtors_aux:
- .word 0x0100 /* save r8 */
+_ENTRY(__do_global_dtors_aux, 0x0100) /* save r8 */
tstb __finished /* done this already? */
bneq 4f
movb $1, __finished /* mark it as done */
@@ -129,8 +127,7 @@ __do_global_dtors_aux:
.weak __register_frame_info
.weak _Jv_RegisterClasses
- .type __do_global_ctors_aux, @function
-__do_global_ctors_aux:
+_ENTRY(__do_global_ctors_aux, 0x0800)
tstb __initialized
bneq 4f
movb $1, __initialized
Index: src/lib/csu/arch/vax/crtend.S
diff -u src/lib/csu/arch/vax/crtend.S:1.1 src/lib/csu/arch/vax/crtend.S:1.2
--- src/lib/csu/arch/vax/crtend.S:1.1 Fri Jun 21 15:54:08 2013
+++ src/lib/csu/arch/vax/crtend.S Tue Jun 25 00:30:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crtend.S,v 1.1 2013/06/21 15:54:08 matt Exp $ */
+/* $NetBSD: crtend.S,v 1.2 2013/06/25 00:30:07 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,21 +30,21 @@
#include <vax/asm.h>
-RCSID("$NetBSD: crtend.S,v 1.1 2013/06/21 15:54:08 matt Exp $")
+RCSID("$NetBSD: crtend.S,v 1.2 2013/06/25 00:30:07 matt Exp $")
.section .ctors, "aw", @progbits
.p2align 2
.global __CTOR_LIST_END__
.hidden __CTOR_LIST_END__
__CTOR_LIST_END__:
- .word 0
+ .long 0
.section .dtors, "aw", @progbits
.p2align 2
.global __DTOR_LIST_END__
.hidden __DTOR_LIST_END__
__DTOR_LIST_END__:
- .word 0
+ .long 0
.section .eh_frame, "a", @progbits
.p2align 2
