From abe4f4583ea7625b07508b03ceae6f6b905162c4 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Sun, 21 May 2023 11:05:13 +1200
Subject: [PATCH] gcc/6.5.0: Regenerate patches

Run patches through ./maintainer/manage-packages.sh -P -s gcc-6.5.0 to
clean them up.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 .../6.5.0/0031-darwin-aarch64-config.patch    |  9 ++--
 ...0032-darwin-aarch64-self-host-driver.patch | 54 +++++++++----------
 ...arwin-align-pch_address_space-to-16k.patch |  9 ++--
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/packages/gcc/6.5.0/0031-darwin-aarch64-config.patch b/packages/gcc/6.5.0/0031-darwin-aarch64-config.patch
index 62cab289..74f62590 100644
--- a/packages/gcc/6.5.0/0031-darwin-aarch64-config.patch
+++ b/packages/gcc/6.5.0/0031-darwin-aarch64-config.patch
@@ -1,6 +1,9 @@
-diff -ru a/config.guess b/config.guess
---- a/config.guess	2015-12-31 22:13:28.000000000 +0100
-+++ b/config.guess	2021-12-20 01:44:40.000000000 +0100
+---
+ config.guess |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/config.guess
++++ b/config.guess
 @@ -1278,6 +1278,9 @@
      *:Rhapsody:*:*)
  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
diff --git a/packages/gcc/6.5.0/0032-darwin-aarch64-self-host-driver.patch b/packages/gcc/6.5.0/0032-darwin-aarch64-self-host-driver.patch
index d4d1b9de..7447e2d1 100644
--- a/packages/gcc/6.5.0/0032-darwin-aarch64-self-host-driver.patch
+++ b/packages/gcc/6.5.0/0032-darwin-aarch64-self-host-driver.patch
@@ -1,28 +1,9 @@
---- a/gcc/config.host  2017-01-09 22:01:26.000000000 +0100
-+++ b/gcc/config.host   2021-12-27 23:11:12.000000000 +0100
-@@ -99,7 +99,7 @@
- esac
+---
+ gcc/config.host                          |    6 ++++-
+ gcc/config/aarch64/host-aarch64-darwin.c |   33 +++++++++++++++++++++++++++++++
+ gcc/config/aarch64/x-darwin              |    3 ++
+ 3 files changed, 41 insertions(+), 1 deletion(-)
 
- case ${host} in
--  aarch64*-*-freebsd* | aarch64*-*-linux*)
-+  aarch64*-*-freebsd* | aarch64*-*-linux* | aarch64*-*-darwin*)
-     case ${target} in
-       aarch64*-*-*)
-    host_extra_gcc_objs="driver-aarch64.o"
-@@ -249,6 +249,10 @@
-     out_host_hook_obj=host-mingw32.o
-     host_lto_plugin_soname=liblto_plugin-0.dll
-     ;;
-+  aarch64*-*-darwin*)
-+    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
-+    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
-+    ;;
-   i[34567]86-*-darwin* | x86_64-*-darwin*)
-     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
-     host_xmake_file="${host_xmake_file} i386/x-darwin"
-diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
-new file mode 100644
-index 0000000000000..d70f2df3bf1b3
 --- /dev/null
 +++ b/gcc/config/aarch64/host-aarch64-darwin.c
 @@ -0,0 +1,33 @@
@@ -59,12 +40,31 @@ index 0000000000000..d70f2df3bf1b3
 +   exists just to include the generic config/host-darwin.h.  */
 +
 +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
-diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
-new file mode 100644
-index 0000000000000..6d788d5e89cfb
 --- /dev/null
 +++ b/gcc/config/aarch64/x-darwin
 @@ -0,0 +1,3 @@
 +host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
 +	$(COMPILE) $<
 +	$(POSTCOMPILE)
+--- a/gcc/config.host
++++ b/gcc/config.host
+@@ -99,7 +99,7 @@
+ esac
+ 
+ case ${host} in
+-  aarch64*-*-freebsd* | aarch64*-*-linux*)
++  aarch64*-*-freebsd* | aarch64*-*-linux* | aarch64*-*-darwin*)
+     case ${target} in
+       aarch64*-*-*)
+ 	host_extra_gcc_objs="driver-aarch64.o"
+@@ -249,6 +249,10 @@
+     out_host_hook_obj=host-mingw32.o
+     host_lto_plugin_soname=liblto_plugin-0.dll
+     ;;
++  aarch64*-*-darwin*)
++    out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
++    host_xmake_file="${host_xmake_file} aarch64/x-darwin"
++    ;;
+   i[34567]86-*-darwin* | x86_64-*-darwin*)
+     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
+     host_xmake_file="${host_xmake_file} i386/x-darwin"
diff --git a/packages/gcc/6.5.0/0033-darwin-align-pch_address_space-to-16k.patch b/packages/gcc/6.5.0/0033-darwin-align-pch_address_space-to-16k.patch
index 6d3083f7..3cfe0df7 100644
--- a/packages/gcc/6.5.0/0033-darwin-align-pch_address_space-to-16k.patch
+++ b/packages/gcc/6.5.0/0033-darwin-align-pch_address_space-to-16k.patch
@@ -12,21 +12,20 @@ gcc/ChangeLog:
 
 (cherry picked from commit 590febb5f6624f78b36402a7c9a9c318978f1efa)
 ---
- gcc/config/host-darwin.c | 5 ++++-
+ gcc/config/host-darwin.c |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c
-index 49d3af77a9237..b9cf347f1e847 100644
 --- a/gcc/config/host-darwin.c
 +++ b/gcc/config/host-darwin.c
 @@ -24,7 +24,10 @@
  #include "config/host-darwin.h"
-
+ 
  /* Yes, this is really supposed to work.  */
 -static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096)));
 +/* This allows for a pagesize of 16384, which we have on Darwin20, but should
 +   continue to work OK for pagesize 4096 which we have on earlier versions.
 +   The size is 1 (binary) Gb.  */
 +static char pch_address_space[65536*16384] __attribute__((aligned (16384)));
-
+ 
  /* Return the address of the PCH address space, if the PCH will fit in it.  */
+