CVS commit: src/lib/csu/arch/m68k

2013-07-27 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sat Jul 27 13:07:06 UTC 2013

Modified Files:
src/lib/csu/arch/m68k: crtbegin.h

Log Message:
In .fini invoke destructors (fix copy  pasto)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/csu/arch/m68k/crtbegin.h

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/m68k/crtbegin.h
diff -u src/lib/csu/arch/m68k/crtbegin.h:1.3 src/lib/csu/arch/m68k/crtbegin.h:1.4
--- src/lib/csu/arch/m68k/crtbegin.h:1.3	Fri Jul 19 06:26:41 2013
+++ src/lib/csu/arch/m68k/crtbegin.h	Sat Jul 27 13:07:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.h,v 1.3 2013/07/19 06:26:41 matt Exp $ */
+/* $NetBSD: crtbegin.h,v 1.4 2013/07/27 13:07:06 martin Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@ __asm(	.pushsection .init
 
 __asm(	.pushsection .fini
 #ifdef __pic__
-\n\t	bsrl	__do_global_ctors_aux
+\n\t	bsrl	__do_global_dtors_aux
 #else
 \n\t	jsr	__do_global_dtors_aux
 #endif

CVS commit: src/lib/csu/arch/m68k

2013-07-26 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Jul 26 18:47:23 UTC 2013

Modified Files:
src/lib/csu/arch/m68k: crt0.S

Log Message:
Simplify to new ___start() signature.
Seems to fix PR port-m68k/48076.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/m68k/crt0.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/m68k/crt0.S
diff -u src/lib/csu/arch/m68k/crt0.S:1.2 src/lib/csu/arch/m68k/crt0.S:1.3
--- src/lib/csu/arch/m68k/crt0.S:1.2	Thu Jul 11 17:07:35 2013
+++ src/lib/csu/arch/m68k/crt0.S	Fri Jul 26 18:47:23 2013
@@ -35,18 +35,13 @@
  * Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp
  */
 
-RCSID($NetBSD: crt0.S,v 1.2 2013/07/11 17:07:35 matt Exp $)
+RCSID($NetBSD: crt0.S,v 1.3 2013/07/26 18:47:23 martin Exp $)
 
 STRONG_ALIAS(_start,__start)
 
 _ENTRY(__start)
-	movl	(%sp),%d0
 	movl	%a2,-(%sp)		| ps_strings
 	movl	%a0,-(%sp)		| obj
 	movl	%a1,-(%sp)		| cleanup
-	movl	%d0,%d1
-	lsll	#2,%d1
-	pea	(16+4)(%sp,%d1.l)	| envp = argv[argc + 1]
-	pea	20(%sp)			| argv
-	movl	%d0,-(%sp)		| argc
+	| call: ___start(cleanup, obj, ps_strings)
 	bsr	___start

CVS commit: src/lib/csu/arch/m68k

2013-07-26 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Fri Jul 26 19:49:19 UTC 2013

Modified Files:
src/lib/csu/arch/m68k: crt0.S

Log Message:
Use jbsr and add END(__start)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/csu/arch/m68k/crt0.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/m68k/crt0.S
diff -u src/lib/csu/arch/m68k/crt0.S:1.3 src/lib/csu/arch/m68k/crt0.S:1.4
--- src/lib/csu/arch/m68k/crt0.S:1.3	Fri Jul 26 18:47:23 2013
+++ src/lib/csu/arch/m68k/crt0.S	Fri Jul 26 19:49:19 2013
@@ -35,7 +35,7 @@
  * Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp
  */
 
-RCSID($NetBSD: crt0.S,v 1.3 2013/07/26 18:47:23 martin Exp $)
+RCSID($NetBSD: crt0.S,v 1.4 2013/07/26 19:49:19 matt Exp $)
 
 STRONG_ALIAS(_start,__start)
 
@@ -44,4 +44,5 @@ _ENTRY(__start)
 	movl	%a0,-(%sp)		| obj
 	movl	%a1,-(%sp)		| cleanup
 	| call: ___start(cleanup, obj, ps_strings)
-	bsr	___start
+	jbsr	___start
+END(__start)

CVS commit: src/lib/csu/arch/m68k

2013-07-19 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Fri Jul 19 06:26:41 UTC 2013

Modified Files:
src/lib/csu/arch/m68k: crtbegin.h

Log Message:
Deal with m68010 not having bsrl so usr jsr on !__pic__


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/m68k/crtbegin.h

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/m68k/crtbegin.h
diff -u src/lib/csu/arch/m68k/crtbegin.h:1.2 src/lib/csu/arch/m68k/crtbegin.h:1.3
--- src/lib/csu/arch/m68k/crtbegin.h:1.2	Thu Jul 18 18:43:04 2013
+++ src/lib/csu/arch/m68k/crtbegin.h	Fri Jul 19 06:26:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.h,v 1.2 2013/07/18 18:43:04 matt Exp $ */
+/* $NetBSD: crtbegin.h,v 1.3 2013/07/19 06:26:41 matt Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,9 +29,17 @@
  */
 
 __asm(	.pushsection .init
+#ifdef __pic__
+\n\t	bsrl	__do_global_ctors_aux
+#else
 \n\t	jsr	__do_global_ctors_aux
+#endif
 \n\t	.popsection);
 
 __asm(	.pushsection .fini
+#ifdef __pic__
+\n\t	bsrl	__do_global_ctors_aux
+#else
 \n\t	jsr	__do_global_dtors_aux
+#endif
 \n\t	.popsection);

CVS commit: src/lib/csu/arch/m68k

2013-07-18 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Thu Jul 18 18:43:04 UTC 2013

Modified Files:
src/lib/csu/arch/m68k: crtbegin.h

Log Message:
s/bsrl/jsr/ and let gas figure it out


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/m68k/crtbegin.h

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/m68k/crtbegin.h
diff -u src/lib/csu/arch/m68k/crtbegin.h:1.1 src/lib/csu/arch/m68k/crtbegin.h:1.2
--- src/lib/csu/arch/m68k/crtbegin.h:1.1	Thu Jul 11 17:07:35 2013
+++ src/lib/csu/arch/m68k/crtbegin.h	Thu Jul 18 18:43:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.h,v 1.1 2013/07/11 17:07:35 matt Exp $ */
+/* $NetBSD: crtbegin.h,v 1.2 2013/07/18 18:43:04 matt Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,9 +29,9 @@
  */
 
 __asm(	.pushsection .init
-\n\t	bsrl	__do_global_ctors_aux
+\n\t	jsr	__do_global_ctors_aux
 \n\t	.popsection);
 
 __asm(	.pushsection .fini
-\n\t	bsrl	__do_global_dtors_aux
+\n\t	jsr	__do_global_dtors_aux
 \n\t	.popsection);

CVS commit: src/lib/csu/arch/m68k

2013-07-11 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Thu Jul 11 17:07:35 UTC 2013

Modified Files:
src/lib/csu/arch/m68k: Makefile.inc crt0.S
Added Files:
src/lib/csu/arch/m68k: crtbegin.h crtend.S

Log Message:
Use pc-relative branch in crt0.S
Add crtend.S and crtbegin.h (uses pc-relative branches as well).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/m68k/Makefile.inc \
src/lib/csu/arch/m68k/crt0.S
cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/m68k/crtbegin.h \
src/lib/csu/arch/m68k/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/m68k/Makefile.inc
diff -u src/lib/csu/arch/m68k/Makefile.inc:1.1 src/lib/csu/arch/m68k/Makefile.inc:1.2
--- src/lib/csu/arch/m68k/Makefile.inc:1.1	Sat Aug  7 18:01:34 2010
+++ src/lib/csu/arch/m68k/Makefile.inc	Thu Jul 11 17:07:35 2013
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 2010/08/07 18:01:34 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/07/11 17:07:35 matt Exp $
 
-CPPFLAGS+=	-DELFSIZE=32
+CPPFLAGS+=	-I${ARCHDIR} -DELFSIZE=32
 
 
Index: src/lib/csu/arch/m68k/crt0.S
diff -u src/lib/csu/arch/m68k/crt0.S:1.1 src/lib/csu/arch/m68k/crt0.S:1.2
--- src/lib/csu/arch/m68k/crt0.S:1.1	Sat Aug  7 18:01:34 2010
+++ src/lib/csu/arch/m68k/crt0.S	Thu Jul 11 17:07:35 2013
@@ -35,7 +35,7 @@
  * Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp
  */
 
-RCSID($NetBSD: crt0.S,v 1.1 2010/08/07 18:01:34 joerg Exp $)
+RCSID($NetBSD: crt0.S,v 1.2 2013/07/11 17:07:35 matt Exp $)
 
 STRONG_ALIAS(_start,__start)
 
@@ -49,4 +49,4 @@ _ENTRY(__start)
 	pea	(16+4)(%sp,%d1.l)	| envp = argv[argc + 1]
 	pea	20(%sp)			| argv
 	movl	%d0,-(%sp)		| argc
-	jsr	___start
+	bsr	___start

Added files:

Index: src/lib/csu/arch/m68k/crtbegin.h
diff -u /dev/null src/lib/csu/arch/m68k/crtbegin.h:1.1
--- /dev/null	Thu Jul 11 17:07:35 2013
+++ src/lib/csu/arch/m68k/crtbegin.h	Thu Jul 11 17:07:35 2013
@@ -0,0 +1,37 @@
+/* $NetBSD: crtbegin.h,v 1.1 2013/07/11 17:07:35 matt Exp $ */
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+__asm(	.pushsection .init
+\n\t	bsrl	__do_global_ctors_aux
+\n\t	.popsection);
+
+__asm(	.pushsection .fini
+\n\t	bsrl	__do_global_dtors_aux
+\n\t	.popsection);
Index: src/lib/csu/arch/m68k/crtend.S
diff -u /dev/null src/lib/csu/arch/m68k/crtend.S:1.1
--- /dev/null	Thu Jul 11 17:07:35 2013
+++ src/lib/csu/arch/m68k/crtend.S	Thu Jul 11 17:07:35 2013
@@ -0,0 +1,55 @@
+/*	$NetBSD: crtend.S,v 1.1 2013/07/11 17:07:35 matt Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A