[Midnightbsd-cvs] src [10426] trunk/lib/csu/sparc64: cleanup

[laffer1 at midnightbsd.org]

Revision: 10426
          http://svnweb.midnightbsd.org/src/?rev=10426
Author:   laffer1
Date:     2018-06-05 18:44:47 -0400 (Tue, 05 Jun 2018)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/lib/csu/sparc64/Makefile
    trunk/lib/csu/sparc64/crt1.c

Modified: trunk/lib/csu/sparc64/Makefile
===================================================================
--- trunk/lib/csu/sparc64/Makefile	2018-06-05 22:44:35 UTC (rev 10425)
+++ trunk/lib/csu/sparc64/Makefile	2018-06-05 22:44:47 UTC (rev 10426)
@@ -1,12 +1,13 @@
-# $MidnightBSD: src/lib/csu/sparc64/Makefile,v 1.2 2008/05/16 18:43:29 laffer1 Exp $
-# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.12 2002/07/29 09:40:11 ru Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/csu/sparc64/Makefile 313582 2017-02-11 05:47:56Z ngie $
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 
 all: ${OBJS}
 

Modified: trunk/lib/csu/sparc64/crt1.c
===================================================================
--- trunk/lib/csu/sparc64/crt1.c	2018-06-05 22:44:35 UTC (rev 10425)
+++ trunk/lib/csu/sparc64/crt1.c	2018-06-05 22:44:47 UTC (rev 10426)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /* LINTLIBRARY */
 /*-
  * Copyright 2001 David E. O'Brien.
@@ -30,26 +31,15 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-#ifndef __GNUC__
-#error "GCC is needed to compile this file"
-#endif
-#endif /* lint */
-
 #include <stdlib.h>
 
 #include "libc_private.h"
 #include "crtbrand.c"
+#include "ignore_init.c"
 
 struct Struct_Obj_Entry;
 struct ps_strings;
 
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
-
-extern void _fini(void);
-extern void _init(void);
-extern int main(int, char **, char **);
 extern void __sparc_utrap_setup(void);
 
 #ifdef GCRT
@@ -59,9 +49,6 @@
 extern int etext;
 #endif
 
-char **environ;
-const char *__progname = "";
-
 void _start(char **, void (*)(void), struct Struct_Obj_Entry *,
     struct ps_strings *);
 
@@ -86,19 +73,11 @@
 	int argc;
 	char **argv;
 	char **env;
-	const char *s;
 
 	argc = *(long *)(void *)ap;
 	argv = ap + 1;
 	env  = ap + 2 + argc;
-	if (environ == NULL)
-		environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
+	handle_argv(argc, argv, env);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);
@@ -108,13 +87,11 @@
 	}
 #ifdef GCRT
 	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
 	monstartup(&eprol, &etext);
 #endif
-	_init();
-	exit( main(argc, argv, env) );
+
+	handle_static_init(argc, argv, env);
+	exit(main(argc, argv, env));
 }
 
 #ifdef GCRT