--- Makefile.target.~1.186.~	2007-07-02 17:08:34.000000000 +0200
+++ Makefile.target	2007-07-09 19:13:35.000000000 +0200
@@ -92,6 +92,8 @@ cc-option = $(shell if $(CC) $(OP_CFLAGS
 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, "")
@@ -165,8 +167,9 @@ BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)
 endif
 
 ifeq ($(ARCH),ia64)
-BASE_CFLAGS+=-mno-sdata
-OP_CFLAGS+=-mno-sdata
+OP_CFLAGS+=$(call cc-option, -mno-sched-ar-data-spec, "")
+BASE_CFLAGS+=-G0 -mno-sdata
+OP_CFLAGS+=-G0 -mno-sdata
 BASE_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/$(ARCH).ld
 endif
 
--- target-alpha/op.c.~1.1.~	2007-04-05 08:58:33.000000000 +0200
+++ target-alpha/op.c	2007-07-09 20:11:42.000000000 +0200
@@ -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"
 
@@ -125,8 +123,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();
 }