Module Name: src
Committed By: christos
Date: Fri Dec 28 18:17:11 UTC 2018
Modified Files:
src/lib/csu/arch/aarch64: Makefile.inc
src/lib/csu/arch/arm: Makefile.inc
src/lib/csu/arch/earm: Makefile.inc
src/lib/csu/arch/or1k: Makefile.inc
src/lib/csu/arch/riscv: Makefile.inc
src/lib/csu/common: Makefile.inc crt0-common.c crtbegin.c
Log Message:
Undo previous; breaks macppc/m68k (at least)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/aarch64/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/lib/csu/arch/arm/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/csu/arch/earm/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/or1k/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/riscv/Makefile.inc
cvs rdiff -u -r1.34 -r1.35 src/lib/csu/common/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/lib/csu/common/crt0-common.c
cvs rdiff -u -r1.16 -r1.17 src/lib/csu/common/crtbegin.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/arch/aarch64/Makefile.inc
diff -u src/lib/csu/arch/aarch64/Makefile.inc:1.2 src/lib/csu/arch/aarch64/Makefile.inc:1.3
--- src/lib/csu/arch/aarch64/Makefile.inc:1.2 Thu Dec 27 13:57:14 2018
+++ src/lib/csu/arch/aarch64/Makefile.inc Fri Dec 28 13:17:10 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:57:14 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/12/28 18:17:10 christos Exp $
CPPFLAGS+= -I${ARCHDIR}
+CPPFLAGS+= -DHAVE_INITFINI_ARRAY
#CPPFLAGS+= -DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
Index: src/lib/csu/arch/arm/Makefile.inc
diff -u src/lib/csu/arch/arm/Makefile.inc:1.8 src/lib/csu/arch/arm/Makefile.inc:1.9
--- src/lib/csu/arch/arm/Makefile.inc:1.8 Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/arm/Makefile.inc Fri Dec 28 13:17:10 2018
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.8 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2018/12/28 18:17:10 christos Exp $
CPPFLAGS+= -I${ARCHDIR}
+.if (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
+CPPFLAGS+= -DHAVE_INITFINI_ARRAY
+.endif
CPPFLAGS+= -DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
Index: src/lib/csu/arch/earm/Makefile.inc
diff -u src/lib/csu/arch/earm/Makefile.inc:1.4 src/lib/csu/arch/earm/Makefile.inc:1.5
--- src/lib/csu/arch/earm/Makefile.inc:1.4 Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/earm/Makefile.inc Fri Dec 28 13:17:10 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2018/12/28 18:17:10 christos Exp $
CPPFLAGS+= -I${ARCHDIR}
+CPPFLAGS+= -DHAVE_INITFINI_ARRAY
CPPFLAGS+= -DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
Index: src/lib/csu/arch/or1k/Makefile.inc
diff -u src/lib/csu/arch/or1k/Makefile.inc:1.2 src/lib/csu/arch/or1k/Makefile.inc:1.3
--- src/lib/csu/arch/or1k/Makefile.inc:1.2 Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/or1k/Makefile.inc Fri Dec 28 13:17:11 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/12/28 18:17:11 christos Exp $
CPPFLAGS+= -I${ARCHDIR}
+CPPFLAGS+= -DHAVE_INITFINI_ARRAY
#CPPFLAGS+= -DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
Index: src/lib/csu/arch/riscv/Makefile.inc
diff -u src/lib/csu/arch/riscv/Makefile.inc:1.2 src/lib/csu/arch/riscv/Makefile.inc:1.3
--- src/lib/csu/arch/riscv/Makefile.inc:1.2 Thu Dec 27 13:57:15 2018
+++ src/lib/csu/arch/riscv/Makefile.inc Fri Dec 28 13:17:11 2018
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/12/28 18:17:11 christos Exp $
CPPFLAGS+= -I${ARCHDIR}
+CPPFLAGS+= -DHAVE_INITFINI_ARRAY
#CPPFLAGS+= -DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.34 src/lib/csu/common/Makefile.inc:1.35
--- src/lib/csu/common/Makefile.inc:1.34 Thu Dec 27 13:57:15 2018
+++ src/lib/csu/common/Makefile.inc Fri Dec 28 13:17:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.34 2018/12/27 18:57:15 christos Exp $
+# $NetBSD: Makefile.inc,v 1.35 2018/12/28 18:17:11 christos Exp $
.include <bsd.own.mk>
@@ -9,7 +9,6 @@ COMMON_DIR:= ${.CURDIR}/common
.PATH: ${COMMON_DIR}
CPPFLAGS+= -I${COMMON_DIR} -I.
-CPPFLAGS+= -DHAVE_INITFINI_ARRAY
OBJS+= crt0.o gcrt0.o crti.o crtn.o
OBJS+= crtbegin.o crtend.o
Index: src/lib/csu/common/crt0-common.c
diff -u src/lib/csu/common/crt0-common.c:1.21 src/lib/csu/common/crt0-common.c:1.22
--- src/lib/csu/common/crt0-common.c:1.21 Thu Dec 27 14:32:32 2018
+++ src/lib/csu/common/crt0-common.c Fri Dec 28 13:17:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.21 2018/12/27 19:32:32 christos Exp $ */
+/* $NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: crt0-common.c,v 1.21 2018/12/27 19:32:32 christos Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.22 2018/12/28 18:17:11 christos Exp $");
#include <sys/types.h>
#include <sys/exec.h>
@@ -50,9 +50,10 @@ extern int main(int, char **, char **);
#ifdef HAVE_INITFINI_ARRAY
typedef void (*fptr_t)(void);
-#endif
+#else
extern void _init(void);
extern void _fini(void);
+#endif
extern void _libc_init(void);
/*
@@ -110,7 +111,7 @@ _preinit(void)
}
static inline void
-_initarray(void)
+_init(void)
{
for (const fptr_t *f = __init_array_start; f < __init_array_end; f++) {
(*f)();
@@ -118,7 +119,7 @@ _initarray(void)
}
static void
-_finiarray(void)
+_fini(void)
{
for (const fptr_t *f = __fini_array_start; f < __fini_array_end; f++) {
(*f)();
@@ -336,10 +337,6 @@ ___start(void (*cleanup)(void), /* fro
#endif
atexit(_fini);
-#ifdef HAVE_INITFINI_ARRAY
- atexit(_finiarray);
- _initarray();
-#endif
_init();
exit(main(ps_strings->ps_nargvstr, ps_strings->ps_argvstr, environ));
Index: src/lib/csu/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.16 src/lib/csu/common/crtbegin.c:1.17
--- src/lib/csu/common/crtbegin.c:1.16 Fri Dec 28 08:53:17 2018
+++ src/lib/csu/common/crtbegin.c Fri Dec 28 13:17:11 2018
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: crtbegin.c,v 1.16 2018/12/28 13:53:17 christos Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.17 2018/12/28 18:17:11 christos Exp $");
#include "crtbegin.h"
