Revision a558ee17
b/Makefile | ||
---|---|---|
16 | 16 |
|
17 | 17 |
VPATH=$(SRC_PATH):$(SRC_PATH)/hw |
18 | 18 |
|
19 |
CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
|
|
20 |
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
|
21 |
CPPFLAGS += -U_FORTIFY_SOURCE
|
|
19 |
QEMU_CFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
|
|
20 |
QEMU_CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
|
21 |
QEMU_CFLAGS += -U_FORTIFY_SOURCE
|
|
22 | 22 |
LIBS+=-lz |
23 | 23 |
|
24 | 24 |
ifdef BUILD_DOCS |
... | ... | |
105 | 105 |
AUDIO_PT = y |
106 | 106 |
endif |
107 | 107 |
ifdef CONFIG_FMOD |
108 |
audio/audio.o audio/fmodaudio.o: CPPFLAGS := $(FMOD_CFLAGS) $(CPPFLAGS)
|
|
108 |
audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS := $(FMOD_CFLAGS) $(QEMU_CFLAGS)
|
|
109 | 109 |
endif |
110 | 110 |
ifdef CONFIG_ESD |
111 | 111 |
AUDIO_PT = y |
... | ... | |
142 | 142 |
obj-$(CONFIG_IOTHREAD) += qemu-thread.o |
143 | 143 |
|
144 | 144 |
ifdef CONFIG_SLIRP |
145 |
CPPFLAGS+=-I$(SRC_PATH)/slirp
|
|
145 |
QEMU_CFLAGS+=-I$(SRC_PATH)/slirp
|
|
146 | 146 |
endif |
147 | 147 |
|
148 | 148 |
slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o |
... | ... | |
156 | 156 |
obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o |
157 | 157 |
obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o |
158 | 158 |
|
159 |
CPPFLAGS+=$(CURL_CFLAGS)
|
|
159 |
QEMU_CFLAGS+=$(CURL_CFLAGS)
|
|
160 | 160 |
LIBS+=$(CURL_LIBS) |
161 | 161 |
|
162 | 162 |
cocoa.o: cocoa.m |
... | ... | |
167 | 167 |
|
168 | 168 |
sdl.o: sdl.c keymaps.h sdl_keysym.h sdl_zoom.h |
169 | 169 |
|
170 |
sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: CFLAGS += $(SDL_CFLAGS) |
|
170 |
sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
|
|
171 | 171 |
|
172 | 172 |
acl.o: acl.h acl.c |
173 | 173 |
|
... | ... | |
175 | 175 |
|
176 | 176 |
vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h |
177 | 177 |
|
178 |
vnc.o: CFLAGS += $(VNC_TLS_CFLAGS) |
|
178 |
vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
|
|
179 | 179 |
|
180 | 180 |
vnc-tls.o: vnc-tls.c vnc.h |
181 | 181 |
|
... | ... | |
185 | 185 |
|
186 | 186 |
curses.o: curses.c keymaps.h curses_keys.h |
187 | 187 |
|
188 |
bt-host.o: CFLAGS += $(BLUEZ_CFLAGS) |
|
188 |
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
|
|
189 | 189 |
|
190 | 190 |
libqemu_common.a: $(obj-y) |
191 | 191 |
|
b/Makefile.hw | ||
---|---|---|
8 | 8 |
|
9 | 9 |
VPATH=$(SRC_PATH):$(SRC_PATH)/hw |
10 | 10 |
|
11 |
CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
|
|
12 |
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
|
13 |
CPPFLAGS+=-I$(SRC_PATH)/fpu
|
|
11 |
QEMU_CFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
|
|
12 |
QEMU_CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
|
13 |
QEMU_CFLAGS+=-I$(SRC_PATH)/fpu
|
|
14 | 14 |
|
15 | 15 |
obj-y = |
16 | 16 |
obj-y += virtio.o virtio-pci.o |
b/Makefile.target | ||
---|---|---|
3 | 3 |
|
4 | 4 |
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) |
5 | 5 |
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw |
6 |
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
|
|
6 |
QEMU_CFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
|
|
7 | 7 |
|
8 | 8 |
ifdef CONFIG_USER_ONLY |
9 | 9 |
# user emulator name |
... | ... | |
26 | 26 |
endif |
27 | 27 |
|
28 | 28 |
ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc) |
29 |
translate.o: CFLAGS := $(CFLAGS) $(call cc-option, $(CFLAGS), -fno-unit-at-a-time,)
|
|
29 |
translate.o: QEMU_CFLAGS := $(QEMU_CFLAGS) $(call cc-option, $(QEMU_CFLAGS), -fno-unit-at-a-time,)
|
|
30 | 30 |
endif |
31 | 31 |
|
32 | 32 |
ifeq ($(ARCH),sparc) |
... | ... | |
37 | 37 |
|
38 | 38 |
ifeq ($(ARCH),alpha) |
39 | 39 |
# Ensure there's only a single GP |
40 |
CFLAGS+=-msmall-data |
|
40 |
QEMU_CFLAGS+=-msmall-data
|
|
41 | 41 |
endif |
42 | 42 |
|
43 | 43 |
ifeq ($(ARCH),ia64) |
44 |
CFLAGS+=-mno-sdata |
|
44 |
QEMU_CFLAGS+=-mno-sdata
|
|
45 | 45 |
endif |
46 | 46 |
|
47 |
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
|
48 |
CPPFLAGS+=-U_FORTIFY_SOURCE
|
|
47 |
QEMU_CFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
|
48 |
QEMU_CFLAGS+=-U_FORTIFY_SOURCE
|
|
49 | 49 |
LIBS+=-lm |
50 | 50 |
ifdef CONFIG_SOLARIS |
51 | 51 |
ifdef CONFIG_NEEDS_LIBSUNMATH |
52 | 52 |
LIBS+=-lsunmath |
53 | 53 |
LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib |
54 |
CFLAGS+=-I/opt/SUNWspro/prod/include/cc |
|
54 |
QEMU_CFLAGS+=-I/opt/SUNWspro/prod/include/cc
|
|
55 | 55 |
endif |
56 | 56 |
endif |
57 | 57 |
|
58 |
kvm.o: CFLAGS+=$(KVM_CFLAGS) |
|
59 |
kvm-all.o: CFLAGS+=$(KVM_CFLAGS) |
|
58 |
kvm.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
|
|
59 |
kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
|
|
60 | 60 |
|
61 | 61 |
all: $(PROGS) |
62 | 62 |
# Dummy command so that make thinks it has done something |
... | ... | |
68 | 68 |
libobj-$(CONFIG_KQEMU) += kqemu.o |
69 | 69 |
# TCG code generator |
70 | 70 |
libobj-y += tcg/tcg.o tcg/tcg-runtime.o |
71 |
CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
|
|
71 |
QEMU_CFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
|
|
72 | 72 |
ifeq ($(ARCH),sparc64) |
73 |
CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
|
|
73 |
QEMU_CFLAGS+=-I$(SRC_PATH)/tcg/sparc
|
|
74 | 74 |
endif |
75 | 75 |
ifdef CONFIG_SOFTFLOAT |
76 | 76 |
libobj-y += fpu/softfloat.o |
77 | 77 |
else |
78 | 78 |
libobj-y += fpu/softfloat-native.o |
79 | 79 |
endif |
80 |
CPPFLAGS+=-I$(SRC_PATH)/fpu
|
|
80 |
QEMU_CFLAGS+=-I$(SRC_PATH)/fpu
|
|
81 | 81 |
libobj-y += op_helper.o helper.o |
82 | 82 |
|
83 | 83 |
ifeq ($(TARGET_BASE_ARCH), arm) |
... | ... | |
151 | 151 |
|
152 | 152 |
# HELPER_CFLAGS is used for all the code compiled with static register |
153 | 153 |
# variables |
154 |
op_helper.o: CFLAGS += $(HELPER_CFLAGS) |
|
154 |
op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
155 | 155 |
|
156 |
cpu-exec.o: CFLAGS += $(HELPER_CFLAGS) |
|
156 |
cpu-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
157 | 157 |
|
158 | 158 |
######################################################### |
159 | 159 |
# Linux user emulator target |
... | ... | |
161 | 161 |
ifdef CONFIG_LINUX_USER |
162 | 162 |
|
163 | 163 |
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) |
164 |
CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
|
|
164 |
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
|
|
165 | 165 |
|
166 | 166 |
# profiling code |
167 | 167 |
ifdef TARGET_GPROF |
168 | 168 |
LDFLAGS+=-p |
169 |
CFLAGS+=-p |
|
169 |
QEMU_CFLAGS+=-p
|
|
170 | 170 |
endif |
171 | 171 |
|
172 | 172 |
obj-y = main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \ |
... | ... | |
192 | 192 |
|
193 | 193 |
# Note: this is a workaround. The real fix is to avoid compiling |
194 | 194 |
# cpu_signal_handler() in cpu-exec.c. |
195 |
signal.o: CFLAGS += $(HELPER_CFLAGS) |
|
195 |
signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
196 | 196 |
|
197 | 197 |
ARLIBS=../libqemu_user.a libqemu.a |
198 | 198 |
endif #CONFIG_LINUX_USER |
... | ... | |
203 | 203 |
ifdef CONFIG_DARWIN_USER |
204 | 204 |
|
205 | 205 |
VPATH+=:$(SRC_PATH)/darwin-user |
206 |
CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)
|
|
206 |
QEMU_CFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)
|
|
207 | 207 |
|
208 | 208 |
# Leave some space for the regular program loading zone |
209 | 209 |
LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000 |
... | ... | |
215 | 215 |
|
216 | 216 |
# Note: this is a workaround. The real fix is to avoid compiling |
217 | 217 |
# cpu_signal_handler() in cpu-exec.c. |
218 |
signal.o: CFLAGS += $(HELPER_CFLAGS) |
|
218 |
signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
219 | 219 |
|
220 | 220 |
ARLIBS=libqemu.a |
221 | 221 |
|
... | ... | |
227 | 227 |
ifdef CONFIG_BSD_USER |
228 | 228 |
|
229 | 229 |
VPATH+=:$(SRC_PATH)/bsd-user |
230 |
CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
|
|
230 |
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
|
|
231 | 231 |
|
232 | 232 |
obj-y = main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \ |
233 | 233 |
gdbstub.o gdbstub-xml.o ioport-user.o |
... | ... | |
235 | 235 |
|
236 | 236 |
# Note: this is a workaround. The real fix is to avoid compiling |
237 | 237 |
# cpu_signal_handler() in cpu-exec.c. |
238 |
signal.o: CFLAGS += $(HELPER_CFLAGS) |
|
238 |
signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
239 | 239 |
|
240 | 240 |
ARLIBS=libqemu.a ../libqemu_user.a |
241 | 241 |
|
... | ... | |
281 | 281 |
sound-obj-$(CONFIG_CS4231A) += cs4231a.o |
282 | 282 |
|
283 | 283 |
ifdef CONFIG_ADLIB |
284 |
adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
|
|
284 |
adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0
|
|
285 | 285 |
endif |
286 | 286 |
|
287 | 287 |
ifdef CONFIG_VNC_TLS |
288 |
CPPFLAGS += $(VNC_TLS_CFLAGS)
|
|
288 |
QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
|
|
289 | 289 |
LIBS += $(VNC_TLS_LIBS) |
290 | 290 |
endif |
291 | 291 |
|
292 | 292 |
ifdef CONFIG_VNC_SASL |
293 |
CPPFLAGS += $(VNC_SASL_CFLAGS)
|
|
293 |
QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
|
|
294 | 294 |
LIBS += $(VNC_SASL_LIBS) |
295 | 295 |
endif |
296 | 296 |
|
... | ... | |
325 | 325 |
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o |
326 | 326 |
|
327 | 327 |
ifeq ($(TARGET_BASE_ARCH), i386) |
328 |
CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
|
|
328 |
QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
|
|
329 | 329 |
endif |
330 | 330 |
|
331 | 331 |
# shared objects |
... | ... | |
347 | 347 |
obj-ppc-$(CONFIG_KVM) += kvm_ppc.o |
348 | 348 |
|
349 | 349 |
ifeq ($(TARGET_BASE_ARCH), ppc) |
350 |
CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
|
|
350 |
QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
|
|
351 | 351 |
endif |
352 | 352 |
|
353 | 353 |
obj-ppc-$(CONFIG_FDT) += device_tree.o |
... | ... | |
363 | 363 |
obj-mips-y += vmware_vga.o |
364 | 364 |
|
365 | 365 |
ifeq ($(TARGET_BASE_ARCH), mips) |
366 |
CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
|
|
366 |
QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
|
|
367 | 367 |
endif |
368 | 368 |
|
369 | 369 |
obj-microblaze-y = petalogix_s3adsp1800_mmu.o |
... | ... | |
424 | 424 |
obj-arm-y += syborg_virtio.o |
425 | 425 |
|
426 | 426 |
ifeq ($(TARGET_BASE_ARCH), arm) |
427 |
CPPFLAGS += -DHAS_AUDIO
|
|
427 |
QEMU_CFLAGS += -DHAS_AUDIO
|
|
428 | 428 |
endif |
429 | 429 |
|
430 | 430 |
obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o |
... | ... | |
441 | 441 |
endif |
442 | 442 |
endif |
443 | 443 |
ifdef CONFIG_SLIRP |
444 |
CPPFLAGS+=-I$(SRC_PATH)/slirp
|
|
444 |
QEMU_CFLAGS+=-I$(SRC_PATH)/slirp
|
|
445 | 445 |
endif |
446 | 446 |
|
447 | 447 |
# specific flags are needed for non soft mmu emulator |
... | ... | |
455 | 455 |
endif |
456 | 456 |
endif |
457 | 457 |
ifdef TARGET_GPROF |
458 |
vl.o: CFLAGS+=-p |
|
458 |
vl.o: QEMU_CFLAGS+=-p
|
|
459 | 459 |
LDFLAGS+=-p |
460 | 460 |
endif |
461 | 461 |
|
... | ... | |
470 | 470 |
# profiling code |
471 | 471 |
ifdef TARGET_GPROF |
472 | 472 |
LDFLAGS+=-p |
473 |
main.o: CFLAGS+=-p |
|
473 |
main.o: QEMU_CFLAGS+=-p
|
|
474 | 474 |
endif |
475 | 475 |
|
476 |
vl.o: CFLAGS+=$(SDL_CFLAGS) |
|
476 |
vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
|
|
477 | 477 |
|
478 | 478 |
vl.o: qemu-options.h |
479 | 479 |
|
b/configure | ||
---|---|---|
18 | 18 |
trap "rm -f $TMPC $TMPO $TMPE ; exit" 0 2 3 15 |
19 | 19 |
|
20 | 20 |
compile_object() { |
21 |
$cc $CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null |
|
21 |
$cc $QEMU_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null
|
|
22 | 22 |
} |
23 | 23 |
|
24 | 24 |
compile_prog() { |
25 | 25 |
local_cflags="$1" |
26 | 26 |
local_ldflags="$2" |
27 |
$cc $CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null |
|
27 |
$cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null
|
|
28 | 28 |
} |
29 | 29 |
|
30 | 30 |
# default parameters |
... | ... | |
55 | 55 |
;; |
56 | 56 |
--cpu=*) cpu="$optarg" |
57 | 57 |
;; |
58 |
--extra-cflags=*) CFLAGS="$optarg $CFLAGS"
|
|
58 |
--extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS"
|
|
59 | 59 |
;; |
60 | 60 |
--extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS" |
61 | 61 |
;; |
... | ... | |
224 | 224 |
case $targetos in |
225 | 225 |
CYGWIN*) |
226 | 226 |
mingw32="yes" |
227 |
CFLAGS="-mno-cygwin $CFLAGS"
|
|
227 |
QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS"
|
|
228 | 228 |
audio_possible_drivers="sdl" |
229 | 229 |
;; |
230 | 230 |
MINGW32*) |
... | ... | |
277 | 277 |
[ "$is_x86_64" = "1" ] && cpu=x86_64 |
278 | 278 |
fi |
279 | 279 |
if [ "$cpu" = "x86_64" ] ; then |
280 |
CFLAGS="-arch x86_64 $CFLAGS"
|
|
280 |
QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS"
|
|
281 | 281 |
LDFLAGS="-arch x86_64 $LDFLAGS" |
282 | 282 |
else |
283 |
CFLAGS="-mdynamic-no-pic $CFLAGS"
|
|
283 |
QEMU_CFLAGS="-mdynamic-no-pic $QEMU_CFLAGS"
|
|
284 | 284 |
fi |
285 | 285 |
darwin_user="yes" |
286 | 286 |
cocoa="yes" |
... | ... | |
320 | 320 |
audio_drv_list="oss" |
321 | 321 |
fi |
322 | 322 |
audio_possible_drivers="oss sdl" |
323 |
CFLAGS="-std=gnu99 $CFLAGS"
|
|
323 |
QEMU_CFLAGS="-std=gnu99 $QEMU_CFLAGS"
|
|
324 | 324 |
LIBS="-lsocket -lnsl -lresolv $LIBS" |
325 | 325 |
;; |
326 | 326 |
AIX) |
... | ... | |
354 | 354 |
kqemu="yes" |
355 | 355 |
fi |
356 | 356 |
EXESUF=".exe" |
357 |
CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
|
|
357 |
QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
|
|
358 | 358 |
LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS" |
359 | 359 |
fi |
360 | 360 |
|
... | ... | |
515 | 515 |
|
516 | 516 |
# |
517 | 517 |
# If cpu ~= sparc and sparc_cpu hasn't been defined, plug in the right |
518 |
# CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit) |
|
518 |
# QEMU_CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
|
|
519 | 519 |
# |
520 | 520 |
host_guest_base="no" |
521 | 521 |
case "$cpu" in |
522 | 522 |
sparc) case $sparc_cpu in |
523 | 523 |
v7|v8) |
524 |
CFLAGS="-mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__ $CFLAGS"
|
|
524 |
QEMU_CFLAGS="-mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__ $QEMU_CFLAGS"
|
|
525 | 525 |
;; |
526 | 526 |
v8plus|v8plusa) |
527 |
CFLAGS="-mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $CFLAGS"
|
|
527 |
QEMU_CFLAGS="-mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $QEMU_CFLAGS"
|
|
528 | 528 |
;; |
529 | 529 |
*) # sparc_cpu not defined in the command line |
530 |
CFLAGS="-mcpu=ultrasparc -D__sparc_v8plus__ $CFLAGS"
|
|
530 |
QEMU_CFLAGS="-mcpu=ultrasparc -D__sparc_v8plus__ $QEMU_CFLAGS"
|
|
531 | 531 |
esac |
532 | 532 |
LDFLAGS="-m32 $LDFLAGS" |
533 |
CFLAGS="-m32 -ffixed-g2 -ffixed-g3 $CFLAGS"
|
|
533 |
QEMU_CFLAGS="-m32 -ffixed-g2 -ffixed-g3 $QEMU_CFLAGS"
|
|
534 | 534 |
if test "$solaris" = "no" ; then |
535 |
CFLAGS="-ffixed-g1 -ffixed-g6 $CFLAGS"
|
|
535 |
QEMU_CFLAGS="-ffixed-g1 -ffixed-g6 $QEMU_CFLAGS"
|
|
536 | 536 |
fi |
537 | 537 |
;; |
538 | 538 |
sparc64) |
539 |
CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__ $CFLAGS"
|
|
539 |
QEMU_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__ $QEMU_CFLAGS"
|
|
540 | 540 |
LDFLAGS="-m64 $LDFLAGS" |
541 |
CFLAGS="-ffixed-g5 -ffixed-g6 -ffixed-g7 $CFLAGS"
|
|
541 |
QEMU_CFLAGS="-ffixed-g5 -ffixed-g6 -ffixed-g7 $QEMU_CFLAGS"
|
|
542 | 542 |
if test "$solaris" != "no" ; then |
543 |
CFLAGS="-ffixed-g1 $CFLAGS"
|
|
543 |
QEMU_CFLAGS="-ffixed-g1 $QEMU_CFLAGS"
|
|
544 | 544 |
fi |
545 | 545 |
;; |
546 | 546 |
s390) |
547 |
CFLAGS="-march=z900 $CFLAGS"
|
|
547 |
QEMU_CFLAGS="-march=z900 $QEMU_CFLAGS"
|
|
548 | 548 |
;; |
549 | 549 |
i386) |
550 |
CFLAGS="-m32 $CFLAGS"
|
|
550 |
QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
|
|
551 | 551 |
LDFLAGS="-m32 $LDFLAGS" |
552 | 552 |
host_guest_base="yes" |
553 | 553 |
;; |
554 | 554 |
x86_64) |
555 |
CFLAGS="-m64 $CFLAGS"
|
|
555 |
QEMU_CFLAGS="-m64 $QEMU_CFLAGS"
|
|
556 | 556 |
LDFLAGS="-m64 $LDFLAGS" |
557 | 557 |
host_guest_base="yes" |
558 | 558 |
;; |
... | ... | |
588 | 588 |
echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" |
589 | 589 |
echo " --cc=CC use C compiler CC [$cc]" |
590 | 590 |
echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc." |
591 |
echo " --extra-cflags=CFLAGS append extra C compiler flags CFLAGS" |
|
591 |
echo " --extra-cflags=CFLAGS append extra C compiler flags QEMU_CFLAGS"
|
|
592 | 592 |
echo " --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS" |
593 | 593 |
echo " --make=MAKE use specified make [$make]" |
594 | 594 |
echo " --install=INSTALL use specified install [$install]" |
... | ... | |
1131 | 1131 |
kvm="no"; |
1132 | 1132 |
if [ -x "`which awk 2>/dev/null`" ] && \ |
1133 | 1133 |
[ -x "`which grep 2>/dev/null`" ]; then |
1134 |
kvmerr=`LANG=C $cc $CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \ |
|
1134 |
kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
|
|
1135 | 1135 |
| grep "error: " \ |
1136 | 1136 |
| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'` |
1137 | 1137 |
if test "$kvmerr" != "" ; then |
... | ... | |
1382 | 1382 |
# After here, no more $cc or $ld runs |
1383 | 1383 |
|
1384 | 1384 |
# default flags for all hosts |
1385 |
CFLAGS="-g -fno-strict-aliasing $CFLAGS" |
|
1385 |
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" |
|
1386 |
CFLAGS="-g $CFLAGS" |
|
1386 | 1387 |
if test "$debug" = "no" ; then |
1387 | 1388 |
CFLAGS="-O2 $CFLAGS" |
1388 | 1389 |
fi |
1389 |
CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls $CFLAGS"
|
|
1390 |
QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
|
|
1390 | 1391 |
LDFLAGS="-g $LDFLAGS" |
1391 | 1392 |
|
1392 | 1393 |
# Consult white-list to determine whether to enable werror |
... | ... | |
1402 | 1403 |
fi |
1403 | 1404 |
|
1404 | 1405 |
if test "$werror" = "yes" ; then |
1405 |
CFLAGS="-Werror $CFLAGS"
|
|
1406 |
QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
|
|
1406 | 1407 |
fi |
1407 | 1408 |
|
1408 | 1409 |
if test "$solaris" = "no" ; then |
... | ... | |
1440 | 1441 |
echo "C compiler $cc" |
1441 | 1442 |
echo "Host C compiler $host_cc" |
1442 | 1443 |
echo "CFLAGS $CFLAGS" |
1444 |
echo "QEMU_CFLAGS $QEMU_CFLAGS" |
|
1443 | 1445 |
echo "LDFLAGS $LDFLAGS" |
1444 | 1446 |
echo "make $make" |
1445 | 1447 |
echo "install $install" |
... | ... | |
1740 | 1742 |
if test "$sparse" = "yes" ; then |
1741 | 1743 |
echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak |
1742 | 1744 |
echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak |
1743 |
echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak |
|
1745 |
echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
|
|
1744 | 1746 |
fi |
1745 | 1747 |
echo "AR=$ar" >> $config_host_mak |
1746 | 1748 |
echo "OBJCOPY=$objcopy" >> $config_host_mak |
1747 | 1749 |
echo "LD=$ld" >> $config_host_mak |
1748 | 1750 |
echo "CFLAGS=$CFLAGS" >> $config_host_mak |
1751 |
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak |
|
1749 | 1752 |
echo "LDFLAGS=$LDFLAGS" >> $config_host_mak |
1750 | 1753 |
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak |
1751 | 1754 |
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak |
... | ... | |
2116 | 2119 |
rm -f $d/Makefile |
2117 | 2120 |
ln -s $source_path/Makefile.hw $d/Makefile |
2118 | 2121 |
echo "HWLIB=libqemuhw$hwlib.a" > $d/config.mak |
2119 |
echo "CPPFLAGS=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak
|
|
2122 |
echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak
|
|
2120 | 2123 |
done |
b/pc-bios/optionrom/Makefile | ||
---|---|---|
7 | 7 |
|
8 | 8 |
VPATH=$(SRC_PATH)/pc-bios/optionrom |
9 | 9 |
|
10 |
CPPFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
|
|
11 |
CPPFLAGS += -I$(SRC_PATH)
|
|
12 |
CPPFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector,"")
|
|
10 |
CFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin |
|
11 |
CFLAGS += -I$(SRC_PATH) |
|
12 |
CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector,"") |
|
13 | 13 |
|
14 | 14 |
build-all: multiboot.bin |
15 | 15 |
|
b/rules.mak | ||
---|---|---|
1 | 1 |
|
2 | 2 |
%.o: %.c |
3 |
$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
|
|
3 |
$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
|
|
4 | 4 |
|
5 | 5 |
%.o: %.S |
6 |
$(call quiet-command,$(CC) $(CPPFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
|
|
6 |
$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
|
|
7 | 7 |
|
8 | 8 |
%.o: %.m |
9 |
$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
|
|
9 |
$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
|
|
10 | 10 |
|
11 | 11 |
LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(1) $(ARLIBS_BEGIN) $(ARLIBS) $(ARLIBS_END) $(LIBS)," LINK $(TARGET_DIR)$@") |
12 | 12 |
|
Also available in: Unified diff