automatic import of gccopeneuler24.03_LTS_SP1

1 files changed, 64 insertions, 0 deletions

diff --git a/0173-Backport-SME-aarch64-Fix-plugin-header-install.patch b/0173-Backport-SME-aarch64-Fix-plugin-header-install.patch
new file mode 100644
index 0000000..4bea8a5
--- /dev/null
+++ b/0173-Backport-SME-aarch64-Fix-plugin-header-install.patch
@@ -0,0 +1,64 @@
+From b1025ef48bff0622e54822dc0974f38748e9109f Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Thu, 22 Dec 2022 11:15:47 +0100
+Subject: [PATCH 074/157] [Backport][SME] aarch64: Fix plugin header install
+
+Reference: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=5b30e9bc211fede06cf85b54e466012540bef14d
+
+The r13-2943-g11a113d501ff64 made aarch64.h include
+aarch64-option-extensions.def, but that file isn't installed
+for building plugins.
+
+On Wed, Dec 21, 2022 at 09:56:33AM +0000, Richard Sandiford wrote:
+> 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.
+
+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 following.
+
+2022-12-22  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 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
+index ba74abc0a..6a21a248f 100644
+--- a/gcc/config/aarch64/t-aarch64
++++ b/gcc/config/aarch64/t-aarch64
+@@ -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 \
+-- 
+2.33.0
+