mono: Update to 5.2.0.215
This is partial upgrade. Build broken.
This commit is contained in:
Kamil Rytarowski
parent
577b3f7851
commit
c8c291899f
|
|
@ -1,8 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.168 2016/02/24 16:48:09 jperkin Exp $
|
||||
|
||||
DISTNAME= mono-4.6.0.125
|
||||
DISTNAME= mono-5.2.0.215
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= http://download.mono-project.com/sources/mono/
|
||||
MASTER_SITES= https://download.mono-project.com/sources/mono/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
|
|
@ -10,7 +10,7 @@ HOMEPAGE= http://www.mono-project.com/
|
|||
COMMENT= Open source implementation of the .NET Development Framework
|
||||
LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
|
||||
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME:R}
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME}
|
||||
|
||||
BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
|
||||
CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
$NetBSD: distinfo,v 1.107 2015/11/03 22:50:39 agc Exp $
|
||||
|
||||
SHA1 (mono-4.6.0.125.tar.bz2) = b207c6a3297bdf65af095de3e302b9a6f8d6fabc
|
||||
RMD160 (mono-4.6.0.125.tar.bz2) = 9dcad0eab1e7a90d3a3595ac53c100d6ef540a1f
|
||||
SHA512 (mono-4.6.0.125.tar.bz2) = 6f5df66021c472808a5c3c6b43dcb89c9f3616b95ded63cf6b5e69b39bfcbfaa673a3bae8ec62c1dd87629bbafa039177242730f79a18d8fd44f455325913e99
|
||||
Size (mono-4.6.0.125.tar.bz2) = 100227098 bytes
|
||||
SHA1 (mono-5.2.0.215.tar.bz2) = 99aa010c8a9ffdf569e847fc85a2c5220820f692
|
||||
RMD160 (mono-5.2.0.215.tar.bz2) = ee9453e34ec061ca931b8868a5db1a2b01e0bde0
|
||||
SHA512 (mono-5.2.0.215.tar.bz2) = 5bc0fcdc19f104447bd9371fae1035da779f5c5b149c738a449998313d7b4360b71c43ea994b2af90335b2827a1dd42c9a9d19d1adb3f2aebae97cade22de80f
|
||||
Size (mono-5.2.0.215.tar.bz2) = 158189773 bytes
|
||||
SHA1 (patch-ad) = 7e3e11b7a519b7fef82f3de167ea63a4ee413de5
|
||||
SHA1 (patch-ae) = 25869b98f9197243aea799b75b238d92f58e8845
|
||||
SHA1 (patch-aj) = 33b75ec2662cc442f602b21b03fee1e5c39e3a76
|
||||
SHA1 (patch-ak) = 262845edcf84cf5127b7e01963f0d433aad7682a
|
||||
SHA1 (patch-al) = 07462d3f9cf2aa08b1fb837400084d32a7062eee
|
||||
SHA1 (patch-am) = 450766a4951d6e9f5633dfd4ebd801606198b2fb
|
||||
SHA1 (patch-al) = da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
SHA1 (patch-ap) = e0590d7014ae4ef74ee9f9c39f069411a66c8f76
|
||||
SHA1 (patch-aq) = 91f8384c62e4a7a1b2079038495a1a78364926c9
|
||||
SHA1 (patch-ar) = e225bfaa1a18aa5997a1a6472889da3a0ec533cc
|
||||
SHA1 (patch-as) = 101c0119f498a389613a3cd54497e85b3aece1c2
|
||||
SHA1 (patch-as) = aebcc1493eb904c9acdd46dc71df7df42c24d201
|
||||
SHA1 (patch-ba) = f501f1fa3e603660dc8f64ea6bc020b4f4c08a57
|
||||
SHA1 (patch-bd) = 55ce86203c1a1734354ead3e55083c5d997e78ad
|
||||
SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f
|
||||
SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d
|
||||
SHA1 (patch-be) = aed2aad4c63e02bdcdda85e4bc5856a0f9a860a5
|
||||
SHA1 (patch-bf) = da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb
|
||||
SHA1 (patch-configure) = 31556388f316ec2c050599a3d727a792a88dfbfa
|
||||
SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd
|
||||
|
|
@ -25,25 +24,25 @@ SHA1 (patch-data_Makefile.in) = 0c54664b1a59714c6bec02547d70eaa7dee47928
|
|||
SHA1 (patch-data_net_4_0_Browsers_Makefile.in) = ab4baa45dd75b87786cbc7d942611915d5ae1f72
|
||||
SHA1 (patch-data_net_4_5_Browsers_Makefile.in) = e4cab08ffa040020684edb3a9fbc8e448d2faf35
|
||||
SHA1 (patch-data_net_4_5_Makefile.in) = 778be615f4f21f2561e47e082302c09f02c6f8f6
|
||||
SHA1 (patch-dc) = 725c82a9ac4ae9c01045149504a6df6a64d808a3
|
||||
SHA1 (patch-dc) = da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
SHA1 (patch-de) = 0c2a123868b20236fceb93d33fa3084a1afd004c
|
||||
SHA1 (patch-df) = b2780e809d681795a6bdd9039ec890cfc9362187
|
||||
SHA1 (patch-dh) = 30f0bea7c707829247c2b426a88c4adba057e534
|
||||
SHA1 (patch-di) = 67a26c3cd7752d5b629f00cdba7cc9613d10f43c
|
||||
SHA1 (patch-di) = da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
SHA1 (patch-dj) = 049cc88dc523975404445f13de81255d75a22156
|
||||
SHA1 (patch-dk) = ad78819e71f082d0b7f262c162d3a67cfdfdcf2f
|
||||
SHA1 (patch-dl) = dc63c1d3f6a1d78b2f5bb725cdff6824e2307dc5
|
||||
SHA1 (patch-dl) = 79c5411f4e12f2f89d4fb108bedfd3ad1f1d24ef
|
||||
SHA1 (patch-do) = 0bda0d2e482be218fb502e0c4ea945a41d078d27
|
||||
SHA1 (patch-libgc_misc.c) = 52c68e7b6f1b58f480286bd135591f97a3e13125
|
||||
SHA1 (patch-man_mprof-report.1) = 0a80c164614cc9af5f01822005193d80f1d89946
|
||||
SHA1 (patch-mono_metadata_mono-perfcounters.c) = 3a156099e6ad26c7260326d2555037574db0323d
|
||||
SHA1 (patch-man_mprof-report.1) = e73079959b646bd851d5c860045b56a05833ce6a
|
||||
SHA1 (patch-mono_metadata_mono-perfcounters.c) = bd203f3bad11c34b65ba4dffbedde097e78b2d9a
|
||||
SHA1 (patch-mono_metadata_mono-route.c) = 6eb741efca0a66fae894f7c49fa8f6393079e67f
|
||||
SHA1 (patch-mono_metadata_w32file-unix.c) = c4f4ff5e0e8dc972e89fc43ede936c96597e6bfb
|
||||
SHA1 (patch-mono_mini_mini-arm.c) = 6139e45a762c7707e3e177e81c65ff523148de0f
|
||||
SHA1 (patch-mono_profiler_proflog.c) = 060e8052aeedc1ee224d33644f39b8085a6c92a2
|
||||
SHA1 (patch-mono_utils_mono-compiler.h) = 210062c167c00500f6a9176ef94c8cd96d39c730
|
||||
SHA1 (patch-mono_utils_mono-compiler.h) = 56f04fe56cb9e944e3563f81c70d82ef3bf252a0
|
||||
SHA1 (patch-mono_utils_mono-mmap.c) = 869c24a57861fcfb1bdc8a04ed0e0d1fd5a0e0b5
|
||||
SHA1 (patch-mono_utils_mono-threads-dragonfly.c) = d41c7735d5ba0224ff4a4cf70308fb835ec00bbe
|
||||
SHA1 (patch-mono_utils_mono-threads-netbsd.c) = 29d7bdb4906bca4e2f5a0a94b7e70e04570df8ee
|
||||
SHA1 (patch-mono_utils_mono-threads-netbsd.c) = 797d6fc3f387eac549d69d8f5d996019240669a5
|
||||
SHA1 (patch-mono_utils_mono-threads-solaris.c) = 8781c9e09edfbbbc9940f02cce46a3ce5b6c10c3
|
||||
SHA1 (patch-po_Makefile.in) = 53f967c75ae028d991f118fb3bbc5b90bb4ceea7
|
||||
SHA1 (patch-support_signal.c) = 33e0c19c21955b105d78a05b2b10d00f479a60c2
|
||||
|
|
|
|||
|
|
@ -1,12 +1 @@
|
|||
$NetBSD: patch-al,v 1.8 2014/11/30 08:40:51 spz Exp $
|
||||
--- data/config.in.orig 2014-10-04 09:27:43.000000000 +0000
|
||||
+++ data/config.in
|
||||
@@ -21,7 +21,7 @@
|
||||
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
|
||||
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
|
||||
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
|
||||
- <dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
|
||||
+ <dllmap dll="libcups" target="libcups.so" os="!windows"/>
|
||||
<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
|
||||
<dllmap dll="i:kernel32.dll">
|
||||
<dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-am,v 1.7 2014/11/30 08:40:51 spz Exp $
|
||||
|
||||
--- mono/io-layer/io.c.orig 2016-08-03 10:33:31.000000000 +0000
|
||||
+++ mono/io-layer/io.c
|
||||
@@ -4241,7 +4241,7 @@ guint32 GetDriveType(const gunichar2 *ro
|
||||
return (drive_type);
|
||||
}
|
||||
|
||||
-#if defined (PLATFORM_MACOSX) || defined (__linux__) || defined(PLATFORM_BSD) || defined(__native_client__) || defined(__FreeBSD_kernel__)
|
||||
+#if defined (PLATFORM_MACOSX) || defined (__linux__) || defined(PLATFORM_BSD) || defined(__native_client__) || defined(__FreeBSD_kernel__) || defined(PLATFORM_SOLARIS)
|
||||
static gchar*
|
||||
get_fstypename (gchar *utfpath)
|
||||
{
|
||||
|
|
@ -2,17 +2,3 @@ $NetBSD: patch-as,v 1.4 2014/11/30 08:40:51 spz Exp $
|
|||
|
||||
From FreeBSD: https://bugzilla.novell.com/show_bug.cgi?id=528830
|
||||
|
||||
--- mono/metadata/appdomain.c.orig 2014-10-04 09:27:43.000000000 +0000
|
||||
+++ mono/metadata/appdomain.c
|
||||
@@ -2476,6 +2476,11 @@ mono_domain_try_unload (MonoDomain *doma
|
||||
CloseHandle (thread_handle);
|
||||
unload_data_unref (thread_data);
|
||||
return;
|
||||
+ } else if (!mono_thread_has_appdomain_ref (mono_thread_current (), domain) && !(mono_thread_interruption_requested ())) {
|
||||
+ if (!domain->friendly_name) {
|
||||
+ CloseHandle (thread_handle);
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
CloseHandle (thread_handle);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-be,v 1.5 2014/11/30 08:40:51 spz Exp $
|
||||
|
||||
--- support/sys-mman.c.orig 2014-09-22 13:23:09.000000000 +0000
|
||||
--- support/sys-mman.c.orig 2017-08-02 13:16:42.000000000 +0000
|
||||
+++ support/sys-mman.c
|
||||
@@ -10,7 +10,6 @@
|
||||
#include <config.h>
|
||||
|
|
@ -10,7 +10,7 @@ $NetBSD: patch-be,v 1.5 2014/11/30 08:40:51 spz Exp $
|
|||
#endif
|
||||
|
||||
#ifdef PLATFORM_MACOSX
|
||||
@@ -25,6 +24,9 @@
|
||||
@@ -30,6 +29,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include <errno.h>
|
||||
|
|
@ -20,17 +20,3 @@ $NetBSD: patch-be,v 1.5 2014/11/30 08:40:51 spz Exp $
|
|||
|
||||
#include "map.h"
|
||||
#include "mph.h"
|
||||
@@ -109,8 +111,13 @@ Mono_Posix_Syscall_mremap (void *old_add
|
||||
if (Mono_Posix_FromMremapFlags (flags, &_flags) == -1)
|
||||
return MAP_FAILED;
|
||||
|
||||
+#if defined(__NetBSD__)
|
||||
+ return mremap (old_address, (size_t) old_size, old_address, (size_t) new_size,
|
||||
+ (unsigned long) _flags);
|
||||
+#else
|
||||
return mremap (old_address, (size_t) old_size, (size_t) new_size,
|
||||
(unsigned long) _flags);
|
||||
+#endif
|
||||
}
|
||||
#endif /* def HAVE_MREMAP */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1 @@
|
|||
$NetBSD: patch-bf,v 1.4 2014/11/30 08:40:51 spz Exp $
|
||||
--- support/map.c.orig 2014-09-22 13:23:09.000000000 +0000
|
||||
+++ support/map.c
|
||||
@@ -3623,13 +3623,21 @@ int Mono_Posix_ToMountFlags (guint64 x,
|
||||
|
||||
int Mono_Posix_FromMremapFlags (guint64 x, guint64 *r)
|
||||
{
|
||||
+#ifdef __NetBSD__
|
||||
+ *r = MAP_FIXED;
|
||||
+#else
|
||||
*r = 0;
|
||||
+#endif
|
||||
if ((x & Mono_Posix_MremapFlags_MREMAP_MAYMOVE) == Mono_Posix_MremapFlags_MREMAP_MAYMOVE)
|
||||
+#ifdef __NetBSD__
|
||||
+ *r &= ~MAP_FIXED;
|
||||
+#else
|
||||
#ifdef MREMAP_MAYMOVE
|
||||
*r |= MREMAP_MAYMOVE;
|
||||
#else /* def MREMAP_MAYMOVE */
|
||||
{errno = EINVAL; return -1;}
|
||||
#endif /* ndef MREMAP_MAYMOVE */
|
||||
+#endif /* __NetBSD__ */
|
||||
if (x == 0)
|
||||
return 0;
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1,12 +1 @@
|
|||
$NetBSD: patch-dc,v 1.7 2014/11/30 08:40:51 spz Exp $
|
||||
--- mono/mini/mini-x86.h.orig 2014-10-04 09:27:43.000000000 +0000
|
||||
+++ mono/mini/mini-x86.h
|
||||
@@ -48,7 +48,7 @@ struct sigcontext {
|
||||
#endif /* __HAIKU__ */
|
||||
|
||||
#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || \
|
||||
- defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
|
||||
+ defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||
#define MONO_ARCH_USE_SIGACTION
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1 @@
|
|||
$NetBSD: patch-di,v 1.6 2014/11/30 08:40:51 spz Exp $
|
||||
--- mono/tests/libtest.c.orig 2014-09-22 13:23:09.000000000 +0000
|
||||
+++ mono/tests/libtest.c
|
||||
@@ -3463,7 +3463,7 @@ mono_test_marshal_ccw_itest (MonoComObje
|
||||
* mono_method_get_unmanaged_thunk tests
|
||||
*/
|
||||
|
||||
-#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__FreeBSD__) || defined(__OpenBSD__)) || (defined(__ppc__) && defined(__APPLE__)))
|
||||
+#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__NetBSD__) || defined (__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)) || (defined(__ppc__) && defined(__APPLE__)))
|
||||
#define ALIGN(size) __attribute__ ((aligned(size)))
|
||||
#else
|
||||
#define ALIGN(size)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ $NetBSD: patch-dl,v 1.5 2014/11/30 08:40:51 spz Exp $
|
|||
|
||||
SunOS needs unistd.h for sysconf().
|
||||
|
||||
--- mono/utils/dlmalloc.c.orig 2014-09-22 13:23:09.000000000 +0000
|
||||
--- mono/utils/dlmalloc.c.orig 2017-08-02 13:16:42.000000000 +0000
|
||||
+++ mono/utils/dlmalloc.c
|
||||
@@ -1208,11 +1208,14 @@ int mspace_mallopt(int, int);
|
||||
#ifndef LACKS_UNISTD_H
|
||||
|
|
@ -20,15 +20,3 @@ SunOS needs unistd.h for sysconf().
|
|||
|
||||
#ifndef WIN32
|
||||
#ifndef malloc_getpagesize
|
||||
@@ -1375,7 +1378,11 @@ static int win32munmap(void* ptr, size_t
|
||||
#endif /* HAVE_MMAP */
|
||||
|
||||
#if HAVE_MMAP && HAVE_MREMAP
|
||||
+#ifdef linux
|
||||
#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv))
|
||||
+#else
|
||||
+#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (addr), (nsz), (mv))
|
||||
+#endif
|
||||
#else /* HAVE_MMAP && HAVE_MREMAP */
|
||||
#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
|
||||
#endif /* HAVE_MMAP && HAVE_MREMAP */
|
||||
|
|
|
|||
|
|
@ -2,11 +2,3 @@ $NetBSD: patch-man_mprof-report.1,v 1.3 2014/11/30 08:40:51 spz Exp $
|
|||
|
||||
Fix mandoc -Tlint warnings.
|
||||
|
||||
--- man/mprof-report.1.orig 2014-09-22 13:23:05.000000000 +0000
|
||||
+++ man/mprof-report.1
|
||||
@@ -1,4 +1,4 @@
|
||||
-.TH mprof-report 1 ""
|
||||
+.TH MPROF-REPORT 1 ""
|
||||
.SH The Mono log profiler
|
||||
.PP
|
||||
The Mono \f[I]log\f[] profiler can be used to collect a lot of
|
||||
|
|
|
|||
|
|
@ -2,28 +2,3 @@ $NetBSD: patch-mono_metadata_mono-perfcounters.c,v 1.2 2015/05/22 06:55:40 kefre
|
|||
|
||||
Correct mibs initialization for NetBSD
|
||||
|
||||
--- mono/metadata/mono-perfcounters.c.orig 2016-08-03 10:33:31.000000000 +0000
|
||||
+++ mono/metadata/mono-perfcounters.c
|
||||
@@ -34,6 +34,9 @@
|
||||
#if defined (__NetBSD__) || defined (__APPLE__)
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
+#if defined(__NetBSD__)
|
||||
+#include <sys/vmmeter.h>
|
||||
+#endif
|
||||
#include "metadata/mono-perfcounters.h"
|
||||
#include "metadata/appdomain.h"
|
||||
#include "metadata/object-internals.h"
|
||||
@@ -474,11 +477,7 @@ mono_determine_physical_ram_available_si
|
||||
#elif defined (__NetBSD__)
|
||||
struct vmtotal vm_total;
|
||||
guint64 page_size;
|
||||
- int mib [2];
|
||||
- size_t len;
|
||||
-
|
||||
-
|
||||
- mib = {
|
||||
+ int mib [2] = {
|
||||
CTL_VM,
|
||||
#if defined (VM_METER)
|
||||
VM_METER
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
--- mono/metadata/w32file-unix.c.orig 2017-08-02 13:16:42.000000000 +0000
|
||||
+++ mono/metadata/w32file-unix.c
|
||||
@@ -4055,7 +4055,7 @@ mono_w32file_create_pipe (gpointer *read
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
-#ifdef HAVE_GETFSSTAT
|
||||
+#if defined(HAVE_GETFSSTAT) && !defined(__NetBSD__)
|
||||
/* Darwin has getfsstat */
|
||||
gint32
|
||||
mono_w32file_get_logical_drive (guint32 len, gunichar2 *buf)
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD: patch-mono_profiler_proflog.c,v 1.2 2014/11/30 08:40:51 spz Exp $
|
||||
|
||||
SunOS libelf does not support largefile.
|
||||
|
||||
--- mono/profiler/proflog.c.orig 2014-09-22 13:23:09.000000000 +0000
|
||||
+++ mono/profiler/proflog.c
|
||||
@@ -38,6 +38,10 @@
|
||||
#ifdef HAVE_EXECINFO_H
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
+#ifdef __sun
|
||||
+#undef _FILE_OFFSET_BITS
|
||||
+#define _FILE_OFFSET_BITS 32
|
||||
+#endif
|
||||
#ifdef HAVE_LINK_H
|
||||
#include <link.h>
|
||||
#endif
|
||||
|
|
@ -3,36 +3,3 @@ $NetBSD: patch-mono_utils_mono-compiler.h,v 1.3 2014/11/30 08:40:51 spz Exp $
|
|||
Make sure that TLS variables are actually emitted, since the compiler
|
||||
doesn't see all references.
|
||||
|
||||
--- mono/utils/mono-compiler.h.orig 2014-10-04 09:27:43.000000000 +0000
|
||||
+++ mono/utils/mono-compiler.h
|
||||
@@ -36,7 +36,7 @@
|
||||
#if defined(PIC)
|
||||
|
||||
#ifdef PIC_INITIAL_EXEC
|
||||
-#define MONO_TLS_FAST __attribute__((tls_model("initial-exec")))
|
||||
+#define MONO_TLS_FAST __attribute__((tls_model("initial-exec"), used))
|
||||
#else
|
||||
#if defined (__powerpc__)
|
||||
/* local dynamic requires a call to __tls_get_addr to look up the
|
||||
@@ -48,18 +48,18 @@
|
||||
For now we will disable this. */
|
||||
#define MONO_TLS_FAST
|
||||
#else
|
||||
-#define MONO_TLS_FAST __attribute__((tls_model("local-dynamic")))
|
||||
+#define MONO_TLS_FAST __attribute__((tls_model("local-dynamic"), used))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
-#define MONO_TLS_FAST __attribute__((tls_model("local-exec")))
|
||||
+#define MONO_TLS_FAST __attribute__((tls_model("local-exec"), used))
|
||||
|
||||
#endif
|
||||
|
||||
#else
|
||||
-#define MONO_TLS_FAST
|
||||
+#define MONO_TLS_FAST
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && defined(__i386__)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-mono_utils_mono-threads-netbsd.c,v 1.1 2014/11/30 08:40:51 spz Exp $
|
||||
|
||||
--- mono/utils/mono-threads-netbsd.c.orig 2014-11-29 21:20:20.000000000 +0000
|
||||
--- mono/utils/mono-threads-netbsd.c.orig 2017-08-02 13:16:42.000000000 +0000
|
||||
+++ mono/utils/mono-threads-netbsd.c
|
||||
@@ -0,0 +1,23 @@
|
||||
@@ -1,3 +1,26 @@
|
||||
+#include <config.h>
|
||||
+
|
||||
+#if defined(__NetBSD__)
|
||||
|
|
@ -26,3 +26,6 @@ $NetBSD: patch-mono_utils_mono-threads-netbsd.c,v 1.1 2014/11/30 08:40:51 spz Ex
|
|||
+}
|
||||
+
|
||||
+#endif
|
||||
/**
|
||||
* \file
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue