 @@ -1,14 +1,14 @@
-/* $NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $ */
+/* $NetBSD: crt0-common.c,v 1.23 2018/12/28 20:12:35 christos Exp $ */
 /*
  * Copyright (c) 1998 Christos Zoulas
  * Copyright (c) 1995 Christopher G. Demetriou
  * All rights reserved.
+ *
  * 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
 @@ -26,41 +26,40 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
+ *
  * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.23 2018/12/28 20:12:35 christos Exp $");
 #include <sys/types.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/syscall.h>
 #include <machine/profile.h>
 #include <stdlib.h>
 #include <unistd.h>
 extern int main(int, char **, char **);
 #ifdef HAVE_INITFINI_ARRAY
 typedef void (*fptr_t)(void);
-#else
+#ifndef HAVE_INITFINI_ARRAY
 extern void	_init(void);
 extern void	_fini(void);
 #endif
 extern void	_libc_init(void);
 /*
  * Arrange for _DYNAMIC to be weak and undefined (and therefore to show up
  * as being at address zero, unless something else defines it).  That way,
  * if we happen to be compiling without -static but with without any
  * shared libs present, things will still work.
  */
 __weakref_visible int rtld_DYNAMIC __weak_reference(_DYNAMIC);
 @@ -77,65 +76,63 @@ struct ps_strings *__ps_strings = 0;
 static char	 empty_string[] = "";
 char		*__progname = empty_string;
 __dead __dso_hidden void ___start(void (*)(void), struct ps_strings *);
 #define	write(fd, s, n)	__syscall(SYS_write, (fd), (s), (n))
 #define	_FATAL(str)				\
 do {						\
 	write(2, str, sizeof(str)-1);		\
 	_exit(1);				\
 } while (0)
 #ifdef HAVE_INITFINI_ARRAY
 /*
  * If we are using INIT_ARRAY/FINI_ARRAY and we are linked statically,
  * we have to process these instead of relying on RTLD to do it for us.
+ *
  * Since we don't need .init or .fini sections, just code them in C
  * to make life easier.
  */
 extern const fptr_t __preinit_array_start[] __dso_hidden;
 extern const fptr_t __preinit_array_end[] __dso_hidden __weak;
 extern const fptr_t __init_array_start[] __dso_hidden;
 extern const fptr_t __init_array_end[] __dso_hidden __weak;
 extern const fptr_t __fini_array_start[] __dso_hidden;
 extern const fptr_t __fini_array_end[] __dso_hidden __weak;
 static inline void
 _preinit(void)
+{
 	for (const fptr_t *f = __preinit_array_start; f < __preinit_array_end; f++) {
 		(*f)();
+	}
+}
 static inline void
-_init(void)
+_initarray(void)
+{
 	for (const fptr_t *f = __init_array_start; f < __init_array_end; f++) {
 		(*f)();
+	}
+}
 static void
-_fini(void)
+_finiarray(void)
+{
 	for (const fptr_t *f = __fini_array_start; f < __fini_array_end; f++) {
 		(*f)();
+	}
+}
 #endif /* HAVE_INITFINI_ARRAY */
 #if defined(__x86_64__) || defined(__powerpc__) || defined(__sparc__)
 #define HAS_IPLTA
 static void fix_iplta(void) __noinline;
 #elif defined(__i386__) || defined(__arm__)
 #define HAS_IPLT
 static void fix_iplt(void) __noinline;
 #endif
 #ifdef HAS_IPLTA
 #include <stdio.h>
 extern const Elf_Rela __rela_iplt_start[] __dso_hidden __weak;
 @@ -317,27 +314,30 @@ ___start(void (*cleanup)(void),			/* fro
 		atexit(cleanup);
 	_libc_init();
 	if (&rtld_DYNAMIC == NULL) {
 #ifdef HAS_IPLTA
 		fix_iplta();
 #endif
 #ifdef HAS_IPLT
 		fix_iplt();
 #endif
+	}
 #ifdef HAVE_INITFINI_ARRAY
 	_preinit();
 #endif
 #ifdef MCRT0
 	atexit(_mcleanup);
 	monstartup((u_long)&__eprol, (u_long)&__etext);
 #endif
 	atexit(_finiarray);
 	_initarray();
 #ifndef HAVE_INITFINI_ARRAY
 	atexit(_fini);
 	_init();
 #endif
 	exit(main(ps_strings->ps_nargvstr, ps_strings->ps_argvstr, environ));
+}