Generate gdbstub-xml.c only when needed

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>

diff --git a/Makefile.target b/Makefile.target
index 191d9793323889147ba38c3d73f340c964da010b..debe0e4c82a5f83639a6e3203157906f8dbc4efb 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -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)$@")

diff --git a/configure b/configure
index 0cb4326559b023c425a07b3d78993aaad5031b82..5c09c0534eff5d070d7c4c4ed041f23414233dc7 100755 (executable)
--- a/configure
+++ b/configure
@@ -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)

diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
index 413361a022e72d5833ec105c4010ae76512745b7..46d4aa2d71039eea404217ec9578bd1057ece061 100644 (file)
--- a/default-configs/arm-linux-user.mak
+++ b/default-configs/arm-linux-user.mak
@@ -1 +1,3 @@
 # Default configuration for arm-linux-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 372a549722287db0560648b66df1ab6726c8e85b..2786138b277e052f1abe7339ce7665a40423316b 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for arm-softmmu
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
index bf2ffe703851835722ac7a3e669f54453d6c7cfd..41d0cc4926e5cd8d2878b9214558397196fb274a 100644 (file)
--- a/default-configs/armeb-linux-user.mak
+++ b/default-configs/armeb-linux-user.mak
@@ -1 +1,3 @@
 # Default configuration for armeb-linux-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
index 06cd5ed7ed87e1409d1730854015e270cd9649db..f3487aa3d9ce615e046bc5c98c5c514143b6ff51 100644 (file)
--- a/default-configs/m68k-linux-user.mak
+++ b/default-configs/m68k-linux-user.mak
@@ -1 +1,3 @@
 # Default configuration for m68k-linux-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 572b8684b0a5ffe14d4e85d6997a2de17c00f35a..0faeb2cc7af3baf986760f410d7eae533fd32510 100644 (file)
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for m68k-softmmu
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppc-darwin-user.mak b/default-configs/ppc-darwin-user.mak
index 117f17638c4a44eeaa21f6c404af58de40ce3a9e..153ed12876236e097009e6d15ab243ed4d3836a2 100644 (file)
--- a/default-configs/ppc-darwin-user.mak
+++ b/default-configs/ppc-darwin-user.mak
@@ -1 +1,3 @@
 # Default configuration for ppc-darwin-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
index 6273df2930250e4921fac15f6efc81f757d91882..681a94598e620ea810369148462c07a10eb09fdf 100644 (file)
--- a/default-configs/ppc-linux-user.mak
+++ b/default-configs/ppc-linux-user.mak
@@ -1 +1,3 @@
 # Default configuration for ppc-linux-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index ba80ba24c1c300afc0849d61194f3e2c404ede5d..d28171b6cbd9130c65f96fd0b7e34a3a9bd35101 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for ppc-softmmu
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
index 422d3fbaeb87fd477c093a06ba7b810b56e0e392..089c08f3a0bbf4bb45df72757f454cccdd367d0a 100644 (file)
--- a/default-configs/ppc64-linux-user.mak
+++ b/default-configs/ppc64-linux-user.mak
@@ -1 +1,3 @@
 # Default configuration for ppc64-linux-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 0b72c70ae4bcfc40f0cba8e39a7518571bfc55e2..fe665242222f25575f3fd19231236b913237dcdf 100644 (file)
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for ppc64-softmmu
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
index 1c657ec9bb29d0723d30f1e7583f381d21d29f97..f038ffd97c59c6573deef720bbbceb36afb87b9e 100644 (file)
--- a/default-configs/ppc64abi32-linux-user.mak
+++ b/default-configs/ppc64abi32-linux-user.mak
@@ -1 +1,3 @@
 # Default configuration for ppc64abi32-linux-user
+
+CONFIG_GDBSTUB_XML=y

diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 951bfa0403852f6763d5efb1c704de7aff130122..bff13e605bcd91ebf0e0e6d78b2bbd140936438d 100644 (file)
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for ppcemb-softmmu
+
+CONFIG_GDBSTUB_XML=y