From f6fdf0197c130a6c3f9f5b66ab4305bc22282a38 Mon Sep 17 00:00:00 2001
From: vectorsigma <vectorsigma@MacBook-Pro-di-Micky.local>
Date: Thu, 12 Sep 2019 08:49:40 +0200
Subject: [PATCH] Sync revision with sourceforge

Added gcc9 following Zenith432's commit https://sourceforge.net/p/cloverefiboot/code/5079/
---
 FileSystems/GrubFS/grub/grub-core/fs/hfsplus.c | 4 ++++
 FileSystems/VBoxFsDxe/fsw_hfs.c                | 4 ++++
 buildExtras.sh                                 | 2 +-
 build_gcc8.sh => build_gcc9.sh                 | 2 +-
 vers.txt                                       | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)
 rename build_gcc8.sh => build_gcc9.sh (99%)

diff --git a/FileSystems/GrubFS/grub/grub-core/fs/hfsplus.c b/FileSystems/GrubFS/grub/grub-core/fs/hfsplus.c
index 2d8580c0c..8c82fff25 100644
--- a/FileSystems/GrubFS/grub/grub-core/fs/hfsplus.c
+++ b/FileSystems/GrubFS/grub/grub-core/fs/hfsplus.c
@@ -34,6 +34,10 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
+#if defined(__GNUC__) && __GNUC__ >= 9
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#endif
+
 /* The type of node.  */
 enum grub_hfsplus_btnode_type
   {
diff --git a/FileSystems/VBoxFsDxe/fsw_hfs.c b/FileSystems/VBoxFsDxe/fsw_hfs.c
index 940964569..10ac2831e 100644
--- a/FileSystems/VBoxFsDxe/fsw_hfs.c
+++ b/FileSystems/VBoxFsDxe/fsw_hfs.c
@@ -54,6 +54,10 @@
 #define BP(msg)
 #endif
 
+#if defined(__GNUC__) && __GNUC__ >= 9
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#endif
+
 static int hardlink = 0;
 
 static fsw_status_t fsw_hfs_volume_mount(struct fsw_hfs_volume *vol);
diff --git a/buildExtras.sh b/buildExtras.sh
index 8edd9683a..1d7d74257 100755
--- a/buildExtras.sh
+++ b/buildExtras.sh
@@ -22,7 +22,7 @@ if [[ "$(uname)" == Darwin ]] && [[ ! -x "$TOOLCHAIN_DIR"/cross/bin/x86_64-clove
       echo -n b
   	fi
    	echo "uilding it"
- 	./build_gcc8.sh
+ 	./build_gcc9.sh
    	echo "Continuing..."
 fi
 
diff --git a/build_gcc8.sh b/build_gcc9.sh
similarity index 99%
rename from build_gcc8.sh
rename to build_gcc9.sh
index e9a1d34fd..0b6f9155e 100755
--- a/build_gcc8.sh
+++ b/build_gcc9.sh
@@ -28,7 +28,7 @@ set -u # exit with error if unbound variables
 # here we can change source versions of tools
 #
 export BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-2.32}
-export GCC_VERSION=${GCC_VERSION:-8.3.0}
+export GCC_VERSION=${GCC_VERSION:-9.2.0}
 
 # Version of libraries are from ./contrib/download_prerequisites in gcc source directory
 export GMP_VERSION=${GMP_VERSION:-gmp-6.1.2}
diff --git a/vers.txt b/vers.txt
index 1c2c1454c..062eca48d 100644
--- a/vers.txt
+++ b/vers.txt
@@ -1 +1 @@
-5078
\ No newline at end of file
+5080
\ No newline at end of file