Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

support/Makefile.am

@@ -44,6 +44,7 @@ MPH_UNIX_SOURCE =				\
 	sys-statvfs.c				\
 	sys-time.c				\
 	sys-uio.c				\
+	sys-uio.h				\
 	sys-utsname.c   \
 	sys-wait.c				\
 	sys-xattr.c				\
@@ -161,7 +162,7 @@ refresh:
 	--rename-member=st_mtime=st_mtime_                    \
 	--rename-namespace=Mono.Unix.Native=Mono.Posix        \
 	--library=MonoPosixHelper                             \
-	$(mcs_topdir)/class/lib/net_4_x/Mono.Posix.dll map
+	$(mcs_topdir_from_srcdir)/class/lib/net_4_x/Mono.Posix.dll map
 
 # Useful if mono is compiled with --enable-shared=no
 patch-libtool:

support/Makefile.in

@@ -81,7 +81,7 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = support
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ChangeLog
+	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -137,14 +137,14 @@ am__libMonoPosixHelper_la_SOURCES_DIST = errno.c map.c map.h mph.h \
 	signal.c stdio.c string.c stdlib.c dirent.c fcntl.c fstab.c \
 	grp.c macros.c nl.c nl.h old-map.c old-map.h pwd.c serial.c \
 	sys-mman.c sys-sendfile.c sys-socket.c sys-stat.c \
-	sys-statvfs.c sys-time.c sys-uio.c sys-utsname.c sys-wait.c \
-	sys-xattr.c syslog.c time.c unistd.c utime.c x-struct-str.c \
-	zlib-helper.c adler32.c compress.c crc32.c uncompr.c deflate.c \
-	trees.c zutil.c inflate.c infback.c inftrees.c inffast.c \
-	crc32.h deflate.h inffast.h inffixed.h inflate.h inftrees.h \
-	trees.h zconf.h zlib.h zutil.h minizip/crypt.h minizip/ioapi.c \
-	minizip/ioapi.h minizip/unzip.c minizip/unzip.h minizip/zip.c \
-	minizip/zip.h
+	sys-statvfs.c sys-time.c sys-uio.c sys-uio.h sys-utsname.c \
+	sys-wait.c sys-xattr.c syslog.c time.c unistd.c utime.c \
+	x-struct-str.c zlib-helper.c adler32.c compress.c crc32.c \
+	uncompr.c deflate.c trees.c zutil.c inflate.c infback.c \
+	inftrees.c inffast.c crc32.h deflate.h inffast.h inffixed.h \
+	inflate.h inftrees.h trees.h zconf.h zlib.h zutil.h \
+	minizip/crypt.h minizip/ioapi.c minizip/ioapi.h \
+	minizip/unzip.c minizip/unzip.h minizip/zip.c minizip/zip.h
 am__objects_1 = errno.lo map.lo signal.lo stdio.lo string.lo stdlib.lo
 am__objects_2 = dirent.lo fcntl.lo fstab.lo grp.lo macros.lo nl.lo \
 	old-map.lo pwd.lo serial.lo sys-mman.lo sys-sendfile.lo \
@@ -332,8 +332,6 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-OPROFILE_LIBS = @OPROFILE_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -487,6 +485,7 @@ MPH_UNIX_SOURCE = \
 	sys-statvfs.c				\
 	sys-time.c				\
 	sys-uio.c				\
+	sys-uio.h				\
 	sys-utsname.c   \
 	sys-wait.c				\
 	sys-xattr.c				\
@@ -980,7 +979,7 @@ refresh:
 	--rename-member=st_mtime=st_mtime_                    \
 	--rename-namespace=Mono.Unix.Native=Mono.Posix        \
 	--library=MonoPosixHelper                             \
-	$(mcs_topdir)/class/lib/net_4_x/Mono.Posix.dll map
+	$(mcs_topdir_from_srcdir)/class/lib/net_4_x/Mono.Posix.dll map
 
 # Useful if mono is compiled with --enable-shared=no
 patch-libtool:

support/map.c.REMOVED.git-id

@@ -1 +1 @@
-ee61ae661d9be7e741c0997fdf7e6de54ccc5d9a
+136f2b71878105b87fdcb5ccb5faa0f1cc943646

support/map.h.REMOVED.git-id

@@ -1 +1 @@
-9f89fcde93b94c6326a863c767ea2ff2b4b877c7
+ccd221b106a219d161e744e9e6f42828089f7130

support/stdlib.c

@@ -15,7 +15,7 @@
 G_BEGIN_DECLS
 
 // See Stdlib.cs
-const char *
+void*
 Mono_Unix_VersionString ()
 {
 	return "MonoProject-2015-12-1";

support/sys-uio.c

@@ -11,6 +11,8 @@
 #define _GNU_SOURCE
 #endif /* ndef _GNU_SOURCE */
 
+#include "sys-uio.h"
+
 #include <sys/uio.h>
 
 #include "map.h"
@@ -18,8 +20,8 @@
 
 G_BEGIN_DECLS
 
-static struct iovec*
-from_iovec (struct Mono_Posix_Iovec *iov, gint32 iovcnt)
+struct iovec*
+_mph_from_iovec_array (struct Mono_Posix_Iovec *iov, gint32 iovcnt)
 {
 	struct iovec* v;
 	gint32 i;
@@ -51,7 +53,7 @@ Mono_Posix_Syscall_readv (int dirfd, struct Mono_Posix_Iovec *iov, gint32 iovcnt
 	struct iovec* v;
 	gint64 res;
 
-	v = from_iovec (iov, iovcnt);
+	v = _mph_from_iovec_array (iov, iovcnt);
 	if (!v) {
 		return -1;
 	}
@@ -69,7 +71,7 @@ Mono_Posix_Syscall_writev (int dirfd, struct Mono_Posix_Iovec *iov, gint32 iovcn
 	struct iovec* v;
 	gint64 res;
 
-	v = from_iovec (iov, iovcnt);
+	v = _mph_from_iovec_array (iov, iovcnt);
 	if (!v) {
 		return -1;
 	}
@@ -89,7 +91,7 @@ Mono_Posix_Syscall_preadv (int dirfd, struct Mono_Posix_Iovec *iov, gint32 iovcn
 
 	mph_return_if_off_t_overflow (off);
 
-	v = from_iovec (iov, iovcnt);
+	v = _mph_from_iovec_array (iov, iovcnt);
 	if (!v) {
 		return -1;
 	}
@@ -109,7 +111,7 @@ Mono_Posix_Syscall_pwritev (int dirfd, struct Mono_Posix_Iovec *iov, gint32 iovc
 
 	mph_return_if_off_t_overflow (off);
 
-	v = from_iovec (iov, iovcnt);
+	v = _mph_from_iovec_array (iov, iovcnt);
 	if (!v) {
 		return -1;
 	}

support/sys-uio.h

@@ -0,0 +1,18 @@
+#ifndef SYS_UIO_H
+#define SYS_UIO_H
+
+#include <glib.h>
+
+#include <sys/uio.h>
+
+#include "map.h"
+#include "mph.h"
+
+G_BEGIN_DECLS
+
+MPH_INTERNAL struct iovec*
+_mph_from_iovec_array (struct Mono_Posix_Iovec *iov, gint32 iovcnt);
+
+G_END_DECLS
+
+#endif /* SYS_UIO_H */