Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/csu/common Avoid duplicate definitions on arm (reported ...



details:   https://anonhg.NetBSD.org/src/rev/8c243b3e8236
branches:  trunk
changeset: 447016:8c243b3e8236
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 28 13:53:17 2018 +0000

description:
Avoid duplicate definitions on arm (reported by kre@)

diffstat:

 lib/csu/common/crtbegin.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r a8b4a16b98ea -r 8c243b3e8236 lib/csu/common/crtbegin.c
--- a/lib/csu/common/crtbegin.c Fri Dec 28 13:11:46 2018 +0000
+++ b/lib/csu/common/crtbegin.c Fri Dec 28 13:53:17 2018 +0000
@@ -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 @@
 __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;



Home | Main Index | Thread Index | Old Index