From 5f035c0716c3b6b310a736841b16088d984be917 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 5 Sep 2017 09:54:53 +0100 Subject: Share i386-linux target description between GDB and GDBserver The code on creating i386-linux target descriptions are quite similar between GDB and GDBserver, so this patch moves them into a shared file arch/i386.c. I didn't name it as i386-linux.c, because I want to reuse it to create other i386 non-linux target descriptions later. gdb: 2017-09-05 Yao Qi * Makefile.in (ALL_TARGET_OBS): Add i386.o. (SFILES): Add arch/i386.c. (HFILES_NO_SRCDIR): Add arch/i386.h. * arch/i386.c: New file. * arch/i386.h: New file. * arch/tdesc.h (allocate_target_description): Declare. (set_tdesc_architecture): Declare. (set_tdesc_osabi): Declare. * configure.tgt (i[34567]86-*-linux*): Add i386.o. * i386-linux-tdep.c: Don't include ../features/i386/32bit-XXX.c. include arch/i386.h. (i386_linux_read_description): Remove code and call i386_create_target_description. (set_tdesc_architecture): New function. (set_tdesc_osabi): New function. * target-descriptions.h (allocate_target_description): Remove. gdb/gdbserver: 2017-09-05 Yao Qi * Makefile.in (arch-i386.o): New rule. * configure.srv (i[34567]86-*-linux*): Add arch-i386.o. (x86_64-*-linux*): Likewise. * linux-x86-tdesc.c: Don't include ../features/i386/32bit-XXX.c, include arch/i386.h. (i386_linux_read_description): Remove code and call i386_create_target_description. * tdesc.c (allocate_target_description): New function. * tdesc.h (set_tdesc_architecture): Remove declaration. (set_tdesc_osabi): Likewise. --- gdb/target-descriptions.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gdb/target-descriptions.c') diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 6135e0d99ee..7a8dac0e93b 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -1823,6 +1823,15 @@ set_tdesc_property (struct target_desc *target_desc, VEC_safe_push (property_s, target_desc->properties, &new_prop); } +/* See arch/tdesc.h. */ + +void +set_tdesc_architecture (struct target_desc *target_desc, + const char *name) +{ + set_tdesc_architecture (target_desc, bfd_scan_arch (name)); +} + void set_tdesc_architecture (struct target_desc *target_desc, const struct bfd_arch_info *arch) @@ -1830,6 +1839,14 @@ set_tdesc_architecture (struct target_desc *target_desc, target_desc->arch = arch; } +/* See arch/tdesc.h. */ + +void +set_tdesc_osabi (struct target_desc *target_desc, const char *name) +{ + set_tdesc_osabi (target_desc, osabi_from_tdesc_string (name)); +} + void set_tdesc_osabi (struct target_desc *target_desc, enum gdb_osabi osabi) { -- cgit v1.2.1