summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2022-02-25 07:51:30 (GMT)
committerChris Packham <judge.packham@gmail.com>2022-02-28 07:59:33 (GMT)
commit1e47ca1e70497a38641b9025998a6333265fe84e (patch)
tree71b6c716ca857db737136239c842757055fe6c34
parent0822a8a2e41d51dea7cad580a9c66a55a907d4fe (diff)
gcc: powerpc: Fix asm machine directive for some CPUsHEADcrosstool-ng-1.25.0-rc1master
Bring in upstream fix for gcc outputting an incorrect .machine directive. Signed-off-by: Chris Packham <judge.packham@gmail.com>
-rw-r--r--packages/gcc/10.3.0/0023-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch59
-rw-r--r--packages/gcc/11.2.0/0010-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch59
2 files changed, 118 insertions, 0 deletions
diff --git a/packages/gcc/10.3.0/0023-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch b/packages/gcc/10.3.0/0023-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch
new file mode 100644
index 0000000..3ad38f1
--- /dev/null
+++ b/packages/gcc/10.3.0/0023-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch
@@ -0,0 +1,59 @@
+From d568abb25fc799123168aac840372b28bb81f85d Mon Sep 17 00:00:00 2001
+From: Sebastian Huber <sebastian.huber@embedded-brains.de>
+Date: Tue, 18 Jan 2022 12:44:53 +0100
+Subject: [PATCH] powerpc: Fix asm machine directive for some CPUs
+
+For some CPUs, the assembler machine directive cannot be determined by ISA
+flags.
+
+gcc/
+
+ PR target/104090
+ * config/rs6000/rs6000.c (rs6000_machine_from_flags): Use also
+ rs6000_cpu.
+---
+ gcc/config/rs6000/rs6000.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
+index 4b473e00be39..5404fb187556 100644
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -5547,6 +5547,34 @@ const char *rs6000_machine;
+ const char *
+ rs6000_machine_from_flags (void)
+ {
++ /* For some CPUs, the machine cannot be determined by ISA flags. We have to
++ check them first. */
++ switch (rs6000_cpu)
++ {
++ case PROCESSOR_PPC8540:
++ case PROCESSOR_PPC8548:
++ return "e500";
++
++ case PROCESSOR_PPCE300C2:
++ case PROCESSOR_PPCE300C3:
++ return "e300";
++
++ case PROCESSOR_PPCE500MC:
++ return "e500mc";
++
++ case PROCESSOR_PPCE500MC64:
++ return "e500mc64";
++
++ case PROCESSOR_PPCE5500:
++ return "e5500";
++
++ case PROCESSOR_PPCE6500:
++ return "e6500";
++
++ default:
++ break;
++ }
++
+ HOST_WIDE_INT flags = rs6000_isa_flags;
+
+ /* Disable the flags that should never influence the .machine selection. */
+--
+2.35.1
+
diff --git a/packages/gcc/11.2.0/0010-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch b/packages/gcc/11.2.0/0010-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch
new file mode 100644
index 0000000..424cb1d
--- /dev/null
+++ b/packages/gcc/11.2.0/0010-powerpc-Fix-asm-machine-directive-for-some-CPUs.patch
@@ -0,0 +1,59 @@
+From 3cb53c10831be59d967d9dce8e7980fee4703500 Mon Sep 17 00:00:00 2001
+From: Sebastian Huber <sebastian.huber@embedded-brains.de>
+Date: Tue, 18 Jan 2022 12:44:53 +0100
+Subject: [PATCH] powerpc: Fix asm machine directive for some CPUs
+
+For some CPUs, the assembler machine directive cannot be determined by ISA
+flags.
+
+gcc/
+
+ PR target/104090
+ * config/rs6000/rs6000.c (rs6000_machine_from_flags): Use also
+ rs6000_cpu.
+---
+ gcc/config/rs6000/rs6000.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
+index c4f5c53932c7..9b1c3a8b5eae 100644
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -5766,6 +5766,34 @@ const char *rs6000_machine;
+ const char *
+ rs6000_machine_from_flags (void)
+ {
++ /* For some CPUs, the machine cannot be determined by ISA flags. We have to
++ check them first. */
++ switch (rs6000_cpu)
++ {
++ case PROCESSOR_PPC8540:
++ case PROCESSOR_PPC8548:
++ return "e500";
++
++ case PROCESSOR_PPCE300C2:
++ case PROCESSOR_PPCE300C3:
++ return "e300";
++
++ case PROCESSOR_PPCE500MC:
++ return "e500mc";
++
++ case PROCESSOR_PPCE500MC64:
++ return "e500mc64";
++
++ case PROCESSOR_PPCE5500:
++ return "e5500";
++
++ case PROCESSOR_PPCE6500:
++ return "e6500";
++
++ default:
++ break;
++ }
++
+ HOST_WIDE_INT flags = rs6000_isa_flags;
+
+ /* Disable the flags that should never influence the .machine selection. */
+--
+2.35.1
+