[mono/mono] 88bbc34b: [runtime] Fix the build.
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <00000141cc5707ec-96b5ec79-4296-4e7c-bdfd-9d5109d6b4fd-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/c94acdd08549...88bbc34b276b
Commit: 88bbc34b276b74324cd3017cdb8bc79266ac5a91
Author: Zoltan Varga <[email protected]> (vargaz)
Date: 2013-10-18 16:10:30 GMT
URL: https://github.com/mono/mono/commit/88bbc34b276b74324cd3017cdb8bc79266ac5a91
[runtime] Fix the build.
Changed paths:
M mono/metadata/sgen-alloc.c
Modified: mono/metadata/sgen-alloc.c
===================================================================
@@ -704,6 +704,9 @@ 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
@@ -851,7 +854,7 @@ enum {
/* tlab_next_addr (local) = tlab_next_addr (TLS var) */
tlab_next_addr_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
- EMIT_TLS_ACCESS (mb, tlab_next_addr, TLS_KEY_SGEN_TLAB_NEXT);
+ EMIT_TLS_ACCESS (mb, tlab_next_addr, TLS_KEY_SGEN_TLAB_NEXT_ADDR);
mono_mb_emit_stloc (mb, tlab_next_addr_var);
/* p = (void**)tlab_next; */
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches