From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D6A063858D1E for ; Wed, 21 Dec 2022 10:12:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D6A063858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671617571; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=f3+ebgRJguLXKFYnBIYQIMMdQp9ek+WfoEhgPQbciyE=; b=U02/zQA1cKe9mDqUkcnouTeAFFcIl9RJXjpFs7biUKpjFtA2cfHjJPivMM1IEmIavwwTpp DXUrwQytxwv0uaWilXhS82LjhYxwC2GQqb1xJ5/fUwp9Y9DXOvDHXkaCWlT6/izkQgu3OG cpo3g4JeKgl+KNzSD5yy4dZVdPs8NLs= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-176-NoxomcALPzKOnDTcivEURA-1; Wed, 21 Dec 2022 05:12:50 -0500 X-MC-Unique: NoxomcALPzKOnDTcivEURA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B20353813F42; Wed, 21 Dec 2022 10:12:49 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C2AC492C14; Wed, 21 Dec 2022 10:12:49 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 2BLACkEO3214737 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 11:12:47 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2BLACjww3214736; Wed, 21 Dec 2022 11:12:45 +0100 Date: Wed, 21 Dec 2022 11:12:45 +0100 From: Jakub Jelinek To: Richard Earnshaw , Kyrylo Tkachov , gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: Re: [PATCH] aarch64: Fix plugin header install Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Dec 21, 2022 at 09:56:33AM +0000, Richard Sandiford wrote: > Jakub Jelinek 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 > > > > * 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 * 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 # . -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