From: Jason Self <j@jxself.org>
Date: Wed, 10 Jan 2018 03:51:54 +0000 (-0800)
Subject: ath9k_htc: Add patch for GCC 6.3.0
X-Git-Tag: v1.1~8
X-Git-Url: https://jxself.org/git/?p=linux-libre-firmware.git;a=commitdiff_plain;h=bc69b51eca842f9a09ed8482f67bdd607af554f3

ath9k_htc: Add patch for GCC 6.3.0

ISO C++ forbids comparison between pointer and integer.
---

diff --git a/ath9k_htc/Makefile b/ath9k_htc/Makefile
index 9469c40..ee5e61b 100644
--- a/ath9k_htc/Makefile
+++ b/ath9k_htc/Makefile
@@ -27,7 +27,7 @@ GCC_VER=6.3.0
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VER)/gcc-$(GCC_VER).tar.bz2
 GCC_TAR=gcc-$(GCC_VER).tar.bz2
 GCC_DIR=gcc-$(GCC_VER)
-GCC_PATCHES=local/patches/gcc.patch local/patches/gcc-6.3.0_fixup.patch
+GCC_PATCHES=local/patches/gcc.patch local/patches/gcc-6.3.0_fixup.patch local/patches/gcc.patch2
 GCC_SUM=f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
 
 BASEDIR=$(shell pwd)
diff --git a/ath9k_htc/local/patches/gcc.patch2 b/ath9k_htc/local/patches/gcc.patch2
new file mode 100644
index 0000000..4d82574
--- /dev/null
+++ b/ath9k_htc/local/patches/gcc.patch2
@@ -0,0 +1,13 @@
+diff --git a/gcc/ubsan.c b/gcc/ubsan.c
+index 56637d8..1093824 100644
+--- a/gcc/ubsan.c
++++ b/gcc/ubsan.c
+@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
+ 
+   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;
+