Module Name: src
Committed By: tls
Date: Sun Aug 10 06:51:43 UTC 2014
Modified Files:
src/lib/csu [tls-earlyentropy]: Makefile README
src/lib/csu/arch/earm [tls-earlyentropy]: crtbegin.h
src/lib/csu/common [tls-earlyentropy]: compident.S crtbegin.c
sysident.S
Removed Files:
src/lib/csu/common_elf [tls-earlyentropy]: Makefile.inc common.c
common.h crti.c crtn.c dot_init.h dwarf2_eh.h
src/lib/csu/ia64 [tls-earlyentropy]: Makefile crt0.c dot_init.h
src/lib/csu/m68k_elf [tls-earlyentropy]: Makefile crt0.c dot_init.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.2.1 src/lib/csu/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 src/lib/csu/README
cvs rdiff -u -r1.1 -r1.1.4.1 src/lib/csu/arch/earm/crtbegin.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/lib/csu/common/compident.S \
src/lib/csu/common/sysident.S
cvs rdiff -u -r1.8 -r1.8.2.1 src/lib/csu/common/crtbegin.c
cvs rdiff -u -r1.35 -r0 src/lib/csu/common_elf/Makefile.inc
cvs rdiff -u -r1.17 -r0 src/lib/csu/common_elf/common.c
cvs rdiff -u -r1.16 -r0 src/lib/csu/common_elf/common.h
cvs rdiff -u -r1.6 -r0 src/lib/csu/common_elf/crti.c
cvs rdiff -u -r1.3 -r0 src/lib/csu/common_elf/crtn.c \
src/lib/csu/common_elf/dot_init.h src/lib/csu/common_elf/dwarf2_eh.h
cvs rdiff -u -r1.2 -r0 src/lib/csu/ia64/Makefile
cvs rdiff -u -r1.4 -r0 src/lib/csu/ia64/crt0.c
cvs rdiff -u -r1.6 -r0 src/lib/csu/ia64/dot_init.h
cvs rdiff -u -r1.7 -r0 src/lib/csu/m68k_elf/Makefile
cvs rdiff -u -r1.13 -r0 src/lib/csu/m68k_elf/crt0.c
cvs rdiff -u -r1.6 -r0 src/lib/csu/m68k_elf/dot_init.h
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/Makefile
diff -u src/lib/csu/Makefile:1.33 src/lib/csu/Makefile:1.33.2.1
--- src/lib/csu/Makefile:1.33 Tue Sep 10 16:45:33 2013
+++ src/lib/csu/Makefile Sun Aug 10 06:51:42 2014
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/09/10 16:45:33 matt Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2014/08/10 06:51:42 tls Exp $
.include <bsd.own.mk>
-.if ${USE_COMPILERCRTSTUFF} != "yes"
-
CSU_MACHINE_ARCH?= ${MACHINE_ARCH}
.if !empty(CSU_MACHINE_ARCH:Mearm*)
@@ -18,28 +16,5 @@ ARCHDIR:= ${.CURDIR}/arch/${MACHINE_CPU}
.PATH: ${ARCHDIR}
-. include "${ARCHDIR}/Makefile.inc"
-
-. include "${.CURDIR}/common/Makefile.inc"
-
-.else
-
-CSU_MACHINE_ARCH?= ${MACHINE_ARCH}
-
-. if exists(${CSU_MACHINE_ARCH}_elf/Makefile)
-SUBDIR= ${CSU_MACHINE_ARCH}_elf
-. elif exists(${CSU_MACHINE_ARCH}/Makefile)
-SUBDIR= ${CSU_MACHINE_ARCH}
-. elif exists(${MACHINE_CPU}_elf/Makefile)
-SUBDIR= ${MACHINE_CPU}_elf
-. elif exists(${MACHINE_CPU}/Makefile)
-SUBDIR= ${MACHINE_CPU}
-. else
-.BEGIN:
- @echo no SUBDIR for ${MACHINE_ARCH}_elf, ${MACHINE_ARCH} nor \
- ${MACHINE_CPU}
- @false
-. endif
-
-. include <bsd.subdir.mk>
-.endif
+.include "${ARCHDIR}/Makefile.inc"
+.include "${.CURDIR}/common/Makefile.inc"
Index: src/lib/csu/README
diff -u src/lib/csu/README:1.5 src/lib/csu/README:1.5.4.1
--- src/lib/csu/README:1.5 Sat Jul 13 09:48:26 2013
+++ src/lib/csu/README Sun Aug 10 06:51:42 2014
@@ -1,8 +1,6 @@
Introduction
-This document covers the native NetBSD compiler runtime. The full support
-for the native runtime is enabled by setting USE_COMPILERCRTSTUFF to no
-in bsd.own.mk.
+This document covers the native NetBSD compiler runtime.
Machine independent sources can be found in common. The crtbegin.c in
that directory is a useful template for deriving compact assembler
Index: src/lib/csu/arch/earm/crtbegin.h
diff -u src/lib/csu/arch/earm/crtbegin.h:1.1 src/lib/csu/arch/earm/crtbegin.h:1.1.4.1
--- src/lib/csu/arch/earm/crtbegin.h:1.1 Thu Jun 27 21:24:39 2013
+++ src/lib/csu/arch/earm/crtbegin.h Sun Aug 10 06:51:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.h,v 1.1 2013/06/27 21:24:39 matt Exp $ */
+/* $NetBSD: crtbegin.h,v 1.1.4.1 2014/08/10 06:51:42 tls Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@ static void __do_global_ctors_aux(void)
static void __do_global_dtors_aux(void) __attribute__((__destructor__)) __used;
#endif
-#ifndef SHARED
+#if !defined(SHARED) && !defined(__ARM_DWARF_EH__)
static const void *find_exidx(void *, int *) __used;
static const void *
@@ -47,4 +47,4 @@ find_exidx(void * pc, int * pcount)
}
__weak_alias(__gnu_Uwind_find_exidx,find_exidx)
-#endif /* !SHARED */
+#endif /* !SHARED && !__ARM_DWARF_EH__ */
Index: src/lib/csu/common/compident.S
diff -u src/lib/csu/common/compident.S:1.2 src/lib/csu/common/compident.S:1.2.2.1
--- src/lib/csu/common/compident.S:1.2 Wed Feb 26 14:54:50 2014
+++ src/lib/csu/common/compident.S Sun Aug 10 06:51:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compident.S,v 1.2 2014/02/26 14:54:50 martin Exp $ */
+/* $NetBSD: compident.S,v 1.2.2.1 2014/08/10 06:51:42 tls Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -63,3 +63,4 @@
.long ELF_NOTE_TYPE_MCMODEL_TAG
.ascii "NetBSD\0\0"
.ascii CONTENT
+ .p2align 2
Index: src/lib/csu/common/sysident.S
diff -u src/lib/csu/common/sysident.S:1.2 src/lib/csu/common/sysident.S:1.2.2.1
--- src/lib/csu/common/sysident.S:1.2 Tue Sep 10 16:45:33 2013
+++ src/lib/csu/common/sysident.S Sun Aug 10 06:51:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysident.S,v 1.2 2013/09/10 16:45:33 matt Exp $ */
+/* $NetBSD: sysident.S,v 1.2.2.1 2014/08/10 06:51:42 tls Exp $ */
/*
* Copyright (c) 1997 Christopher G. Demetriou
@@ -85,4 +85,5 @@
.long ELF_NOTE_TYPE_MARCH_TAG
.ascii "NetBSD\0\0"
.asciz ELF_NOTE_MARCH_DESC
+ .p2align 2
#endif
Index: src/lib/csu/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.8 src/lib/csu/common/crtbegin.c:1.8.2.1
--- src/lib/csu/common/crtbegin.c:1.8 Wed Jan 29 20:57:49 2014
+++ src/lib/csu/common/crtbegin.c Sun Aug 10 06:51:42 2014
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: crtbegin.c,v 1.8 2014/01/29 20:57:49 bouyer Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.8.2.1 2014/08/10 06:51:42 tls Exp $");
#include "crtbegin.h"
@@ -54,7 +54,7 @@ __weakref_visible void cxa_finalize(void
__dso_hidden void *__dso_handle;
#endif
-#if !defined(__ARM_EABI__)
+#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
__dso_hidden
#if !defined(__mips__)
const
@@ -81,7 +81,7 @@ __do_global_ctors_aux(void)
__initialized = 1;
-#if !defined(__ARM_EABI__)
+#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
if (register_frame_info)
register_frame_info(__EH_FRAME_LIST__, &dwarf_eh_object);
#endif
@@ -96,7 +96,7 @@ __do_global_ctors_aux(void)
#endif
}
-#if !defined(__ARM_EABI__) || defined(SHARED)
+#if !defined(__ARM_EABI__) || defined(SHARED) || defined(__ARM_DWARF_EH__)
#if !defined(HAVE_INITFINI_ARRAY)
__dso_hidden const fptr_t __aligned(sizeof(void *)) __DTOR_LIST__[] __section(".dtors") = {
(fptr_t) -1,
@@ -127,9 +127,9 @@ __do_global_dtors_aux(void)
}
#endif
-#if !defined(__ARM_EABI__)
+#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
if (deregister_frame_info)
deregister_frame_info(__EH_FRAME_LIST__);
#endif
}
-#endif /* !__ARM_EABI__ || SHARED */
+#endif /* !__ARM_EABI__ || SHARED || __ARM_DWARF_EH__ */
