Module Name:    src
Committed By:   matt
Date:           Sun Aug 30 09:59:27 UTC 2009

Modified Files:
        src/lib/csu/mips [matt-nb5-mips64]: crt0.c

Log Message:
Use dla for N64/O64 (_LP64).


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.32.1 src/lib/csu/mips/crt0.c

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/mips/crt0.c
diff -u src/lib/csu/mips/crt0.c:1.19 src/lib/csu/mips/crt0.c:1.19.32.1
--- src/lib/csu/mips/crt0.c:1.19	Sat Dec 24 22:02:10 2005
+++ src/lib/csu/mips/crt0.c	Sun Aug 30 09:59:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.c,v 1.19 2005/12/24 22:02:10 perry Exp $ */
+/* $NetBSD: crt0.c,v 1.19.32.1 2009/08/30 09:59:26 matt Exp $ */
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -86,10 +86,15 @@
 	 */
 
 #ifndef DYNAMIC
+#ifdef _LP64
+	__asm volatile("dla $28,_gp");
+#else
 	__asm volatile("la $28,_gp");
 #endif
+#endif
 
 	ksp = (char**)sp;
+#if defined(__mips_n32) || defined(__mips_n64)
 	if (ksp == 0) {
 		/*
 		 * Uh, oh. We're running on a old kernel that passed
@@ -110,6 +115,7 @@
 		__asm volatile("	addiu	%0,$29,64" : "=r" (ksp));
 #endif
 	}
+#endif
 
 
 	argc = *(int *)ksp;
@@ -157,7 +163,7 @@
  *  is the entrypoint. (Only needed for old toolchains).
  */
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: crt0.c,v 1.19 2005/12/24 22:02:10 perry Exp $");
+__RCSID("$NetBSD: crt0.c,v 1.19.32.1 2009/08/30 09:59:26 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "common.c"

Reply via email to