From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27892 invoked by alias); 1 Feb 2018 11:19:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 27875 invoked by uid 89); 1 Feb 2018 11:19:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,KAM_SHORT,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=taste X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 01 Feb 2018 11:19:52 +0000 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w11BJOY3025989 for ; Thu, 1 Feb 2018 06:19:50 -0500 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fv1m5h021-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 01 Feb 2018 06:19:49 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Feb 2018 11:14:47 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 1 Feb 2018 11:14:45 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w11BEilf48758946; Thu, 1 Feb 2018 11:14:44 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5044711C052; Thu, 1 Feb 2018 11:08:13 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 264DB11C04A; Thu, 1 Feb 2018 11:08:13 +0000 (GMT) Received: from ThinkPad (unknown [9.152.212.63]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 1 Feb 2018 11:08:13 +0000 (GMT) Date: Thu, 01 Feb 2018 11:19:00 -0000 From: Philipp Rudo To: Alan Hayward Cc: gdb-patches@sourceware.org, nd@arm.com Subject: Re: [PATCH] Move arch/tdesc.h to common/common-tdesc.h In-Reply-To: <97948063-b3db-fd3a-f62e-b552935cb8dd@arm.com> References: <97948063-b3db-fd3a-f62e-b552935cb8dd@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 18020111-0040-0000-0000-0000040B4B5D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18020111-0041-0000-0000-0000260EEB63 Message-Id: <20180201121443.43322674@ThinkPad> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-01_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802010149 X-IsSubscribed: yes X-SW-Source: 2018-02/txt/msg00004.txt.bz2 Hi Alan, the patch looks good to me. If it were for me, I would drop the extra 'common-' and call the file just common/tdesc.h ... On Wed, 31 Jan 2018 13:40:04 +0000 Alan Hayward wrote: > Following on from review comments for: > [PATCH v2 5/8] Use tdesc types in gdbserver tdesc >=20 > This patch simply moves arch/tdesc.h to common/tdesc.h. ... like stated here. But that's just my taste. When looking at the git lo= g in common/ I don't see any clear pattern for the current best practice in nami= ng the files. Thanks Philipp > The arch/ directory is for port specific code. > tdesc.h is not port specific, and is common to both > gdb and gdbserver. >=20 > Updated all the references to the file, including those > generated from xml. >=20 > I am adding this because my xml patch series will add a > common-tdesc.c file. >=20 > This patch contains no functional changes. >=20 > Tested by building for x86, ppc and aarch64. Ran unittests > for x86. Checked that my later patch series can apply on top. >=20 >=20 > 2018-01-31 Alan Hayward >=20 > gdb/ > * arch/aarch64.h: Use common-tdesc.h. > * arch/amd64.h: Likewise. > * arch/i386.c: Likewise. > * arch/i386.h: Likewise. > * arch/tic6x.c: Likewise. > * arch/tdesc.h: Move file from here... > * common/common-tdesc.h: ...to here. > * features/aarch64-core.c: Regenerate. > * features/aarch64-fpu.c: Regenerate. > * features/i386/32bit-avx.c: Regenerate. > * features/i386/32bit-avx512.c: Regenerate. > * features/i386/32bit-core.c: Regenerate. > * features/i386/32bit-linux.c: Regenerate. > * features/i386/32bit-mpx.c: Regenerate. > * features/i386/32bit-pkeys.c: Regenerate. > * features/i386/32bit-sse.c: Regenerate. > * features/i386/64bit-avx.c: Regenerate. > * features/i386/64bit-avx512.c: Regenerate. > * features/i386/64bit-core.c: Regenerate. > * features/i386/64bit-linux.c: Regenerate. > * features/i386/64bit-mpx.c: Regenerate. > * features/i386/64bit-pkeys.c: Regenerate. > * features/i386/64bit-segments.c: Regenerate. > * features/i386/64bit-sse.c: Regenerate. > * features/i386/x32-core.c: Regenerate. > * features/tic6x-c6xp.c: Regenerate. > * features/tic6x-core.c: Regenerate. > * features/tic6x-gp.c: Regenerate. > * target-descriptions.c: Use common-tdesc.h. > * target-descriptions.h: Likewise. >=20 > gdbserver/ > * tdesc.h: Use common-tdesc.h. > * tdesc.h: Likewise. >=20 > --- > gdb/arch/aarch64.h | 2 +- > gdb/arch/amd64.h | 2 +- > gdb/arch/i386.c | 2 +- > gdb/arch/i386.h | 2 +- > gdb/arch/tic6x.c | 2 +- > gdb/{arch/tdesc.h =3D> common/common-tdesc.h} | 0 > gdb/features/aarch64-core.c | 2 +- > gdb/features/aarch64-fpu.c | 2 +- > gdb/features/i386/32bit-avx.c | 2 +- > gdb/features/i386/32bit-avx512.c | 2 +- > gdb/features/i386/32bit-core.c | 2 +- > gdb/features/i386/32bit-linux.c | 2 +- > gdb/features/i386/32bit-mpx.c | 2 +- > gdb/features/i386/32bit-pkeys.c | 2 +- > gdb/features/i386/32bit-sse.c | 2 +- > gdb/features/i386/64bit-avx.c | 2 +- > gdb/features/i386/64bit-avx512.c | 2 +- > gdb/features/i386/64bit-core.c | 2 +- > gdb/features/i386/64bit-linux.c | 2 +- > gdb/features/i386/64bit-mpx.c | 2 +- > gdb/features/i386/64bit-pkeys.c | 2 +- > gdb/features/i386/64bit-segments.c | 2 +- > gdb/features/i386/64bit-sse.c | 2 +- > gdb/features/i386/x32-core.c | 2 +- > gdb/features/tic6x-c6xp.c | 2 +- > gdb/features/tic6x-core.c | 2 +- > gdb/features/tic6x-gp.c | 2 +- > gdb/gdbserver/tdesc.c | 24 ++++++++++++------------ > gdb/gdbserver/tdesc.h | 2 +- > gdb/target-descriptions.c | 28 ++++++++++++++---------= ----- > gdb/target-descriptions.h | 2 +- > 31 files changed, 54 insertions(+), 54 deletions(-) > rename gdb/{arch/tdesc.h =3D> common/common-tdesc.h} (100%) >=20 > diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h > index 1ca83114f6..418a46f628 100644 > --- a/gdb/arch/aarch64.h > +++ b/gdb/arch/aarch64.h > @@ -20,7 +20,7 @@ > #ifndef ARCH_AARCH64_H > #define ARCH_AARCH64_H >=20 > -#include "tdesc.h" > +#include "common-tdesc.h" >=20 > target_desc *aarch64_create_target_description (); >=20 > diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h > index b50051f698..17c044f425 100644 > --- a/gdb/arch/amd64.h > +++ b/gdb/arch/amd64.h > @@ -15,7 +15,7 @@ > You should have received a copy of the GNU General Public License > along with this program. If not, see .= */ >=20 > -#include "tdesc.h" > +#include "common-tdesc.h" > #include >=20 > target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32, > diff --git a/gdb/arch/i386.c b/gdb/arch/i386.c > index d3e1eb90e0..d60196fc54 100644 > --- a/gdb/arch/i386.c > +++ b/gdb/arch/i386.c > @@ -16,7 +16,7 @@ > along with this program. If not, see .= */ >=20 > #include "i386.h" > -#include "tdesc.h" > +#include "common-tdesc.h" > #include "x86-xstate.h" > #include >=20 > diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h > index ffc34e3913..ba283c2bc2 100644 > --- a/gdb/arch/i386.h > +++ b/gdb/arch/i386.h > @@ -15,7 +15,7 @@ > You should have received a copy of the GNU General Public License > along with this program. If not, see .= */ >=20 > -#include "tdesc.h" > +#include "common-tdesc.h" > #include >=20 > target_desc *i386_create_target_description (uint64_t xcr0, bool is_linu= x); > diff --git a/gdb/arch/tic6x.c b/gdb/arch/tic6x.c > index 9fc36cd4ca..da3a656f78 100644 > --- a/gdb/arch/tic6x.c > +++ b/gdb/arch/tic6x.c > @@ -15,7 +15,7 @@ > You should have received a copy of the GNU General Public License > along with this program. If not, see .= */ >=20 > -#include "tdesc.h" > +#include "common-tdesc.h" > #include "tic6x.h" > #include "common/common-defs.h" >=20 > diff --git a/gdb/arch/tdesc.h b/gdb/common/common-tdesc.h > similarity index 100% > rename from gdb/arch/tdesc.h > rename to gdb/common/common-tdesc.h > diff --git a/gdb/features/aarch64-core.c b/gdb/features/aarch64-core.c > index 3707b7e055..b89f94b1ff 100644 > --- a/gdb/features/aarch64-core.c > +++ b/gdb/features/aarch64-core.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: aarch64-core.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_aarch64_core (struct target_desc *result, long regnum) > diff --git a/gdb/features/aarch64-fpu.c b/gdb/features/aarch64-fpu.c > index cac3981f7d..0d1449ce5b 100644 > --- a/gdb/features/aarch64-fpu.c > +++ b/gdb/features/aarch64-fpu.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: aarch64-fpu.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_aarch64_fpu (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/32bit-avx.c b/gdb/features/i386/32bit-avx.c > index 8a0c35655d..37bfd922ad 100644 > --- a/gdb/features/i386/32bit-avx.c > +++ b/gdb/features/i386/32bit-avx.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-avx.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_avx (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/32bit-avx512.c b/gdb/features/i386/32bit-a= vx512.c > index 39c7e9771a..d4c1983845 100644 > --- a/gdb/features/i386/32bit-avx512.c > +++ b/gdb/features/i386/32bit-avx512.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-avx512.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_avx512 (struct target_desc *result, long regnu= m) > diff --git a/gdb/features/i386/32bit-core.c b/gdb/features/i386/32bit-cor= e.c > index 294e86d81e..7909340537 100644 > --- a/gdb/features/i386/32bit-core.c > +++ b/gdb/features/i386/32bit-core.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-core.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_core (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/32bit-linux.c b/gdb/features/i386/32bit-li= nux.c > index 136e3d71b4..d3e18024e9 100644 > --- a/gdb/features/i386/32bit-linux.c > +++ b/gdb/features/i386/32bit-linux.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-linux.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_linux (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/32bit-mpx.c b/gdb/features/i386/32bit-mpx.c > index 8f1be3a60f..4c16713c9a 100644 > --- a/gdb/features/i386/32bit-mpx.c > +++ b/gdb/features/i386/32bit-mpx.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-mpx.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_mpx (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/32bit-pkeys.c b/gdb/features/i386/32bit-pk= eys.c > index 4ad7649915..76d38b9a1c 100644 > --- a/gdb/features/i386/32bit-pkeys.c > +++ b/gdb/features/i386/32bit-pkeys.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-pkeys.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_pkeys (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/32bit-sse.c b/gdb/features/i386/32bit-sse.c > index cf48960353..e52baf8a5c 100644 > --- a/gdb/features/i386/32bit-sse.c > +++ b/gdb/features/i386/32bit-sse.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 32bit-sse.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_32bit_sse (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/64bit-avx.c b/gdb/features/i386/64bit-avx.c > index d8e391423b..0cc8a4e16e 100644 > --- a/gdb/features/i386/64bit-avx.c > +++ b/gdb/features/i386/64bit-avx.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-avx.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_avx (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/64bit-avx512.c b/gdb/features/i386/64bit-a= vx512.c > index e103e43464..e281144a6a 100644 > --- a/gdb/features/i386/64bit-avx512.c > +++ b/gdb/features/i386/64bit-avx512.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-avx512.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_avx512 (struct target_desc *result, long regnu= m) > diff --git a/gdb/features/i386/64bit-core.c b/gdb/features/i386/64bit-cor= e.c > index 9e39ee42d9..e2f197fcce 100644 > --- a/gdb/features/i386/64bit-core.c > +++ b/gdb/features/i386/64bit-core.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-core.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_core (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/64bit-linux.c b/gdb/features/i386/64bit-li= nux.c > index 570910b9cc..4304476779 100644 > --- a/gdb/features/i386/64bit-linux.c > +++ b/gdb/features/i386/64bit-linux.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-linux.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_linux (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/64bit-mpx.c b/gdb/features/i386/64bit-mpx.c > index 725e76a0dd..602c21bddf 100644 > --- a/gdb/features/i386/64bit-mpx.c > +++ b/gdb/features/i386/64bit-mpx.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-mpx.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_mpx (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/64bit-pkeys.c b/gdb/features/i386/64bit-pk= eys.c > index 9d974c3772..444239f106 100644 > --- a/gdb/features/i386/64bit-pkeys.c > +++ b/gdb/features/i386/64bit-pkeys.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-pkeys.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_pkeys (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/64bit-segments.c b/gdb/features/i386/64bit= -segments.c > index 7a1fbf53f3..28c4307066 100644 > --- a/gdb/features/i386/64bit-segments.c > +++ b/gdb/features/i386/64bit-segments.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-segments.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_segments (struct target_desc *result, long reg= num) > diff --git a/gdb/features/i386/64bit-sse.c b/gdb/features/i386/64bit-sse.c > index 2859217f45..8b661ecfb6 100644 > --- a/gdb/features/i386/64bit-sse.c > +++ b/gdb/features/i386/64bit-sse.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: 64bit-sse.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_64bit_sse (struct target_desc *result, long regnum) > diff --git a/gdb/features/i386/x32-core.c b/gdb/features/i386/x32-core.c > index c268e11bea..aca0317e26 100644 > --- a/gdb/features/i386/x32-core.c > +++ b/gdb/features/i386/x32-core.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: x32-core.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_i386_x32_core (struct target_desc *result, long regnum) > diff --git a/gdb/features/tic6x-c6xp.c b/gdb/features/tic6x-c6xp.c > index 5b0f566ee4..5d745844a4 100644 > --- a/gdb/features/tic6x-c6xp.c > +++ b/gdb/features/tic6x-c6xp.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: tic6x-c6xp.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_tic6x_c6xp (struct target_desc *result, long regnum) > diff --git a/gdb/features/tic6x-core.c b/gdb/features/tic6x-core.c > index 823d4c1da1..9e5e3a021f 100644 > --- a/gdb/features/tic6x-core.c > +++ b/gdb/features/tic6x-core.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: tic6x-core.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_tic6x_core (struct target_desc *result, long regnum) > diff --git a/gdb/features/tic6x-gp.c b/gdb/features/tic6x-gp.c > index df0d0e37fc..86efffa561 100644 > --- a/gdb/features/tic6x-gp.c > +++ b/gdb/features/tic6x-gp.c > @@ -1,7 +1,7 @@ > /* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: > Original: tic6x-gp.xml */ >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > static int > create_feature_tic6x_gp (struct target_desc *result, long regnum) > diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c > index c39b5e7d27..29e13d7216 100644 > --- a/gdb/gdbserver/tdesc.c > +++ b/gdb/gdbserver/tdesc.c > @@ -66,7 +66,7 @@ current_target_desc (void) > return current_process ()->tdesc; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > set_tdesc_architecture (struct target_desc *target_desc, > @@ -75,7 +75,7 @@ set_tdesc_architecture (struct target_desc *target_desc, > target_desc->arch =3D xstrdup (name); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > set_tdesc_osabi (struct target_desc *target_desc, const char *name) > @@ -132,7 +132,7 @@ tdesc_get_features_xml (target_desc *tdesc) > struct tdesc_type > {}; >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > struct tdesc_feature * > tdesc_create_feature (struct target_desc *tdesc, const char *name, > @@ -144,7 +144,7 @@ tdesc_create_feature (struct target_desc *tdesc, cons= t char *name, > return tdesc; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > tdesc_type_with_fields * > tdesc_create_flags (struct tdesc_feature *feature, const char *name, > @@ -153,14 +153,14 @@ tdesc_create_flags (struct tdesc_feature *feature, = const char *name, > return NULL; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_add_flag (tdesc_type_with_fields *type, int start, > const char *flag_name) > {} >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > struct tdesc_type * > tdesc_named_type (const struct tdesc_feature *feature, const char *id) > @@ -168,7 +168,7 @@ tdesc_named_type (const struct tdesc_feature *feature= , const char *id) > return NULL; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > tdesc_type_with_fields * > tdesc_create_union (struct tdesc_feature *feature, const char *id) > @@ -176,7 +176,7 @@ tdesc_create_union (struct tdesc_feature *feature, co= nst char *id) > return NULL; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > tdesc_type_with_fields * > tdesc_create_struct (struct tdesc_feature *feature, const char *id) > @@ -184,7 +184,7 @@ tdesc_create_struct (struct tdesc_feature *feature, c= onst char *id) > return NULL; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_create_reg (struct tdesc_feature *feature, const char *name, > @@ -212,7 +212,7 @@ tdesc_create_reg (struct tdesc_feature *feature, cons= t char *name, > tdesc->reg_defs.push_back (reg); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > struct tdesc_type * > tdesc_create_vector (struct tdesc_feature *feature, const char *name, > @@ -226,14 +226,14 @@ tdesc_add_bitfield (tdesc_type_with_fields *type, c= onst char *field_name, > int start, int end) > {} >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_add_field (tdesc_type_with_fields *type, const char *field_name, > struct tdesc_type *field_type) > {} >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_set_struct_size (tdesc_type_with_fields *type, int size) > diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h > index 783500598b..28ffdc597e 100644 > --- a/gdb/gdbserver/tdesc.h > +++ b/gdb/gdbserver/tdesc.h > @@ -19,7 +19,7 @@ > #ifndef TDESC_H > #define TDESC_H >=20 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > #include "regdef.h" > #include > diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c > index 1b20a12d76..6302c15563 100644 > --- a/gdb/target-descriptions.c > +++ b/gdb/target-descriptions.c > @@ -991,7 +991,7 @@ tdesc_predefined_type (enum tdesc_type_kind kind) > gdb_assert_not_reached ("bad predefined tdesc type"); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > struct tdesc_type * > tdesc_named_type (const struct tdesc_feature *feature, const char *id) > @@ -1442,7 +1442,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, > } > =0C >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_create_reg (struct tdesc_feature *feature, const char *name, > @@ -1455,7 +1455,7 @@ tdesc_create_reg (struct tdesc_feature *feature, co= nst char *name, > feature->registers.emplace_back (reg); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > struct tdesc_type * > tdesc_create_vector (struct tdesc_feature *feature, const char *name, > @@ -1467,7 +1467,7 @@ tdesc_create_vector (struct tdesc_feature *feature,= const char *name, > return type; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > tdesc_type_with_fields * > tdesc_create_struct (struct tdesc_feature *feature, const char *name) > @@ -1479,7 +1479,7 @@ tdesc_create_struct (struct tdesc_feature *feature,= const char *name) > return type; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_set_struct_size (tdesc_type_with_fields *type, int size) > @@ -1489,7 +1489,7 @@ tdesc_set_struct_size (tdesc_type_with_fields *type= , int size) > type->size =3D size; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > tdesc_type_with_fields * > tdesc_create_union (struct tdesc_feature *feature, const char *name) > @@ -1501,7 +1501,7 @@ tdesc_create_union (struct tdesc_feature *feature, = const char *name) > return type; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > tdesc_type_with_fields * > tdesc_create_flags (struct tdesc_feature *feature, const char *name, > @@ -1529,7 +1529,7 @@ tdesc_create_enum (struct tdesc_feature *feature, c= onst char *name, > return type; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_add_field (tdesc_type_with_fields *type, const char *field_name, > @@ -1554,7 +1554,7 @@ tdesc_add_typed_bitfield (tdesc_type_with_fields *t= ype, const char *field_name, > type->fields.emplace_back (field_name, field_type, start, end); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name, > @@ -1572,7 +1572,7 @@ tdesc_add_bitfield (tdesc_type_with_fields *type, c= onst char *field_name, > tdesc_add_typed_bitfield (type, field_name, start, end, field_type); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > tdesc_add_flag (tdesc_type_with_fields *type, int start, > @@ -1596,7 +1596,7 @@ tdesc_add_enum_value (tdesc_type_with_fields *type,= int value, > value, -1); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > struct tdesc_feature * > tdesc_create_feature (struct target_desc *tdesc, const char *name, > @@ -1662,7 +1662,7 @@ set_tdesc_property (struct target_desc *target_desc, > target_desc->properties.emplace_back (key, value); > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > set_tdesc_architecture (struct target_desc *target_desc, > @@ -1678,7 +1678,7 @@ set_tdesc_architecture (struct target_desc *target_= desc, > target_desc->arch =3D arch; > } >=20 > -/* See arch/tdesc.h. */ > +/* See common-tdesc.h. */ >=20 > void > set_tdesc_osabi (struct target_desc *target_desc, const char *name) > @@ -2043,7 +2043,7 @@ public: > printf_unfiltered (" Original: %s */\n\n", > lbasename (m_filename_after_features.c_str ())); >=20 > - printf_unfiltered ("#include \"arch/tdesc.h\"\n"); > + printf_unfiltered ("#include \"common-tdesc.h\"\n"); > printf_unfiltered ("\n"); > } >=20 > diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h > index 759fd34a0f..ec8d39a819 100644 > --- a/gdb/target-descriptions.h > +++ b/gdb/target-descriptions.h > @@ -21,7 +21,7 @@ >=20 > #ifndef TARGET_DESCRIPTIONS_H > #define TARGET_DESCRIPTIONS_H 1 > -#include "arch/tdesc.h" > +#include "common-tdesc.h" >=20 > struct tdesc_arch_data; > struct target_ops;