From 82c40d4b1deb252f2d17ff74f3fae6ae8cdd0383 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 7 Jul 2015 16:58:19 +0100 Subject: [PATCH] Set architecture to arm in arm-*.xml files This patch is to add the following line to various arm target description xml files, arm in order to fix problems I've seen on aarch64 multi-arch debugging, detach^M Detaching from program: build-gdb/gdb/testsuite/gdb.base/attach, process 17145^M (gdb) PASS: gdb.base/attach.exp: attach1 detach file^M No executable file now.^M Architecture of file not recognized.^M (gdb) FAIL: gdb.base/attach.exp: attach1, purging symbols after detach Without this patch, struct target_desc *tdesc_* are not initialised properly, that is, fields arch and osabi in 'struct target_desc' are not set properly. This doesn't cause any problems on single arch debugging, because arch-utils.c:gdbarch_info_fill will guess correctly. However, in multi-arch debugging, gdbarch_info_fill gets the aarch64 arch, but the target description is for arm (because the current inferior is 32-bit arm). It is a surprise to me we didn't set architecture to "arm" before in *.xml files, and I didn't find out why didn't do so. AFAICS, gdb/features/arm-with-iwmmxt.xml was added firstly (in patch https://sourceware.org/ml/gdb-patches/2007-01/msg00593.html) which had iwmmxt, however, afterwards, architecture isn't set anymore in features/arm-*.xml files (in patches https://sourceware.org/ml/gdb-patches/2009-07/msg00689.html and https://sourceware.org/ml/gdb-patches/2010-08/msg00225.html). gdb: 2015-07-07 Yao Qi * features/arm-with-m-fpa-layout.xml: Set architecture to arm. * features/arm-with-m-fpa-layout.c: Regenerated. * features/arm-with-m-vfp-d16.xml: Likewise. * features/arm-with-m-vfp-d16.c: Regenerated. * features/arm-with-m.xml: Likewise. * features/arm-with-m.c: Regenerated. * features/arm-with-neon.xml: Likewise. * features/arm-with-neon.c: Regenerated. * features/arm-with-vfpv2.xml: Likewise. * features/arm-with-vfpv2.c: Regenerated. * features/arm-with-vfpv3.xml: Likewise. * features/arm-with-vfpv3.c: Regenerated. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/features/arm-with-m-fpa-layout.c | 2 ++ gdb/features/arm-with-m-fpa-layout.xml | 1 + gdb/features/arm-with-m-vfp-d16.c | 2 ++ gdb/features/arm-with-m-vfp-d16.xml | 1 + gdb/features/arm-with-m.c | 2 ++ gdb/features/arm-with-m.xml | 1 + gdb/features/arm-with-neon.c | 2 ++ gdb/features/arm-with-neon.xml | 1 + gdb/features/arm-with-vfpv2.c | 2 ++ gdb/features/arm-with-vfpv2.xml | 1 + gdb/features/arm-with-vfpv3.c | 2 ++ gdb/features/arm-with-vfpv3.xml | 1 + 13 files changed, 33 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c1f3994664..680f96c6e8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2015-07-07 Yao Qi + + * features/arm-with-m-fpa-layout.xml: Set architecture to arm. + * features/arm-with-m-fpa-layout.c: Regenerated. + * features/arm-with-m-vfp-d16.xml: Likewise. + * features/arm-with-m-vfp-d16.c: Regenerated. + * features/arm-with-m.xml: Likewise. + * features/arm-with-m.c: Regenerated. + * features/arm-with-neon.xml: Likewise. + * features/arm-with-neon.c: Regenerated. + * features/arm-with-vfpv2.xml: Likewise. + * features/arm-with-vfpv2.c: Regenerated. + * features/arm-with-vfpv3.xml: Likewise. + * features/arm-with-vfpv3.c: Regenerated. + 2015-07-07 Yao Qi * aarch32-linux-nat.h (VFP_REGS_SIZE): New macro, moved from diff --git a/gdb/features/arm-with-m-fpa-layout.c b/gdb/features/arm-with-m-fpa-layout.c index bc51f05211..f720614959 100644 --- a/gdb/features/arm-with-m-fpa-layout.c +++ b/gdb/features/arm-with-m-fpa-layout.c @@ -12,6 +12,8 @@ initialize_tdesc_arm_with_m_fpa_layout (void) struct target_desc *result = allocate_target_description (); struct tdesc_feature *feature; + set_tdesc_architecture (result, bfd_scan_arch ("arm")); + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile"); tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int"); tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int"); diff --git a/gdb/features/arm-with-m-fpa-layout.xml b/gdb/features/arm-with-m-fpa-layout.xml index 7700666089..aab180673f 100644 --- a/gdb/features/arm-with-m-fpa-layout.xml +++ b/gdb/features/arm-with-m-fpa-layout.xml @@ -10,6 +10,7 @@ +arm diff --git a/gdb/features/arm-with-m-vfp-d16.c b/gdb/features/arm-with-m-vfp-d16.c index a0da583f43..069baac4db 100644 --- a/gdb/features/arm-with-m-vfp-d16.c +++ b/gdb/features/arm-with-m-vfp-d16.c @@ -12,6 +12,8 @@ initialize_tdesc_arm_with_m_vfp_d16 (void) struct target_desc *result = allocate_target_description (); struct tdesc_feature *feature; + set_tdesc_architecture (result, bfd_scan_arch ("arm")); + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile"); tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int"); tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int"); diff --git a/gdb/features/arm-with-m-vfp-d16.xml b/gdb/features/arm-with-m-vfp-d16.xml index 315d1a8d33..0586017ef5 100644 --- a/gdb/features/arm-with-m-vfp-d16.xml +++ b/gdb/features/arm-with-m-vfp-d16.xml @@ -7,6 +7,7 @@ + arm diff --git a/gdb/features/arm-with-m.c b/gdb/features/arm-with-m.c index 8e27a80789..64d31bb9c6 100644 --- a/gdb/features/arm-with-m.c +++ b/gdb/features/arm-with-m.c @@ -12,6 +12,8 @@ initialize_tdesc_arm_with_m (void) struct target_desc *result = allocate_target_description (); struct tdesc_feature *feature; + set_tdesc_architecture (result, bfd_scan_arch ("arm")); + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile"); tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int"); tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int"); diff --git a/gdb/features/arm-with-m.xml b/gdb/features/arm-with-m.xml index 6289472c30..a7aa2d2c3f 100644 --- a/gdb/features/arm-with-m.xml +++ b/gdb/features/arm-with-m.xml @@ -7,5 +7,6 @@ + arm diff --git a/gdb/features/arm-with-neon.c b/gdb/features/arm-with-neon.c index 61c9a3a360..d365c0fd3a 100644 --- a/gdb/features/arm-with-neon.c +++ b/gdb/features/arm-with-neon.c @@ -12,6 +12,8 @@ initialize_tdesc_arm_with_neon (void) struct target_desc *result = allocate_target_description (); struct tdesc_feature *feature; + set_tdesc_architecture (result, bfd_scan_arch ("arm")); + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core"); tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32"); diff --git a/gdb/features/arm-with-neon.xml b/gdb/features/arm-with-neon.xml index b5373374d0..777b8260b9 100644 --- a/gdb/features/arm-with-neon.xml +++ b/gdb/features/arm-with-neon.xml @@ -7,6 +7,7 @@ + arm diff --git a/gdb/features/arm-with-vfpv2.c b/gdb/features/arm-with-vfpv2.c index 78e3c81920..0ebbfef6e2 100644 --- a/gdb/features/arm-with-vfpv2.c +++ b/gdb/features/arm-with-vfpv2.c @@ -12,6 +12,8 @@ initialize_tdesc_arm_with_vfpv2 (void) struct target_desc *result = allocate_target_description (); struct tdesc_feature *feature; + set_tdesc_architecture (result, bfd_scan_arch ("arm")); + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core"); tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32"); diff --git a/gdb/features/arm-with-vfpv2.xml b/gdb/features/arm-with-vfpv2.xml index 6008124f02..fe7941ad27 100644 --- a/gdb/features/arm-with-vfpv2.xml +++ b/gdb/features/arm-with-vfpv2.xml @@ -7,6 +7,7 @@ + arm diff --git a/gdb/features/arm-with-vfpv3.c b/gdb/features/arm-with-vfpv3.c index e48ca79570..e235dfa762 100644 --- a/gdb/features/arm-with-vfpv3.c +++ b/gdb/features/arm-with-vfpv3.c @@ -12,6 +12,8 @@ initialize_tdesc_arm_with_vfpv3 (void) struct target_desc *result = allocate_target_description (); struct tdesc_feature *feature; + set_tdesc_architecture (result, bfd_scan_arch ("arm")); + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core"); tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32"); diff --git a/gdb/features/arm-with-vfpv3.xml b/gdb/features/arm-with-vfpv3.xml index e4eeb6aaf8..66d98ecded 100644 --- a/gdb/features/arm-with-vfpv3.xml +++ b/gdb/features/arm-with-vfpv3.xml @@ -7,6 +7,7 @@ + arm