Print this page
HVM-785 kvm-cmd build should use CTFMERGE and CTFCONVERT
| Split |
Close |
| Expand all |
| Collapse all |
--- old/./Makefile.target
+++ new/./Makefile.target
1 1 # Copyright 2011 QEMU contributors
2 2 # Portions Copyright 2011 Joyent, Inc.
3 3 # -*- Mode: makefile -*-
4 4
5 5 GENERATED_HEADERS = config-target.h
6 6 CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
7 7 CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
8 8
9 9 include ../config-host.mak
10 10 include config-devices.mak
11 11 include config-target.mak
12 12 include $(SRC_PATH)/rules.mak
13 13 ifneq ($(HWDIR),)
14 14 include $(HWDIR)/config.mak
15 15 endif
16 16
17 17 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
18 18 $(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw)
19 19 QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H
20 20
21 21 include $(SRC_PATH)/Makefile.objs
22 22
23 23 ifdef CONFIG_USER_ONLY
24 24 # user emulator name
25 25 QEMU_PROG=qemu-$(TARGET_ARCH2)
26 26 else
27 27 # system emulator name
28 28 ifeq ($(TARGET_ARCH), i386)
29 29 QEMU_PROG=qemu$(EXESUF)
30 30 else
31 31 QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
32 32 endif
33 33 endif
34 34
35 35 PROGS=$(QEMU_PROG)
36 36 STPFILES=
37 37
38 38 ifndef CONFIG_HAIKU
39 39 LIBS+=-lm
40 40 endif
41 41
42 42 kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
43 43
44 44 CFLAGS += $(KVM_CFLAGS)
45 45
46 46 config-target.h: config-target.h-timestamp
47 47 config-target.h-timestamp: config-target.mak
48 48
49 49 ifdef CONFIG_SYSTEMTAP_TRACE
50 50 stap: $(QEMU_PROG).stp
51 51
52 52 ifdef CONFIG_USER_ONLY
53 53 TARGET_TYPE=user
54 54 else
55 55 TARGET_TYPE=system
56 56 endif
57 57
58 58 $(QEMU_PROG).stp:
59 59 $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool \
60 60 --$(TRACE_BACKEND) \
61 61 --binary $(bindir)/$(QEMU_PROG) \
62 62 --target-arch $(TARGET_ARCH) \
63 63 --target-type $(TARGET_TYPE) \
64 64 --stap < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp")
65 65 else
66 66 stap:
67 67 endif
68 68
69 69 all: $(PROGS) stap
70 70
71 71 # Dummy command so that make thinks it has done something
72 72 @true
73 73
74 74 #########################################################
75 75 # cpu emulator library
76 76 libobj-y = exec.o cpu-exec.o
77 77 libobj-$(CONFIG_NO_CPU_EMULATION) += fake-exec.o
78 78 libobj-$(CONFIG_CPU_EMULATION) += translate-all.o translate.o
79 79 libobj-$(CONFIG_CPU_EMULATION) += tcg/tcg.o
80 80 libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o
81 81 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
82 82 libobj-y += op_helper.o helper.o
83 83 ifeq ($(TARGET_BASE_ARCH), i386)
84 84 libobj-y += cpuid.o
85 85 endif
86 86 libobj-$(CONFIG_NEED_MMU) += mmu.o
87 87
88 88 libobj-$(CONFIG_KVM) += kvm-tpr-opt.o
89 89
90 90 libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
91 91
92 92 libobj-y += disas.o
93 93
94 94 $(libobj-y): $(GENERATED_HEADERS)
95 95
96 96 # libqemu
97 97
98 98 translate.o: translate.c cpu.h
99 99
100 100 translate-all.o: translate-all.c cpu.h
101 101
102 102 tcg/tcg.o: cpu.h
103 103
104 104 # HELPER_CFLAGS is used for all the code compiled with static register
105 105 # variables
106 106 op_helper.o cpu-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
107 107
108 108 # Note: this is a workaround. The real fix is to avoid compiling
109 109 # cpu_signal_handler() in cpu-exec.c.
110 110 signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
111 111
112 112 qemu-kvm-helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
113 113
114 114 #########################################################
115 115 # Linux user emulator target
116 116
117 117 ifdef CONFIG_LINUX_USER
118 118
119 119 $(call set-vpath, $(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR))
120 120
121 121 QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
122 122 obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
123 123 elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \
124 124 qemu-malloc.o $(oslib-obj-y)
125 125
126 126 obj-$(TARGET_HAS_BFLT) += flatload.o
127 127
128 128 obj-$(TARGET_I386) += vm86.o
129 129
130 130 obj-i386-y += ioport-user.o
131 131
132 132 nwfpe-obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
133 133 nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
134 134 obj-arm-y += $(addprefix nwfpe/, $(nwfpe-obj-y))
135 135 obj-arm-y += arm-semi.o
136 136
137 137 obj-m68k-y += m68k-sim.o m68k-semi.o
138 138
139 139 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
140 140
141 141 obj-y += $(addprefix ../libuser/, $(user-obj-y))
142 142 obj-y += $(addprefix ../libdis-user/, $(libdis-y))
143 143 obj-y += $(libobj-y)
144 144
145 145 endif #CONFIG_LINUX_USER
146 146
147 147 #########################################################
148 148 # Darwin user emulator target
149 149
150 150 ifdef CONFIG_DARWIN_USER
151 151
152 152 $(call set-vpath, $(SRC_PATH)/darwin-user)
153 153
154 154 QEMU_CFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)
155 155
156 156 # Leave some space for the regular program loading zone
157 157 LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
158 158
159 159 LIBS+=-lmx
160 160
161 161 obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
162 162 gdbstub.o
163 163
164 164 obj-i386-y += ioport-user.o
165 165
166 166 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
167 167
168 168 obj-y += $(addprefix ../libuser/, $(user-obj-y))
169 169 obj-y += $(addprefix ../libdis-user/, $(libdis-y))
170 170 obj-y += $(libobj-y)
171 171
172 172 endif #CONFIG_DARWIN_USER
173 173
174 174 #########################################################
175 175 # BSD user emulator target
176 176
177 177 ifdef CONFIG_BSD_USER
178 178
179 179 $(call set-vpath, $(SRC_PATH)/bsd-user)
180 180
181 181 QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
182 182
183 183 obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \
184 184 gdbstub.o uaccess.o
185 185
186 186 obj-i386-y += ioport-user.o
187 187
188 188 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
189 189
190 190 obj-y += $(addprefix ../libuser/, $(user-obj-y))
191 191 obj-y += $(addprefix ../libdis-user/, $(libdis-y))
192 192 obj-y += $(libobj-y)
193 193
194 194 endif #CONFIG_BSD_USER
195 195
196 196 #########################################################
197 197 # System emulator target
198 198 ifdef CONFIG_SOFTMMU
199 199
200 200 obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o
201 201 # virtio has to be here due to weird dependency between PCI and virtio-net.
202 202 # need to fix this properly
203 203 obj-$(CONFIG_NO_PCI) += pci-stub.o
204 204 obj-$(CONFIG_PCI) += pci.o
205 205 obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
206 206 obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
207 207 obj-y += vhost_net.o
208 208 obj-$(CONFIG_VHOST_NET) += vhost.o
209 209 obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o
210 210 obj-y += rwhandler.o
211 211 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
212 212 obj-$(CONFIG_NO_KVM) += kvm-stub.o
213 213
214 214 LIBS+=-lz
215 215
216 216 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
217 217 QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
218 218 QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
219 219 QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
220 220
221 221 # xen backend driver support
222 222 obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
223 223
224 224 # Inter-VM PCI shared memory
225 225 obj-$(CONFIG_KVM) += ivshmem.o
226 226
227 227 # Hardware support
228 228 obj-i386-y += vga.o
229 229 obj-i386-y += mc146818rtc.o i8259.o pc.o
230 230 obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o
231 231 obj-i386-y += vmmouse.o vmport.o hpet.o applesmc.o
232 232 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
233 233 obj-i386-y += extboot.o
234 234 obj-i386-y += debugcon.o multiboot.o
235 235 obj-i386-y += pc_piix.o
236 236 obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
237 237 obj-i386-y += testdev.o
238 238 obj-i386-y += acpi.o acpi_piix4.o
239 239
240 240 obj-i386-y += pcspk.o i8254.o
241 241 obj-i386-$(CONFIG_KVM_PIT) += i8254-kvm.o
242 242 obj-i386-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
243 243
244 244 # Hardware support
245 245 obj-ia64-y += ide.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
246 246 obj-ia64-y += fdc.o mc146818rtc.o serial.o i8259.o ipf.o
247 247 obj-ia64-y += cirrus_vga.o parallel.o acpi.o piix_pci.o
248 248 obj-ia64-y += usb-uhci.o
249 249 obj-ia64-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
250 250
251 251 # shared objects
252 252 obj-ppc-y = ppc.o
253 253 obj-ppc-y += vga.o
254 254 # PREP target
255 255 obj-ppc-y += i8259.o mc146818rtc.o
256 256 obj-ppc-y += ppc_prep.o
257 257 # OldWorld PowerMac
258 258 obj-ppc-y += ppc_oldworld.o
259 259 # NewWorld PowerMac
260 260 obj-ppc-y += ppc_newworld.o
261 261 # PowerPC 4xx boards
262 262 obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
263 263 obj-ppc-y += ppc440.o ppc440_bamboo.o
264 264 # PowerPC E500 boards
265 265 obj-ppc-y += ppce500_mpc8544ds.o
266 266 # PowerPC 440 Xilinx ML507 reference board.
267 267 obj-ppc-y += virtex_ml507.o
268 268 obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
269 269 obj-ppc-$(CONFIG_FDT) += device_tree.o
270 270
271 271 # Xilinx PPC peripherals
272 272 obj-ppc-y += xilinx_intc.o
273 273 obj-ppc-y += xilinx_timer.o
274 274 obj-ppc-y += xilinx_uartlite.o
275 275 obj-ppc-y += xilinx_ethlite.o
276 276
277 277 obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
278 278 obj-mips-y += pcspk.o i8254.o
279 279 obj-mips-y += acpi.o acpi_piix4.o
280 280 obj-mips-y += mips_addr.o mips_timer.o mips_int.o
281 281 obj-mips-y += vga.o i8259.o
282 282 obj-mips-y += g364fb.o jazz_led.o
283 283 obj-mips-y += gt64xxx.o mc146818rtc.o
284 284 obj-mips-y += cirrus_vga.o
285 285 obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
286 286
287 287 obj-microblaze-y = petalogix_s3adsp1800_mmu.o
288 288
289 289 obj-microblaze-y += microblaze_pic_cpu.o
290 290 obj-microblaze-y += xilinx_intc.o
291 291 obj-microblaze-y += xilinx_timer.o
292 292 obj-microblaze-y += xilinx_uartlite.o
293 293 obj-microblaze-y += xilinx_ethlite.o
294 294
295 295 obj-microblaze-$(CONFIG_FDT) += device_tree.o
296 296
297 297 # Boards
298 298 obj-cris-y = cris_pic_cpu.o
299 299 obj-cris-y += cris-boot.o
300 300 obj-cris-y += etraxfs.o axis_dev88.o
301 301 obj-cris-y += axis_dev88.o
302 302
303 303 # IO blocks
304 304 obj-cris-y += etraxfs_dma.o
305 305 obj-cris-y += etraxfs_pic.o
306 306 obj-cris-y += etraxfs_eth.o
307 307 obj-cris-y += etraxfs_timer.o
308 308 obj-cris-y += etraxfs_ser.o
309 309
310 310 ifeq ($(TARGET_ARCH), sparc64)
311 311 obj-sparc-y = sun4u.o apb_pci.o
312 312 obj-sparc-y += vga.o
313 313 obj-sparc-y += mc146818rtc.o
314 314 obj-sparc-y += cirrus_vga.o
315 315 else
316 316 obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
317 317 obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
318 318 obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
319 319
320 320 # GRLIB
321 321 obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
322 322 endif
323 323
324 324 obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
325 325 obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
326 326 obj-arm-y += versatile_pci.o
327 327 obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o
328 328 obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
329 329 obj-arm-y += pl061.o
330 330 obj-arm-y += arm-semi.o
331 331 obj-arm-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
332 332 obj-arm-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
333 333 obj-arm-y += gumstix.o
334 334 obj-arm-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o
335 335 obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
336 336 omap_gpio.o omap_intc.o omap_uart.o
337 337 obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
338 338 omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
339 339 obj-arm-y += omap_sx1.o palm.o tsc210x.o
340 340 obj-arm-y += nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
341 341 obj-arm-y += mst_fpga.o mainstone.o
342 342 obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o
343 343 obj-arm-y += framebuffer.o
344 344 obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
345 345 obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
346 346 obj-arm-y += syborg_virtio.o
347 347
348 348 obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
349 349 obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o
350 350 obj-sh4-y += ide/mmio.o
351 351
352 352 obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
353 353 obj-m68k-y += m68k-semi.o dummy_m68k.o
354 354
355 355 obj-s390x-y = s390-virtio-bus.o s390-virtio.o
356 356
357 357 obj-alpha-y = alpha_palcode.o
358 358
359 359 ifeq ($(TARGET_ARCH), ia64)
360 360 firmware.o: firmware.c
361 361 $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
362 362 endif
363 363
364 364 main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
365 365
366 366 monitor.o: hmp-commands.h qmp-commands.h
367 367
368 368 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
369 369
|
↓ open down ↓ |
369 lines elided |
↑ open up ↑ |
370 370 obj-y += $(addprefix ../, $(common-obj-y))
371 371 obj-y += $(addprefix ../libdis/, $(libdis-y))
372 372 obj-y += $(libobj-y)
373 373 obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
374 374
375 375 endif # CONFIG_SOFTMMU
376 376
377 377 obj-y += $(addprefix ../, $(trace-obj-y))
378 378 obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
379 379
380 -#
381 -# Uh, ctfconvert and ctfmerge are in our paths... right... I promise I'll clean
382 -# this up.
383 -#
384 380
385 381 ifeq ($(TRACE_BACKEND),dtrace)
386 382 ifneq ($(strip $(CONFIG_SOLARIS)),)
387 383 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
388 384 $(call quiet-command, dtrace $(CONFIG_DTRACE_FLAGS) -o ../trace-dtrace.o -s ../trace-dtrace.dtrace -G $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)," LINK $(TARGET_DIR)$@.dtrace")
389 - $(call quiet-command, find ../ -type f -name '*.o' -exec ../ctf.sh '{}' \;)
385 + $(call CTFCONVERT_CMD)
390 386 $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../trace-dtrace.o)
391 - $(call CTFMERGE, $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
387 + $(call CTFMERGE_CMD, $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
392 388 else
393 389 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
394 390 $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
395 391 endif
396 392 else
397 393 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
398 394 $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
399 395 endif
400 396
401 397
402 398
403 399
404 400 gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
405 401 $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
406 402
407 403 hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
408 404 $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
409 405
410 406 qmp-commands.h: $(SRC_PATH)/qmp-commands.hx
411 407 $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
412 408
413 409 clean:
414 410 rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
415 411 rm -f *.d */*.d tcg/*.o ide/*.o
416 412 rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c
417 413 ifdef CONFIG_SYSTEMTAP_TRACE
418 414 rm -f *.stp
419 415 endif
420 416
421 417 install: all
422 418 ifneq ($(PROGS),)
423 419 $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
424 420 ifneq ($(STRIP),)
425 421 $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
426 422 endif
427 423 endif
428 424 ifdef CONFIG_SYSTEMTAP_TRACE
429 425 $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"
430 426 $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"
431 427 endif
432 428
433 429 # Include automatically generated dependency files
434 430 -include $(wildcard *.d */*.d)
|
↓ open down ↓ |
33 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX