Fixed MacOS proxy support for proxies requiring authentication

[mono.git] / mono / mini / mini-s390.c

diff --git a/mono/mini/mini-s390.c b/mono/mini/mini-s390.c
index 3168f5183a607f4dcc089b9b5e8194c1d98bbdd4..6f2f76a4780a814465a2bbd964ba501c176a8d4f 100644 (file)
--- a/mono/mini/mini-s390.c
+++ b/mono/mini/mini-s390.c
@@ -335,8 +335,6 @@ int mono_exc_esp_offset = 0;
 
 static int indent_level = 0;
 
-static gboolean tls_offset_inited = FALSE;
-
 static int appdomain_tls_offset = -1,
            thread_tls_offset = -1;
 
@@ -423,7 +421,7 @@ mono_arch_fregname (int reg) {
 /*------------------------------------------------------------------*/
 
 int
-mono_arch_get_argument_info (MonoMethodSignature *csig, 
+mono_arch_get_argument_info (MonoGenericSharingContext *gsctx, MonoMethodSignature *csig, 
                             int param_count, 
                             MonoJitArgumentInfo *arg_info)
 {
@@ -1078,14 +1076,14 @@ mono_arch_cleanup (void)
 
 /*------------------------------------------------------------------*/
 /*                                                                  */
-/* Name                - mono_arch_cpu_optimizazions                       */
+/* Name                - mono_arch_cpu_optimizations                       */
 /*                                                                  */
 /* Function    - Returns the optimizations supported on this CPU   */
 /*                                                                 */
 /*------------------------------------------------------------------*/
 
 guint32
-mono_arch_cpu_optimizazions (guint32 *exclude_mask)
+mono_arch_cpu_optimizations (guint32 *exclude_mask)
 {
        guint32 opts = 0;
 
@@ -1099,6 +1097,21 @@ mono_arch_cpu_optimizazions (guint32 *exclude_mask)
 
 /*========================= End of Function ========================*/
 
+/*------------------------------------------------------------------*/
+/*                                                                  */
+/* Name         - mono_arch_cpu_enumerate_simd_versions             */
+/*                                                                  */
+/* Function     - Returns the SIMD instruction sets on this CPU     */
+/*                                                                  */
+/*------------------------------------------------------------------*/
+guint32
+mono_arch_cpu_enumerate_simd_versions (void)
+{
+       /* SIMD is currently unimplemented */
+       return 0;
+}
+/*========================= End of Function ========================*/
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                -                                                   */
@@ -4313,7 +4326,7 @@ mono_arch_register_lowlevel_calls (void)
 
 void
 mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, 
-                     guint8 *code, MonoJumpInfo *ji, gboolean run_cctors)
+                     guint8 *code, MonoJumpInfo *ji, MonoCodeManager *dyn_code_mp, gboolean run_cctors)
 {
        MonoJumpInfo *patch_info;
 
@@ -4782,7 +4795,7 @@ mono_arch_emit_epilog (MonoCompile *cfg)
        while ((cfg->code_len + max_epilog_size) > (cfg->code_size - 16)) {
                cfg->code_size  *= 2;
                cfg->native_code = g_realloc (cfg->native_code, cfg->code_size);
-               mono_jit_stats.code_reallocs++;
+               cfg->stat_code_reallocs++;
        }
 
        code = cfg->native_code + cfg->code_len;
@@ -4843,7 +4856,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
        while ((cfg->code_len + code_size) > (cfg->code_size - 16)) {
                cfg->code_size  *= 2;
                cfg->native_code = g_realloc (cfg->native_code, cfg->code_size);
-               mono_jit_stats.code_reallocs++; 
+               cfg->stat_code_reallocs++; 
        }
 
        code = cfg->native_code + cfg->code_len;
@@ -4921,19 +4934,15 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 
 /*------------------------------------------------------------------*/
 /*                                                                  */
-/* Name                - mono_arch_setup_jit_tls_data                      */
+/* Name                - mono_arch_finish_init                                 */
 /*                                                                  */
 /* Function    - Setup the JIT's Thread Level Specific Data.       */
 /*                                                                 */
 /*------------------------------------------------------------------*/
 
 void
-mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
+mono_arch_finish_init (void)
 {
-
-       if (!tls_offset_inited) {
-               tls_offset_inited = TRUE;
-
 #if HAVE_KW_THREAD
 # if 0
        __asm__ ("\tear\t%r1,0\n"
@@ -4952,7 +4961,6 @@ mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
                 : "1", "cc");
 # endif
 #endif
-       }               
 
        if (!lmf_addr_key_inited) {
                lmf_addr_key_inited = TRUE;
@@ -5277,7 +5285,7 @@ mono_arch_get_patch_offset (guint8 *code)
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
-gpointer
+mgreg_t
 mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
 {
        /* FIXME: implement */