diff options
| author | Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> | 2017-06-09 13:29:48 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-04-27 08:54:15 +0200 |
| commit | afa8873887664bbf42c8e7914dc572da2d3bcb79 (patch) | |
| tree | af22c3725c692ff83bb8197a1bc0e41d75f74811 | |
| parent | eed9d40133fe6468cc253d0345c7d7332d2aaa7c (diff) | |
| download | upstream-afa8873887664bbf42c8e7914dc572da2d3bcb79.tar.gz upstream-afa8873887664bbf42c8e7914dc572da2d3bcb79.tar.bz2 upstream-afa8873887664bbf42c8e7914dc572da2d3bcb79.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>
(cherry picked from commit 22e2b402aee17684781ae705a91fb3645299de9c)
| -rw-r--r-- | toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch | 11 |
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; + |