Imported Upstream version 4.8.0.371

Former-commit-id: 1cedda3b6a8e480191a7a40a8dc33eb078fba58b
2016-11-28 21:01:12 +00:00
parent 62edeef69b
commit 069517201b
48 changed files with 181 additions and 50 deletions
--- a/mono/btls/CMakeLists.txt
+++ b/mono/btls/CMakeLists.txt
@@ -22,7 +22,14 @@ if (NOT "${BTLS_ARCH}" STREQUAL "")
 	message (WARNING "SET ARCH: ${BTLS_ARCH}")
 	set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
 endif ()
-set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+if (BUILD_DYNAMIC_BTLS)
+	set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+	set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+elseif (BUILD_SHARED_LIBS)
+	set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+else ()
+	set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+endif()
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${BTLS_CFLAGS}")
--- a/mono/btls/btls-ssl.c
+++ b/mono/btls/btls-ssl.c
@@ -207,3 +207,9 @@ mono_btls_ssl_set_server_name (MonoBtlsSsl *ptr, const char *name)
 {
 	return SSL_set_tlsext_host_name (ptr->ssl, name);
 }
+
+MONO_API const char *
+mono_btls_ssl_get_server_name (MonoBtlsSsl *ptr)
+{
+	return SSL_get_servername (ptr->ssl, TLSEXT_NAMETYPE_host_name);
+}
--- a/mono/btls/btls-ssl.h
+++ b/mono/btls/btls-ssl.h
@@ -77,6 +77,9 @@ mono_btls_ssl_set_verify_param (MonoBtlsSsl *ptr, const MonoBtlsX509VerifyParam
 int
 mono_btls_ssl_set_server_name (MonoBtlsSsl *ptr, const char *name);

+const char *
+mono_btls_ssl_get_server_name (MonoBtlsSsl *ptr);
+
 void
 mono_btls_ssl_destroy (MonoBtlsSsl *ptr);

--- a/mono/metadata/class.c.REMOVED.git-id
+++ b/mono/metadata/class.c.REMOVED.git-id
@@ -1 +1 @@
-f1718591e4aa1f373e41b0fa4038d606cc9f72ba
+a1c77761cdbb42ae1e799cfd298fccf01c6bebeb
--- a/mono/metadata/handle.h
+++ b/mono/metadata/handle.h
@@ -91,9 +91,10 @@ static inline void
 mono_stack_mark_pop (MonoThreadInfo *info, HandleStackMark *stackmark)
 {
 	HandleStack *handles = (HandleStack *)info->handle_stack;
-	handles->top->size = stackmark->size;
+	HandleChunk *old_top = stackmark->chunk;
+	old_top->size = stackmark->size;
 	mono_memory_write_barrier ();
-	handles->top = stackmark->chunk;
+	handles->top = old_top;
 }

 /*
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in

 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.8.0.344/f5fbc32\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.8.0.371/902b4a9\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -860,7 +860,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in

 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.8.0.344/f5fbc32\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.8.0.371/902b4a9\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.in.REMOVED.git-id
+++ b/mono/mini/Makefile.in.REMOVED.git-id
@@ -1 +1 @@
-d1e6363311745351e05c4bd7f744e07b7ea2f128
+eaecaed9eab43c2e6afd56e9f55f1f0926fb397a
--- a/mono/mini/aot-compiler.c.REMOVED.git-id
+++ b/mono/mini/aot-compiler.c.REMOVED.git-id
@@ -1 +1 @@
-bd6f925c87c7032d749d0524b3629b3d81a48d63
+a1c359f96a9f1549227cba4f1d82f9b535458f19
--- a/mono/mini/debugger-agent.c.REMOVED.git-id
+++ b/mono/mini/debugger-agent.c.REMOVED.git-id
@@ -1 +1 @@
-747cc484fae7811f7e3041ef630f393f4e180cc3
+ab39180f7b19cdd884bb41bddd68fd3a34b1c44d
--- a/mono/mini/method-to-ir.c.REMOVED.git-id
+++ b/mono/mini/method-to-ir.c.REMOVED.git-id
@@ -1 +1 @@
-965434138b99b82354a510e35de120461917ce05
+b2470bd1725bddc8d4b773a0150fdace813b5560
--- a/mono/mini/mini.c.REMOVED.git-id
+++ b/mono/mini/mini.c.REMOVED.git-id
@@ -1 +1 @@
-750410441af8afda4ad292c84405f3e195b47c24
+26248fcce4cc078e80f5b273afc760876290f922
--- a/mono/mini/mini.h.REMOVED.git-id
+++ b/mono/mini/mini.h.REMOVED.git-id
@@ -1 +1 @@
-7aef90d17eede287da97280c621552b83e8daa49
+fa3a3b738e36916c6cd30fdf6def572c1a1506cd
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@@ -1 +1 @@
-#define FULL_VERSION "Stable 4.8.0.344/f5fbc32"
+#define FULL_VERSION "Stable 4.8.0.371/902b4a9"