Merge pull request #4926 from BrzVlad/fix-tls-v5

[arm] Don't use fast tls on v5 arm

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 14090d8c3ecc5d60c50a5d2225e23b0a559b3e47..06085362c54484072e624443e2c11b6a9dc573c3 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -8,7 +8,7 @@ if SUPPORT_SGEN
 metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
 gc_lib=$(top_builddir)/mono/sgen/libmonosgen-static.la
 else
-metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la
 gc_lib=$(LIBGC_STATIC_LIBS)
 endif
 

diff --git a/mono/metadata/w32socket-unix.c b/mono/metadata/w32socket-unix.c
index 70b36ed2fa36feb4b22bd3579f3dc6e551a35207..75d90df2ed919996d24da13192ded7818e02f240 100644 (file)
--- a/mono/metadata/w32socket-unix.c
+++ b/mono/metadata/w32socket-unix.c
@@ -12,6 +12,7 @@
 #include <pthread.h>
 #include <string.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -27,7 +28,6 @@
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif

diff --git a/mono/unit-tests/Makefile.am b/mono/unit-tests/Makefile.am
index b2c969ba0bd0cbfd5a79ecebc4eeb6f8732856cb..ec04c4d1c5f17f5df5dab43b834893dc048783f1 100644 (file)
--- a/mono/unit-tests/Makefile.am
+++ b/mono/unit-tests/Makefile.am
@@ -10,6 +10,7 @@ endif
 if !CROSS_COMPILE
 if !HOST_WIN32
 if SUPPORT_BOEHM
+if SUPPORT_SGEN
 
 noinst_LTLIBRARIES = libtestlib.la
 libtestlib_la_SOURCES =
@@ -54,6 +55,7 @@ check-local:
                echo "</test-case></results></test-suite></test-results>" >> TestResult-unit-tests.xml; \
        fi;
 
+endif SUPPORT_SGEN
 endif SUPPORT_BOEHM
 endif !HOST_WIN32
 endif !CROSS_COMPILE

diff --git a/mono/utils/mono-proclib.c b/mono/utils/mono-proclib.c
index f733896a6d73ae9a4997347724b5790488230aa4..5c5b891d607ab952d55bc3699d857566c6ce9c64 100644 (file)
--- a/mono/utils/mono-proclib.c
+++ b/mono/utils/mono-proclib.c
@@ -131,11 +131,11 @@ mono_process_list (int *size)
                mib [2] = KERN_PROC_ALL;
                mib [3] = 0;
 
-               res = sysctl (mib, 4, NULL, &data_len, NULL, 0);
+               res = sysctl (mib, 3, NULL, &data_len, NULL, 0);
                if (res)
                        return NULL;
                processes = (struct kinfo_proc *) g_malloc (data_len);
-               res = sysctl (mib, 4, processes, &data_len, NULL, 0);
+               res = sysctl (mib, 3, processes, &data_len, NULL, 0);
                if (res < 0) {
                        g_free (processes);
                        if (errno != ENOMEM)