From: Neale Ferguson <neale@sinenomine.net>
Date: Thu, 9 May 2013 19:42:58 +0000 (-0400)
Subject: Add weak attribute to avoid __data_start undefined messages (s390x)
X-Git-Tag: gc7_4_0~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a0d2d244f47a57fa9c97777330fe8c382e353e8;p=gc

Add weak attribute to avoid __data_start undefined messages (s390x)
(Apply commit 8d3e3ac from 'mono_libgc' branch.)

* include/private/gcconfig.h (__data_start, _end): Add "weak"
attribute for Linux/s390.

Conflicts:

    include/private/gcconfig.h
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 0b4e02b4..56eabda8 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -1941,12 +1941,12 @@
 #       define OS_TYPE "LINUX"
 #       define LINUX_STACKBOTTOM
 #       define DYNAMIC_LOADING
-        extern int __data_start[];
+        extern int __data_start[] __attribute__((__weak__));
 #       define DATASTART ((ptr_t)(__data_start))
-    extern int _end[];
-#   define DATAEND (ptr_t)(_end)
-#   define CACHE_LINE_SIZE 256
-#   define GETPAGESIZE() 4096
+        extern int _end[] __attribute__((__weak__));
+#       define DATAEND (ptr_t)(_end)
+#       define CACHE_LINE_SIZE 256
+#       define GETPAGESIZE() 4096
 #   endif
 # endif