Module Name: src
Committed By: christos
Date: Fri Dec 28 13:53:17 UTC 2018
Modified Files:
src/lib/csu/common: crtbegin.c
Log Message:
Avoid duplicate definitions on arm (reported by kre@)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.15 src/lib/csu/common/crtbegin.c:1.16
--- src/lib/csu/common/crtbegin.c:1.15 Thu Dec 27 14:32:32 2018
+++ src/lib/csu/common/crtbegin.c Fri Dec 28 08:53:17 2018
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: crtbegin.c,v 1.15 2018/12/27 19:32:32 christos Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.16 2018/12/28 13:53:17 christos Exp $");
#include "crtbegin.h"
@@ -38,12 +38,14 @@ __dso_hidden const fptr_t __JCR_LIST__[0
__weakref_visible void Jv_RegisterClasses(const fptr_t *)
__weak_reference(_Jv_RegisterClasses);
+#if !defined(HAVE_INITFINI_ARRAY)
extern __dso_hidden const fptr_t __CTOR_LIST__start __asm("__CTOR_LIST__");
__dso_hidden const fptr_t __aligned(sizeof(void *)) __CTOR_LIST__[] __section(".ctors") = {
(fptr_t) -1,
};
__dso_hidden extern const fptr_t __CTOR_LIST_END__[];
+#endif
#ifdef SHARED
__dso_hidden void *__dso_handle = &__dso_handle;
