From 574341d830f8c5bfde2d7996618cbd244294bbeb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 12 Mar 2016 20:13:57 +0100 Subject: [PATCH] - fix building using gcc 5 - rel 2 --- crossmingw64-gcc.spec | 4 ++- gnu_inline-mismatch.patch | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 gnu_inline-mismatch.patch diff --git a/crossmingw64-gcc.spec b/crossmingw64-gcc.spec index a7eb6e2..b360223 100644 --- a/crossmingw64-gcc.spec +++ b/crossmingw64-gcc.spec @@ -10,7 +10,7 @@ Summary(pt_BR.UTF-8): Utilitários para desenvolvimento de binários da GNU - Mi Summary(tr.UTF-8): GNU geliştirme araçları - Mingw64 gcc Name: crossmingw64-gcc Version: 4.7.2 -Release: 1 +Release: 2 Epoch: 1 License: GPL v3+ Group: Development/Languages @@ -23,6 +23,7 @@ Source1: mingw64-crt.tar.xz Patch0: gcc-branch.diff # Patch0-md5: 2add58e2b9d9874ba62e05ca9b6b513f Patch1: gcc-mingw-dirs.patch +Patch2: gnu_inline-mismatch.patch URL: http://mingw-w64.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -79,6 +80,7 @@ This package contains cross targeted g++ and libstdc++. %setup -q -n gcc-%{version} -a 1 %patch0 -p0 %patch1 -p1 +%patch2 -p1 # override snapshot version. echo %{version} > gcc/BASE-VER diff --git a/gnu_inline-mismatch.patch b/gnu_inline-mismatch.patch new file mode 100644 index 0000000..e47a171 --- /dev/null +++ b/gnu_inline-mismatch.patch @@ -0,0 +1,69 @@ +From: Mike Frysinger +To: gcc-patches at gcc dot gnu dot org +Subject: [PATCH] cfns: fix mismatch in gnu_inline attributes +Date: Thu, 6 Aug 2015 23:47:06 -0400 +Message-Id: <1438919226-30427-1-git-send-email-vapier@gentoo.org> + +Since the 3.0.3 release of gperf (made in May 2007), the generated func +has had the gnu_inline attribute applied to it. The gcc source however +has not been updated to include that which has lead to a mismatch. + +In practice, this hasn't been an issue for two reasons: +(1) Before gcc-5, the default standard was (gnu) C89, and gcc does not +warn or throw an error in this mode. +(2) Starting with gcc-4.8, the compiler driver used to build gcc was +changed to C++, and g++ does not warn or throw an error in this mode. + +This error does show up though when using gcc-5 to build gcc-4.7 or +older as then the default is (gnu) C11 and the C compiler driver is +used. That failure looks like: +In file included from .../gcc-4.7.4/gcc/cp/except.c:990:0: +cfns.gperf: At top level: +cfns.gperf:101:1: error: 'gnu_inline' attribute present on 'libc_name_p' +cfns.gperf:26:14: error: but not here + +Whether the compiler should always emit this error regardless of the +active standard or compiler driver is debatable (I think it should be +consistent -- either always do it or never do it). + +2015-08-06 Mike Frysinger + + * cfns.gperf [__GNUC__, __GNUC_STDC_INLINE__]: Apply the + __gnu_inline__ attribute. + * cfns.h: Regenerated. +--- + gcc/cp/cfns.gperf | 3 +++ + gcc/cp/cfns.h | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf +index 68acd3d..953262f 100644 +--- a/gcc/cp/cfns.gperf ++++ b/gcc/cp/cfns.gperf +@@ -22,6 +22,9 @@ __inline + static unsigned int hash (const char *, unsigned int); + #ifdef __GNUC__ + __inline ++#ifdef __GNUC_STDC_INLINE__ ++__attribute__ ((__gnu_inline__)) ++#endif + #endif + const char * libc_name_p (const char *, unsigned int); + %} +diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h +index 1c6665d..6d00c0e 100644 +--- a/gcc/cp/cfns.h ++++ b/gcc/cp/cfns.h +@@ -53,6 +53,9 @@ __inline + static unsigned int hash (const char *, unsigned int); + #ifdef __GNUC__ + __inline ++#ifdef __GNUC_STDC_INLINE__ ++__attribute__ ((__gnu_inline__)) ++#endif + #endif + const char * libc_name_p (const char *, unsigned int); + /* maximum key range = 391, duplicates = 0 */ +-- +2.4.4 + -- 2.43.0