From b319b0984b505e9a5e653c3da8ae7d5af76c8f28 Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Wed, 18 Apr 2018 21:01:22 +0100 Subject: [PATCH] Remove xml files from gdbserver For ports which use new target descriptions, remove the xml files from being built into gdbserver. gdbserver/ * configure.srv (aarch64*-*-linux*): Don't include xml. (i[34567]86-*-cygwin*): Likewise. (i[34567]86-*-linux*): Likewise. (i[34567]86-*-lynxos*): Likewise. (i[34567]86-*-mingw32ce*): Likewise. (i[34567]86-*-mingw*): Likewise. (i[34567]86-*-nto*): Likewise. (tic6x-*-uclinux): Likewise. (x86_64-*-linux*): Likewise. (x86_64-*-mingw*): Likewise. (x86_64-*-cygwin*): Likewise. --- gdb/gdbserver/ChangeLog | 14 ++++++++++++++ gdb/gdbserver/configure.srv | 28 ---------------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b88fc9f7062..9d2d049a3de 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,17 @@ +2018-04-18 Alan Hayward + + * configure.srv (aarch64*-*-linux*): Don't include xml. + (i[34567]86-*-cygwin*): Likewise. + (i[34567]86-*-linux*): Likewise. + (i[34567]86-*-lynxos*): Likewise. + (i[34567]86-*-mingw32ce*): Likewise. + (i[34567]86-*-mingw*): Likewise. + (i[34567]86-*-nto*): Likewise. + (tic6x-*-uclinux): Likewise. + (x86_64-*-linux*): Likewise. + (x86_64-*-mingw*): Likewise. + (x86_64-*-cygwin*): Likewise. + 2018-04-18 Alan Hayward * tdesc.c: Remove xml parameter. diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 087fd31426b..ffeefb9b926 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -34,14 +34,6 @@ fi ipa_ppc_linux_regobj="powerpc-32l-ipa.o powerpc-altivec32l-ipa.o powerpc-cell32l-ipa.o powerpc-vsx32l-ipa.o powerpc-isa205-32l-ipa.o powerpc-isa205-altivec32l-ipa.o powerpc-isa205-vsx32l-ipa.o powerpc-e500l-ipa.o powerpc-64l-ipa.o powerpc-altivec64l-ipa.o powerpc-cell64l-ipa.o powerpc-vsx64l-ipa.o powerpc-isa205-64l-ipa.o powerpc-isa205-altivec64l-ipa.o powerpc-isa205-vsx64l-ipa.o" -srv_i386_32bit_xmlfiles="i386/32bit-core.xml i386/32bit-sse.xml i386/32bit-avx.xml i386/32bit-avx512.xml i386/32bit-mpx.xml i386/32bit-pkeys.xml" -srv_i386_64bit_xmlfiles="i386/64bit-core.xml i386/64bit-segments.xml i386/64bit-sse.xml i386/64bit-avx.xml i386/64bit-avx512.xml i386/x32-core.xml i386/64bit-mpx.xml i386/64bit-pkeys.xml" -srv_i386_xmlfiles="i386/i386.xml $srv_i386_32bit_xmlfiles" -srv_amd64_xmlfiles="i386/amd64.xml $srv_i386_64bit_xmlfiles" -srv_i386_linux_xmlfiles="i386/32bit-linux.xml $srv_i386_32bit_xmlfiles" -srv_amd64_linux_xmlfiles="i386/64bit-linux.xml $srv_i386_64bit_xmlfiles" - - # Linux object files. This is so we don't have to repeat # these files over and over again. srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-waitpid.o linux-personality.o linux-namespaces.o fork-child.o fork-inferior.o" @@ -63,11 +55,6 @@ case "${target}" in srv_tgtobj="$srv_tgtobj arch/aarch64.o" srv_tgtobj="$srv_tgtobj linux-aarch64-tdesc.o" srv_tgtobj="${srv_tgtobj} $srv_linux_obj" - srv_xmlfiles="aarch64.xml" - srv_xmlfiles="${srv_xmlfiles} aarch64-core.xml" - srv_xmlfiles="${srv_xmlfiles} aarch64-fpu.xml" - srv_xmlfiles="${srv_xmlfiles} arm/arm-core.xml arm/arm-vfpv3.xml" - srv_xmlfiles="${srv_xmlfiles} arm/arm-with-neon.xml" srv_linux_regsets=yes srv_linux_thread_db=yes ipa_obj="linux-aarch64-ipa.o" @@ -121,13 +108,10 @@ case "${target}" in i[34567]86-*-cygwin*) srv_regobj="" srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o" srv_tgtobj="${srv_tgtobj} arch/i386.o" - srv_xmlfiles="$srv_i386_xmlfiles" ;; i[34567]86-*-linux*) srv_regobj="$srv_i386_linux_regobj" - srv_xmlfiles="$srv_i386_linux_xmlfiles" if test "$gdb_cv_i386_is_x86_64" = yes ; then srv_regobj="$srv_regobj $srv_amd64_linux_regobj" - srv_xmlfiles="${srv_xmlfiles} $srv_amd64_linux_xmlfiles" srv_tgtobj="amd64-linux-siginfo.o" fi srv_tgtobj="${srv_tgtobj} arch/i386.o" @@ -145,9 +129,6 @@ case "${target}" in i[34567]86-*-lynxos*) srv_regobj="" srv_tgtobj="lynx-low.o lynx-i386-low.o fork-child.o fork-inferior.o" srv_tgtobj="${srv_tgtobj} arch/i386.o" - srv_xmlfiles="i386/i386.xml" - srv_xmlfiles="${srv_xmlfiles} i386/32bit-core.xml" - srv_xmlfiles="${srv_xmlfiles} i386/32bit-sse.xml" srv_lynxos=yes ;; i[34567]86-*-mingw32ce*) @@ -155,7 +136,6 @@ case "${target}" in srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o" srv_tgtobj="${srv_tgtobj} arch/i386.o" srv_tgtobj="${srv_tgtobj} wincecompat.o" - srv_xmlfiles="$srv_i386_xmlfiles" # hostio_last_error implementation is in win32-low.c srv_hostio_err_objs="" srv_mingw=yes @@ -164,12 +144,10 @@ case "${target}" in i[34567]86-*-mingw*) srv_regobj="" srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o" srv_tgtobj="${srv_tgtobj} arch/i386.o" - srv_xmlfiles="$srv_i386_xmlfiles" srv_mingw=yes ;; i[34567]86-*-nto*) srv_regobj="" srv_tgtobj="nto-low.o nto-x86-low.o arch/i386.o" - srv_xmlfiles="$srv_i386_xmlfiles" srv_qnx="yes" ;; ia64-*-linux*) srv_regobj=reg-ia64.o @@ -370,9 +348,6 @@ case "${target}" in else srv_regobj="" fi - srv_xmlfiles="${srv_xmlfiles} tic6x-core.xml" - srv_xmlfiles="${srv_xmlfiles} tic6x-gp.xml" - srv_xmlfiles="${srv_xmlfiles} tic6x-c6xp.xml" srv_tgtobj="$srv_linux_obj linux-tic6x-low.o" srv_tgtobj="${srv_tgtobj} arch/tic6x.o" srv_linux_regsets=yes @@ -386,7 +361,6 @@ case "${target}" in srv_tgtobj="${srv_tgtobj} linux-btrace.o x86-linux.o" srv_tgtobj="${srv_tgtobj} x86-linux-dregs.o" srv_tgtobj="${srv_tgtobj} amd64-linux-siginfo.o" - srv_xmlfiles="$srv_i386_linux_xmlfiles $srv_amd64_linux_xmlfiles" srv_linux_usrregs=yes # This is for i386 progs. srv_linux_regsets=yes srv_linux_thread_db=yes @@ -397,13 +371,11 @@ case "${target}" in x86_64-*-mingw*) srv_regobj="" srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o" srv_tgtobj="${srv_tgtobj} arch/amd64.o" - srv_xmlfiles="$srv_i386_xmlfiles $srv_amd64_xmlfiles" srv_mingw=yes ;; x86_64-*-cygwin*) srv_regobj="" srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o" srv_tgtobj="${srv_tgtobj} arch/amd64.o" - srv_xmlfiles="$srv_i386_xmlfiles" ;; xtensa*-*-linux*) srv_regobj=reg-xtensa.o -- 2.30.2