From 4a0d2d244f47a57fa9c97777330fe8c382e353e8 Mon Sep 17 00:00:00 2001 From: Neale Ferguson Date: Thu, 9 May 2013 15:42:58 -0400 Subject: [PATCH] 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 --- include/private/gcconfig.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 0b4e02b..56eabda 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 -- 2.7.4