Index: xen-3.2-testing/tools/blktap/drivers/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/blktap/drivers/Makefile
+++ xen-3.2-testing/tools/blktap/drivers/Makefile
@@ -8,7 +8,6 @@ QCOW_UTIL    = img2qcow qcow2raw qcow-cr
 INST_DIR     = /usr/sbin
 LIBAIO_DIR   = ../../libaio/src
 
-CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
 CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
 CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
Index: xen-3.2-testing/Config.mk
===================================================================
--- xen-3.2-testing.orig/Config.mk
+++ xen-3.2-testing/Config.mk
@@ -19,7 +19,7 @@ SHELL     ?= /bin/sh
 
 # Tools to run on system hosting the build
 HOSTCC      = gcc
-HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes $(RPM_OPT_FLAGS)
 HOSTCFLAGS += -fno-strict-aliasing
 HOSTCFLAGS_x86_32 = -m32
 HOSTCFLAGS_x86_64 = -m64
Index: xen-3.2-testing/tools/libxen/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/libxen/Makefile
+++ xen-3.2-testing/tools/libxen/Makefile
@@ -21,10 +21,10 @@ include $(XEN_ROOT)/tools/Rules.mk
 MAJOR = 1.0
 MINOR = 0
 
-CFLAGS = -Iinclude                     \
+CFLAGS += -Iinclude                    \
          $(shell xml2-config --cflags) \
          $(shell curl-config --cflags) \
-         -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
+         -std=c99 -fPIC
 
 LDFLAGS = $(shell xml2-config --libs) \
           $(shell curl-config --libs)