X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fdecompose.c;h=a9b7e0a68f1cfa9e8818da89606bb35c01894422;hb=bc9d5d113ab7064fc199a2f430751643466cb477;hp=5a2fdde7d91e0ebf1740c32a3cb8e5fc5b40a398;hpb=b16bcb6332458610a13bb749b277f042ade32de2;p=mono.git

diff --git a/mono/mini/decompose.c b/mono/mini/decompose.c
index 5a2fdde7d91..a9b7e0a68f1 100644
--- a/mono/mini/decompose.c
+++ b/mono/mini/decompose.c
@@ -307,10 +307,7 @@ mono_decompose_opcode (MonoCompile *cfg, MonoInst *ins)
 	gboolean emulate = FALSE;
 
 	/* FIXME: Instead of = NOP, don't emit the original ins at all */
-
-#ifdef MONO_ARCH_HAVE_DECOMPOSE_OPTS
 	mono_arch_decompose_opts (cfg, ins);
-#endif
 
 	/*
 	 * The code below assumes that we are called immediately after emitting 
@@ -446,7 +443,7 @@ mono_decompose_opcode (MonoCompile *cfg, MonoInst *ins)
 		cfg->exception_message = g_strdup_printf ("float conv.ovf.un opcodes not supported.");
 		break;
 
-#if defined(MONO_ARCH_EMULATE_DIV) && defined(MONO_ARCH_HAVE_OPCODE_NEEDS_EMULATION)
+#if defined(MONO_ARCH_EMULATE_DIV)
 	case OP_IDIV:
 	case OP_IREM:
 	case OP_IDIV_UN:
@@ -639,10 +636,7 @@ mono_decompose_long_opts (MonoCompile *cfg)
 		cfg->cbb->code = cfg->cbb->last_ins = NULL;
 
 		while (tree) {
-
-#ifdef MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS
 			mono_arch_decompose_long_opts (cfg, tree);
-#endif
 
 			switch (tree->opcode) {
 			case OP_I8CONST: