1 |
commit: ff62ad5a8c4d1ba1d2cc5a56f0aa09e97926fd20 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 31 18:50:48 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 31 18:50:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ff62ad5a |
7 |
|
8 |
4.5.4: queue 103_all_gcc-gperf-gnu-inline.patch |
9 |
|
10 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
11 |
|
12 |
4.5.4/gentoo/103_all_gcc-gperf-gnu-inline.patch | 60 +++++++++++++++++++++++++ |
13 |
4.5.4/gentoo/README.history | 1 + |
14 |
2 files changed, 61 insertions(+) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 0000000..c214cd8 |
19 |
--- /dev/null |
20 |
+++ b/4.5.4/gentoo/103_all_gcc-gperf-gnu-inline.patch |
21 |
@@ -0,0 +1,60 @@ |
22 |
+https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html |
23 |
+ |
24 |
+From 1de9842cba4749376b545a09ef0b4fc195d319a6 Mon Sep 17 00:00:00 2001 |
25 |
+From: Mike Frysinger <vapier@g.o> |
26 |
+Date: Thu, 6 Aug 2015 23:32:54 -0400 |
27 |
+Subject: [PATCH] cfns: fix mismatch in gnu_inline attributes |
28 |
+ |
29 |
+Since the 3.0.3 release of gperf (made in May 2007), the generated func |
30 |
+has had the gnu_inline attribute applied to it. The gcc source however |
31 |
+has not been updated to include that which has lead to a mismatch. |
32 |
+ |
33 |
+In practice, this hasn't been an issue for two reasons: |
34 |
+(1) Before gcc-5, the default standard was (gnu) C89, and gcc does not |
35 |
+warn or throw an error in this mode. |
36 |
+(2) Starting with gcc-4.8, the compiler driver used to build gcc was |
37 |
+changed to C++, and g++ does not warn or throw an error in this mode. |
38 |
+ |
39 |
+This error does show up though when using gcc-5 to build gcc-4.7 or |
40 |
+older as then the default is (gnu) C11 and the C compiler driver is |
41 |
+used. That failure looks like: |
42 |
+In file included from .../gcc-4.7.4/gcc/cp/except.c:990:0: |
43 |
+cfns.gperf: At top level: |
44 |
+cfns.gperf:101:1: error: 'gnu_inline' attribute present on 'libc_name_p' |
45 |
+cfns.gperf:26:14: error: but not here |
46 |
+ |
47 |
+Whether the compiler should always emit this error regardless of the |
48 |
+active standard or compiler driver is debatable (I think it should be |
49 |
+consistent -- either always do it or never do it). |
50 |
+--- |
51 |
+ gcc/cp/cfns.gperf | 3 +++ |
52 |
+ gcc/cp/cfns.h | 3 +++ |
53 |
+ 2 files changed, 6 insertions(+) |
54 |
+ |
55 |
+--- a/gcc/cp/cfns.gperf |
56 |
++++ b/gcc/cp/cfns.gperf |
57 |
+@@ -22,6 +22,9 @@ __inline |
58 |
+ static unsigned int hash (const char *, unsigned int); |
59 |
+ #ifdef __GNUC__ |
60 |
+ __inline |
61 |
++#ifdef __GNUC_STDC_INLINE__ |
62 |
++__attribute__ ((__gnu_inline__)) static |
63 |
++#endif |
64 |
+ #endif |
65 |
+ const char * libc_name_p (const char *, unsigned int); |
66 |
+ %} |
67 |
+--- a/gcc/cp/cfns.h |
68 |
++++ b/gcc/cp/cfns.h |
69 |
+@@ -53,6 +53,9 @@ __inline |
70 |
+ static unsigned int hash (const char *, unsigned int); |
71 |
+ #ifdef __GNUC__ |
72 |
+ __inline |
73 |
++#ifdef __GNUC_STDC_INLINE__ |
74 |
++__attribute__ ((__gnu_inline__)) static |
75 |
++#endif |
76 |
+ #endif |
77 |
+ const char * libc_name_p (const char *, unsigned int); |
78 |
+ /* maximum key range = 391, duplicates = 0 */ |
79 |
+-- |
80 |
+2.4.4 |
81 |
+ |
82 |
|
83 |
diff --git a/4.5.4/gentoo/README.history b/4.5.4/gentoo/README.history |
84 |
index 5155ed5..5f391b6 100644 |
85 |
--- a/4.5.4/gentoo/README.history |
86 |
+++ b/4.5.4/gentoo/README.history |
87 |
@@ -1,6 +1,7 @@ |
88 |
1.5 TODO |
89 |
+ 101_all_libjava-ucontext.patch |
90 |
+ 102_all_cgraph_node-gcc-9.patch |
91 |
+ + 103_all_gcc-gperf-gnu-inline.patch |
92 |
|
93 |
1.4 23 Sep 2018 |
94 |
U 93_all_gcc-4.5-cloog-dl.patch |