diff options
| -rw-r--r-- | arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec | 8 | ||||
| -rw-r--r-- | arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/gcc-fix-empty-string-check.patch | 30 |
2 files changed, 36 insertions, 2 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec index 9b85a6f..0702e9c 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec @@ -30,13 +30,14 @@ Name: %{cross_triplet}-gcc%{pkg_suffix} Version: 6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The GNU Compiler Collection (%{cross_triplet}) Group: Development/Languages License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD URL: https://gcc.gnu.org Source0: https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2 +Patch0: gcc-fix-empty-string-check.patch BuildRequires: texinfo, gettext, flex, bison, zlib-devel, isl-devel BuildRequires: gmp-devel, mpfr-devel, libmpc-devel, elfutils-libelf-devel @@ -64,7 +65,7 @@ Provides: %{cross_triplet}-gcc-stage3 = %{version} %prep -%setup -qTb 0 -n gcc-%{version} +%autosetup -p1 -Tb 0 -n gcc-%{version} %build @@ -346,6 +347,9 @@ chmod +x %{__rpmdeps_skip_sysroot} %changelog +* Wed Mar 08 2017 Ting-Wei Lan <lantw44@gmail.com> - 6.3.0-2 +- Fix wrong string check caught by GCC 7 + * Thu Dec 22 2016 Ting-Wei Lan <lantw44@gmail.com> - 6.3.0-1 - Update to new stable release 6.3.0 diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/gcc-fix-empty-string-check.patch b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/gcc-fix-empty-string-check.patch new file mode 100644 index 0000000..8dad52d --- /dev/null +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/gcc-fix-empty-string-check.patch @@ -0,0 +1,30 @@ +From c0c52589c6a7265e8fc6b77706a83d22aa1ef0ce Mon Sep 17 00:00:00 2001 +From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 26 Jan 2017 10:46:01 +0000 +Subject: [PATCH] 2017-01-26 Richard Biener <rguenther@suse.de> + + Backport from mainline + 2016-09-03 Kirill Yukhin <kirill.yukhin@intel.com> + + * ubsan.c (ubsan_use_new_style_p): Fix check for empty string. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@244923 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/ChangeLog | 7 +++++++ + gcc/ubsan.c | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +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; + |