--- Makefile.target
+++ Makefile.target
@@ -84,6 +84,8 @@
 OP_CFLAGS+=$(call cc-option, -fno-reorder-blocks, "")
 OP_CFLAGS+=$(call cc-option, -fno-gcse, "")
 OP_CFLAGS+=$(call cc-option, -fno-tree-ch, "")
+OP_CFLAGS+=$(call cc-option, -fno-tree-dominator-opts, "")
+OP_CFLAGS+=$(call cc-option, -fno-tree-vrp, "")
 OP_CFLAGS+=$(call cc-option, -fno-optimize-sibling-calls, "")
 OP_CFLAGS+=$(call cc-option, -fno-crossjumping, "")
 OP_CFLAGS+=$(call cc-option, -fno-align-labels, "")
@@ -141,8 +143,9 @@
 endif
 
 ifeq ($(ARCH),ia64)
-CFLAGS+=-mno-sdata
-OP_CFLAGS+=-mno-sdata
+OP_CFLAGS+=$(call cc-option, -mno-sched-ar-data-spec, "")
+CFLAGS+=-G0 -mno-sdata
+OP_CFLAGS+=-G0 -mno-sdata
 endif
 
 ifeq ($(ARCH),arm)
--- target-alpha/op.c
+++ target-alpha/op.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define DEBUG_OP
-
 #include "config.h"
 #include "exec.h"
 #include "host-utils.h"
@@ -126,8 +124,12 @@
 void OPPROTO op_no_op (void)
 {
 #if !defined (DEBUG_OP)
+#ifdef __ia64__
+    __asm__ __volatile__("nop 0" : : : "memory");
+#else
     __asm__ __volatile__("nop" : : : "memory");
 #endif
+#endif
     RETURN();
 }