From: Jakub Jelinek <jakub@redhat.com>
To: Richard Earnshaw <richard.earnshaw@arm.com>,
Kyrylo Tkachov <kyrylo.tkachov@arm.com>,
gcc-patches@gcc.gnu.org, richard.sandiford@arm.com
Subject: Re: [PATCH] aarch64: Fix plugin header install
Date: Wed, 21 Dec 2022 11:12:45 +0100 [thread overview]
Message-ID: <Y6LcHQRtOL0NekFU@tucnak> (raw)
In-Reply-To: <mpto7rx3wry.fsf@arm.com>
On Wed, Dec 21, 2022 at 09:56:33AM +0000, Richard Sandiford wrote:
> Jakub Jelinek <jakub@redhat.com> writes:
> > The r13-2943-g11a113d501ff64 made aarch64.h include
> > aarch64-option-extensions.def, but that file isn't installed
> > for building plugins.
> >
> > The following patch should fix that, ok for trunk if it
> > passes bootstrap/regtest + building plugin against it?
> >
> > 2022-12-20 Jakub Jelinek <jakub@redhat.com>
> >
> > * config/aarch64/t-aarch64 (OPTIONS_H_EXTRA): Add
> > aarch64-option-extensions.def.
> >
> > --- gcc/config/aarch64/t-aarch64.jj 2022-04-04 13:55:46.001615509 +0200
> > +++ gcc/config/aarch64/t-aarch64 2022-12-20 11:31:03.245651809 +0100
> > @@ -22,7 +22,8 @@ TM_H += $(srcdir)/config/aarch64/aarch64
> > OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def \
> > $(srcdir)/config/aarch64/aarch64-arches.def \
> > $(srcdir)/config/aarch64/aarch64-fusion-pairs.def \
> > - $(srcdir)/config/aarch64/aarch64-tuning-flags.def
> > + $(srcdir)/config/aarch64/aarch64-tuning-flags.def \
> > + $(srcdir)/config/aarch64/aarch64-option-extensions.def
>
> Should this (and aarch64-fusion-pairs.def and aarch64-tuning-flags.def)
> be in TM_H instead? The first two OPTIONS_H_EXTRA entries seem to be
> for aarch64-opt.h (included via aarch64.opt).
>
> I guess TM_H should also have aarch64-arches.def, since it's included
> for aarch64_feature.
>
> OK with that change if it works/makes sense.
gcc/Makefile.in has
TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
and
OPTIONS_H = options.h flag-types.h $(OPTIONS_H_EXTRA)
which means that adding something into TM_H when it is already in
OPTIONS_H_EXTRA is a unnecessary.
It is true that aarch64-fusion-pairs.def (included by aarch64-protos.h)
and aarch64-tuning-flags.def (ditto) and aarch64-option-extensions.def
(included by aarch64.h) aren't needed for options.h, so I think the
right patch would be:
2022-12-21 Jakub Jelinek <jakub@redhat.com>
* config/aarch64/t-aarch64 (TM_H): Don't add aarch64-cores.def,
add aarch64-fusion-pairs.def, aarch64-tuning-flags.def and
aarch64-option-extensions.def.
(OPTIONS_H_EXTRA): Don't add aarch64-fusion-pairs.def nor
aarch64-tuning-flags.def.
--- gcc/config/aarch64/t-aarch64.jj 2022-12-21 09:03:13.146034669 +0100
+++ gcc/config/aarch64/t-aarch64 2022-12-21 11:06:20.966118401 +0100
@@ -18,11 +18,11 @@
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
-TM_H += $(srcdir)/config/aarch64/aarch64-cores.def
+TM_H += $(srcdir)/config/aarch64/aarch64-fusion-pairs.def \
+ $(srcdir)/config/aarch64/aarch64-tuning-flags.def \
+ $(srcdir)/config/aarch64/aarch64-option-extensions.def
OPTIONS_H_EXTRA += $(srcdir)/config/aarch64/aarch64-cores.def \
- $(srcdir)/config/aarch64/aarch64-arches.def \
- $(srcdir)/config/aarch64/aarch64-fusion-pairs.def \
- $(srcdir)/config/aarch64/aarch64-tuning-flags.def
+ $(srcdir)/config/aarch64/aarch64-arches.def
$(srcdir)/config/aarch64/aarch64-tune.md: s-aarch64-tune-md; @true
s-aarch64-tune-md: $(srcdir)/config/aarch64/gentune.sh \
Jakub
next prev parent reply other threads:[~2022-12-21 10:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-20 10:41 Jakub Jelinek
2022-12-21 9:56 ` Richard Sandiford
2022-12-21 10:12 ` Jakub Jelinek [this message]
2022-12-21 10:43 ` Richard Sandiford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y6LcHQRtOL0NekFU@tucnak \
--to=jakub@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=kyrylo.tkachov@arm.com \
--cc=richard.earnshaw@arm.com \
--cc=richard.sandiford@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).