xen/xen-rpmoptflags.diff

79 lines
3.0 KiB
Diff
Raw Normal View History

Index: xen-3.0.3-testing/tools/firmware/hvmloader/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/firmware/hvmloader/Makefile
+++ xen-3.0.3-testing/tools/firmware/hvmloader/Makefile
@@ -37,7 +37,8 @@ CFLAGS += $(call test-gcc-flag,$(CC),-f
CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
OBJCOPY = objcopy
-CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
+# Optimizations cause problems on 64 bit. Investigate.
+CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O0 -msoft-float
LDFLAGS = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
SRCS = hvmloader.c acpi_madt.c mp_tables.c util.c smbios.c
Index: xen-3.0.3-testing/tools/blktap/drivers/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/blktap/drivers/Makefile
+++ xen-3.0.3-testing/tools/blktap/drivers/Makefile
@@ -10,7 +10,6 @@ QCOW_UTIL = img2qcow qcow2raw qcow-cr
INSTALL_DIR = /usr/sbin
LIBAIO_DIR = ../../libaio/src
-CFLAGS += -Werror
CFLAGS += -Wno-unused
CFLAGS += -fno-strict-aliasing
CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
Index: xen-3.0.3-testing/tools/console/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/console/Makefile
+++ xen-3.0.3-testing/tools/console/Makefile
@@ -9,7 +9,7 @@ INSTALL = install
INSTALL_PROG = $(INSTALL) -m0755
INSTALL_DIR = $(INSTALL) -d -m0755
-CFLAGS += -Werror -g
+CFLAGS += -Werror
CFLAGS += -I $(XEN_LIBXC)
CFLAGS += -I $(XEN_XENSTORE)
Index: xen-3.0.3-testing/tools/ioemu/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/ioemu/Makefile
+++ xen-3.0.3-testing/tools/ioemu/Makefile
@@ -8,7 +8,7 @@ include $(XEN_ROOT)/tools/Rules.mk
.PHONY: all clean distclean dvi info install install-doc tar tarbin \
speed test test2 html dvi info
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
+CFLAGS+=-Wall -fno-strict-aliasing -I.
ifdef CONFIG_DARWIN
CFLAGS+= -mdynamic-no-pic
endif
Index: xen-3.0.3-testing/tools/xenstore/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/xenstore/Makefile
+++ xen-3.0.3-testing/tools/xenstore/Makefile
@@ -11,7 +11,7 @@ INSTALL_PROG = $(INSTALL) -m0755
INSTALL_DIR = $(INSTALL) -d -m0755
PROFILE=#-pg
-BASECFLAGS=-Wall -g -Werror
+BASECFLAGS=-Wall -Werror
# Make gcc generate dependencies.
BASECFLAGS += -Wp,-MD,.$(@F).d
PROG_DEP = .*.d
Index: xen-3.0.3-testing/Config.mk
===================================================================
--- xen-3.0.3-testing.orig/Config.mk
+++ xen-3.0.3-testing/Config.mk
@@ -10,7 +10,7 @@ XEN_TARGET_X86_PAE ?= n
# 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)
AS = $(CROSS_COMPILE)as
LD = $(CROSS_COMPILE)ld