[mono/mono] cb2e2621: [runtime] Really fix the build.

"Zoltan Varga ([email protected])" <[email protected]>
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <00000141cc59cdb3-f4874aa3-69c7-4b7d-b6d7-ac1bdd8bc686-000000@email.amazonses.com>
   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/88bbc34b276b...cb2e2621166a

   Commit: cb2e2621166a00eeb49ede6d0c3f88415fa44373
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-10-18 16:14:25 GMT
      URL: https://github.com/mono/mono/commit/cb2e2621166a00eeb49ede6d0c3f88415fa44373

[runtime] Really fix the build.

Changed paths:
  M mono/metadata/sgen-alloc.c

Modified: mono/metadata/sgen-alloc.c
===================================================================
@@ -704,9 +704,6 @@ enum {
 	MONO_THREAD_VAR_OFFSET (tlab_next_addr, tlab_next_addr_offset);
 	MONO_THREAD_VAR_OFFSET (tlab_temp_end, tlab_temp_end_offset);
 
-	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_NEXT_ADDR, tlab_next_addr_offset);
-	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_TEMP_END, tlab_temp_end_offset);
-
 	g_assert (tlab_next_addr_offset != -1);
 	g_assert (tlab_temp_end_offset != -1);
 #endif
@@ -989,7 +986,7 @@ enum {
 	if (tlab_next_offset == -1 || tlab_temp_end_offset == -1)
 		return NULL;
 
-	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_NEXT, tlab_next_offset);
+	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_NEXT_ADDR, tlab_next_offset);
 	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_TEMP_END, tlab_temp_end_offset);
 #endif
 	if (collect_before_allocs)


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.