--- xen-4.1.3/tools/blktap2/drivers/Makefile.orig	2012-05-07 17:32:31.000000000 +0100
+++ xen-4.1.3/tools/blktap2/drivers/Makefile	2012-05-08 21:32:48.975868913 +0100
@@ -9,7 +9,7 @@
 LOCK_UTIL  = lock-util
 INST_DIR   = $(SBINDIR)
 
-CFLAGS    += -Werror -g -O0
+CFLAGS    += -Werror -g -Wno-error=unused-result -Wno-error=array-bounds
 CFLAGS    += -Wno-unused
 CFLAGS    += -fno-strict-aliasing
 CFLAGS    += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
--- xen-4.1.3/tools/security/Makefile.orig	2012-05-07 17:32:32.000000000 +0100
+++ xen-4.1.3/tools/security/Makefile	2012-05-08 21:34:35.479537435 +0100
@@ -76,7 +76,7 @@
 	chmod 700 $(ACM_SCRIPTS)
 
 xensec_tool: $(OBJS_TOOL)
-	$(CC) -g $(CFLAGS) $(LDFLAGS) -O0 -o $@ $^ $(LDLIBS_libxenctrl)
+	$(CC) -g $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenctrl)
 
 xensec_gen: xensec_gen.py
 	cp -f $^ $@