[Midnightbsd-cvs] src: crt1.c: Merge changes

[laffer1 at midnightbsd.org]

Log Message:
-----------
Merge changes

Modified Files:
--------------
    src/lib/csu/sparc64:
        crt1.c (r1.2 -> r1.3)

-------------- next part --------------
Index: crt1.c
===================================================================
RCS file: /home/cvs/src/lib/csu/sparc64/crt1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/csu/sparc64/crt1.c -L lib/csu/sparc64/crt1.c -u -r1.2 -r1.3
--- lib/csu/sparc64/crt1.c
+++ lib/csu/sparc64/crt1.c
@@ -98,13 +98,12 @@
 				__progname = s + 1;
 	}
 
-	__sparc_utrap_setup();
-
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);
-	else
+	else {
+		__sparc_utrap_setup();
 		_init_tls();
-
+	}
 #ifdef GCRT
 	atexit(_mcleanup);
 #endif