From 6c5ff4207e1abb5a920b92ac83867c304787a5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= <t.poechtrager@gmail.com>
Date: Sun, 6 Aug 2017 09:34:33 +0200
Subject: [PATCH] #120

---
 build_gcc.sh                     |  2 ++
 patches/gcc-6.3.0-buildfix.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 patches/gcc-6.3.0-buildfix.patch

diff --git a/build_gcc.sh b/build_gcc.sh
index 1eb07b8..c3de36c 100755
--- a/build_gcc.sh
+++ b/build_gcc.sh
@@ -68,6 +68,8 @@ fi
 if [ $(osxcross-cmp $GCC_VERSION '==' 6.3.0) == 1 ]; then
     # https://gcc.gnu.org/viewcvs/gcc/trunk/gcc/config/darwin-driver.c?r1=244010&r2=244009&pathrev=244010
     patch -p1 < $PATCH_DIR/darwin-driver.c.patch
+    # https://gcc.gnu.org/ml/gcc-patches/2016-09/msg00129.html
+    patch -p1 < $PATCH_DIR/gcc-6.3.0-buildfix.patch
 fi
 
 mkdir -p build
diff --git a/patches/gcc-6.3.0-buildfix.patch b/patches/gcc-6.3.0-buildfix.patch
new file mode 100644
index 0000000..6ce67b3
--- /dev/null
+++ b/patches/gcc-6.3.0-buildfix.patch
@@ -0,0 +1,11 @@
+--- trunk/gcc/ubsan.c	2016/09/03 09:20:03	239970
++++ trunk/gcc/ubsan.c	2016/09/03 10:57:05	239971
+@@ -1469,7 +1469,7 @@
+ 
+   expanded_location xloc = expand_location (loc);
+   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
+-      || xloc.file == '\0' || xloc.file[0] == '\xff'
++      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
+       || xloc.file[1] == '\xff')
+     return false;
+