2 diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
3 --- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
4 +++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
7 # Define some default flags.
8 # NB. '-Wcast-qual' is nasty, so I omitted it.
9 -DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
10 +DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
11 DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
12 DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
13 DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
14 diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
15 --- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
16 +++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
19 -include $(XEN_TARGET_ARCH)/Makefile
21 -CFLAGS += -Werror -Wmissing-prototypes
22 +CFLAGS += -Wmissing-prototypes
23 CFLAGS += -I. $(CFLAGS_xeninclude)
25 # Needed for posix_fadvise64() in xc_linux.c
27 diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
28 --- Config.mk 2012-09-17 18:23:12.000000000 +0800
29 +++ Config.mk 2012-12-05 14:01:10.641260261 +0800
30 @@ -7,7 +7,6 @@ Drop .config
31 # fallback for older make
32 realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
34 --include $(XEN_ROOT)/.config
36 # A debug build of Xen and tools?
40 # Tools to run on system hosting the build
42 -HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
43 +HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer
44 HOSTCFLAGS += -fno-strict-aliasing
46 DISTDIR ?= $(XEN_ROOT)/dist
51 -CFLAGS += -Wall -Wstrict-prototypes
52 +CFLAGS += -Wstrict-prototypes
54 # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
55 # and is over-zealous with the printf format lint
56 diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile
57 --- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800
58 +++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800
66 CFLAGS += -fno-strict-aliasing
67 CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
68 diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk
69 --- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800
70 +++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800
72 include $(XEN_ROOT)/tools/Rules.mk
74 -CFLAGS += -Werror -Wmissing-prototypes
75 +CFLAGS += -Wmissing-prototypes
76 # (gcc 4.3x and later) -Wconversion -Wno-sign-conversion
77 diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile
78 --- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800
79 +++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800
81 XEN_ROOT=$(CURDIR)/../../..
82 include $(XEN_ROOT)/tools/Rules.mk
84 -#CFLAGS += -Werror -g -O0
87 CFLAGS += $(CFLAGS_libxenctrl)
89 diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile
90 --- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800
91 +++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800
96 -CFLAGS=-Wall -Werror -g -O -laio
97 +CFLAGS=-Wall -g -O -laio
101 diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk
102 --- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800
103 +++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800
105 include $(XEN_ROOT)/tools/Rules.mk
107 CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
108 -CFLAGS += -Werror -D_GNU_SOURCE
109 +CFLAGS += -D_GNU_SOURCE
110 LDFLAGS += -L../common/
112 PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
113 diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile
114 --- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800
115 +++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800
120 -CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
121 +CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
122 -Wno-declaration-after-statement -Wformat-nonliteral
125 diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile
126 --- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800
127 +++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800
130 .PHONY : all clean build-all
132 -CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
133 +CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
134 CFLAGS += -I$(SRC_PATH)
135 CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
136 QEMU_CFLAGS = $(CFLAGS)
137 diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk
138 --- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800
139 +++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800
143 # General compiler flags
144 -CFLAGS = -Werror -g3
147 # Generic project files
148 HDRS = $(wildcard *.h)
149 diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk
150 --- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800
151 +++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800
155 # General compiler flags
156 -CFLAGS = -Werror -g3
159 # Generic project files
160 HDRS = $(wildcard *.h)
161 diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile
162 --- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800
163 +++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800
168 -CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
169 +CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
170 LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
171 CFLAGS += -DHOST_$(XEN_OS)
173 diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk
174 --- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800
175 +++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800
179 CFLAGS += -fno-builtin -fno-common -Wredundant-decls
180 -CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
181 +CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
182 CFLAGS += -I$(BASEDIR)/include
184 # Prevent floating-point variables from creeping into Xen.
185 diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk
186 --- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800
187 +++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800
191 CFLAGS += -fno-builtin -fno-common -Wredundant-decls
192 -CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
193 +CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
194 CFLAGS += -I$(BASEDIR)/include
195 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
196 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
197 diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile
198 --- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800
199 +++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800
203 headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile
204 - for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
205 + for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
209 diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile
210 --- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800
211 +++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800
213 XEN_ROOT=$(CURDIR)/../../../..
214 include $(XEN_ROOT)/tools/Rules.mk
218 CFLAGS += $(CFLAGS_libxenctrl)
219 CFLAGS += $(CFLAGS_libxenguest)
220 CFLAGS += $(CFLAGS_libxenstore)
221 diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile
222 --- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800
223 +++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800
225 XEN_ROOT=$(CURDIR)/../../..
226 include $(XEN_ROOT)/tools/Rules.mk
231 CFLAGS += $(CFLAGS_libxenctrl)
232 CFLAGS += $(CFLAGS_xeninclude)
233 diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile
234 --- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800
235 +++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800
237 XEN_ROOT=$(CURDIR)/../../..
238 include $(XEN_ROOT)/tools/Rules.mk
243 CFLAGS += $(CFLAGS_libxenctrl)
244 CFLAGS += $(CFLAGS_libxenguest)