commit: ff62ad5a8c4d1ba1d2cc5a56f0aa09e97926fd20 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri May 31 18:50:48 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri May 31 18:50:48 2019 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ff62ad5a
4.5.4: queue 103_all_gcc-gperf-gnu-inline.patch Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> 4.5.4/gentoo/103_all_gcc-gperf-gnu-inline.patch | 60 +++++++++++++++++++++++++ 4.5.4/gentoo/README.history | 1 + 2 files changed, 61 insertions(+) diff --git a/4.5.4/gentoo/103_all_gcc-gperf-gnu-inline.patch b/4.5.4/gentoo/103_all_gcc-gperf-gnu-inline.patch new file mode 100644 index 0000000..c214cd8 --- /dev/null +++ b/4.5.4/gentoo/103_all_gcc-gperf-gnu-inline.patch @@ -0,0 +1,60 @@ +https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html + +From 1de9842cba4749376b545a09ef0b4fc195d319a6 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Thu, 6 Aug 2015 23:32:54 -0400 +Subject: [PATCH] cfns: fix mismatch in gnu_inline attributes + +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). +--- + gcc/cp/cfns.gperf | 3 +++ + gcc/cp/cfns.h | 3 +++ + 2 files changed, 6 insertions(+) + +--- 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__)) static ++#endif + #endif + const char * libc_name_p (const char *, unsigned int); + %} +--- 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__)) static ++#endif + #endif + const char * libc_name_p (const char *, unsigned int); + /* maximum key range = 391, duplicates = 0 */ +-- +2.4.4 + diff --git a/4.5.4/gentoo/README.history b/4.5.4/gentoo/README.history index 5155ed5..5f391b6 100644 --- a/4.5.4/gentoo/README.history +++ b/4.5.4/gentoo/README.history @@ -1,6 +1,7 @@ 1.5 TODO + 101_all_libjava-ucontext.patch + 102_all_cgraph_node-gcc-9.patch + + 103_all_gcc-gperf-gnu-inline.patch 1.4 23 Sep 2018 U 93_all_gcc-4.5-cloog-dl.patch
