提交 322f9d01 编写于 作者: J Jan Kiszka 提交者: Paul Brook

Drop CONFIG_GDBSTUB

This is no user-flippable switch, and no arch makes use of disabling
gdbstub support. So it's pointless to keep the related #ifdefs and
configure hunks around - and risking breakages like 711c410fdd again.
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
上级 c599710f
...@@ -317,7 +317,7 @@ CFLAGS+=-p ...@@ -317,7 +317,7 @@ CFLAGS+=-p
endif endif
OBJS= main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \ OBJS= main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \
elfload.o linuxload.o uaccess.o envlist.o elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o
LIBS+= $(PTHREADLIBS) LIBS+= $(PTHREADLIBS)
LIBS+= $(CLOCKLIBS) LIBS+= $(CLOCKLIBS)
ifdef TARGET_HAS_BFLT ifdef TARGET_HAS_BFLT
...@@ -340,10 +340,6 @@ ifeq ($(TARGET_ARCH), m68k) ...@@ -340,10 +340,6 @@ ifeq ($(TARGET_ARCH), m68k)
OBJS+= m68k-sim.o m68k-semi.o OBJS+= m68k-sim.o m68k-semi.o
endif endif
ifdef CONFIG_GDBSTUB
OBJS+=gdbstub.o gdbstub-xml.o
endif
OBJS+= libqemu.a OBJS+= libqemu.a
# Note: this is a workaround. The real fix is to avoid compiling # Note: this is a workaround. The real fix is to avoid compiling
...@@ -373,14 +369,11 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000 ...@@ -373,14 +369,11 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
LIBS+=-lmx LIBS+=-lmx
OBJS= main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o OBJS= main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
gdbstub.o gdbstub-xml.o
OBJS+= libqemu.a OBJS+= libqemu.a
ifdef CONFIG_GDBSTUB
OBJS+=gdbstub.o gdbstub-xml.o
endif
# Note: this is a workaround. The real fix is to avoid compiling # Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c. # cpu_signal_handler() in cpu-exec.c.
signal.o: CFLAGS += $(HELPER_CFLAGS) signal.o: CFLAGS += $(HELPER_CFLAGS)
...@@ -476,15 +469,12 @@ LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld ...@@ -476,15 +469,12 @@ LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld
endif endif
endif endif
OBJS= main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o OBJS= main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \
gdbstub.o gdbstub-xml.o
OBJS+= uaccess.o OBJS+= uaccess.o
OBJS+= libqemu.a OBJS+= libqemu.a
ifdef CONFIG_GDBSTUB
OBJS+=gdbstub.o
endif
# Note: this is a workaround. The real fix is to avoid compiling # Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c. # cpu_signal_handler() in cpu-exec.c.
signal.o: CFLAGS += $(HELPER_CFLAGS) signal.o: CFLAGS += $(HELPER_CFLAGS)
...@@ -498,7 +488,8 @@ endif #CONFIG_BSD_USER ...@@ -498,7 +488,8 @@ endif #CONFIG_BSD_USER
# System emulator target # System emulator target
ifndef CONFIG_USER_ONLY ifndef CONFIG_USER_ONLY
OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o dma-helpers.o OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o dma-helpers.o \
gdbstub.o gdbstub-xml.o
# virtio has to be here due to weird dependency between PCI and virtio-net. # virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly # need to fix this properly
OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
...@@ -686,9 +677,6 @@ ifeq ($(TARGET_BASE_ARCH), m68k) ...@@ -686,9 +677,6 @@ ifeq ($(TARGET_BASE_ARCH), m68k)
OBJS+= an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o OBJS+= an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
OBJS+= m68k-semi.o dummy_m68k.o OBJS+= m68k-semi.o dummy_m68k.o
endif endif
ifdef CONFIG_GDBSTUB
OBJS+=gdbstub.o gdbstub-xml.o
endif
ifdef CONFIG_COCOA ifdef CONFIG_COCOA
COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
ifdef CONFIG_COREAUDIO ifdef CONFIG_COREAUDIO
......
...@@ -159,7 +159,6 @@ strip_opt="yes" ...@@ -159,7 +159,6 @@ strip_opt="yes"
bigendian="no" bigendian="no"
mingw32="no" mingw32="no"
EXESUF="" EXESUF=""
gdbstub="yes"
slirp="yes" slirp="yes"
vde="yes" vde="yes"
fmod_lib="" fmod_lib=""
...@@ -1526,10 +1525,6 @@ if test -n "$sparc_cpu"; then ...@@ -1526,10 +1525,6 @@ if test -n "$sparc_cpu"; then
echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak
echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
fi fi
if test "$gdbstub" = "yes" ; then
echo "CONFIG_GDBSTUB=yes" >> $config_mak
echo "#define CONFIG_GDBSTUB 1" >> $config_h
fi
if test "$gprof" = "yes" ; then if test "$gprof" = "yes" ; then
echo "TARGET_GPROF=yes" >> $config_mak echo "TARGET_GPROF=yes" >> $config_mak
echo "#define HAVE_GPROF 1" >> $config_h echo "#define HAVE_GPROF 1" >> $config_h
......
...@@ -581,7 +581,6 @@ static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs) ...@@ -581,7 +581,6 @@ static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
} }
} }
#ifdef CONFIG_GDBSTUB
static void do_gdbserver(Monitor *mon, const char *device) static void do_gdbserver(Monitor *mon, const char *device)
{ {
if (!device) if (!device)
...@@ -596,7 +595,6 @@ static void do_gdbserver(Monitor *mon, const char *device) ...@@ -596,7 +595,6 @@ static void do_gdbserver(Monitor *mon, const char *device)
device); device);
} }
} }
#endif
static void do_watchdog_action(Monitor *mon, const char *action) static void do_watchdog_action(Monitor *mon, const char *action)
{ {
...@@ -1692,10 +1690,8 @@ static const mon_cmd_t mon_cmds[] = { ...@@ -1692,10 +1690,8 @@ static const mon_cmd_t mon_cmds[] = {
"", "stop emulation", }, "", "stop emulation", },
{ "c|cont", "", do_cont, { "c|cont", "", do_cont,
"", "resume emulation", }, "", "resume emulation", },
#ifdef CONFIG_GDBSTUB
{ "gdbserver", "s?", do_gdbserver, { "gdbserver", "s?", do_gdbserver,
"[device]", "start gdbserver on given device (default 'tcp::1234'), stop with 'none'", }, "[device]", "start gdbserver on given device (default 'tcp::1234'), stop with 'none'", },
#endif
{ "x", "/l", do_memory_dump, { "x", "/l", do_memory_dump,
"/fmt addr", "virtual memory dump starting at 'addr'", }, "/fmt addr", "virtual memory dump starting at 'addr'", },
{ "xp", "/l", do_physical_memory_dump, { "xp", "/l", do_physical_memory_dump,
......
...@@ -4350,13 +4350,11 @@ static void tcg_cpu_exec(void) ...@@ -4350,13 +4350,11 @@ static void tcg_cpu_exec(void)
} }
if (cpu_can_run(env)) if (cpu_can_run(env))
ret = qemu_cpu_exec(env); ret = qemu_cpu_exec(env);
#ifndef CONFIG_GDBSTUB
if (ret == EXCP_DEBUG) { if (ret == EXCP_DEBUG) {
gdb_set_stop_cpu(env); gdb_set_stop_cpu(env);
debug_requested = 1; debug_requested = 1;
break; break;
} }
#endif
} }
} }
...@@ -4795,9 +4793,7 @@ static void termsig_setup(void) ...@@ -4795,9 +4793,7 @@ static void termsig_setup(void)
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)
{ {
#ifdef CONFIG_GDBSTUB
const char *gdbstub_dev = NULL; const char *gdbstub_dev = NULL;
#endif
uint32_t boot_devices_bitmap = 0; uint32_t boot_devices_bitmap = 0;
int i; int i;
int snapshot, linux_boot, net_boot; int snapshot, linux_boot, net_boot;
...@@ -5229,14 +5225,12 @@ int main(int argc, char **argv, char **envp) ...@@ -5229,14 +5225,12 @@ int main(int argc, char **argv, char **envp)
cpu_set_log(mask); cpu_set_log(mask);
} }
break; break;
#ifdef CONFIG_GDBSTUB
case QEMU_OPTION_s: case QEMU_OPTION_s:
gdbstub_dev = "tcp::" DEFAULT_GDBSTUB_PORT; gdbstub_dev = "tcp::" DEFAULT_GDBSTUB_PORT;
break; break;
case QEMU_OPTION_gdb: case QEMU_OPTION_gdb:
gdbstub_dev = optarg; gdbstub_dev = optarg;
break; break;
#endif
case QEMU_OPTION_L: case QEMU_OPTION_L:
bios_dir = optarg; bios_dir = optarg;
break; break;
...@@ -6023,13 +6017,11 @@ int main(int argc, char **argv, char **envp) ...@@ -6023,13 +6017,11 @@ int main(int argc, char **argv, char **envp)
} }
} }
#ifdef CONFIG_GDBSTUB
if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) { if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) {
fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n", fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n",
gdbstub_dev); gdbstub_dev);
exit(1); exit(1);
} }
#endif
if (loadvm) if (loadvm)
do_loadvm(cur_mon, loadvm); do_loadvm(cur_mon, loadvm);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册