mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate gdbstub-xml.c only when needed

Browse Source 
First user of new config-devices.mak

Patchworks-ID: 35198
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-07 02:41:04 +02:00 committed by Anthony Liguori
parent fe0d4d3f77
commit 3d0f151783
14 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.target
View File

@ -91,7 +91,7 @@ ifdef CONFIG_LINUX_USER
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
elfload.o linuxload.o uaccess.o gdbstub.o gdbstub-xml.o
elfload.o linuxload.o uaccess.o gdbstub.o
obj-$(TARGET_HAS_BFLT) += flatload.o
obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
@ -125,7 +125,7 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
LIBS+=-lmx
obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
gdbstub.o gdbstub-xml.o
gdbstub.o
obj-i386-y += ioport-user.o
@ -142,7 +142,7 @@ VPATH+=:$(SRC_PATH)/bsd-user
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \
gdbstub.o gdbstub-xml.o uaccess.o
gdbstub.o uaccess.o
obj-i386-y += ioport-user.o
@ -155,7 +155,7 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_SOFTMMU
obj-y = vl.o monitor.o pci.o isa_mmio.o machine.o \
gdbstub.o gdbstub-xml.o
gdbstub.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
@ -306,16 +306,14 @@ ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # CONFIG_SOFTMMU
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)
$(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
ifeq ($(TARGET_XML_FILES),)
$(call quiet-command,rm -f $@ && echo > $@," GEN $(TARGET_DIR)$@")
else
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
endif
qemu-options.h: $(SRC_PATH)/qemu-options.hx
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")

2
configure vendored
View File

@ -2302,8 +2302,8 @@ if test ! -z "$gdb_xml_files" ; then
for x in $gdb_xml_files; do
list="$list $source_path/gdb-xml/$x"
done
echo "TARGET_XML_FILES=$list" >> $config_target_mak
fi
echo "TARGET_XML_FILES=$list" >> $config_target_mak
case "$target_arch2" in
arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)

2
default-configs/arm-linux-user.mak
View File

@ -1 +1,3 @@
# Default configuration for arm-linux-user
CONFIG_GDBSTUB_XML=y

2
default-configs/arm-softmmu.mak
View File

@ -1 +1,3 @@
# Default configuration for arm-softmmu
CONFIG_GDBSTUB_XML=y

2
default-configs/armeb-linux-user.mak
View File

@ -1 +1,3 @@
# Default configuration for armeb-linux-user
CONFIG_GDBSTUB_XML=y

2
default-configs/m68k-linux-user.mak
View File

@ -1 +1,3 @@
# Default configuration for m68k-linux-user
CONFIG_GDBSTUB_XML=y

2
default-configs/m68k-softmmu.mak
View File

@ -1 +1,3 @@
# Default configuration for m68k-softmmu
CONFIG_GDBSTUB_XML=y

2
default-configs/ppc-darwin-user.mak
View File

@ -1 +1,3 @@
# Default configuration for ppc-darwin-user
CONFIG_GDBSTUB_XML=y

2
default-configs/ppc-linux-user.mak
View File

@ -1 +1,3 @@
# Default configuration for ppc-linux-user
CONFIG_GDBSTUB_XML=y

2
default-configs/ppc-softmmu.mak
View File

@ -1 +1,3 @@
# Default configuration for ppc-softmmu
CONFIG_GDBSTUB_XML=y

2
default-configs/ppc64-linux-user.mak
View File

@ -1 +1,3 @@
# Default configuration for ppc64-linux-user
CONFIG_GDBSTUB_XML=y

2
default-configs/ppc64-softmmu.mak
View File

@ -1 +1,3 @@
# Default configuration for ppc64-softmmu
CONFIG_GDBSTUB_XML=y

2
default-configs/ppc64abi32-linux-user.mak
View File

@ -1 +1,3 @@
# Default configuration for ppc64abi32-linux-user
CONFIG_GDBSTUB_XML=y

2
default-configs/ppcemb-softmmu.mak
View File

@ -1 +1,3 @@
# Default configuration for ppcemb-softmmu
CONFIG_GDBSTUB_XML=y