aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2017-06-09 13:29:48 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-06-24 13:11:19 +0200
commit22e2b402aee17684781ae705a91fb3645299de9c (patch)
tree334602b352f0545d0c001c2954a9bf49f054a1c6
parent4ed40be3e32643560874688d34b6fc69e6c4d20d (diff)
downloadupstream-22e2b402aee17684781ae705a91fb3645299de9c.tar.gz
upstream-22e2b402aee17684781ae705a91fb3645299de9c.tar.bz2
upstream-22e2b402aee17684781ae705a91fb3645299de9c.zip
gcc: gcc 6.3.0 fix comparison between pointer and integer
Fix FS#832 /source/build_dir/toolchain-mips_74kc_gcc-6.3.0_musl/gcc-6.3.0/gcc/ubsan.c: In function 'bool ubsan_use_new_style_p(location_t)': /source/build_dir/toolchain-mips_74kc_gcc-6.3.0_musl/gcc-6.3.0/gcc/ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] || xloc.file == '\0' || xloc.file[0] == '\xff' ^~~~ make[5]: *** [Makefile:1085: ubsan.o] Error 1 https://www.viva64.com/en/b/0425/#ID0EMGCI Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
-rw-r--r--toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch b/toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch
new file mode 100644
index 0000000000..72d86c1498
--- /dev/null
+++ b/toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch
@@ -0,0 +1,11 @@
+--- 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;
+