From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36168138334 for ; Wed, 29 May 2019 06:56:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61BFFE082B; Wed, 29 May 2019 06:56:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39587E082B for ; Wed, 29 May 2019 06:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6E8B344F56 for ; Wed, 29 May 2019 06:56:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 666E15D9 for ; Wed, 29 May 2019 06:56:42 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1559112981.5ea5abd9862ba73faa75e620e1055818fed794c7.slyfox@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch 4.6.4/gentoo/README.history X-VCS-Directories: 4.6.4/gentoo/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 5ea5abd9862ba73faa75e620e1055818fed794c7 X-VCS-Branch: master Date: Wed, 29 May 2019 06:56:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44442239-1411-4ac3-a23e-e9160ad12af2 X-Archives-Hash: 3920d0a650b91bf4af7b9c25ea3398d5 commit: 5ea5abd9862ba73faa75e620e1055818fed794c7 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed May 29 06:56:21 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Wed May 29 06:56:21 2019 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=5ea5abd9 4.6.4: backport gperf-gnu-inline patch Signed-off-by: Sergei Trofimovich gentoo.org> 4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch | 64 ++++++++++++++++++++++++++ 4.6.4/gentoo/README.history | 1 + 2 files changed, 65 insertions(+) diff --git a/4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch b/4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch new file mode 100644 index 0000000..b26647a --- /dev/null +++ b/4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch @@ -0,0 +1,64 @@ +https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html + +From 1de9842cba4749376b545a09ef0b4fc195d319a6 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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(+) + +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__)) static ++#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__)) 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.6.4/gentoo/README.history b/4.6.4/gentoo/README.history index 49ed8ec..af8339f 100644 --- a/4.6.4/gentoo/README.history +++ b/4.6.4/gentoo/README.history @@ -1,5 +1,6 @@ 1.5 TODO + 95_all_libjava-ucontext.patch + + 96_all_gcc-gperf-gnu-inline.patch 1.4 23 Sep 2018 - 10_all_default-fortify-source.patch