Merge pull request #1110 from tpokorra/FixImageListStreamerGeneratingValidResourcesFo...

Fixing ImageListStreamer generating winform resource files that work on MS.Net

diff --git a/configure.ac b/configure.ac
index 6d06c9227ec8c3bb3885b796c5cba65aa638f17a..0551bfe429b25028383a070150950844e53080ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2519,6 +2519,8 @@ INTL="libc.so.6"
 SQLITE="libsqlite.so.0"
 SQLITE3="libsqlite3.so.0"
 X11="libX11.so"
+GDKX11="libgdk-x11-2.0.so.0"
+GTKX11="libgtk-x11-2.0.so.0"
 XINERAMA="libXinerama.so"
 
 sizeof_register="SIZEOF_VOID_P"
@@ -2974,6 +2976,8 @@ case "$host" in
        SQLITE="libsqlite.0.dylib"
        SQLITE3="libsqlite3.0.dylib"
        X11="libX11.dylib"
+       GDKX11="libgdk-x11-2.0.dylib"
+       GTKX11="libgtk-x11-2.0.dylib"
        ;;
      *-*-*netbsd*)
        LIBC="libc.so.12"
@@ -3369,6 +3373,8 @@ AC_SUBST(INTL)
 AC_SUBST(SQLITE)
 AC_SUBST(SQLITE3)
 AC_SUBST(X11)
+AC_SUBST(GDKX11)
+AC_SUBST(GTKX11)
 AC_SUBST(XINERAMA)
 AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
 AC_SUBST(arch_target)

diff --git a/data/config.in b/data/config.in
index 44fefc080276ca63a6080c5327fa6ce66034ce77..3cc39732e1c7dc58800b7a9894fc9733613faac7 100644 (file)
--- a/data/config.in
+++ b/data/config.in
@@ -16,6 +16,8 @@
        <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
        <dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
        <dllmap dll="libX11" target="@X11@" os="!windows" />
+       <dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
+       <dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
        <dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
        <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
        <dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>

diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
index 69a1d3d78aa16d9558fff6e6d915d9a95f816ec0..d2a7aec7cd7373b9ca668f044e158a33502e63ea 100644 (file)
--- a/mono/mini/mini-ppc.c
+++ b/mono/mini/mini-ppc.c
@@ -4388,6 +4388,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_ATOMIC_ADD_NEW_I8: {
                        guint8 *loop = code, *branch;
                        g_assert (ins->inst_offset == 0);
+                       ppc_sync (code);
                        if (ins->opcode == OP_ATOMIC_ADD_NEW_I4)
                                ppc_lwarx (code, ppc_r0, 0, ins->inst_basereg);
                        else
@@ -4400,6 +4401,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        branch = code;
                        ppc_bc (code, PPC_BR_FALSE, PPC_BR_EQ, 0);
                        ppc_patch (branch, loop);
+                       ppc_sync (code);
                        ppc_mr (code, ins->dreg, ppc_r0);
                        break;
                }
@@ -4426,6 +4428,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        guint8 *start, *not_equal, *lost_reservation;
 
                        start = code;
+                       ppc_sync (code);
                        if (ins->opcode == OP_ATOMIC_CAS_I4)
                                ppc_lwarx (code, ppc_r0, 0, location);
 #ifdef __mono_ppc64__
@@ -4448,6 +4451,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        ppc_patch (lost_reservation, start);
 
                        ppc_patch (not_equal, code);
+                       ppc_sync (code);
                        ppc_mr (code, ins->dreg, ppc_r0);
                        break;
                }