1 |
commit: ea14fd9ff6024eb1611f4b43cbf2a7f844cac0ab |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 29 18:34:31 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 18:34:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ea14fd9f |
7 |
|
8 |
5.5.0: fix libcpp ar detection, backport whitespace change |
9 |
|
10 |
Reported-by: Agostino Sarubbo |
11 |
Bug: https://bugs.gentoo.org/718004 |
12 |
Bug: https://gcc.gnu.org/PR94657 |
13 |
Reported-by: Jeroen Roovers |
14 |
Bug: https://bugs.gentoo.org/725676 |
15 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
16 |
|
17 |
5.5.0/gentoo/38_all_libcpp-ar.patch | 143 ++++++++++++++++++++++++++++++++ |
18 |
5.5.0/gentoo/39_all_whitespace-pa.patch | 28 +++++++ |
19 |
5.5.0/gentoo/README.history | 4 + |
20 |
3 files changed, 175 insertions(+) |
21 |
|
22 |
diff --git a/5.5.0/gentoo/38_all_libcpp-ar.patch b/5.5.0/gentoo/38_all_libcpp-ar.patch |
23 |
new file mode 100644 |
24 |
index 0000000..55f2944 |
25 |
--- /dev/null |
26 |
+++ b/5.5.0/gentoo/38_all_libcpp-ar.patch |
27 |
@@ -0,0 +1,143 @@ |
28 |
+https://bugs.gentoo.org/718004 |
29 |
+https://gcc.gnu.org/PR94657 |
30 |
+ |
31 |
+Make sue we use ${CHOST}-ar and not 'ar'. |
32 |
+ |
33 |
+--- a/libcpp/configure.ac |
34 |
++++ b/libcpp/configure.ac |
35 |
+@@ -12,6 +12,7 @@ AC_PROG_INSTALL |
36 |
+ AC_PROG_CC |
37 |
+ AC_PROG_CXX |
38 |
+ AC_PROG_RANLIB |
39 |
++AC_CHECK_TOOL(AR, ar) |
40 |
+ |
41 |
+ AC_USE_SYSTEM_EXTENSIONS |
42 |
+ AC_SYS_LARGEFILE |
43 |
+--- a/libcpp/Makefile.in |
44 |
++++ b/libcpp/Makefile.in |
45 |
+@@ -25,7 +25,7 @@ srcdir = @srcdir@ |
46 |
+ top_builddir = . |
47 |
+ VPATH = @srcdir@ |
48 |
+ INSTALL = @INSTALL@ |
49 |
+-AR = ar |
50 |
++AR = @AR@ |
51 |
+ ARFLAGS = cru |
52 |
+ ACLOCAL = @ACLOCAL@ |
53 |
+ AUTOCONF = @AUTOCONF@ |
54 |
+--- a/libcpp/configure |
55 |
++++ b/libcpp/configure |
56 |
+@@ -657,6 +657,7 @@ ACLOCAL |
57 |
+ EGREP |
58 |
+ GREP |
59 |
+ CPP |
60 |
++AR |
61 |
+ RANLIB |
62 |
+ ac_ct_CXX |
63 |
+ CXXFLAGS |
64 |
+@@ -1038,6 +1039,7 @@ do |
65 |
+ | -silent | --silent | --silen | --sile | --sil) |
66 |
+ silent=yes ;; |
67 |
+ |
68 |
++ |
69 |
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) |
70 |
+ ac_prev=sbindir ;; |
71 |
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ |
72 |
+@@ -4006,6 +4008,98 @@ else |
73 |
+ RANLIB="$ac_cv_prog_RANLIB" |
74 |
+ fi |
75 |
+ |
76 |
++if test -n "$ac_tool_prefix"; then |
77 |
++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
78 |
++set dummy ${ac_tool_prefix}ar; ac_word=$2 |
79 |
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
80 |
++$as_echo_n "checking for $ac_word... " >&6; } |
81 |
++if ${ac_cv_prog_AR+:} false; then : |
82 |
++ $as_echo_n "(cached) " >&6 |
83 |
++else |
84 |
++ if test -n "$AR"; then |
85 |
++ ac_cv_prog_AR="$AR" # Let the user override the test. |
86 |
++else |
87 |
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
88 |
++for as_dir in $PATH |
89 |
++do |
90 |
++ IFS=$as_save_IFS |
91 |
++ test -z "$as_dir" && as_dir=. |
92 |
++ for ac_exec_ext in '' $ac_executable_extensions; do |
93 |
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
94 |
++ ac_cv_prog_AR="${ac_tool_prefix}ar" |
95 |
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
96 |
++ break 2 |
97 |
++ fi |
98 |
++done |
99 |
++ done |
100 |
++IFS=$as_save_IFS |
101 |
++ |
102 |
++fi |
103 |
++fi |
104 |
++AR=$ac_cv_prog_AR |
105 |
++if test -n "$AR"; then |
106 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 |
107 |
++$as_echo "$AR" >&6; } |
108 |
++else |
109 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
110 |
++$as_echo "no" >&6; } |
111 |
++fi |
112 |
++ |
113 |
++ |
114 |
++fi |
115 |
++if test -z "$ac_cv_prog_AR"; then |
116 |
++ ac_ct_AR=$AR |
117 |
++ # Extract the first word of "ar", so it can be a program name with args. |
118 |
++set dummy ar; ac_word=$2 |
119 |
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
120 |
++$as_echo_n "checking for $ac_word... " >&6; } |
121 |
++if ${ac_cv_prog_ac_ct_AR+:} false; then : |
122 |
++ $as_echo_n "(cached) " >&6 |
123 |
++else |
124 |
++ if test -n "$ac_ct_AR"; then |
125 |
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. |
126 |
++else |
127 |
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
128 |
++for as_dir in $PATH |
129 |
++do |
130 |
++ IFS=$as_save_IFS |
131 |
++ test -z "$as_dir" && as_dir=. |
132 |
++ for ac_exec_ext in '' $ac_executable_extensions; do |
133 |
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
134 |
++ ac_cv_prog_ac_ct_AR="ar" |
135 |
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
136 |
++ break 2 |
137 |
++ fi |
138 |
++done |
139 |
++ done |
140 |
++IFS=$as_save_IFS |
141 |
++ |
142 |
++fi |
143 |
++fi |
144 |
++ac_ct_AR=$ac_cv_prog_ac_ct_AR |
145 |
++if test -n "$ac_ct_AR"; then |
146 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 |
147 |
++$as_echo "$ac_ct_AR" >&6; } |
148 |
++else |
149 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
150 |
++$as_echo "no" >&6; } |
151 |
++fi |
152 |
++ |
153 |
++ if test "x$ac_ct_AR" = x; then |
154 |
++ AR="" |
155 |
++ else |
156 |
++ case $cross_compiling:$ac_tool_warned in |
157 |
++yes:) |
158 |
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
159 |
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
160 |
++ac_tool_warned=yes ;; |
161 |
++esac |
162 |
++ AR=$ac_ct_AR |
163 |
++ fi |
164 |
++else |
165 |
++ AR="$ac_cv_prog_AR" |
166 |
++fi |
167 |
++ |
168 |
+ |
169 |
+ |
170 |
+ ac_ext=c |
171 |
|
172 |
diff --git a/5.5.0/gentoo/39_all_whitespace-pa.patch b/5.5.0/gentoo/39_all_whitespace-pa.patch |
173 |
new file mode 100644 |
174 |
index 0000000..9c65b29 |
175 |
--- /dev/null |
176 |
+++ b/5.5.0/gentoo/39_all_whitespace-pa.patch |
177 |
@@ -0,0 +1,28 @@ |
178 |
+From bd7a5c5dc082707dd62083514bbb88c6f78e5bdb Mon Sep 17 00:00:00 2001 |
179 |
+From: John David Anglin <danglin@×××××××.org> |
180 |
+Date: Fri, 20 Sep 2019 21:47:56 +0000 |
181 |
+Subject: [PATCH] pa.c (pa_trampoline_init): Remove spurious extended |
182 |
+ character. |
183 |
+ |
184 |
+ * config/pa/pa.c (pa_trampoline_init): Remove spurious extended |
185 |
+ character. |
186 |
+ |
187 |
+From-SVN: r276007 |
188 |
+--- |
189 |
+ gcc/config/pa/pa.c | 2 +- |
190 |
+ |
191 |
+--- a/gcc/config/pa/pa.c |
192 |
++++ b/gcc/config/pa/pa.c |
193 |
+@@ -10152,7 +10152,7 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) |
194 |
+ } |
195 |
+ |
196 |
+ #ifdef HAVE_ENABLE_EXECUTE_STACK |
197 |
+- emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"), |
198 |
+- LCT_NORMAL, VOIDmode, 1, XEXP (m_tramp, 0), Pmode); |
199 |
++ emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"), |
200 |
++ LCT_NORMAL, VOIDmode, 1, XEXP (m_tramp, 0), Pmode); |
201 |
+ #endif |
202 |
+ } |
203 |
+-- |
204 |
+2.25.0 |
205 |
+ |
206 |
|
207 |
diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history |
208 |
index 5e07898..a50ba3d 100644 |
209 |
--- a/5.5.0/gentoo/README.history |
210 |
+++ b/5.5.0/gentoo/README.history |
211 |
@@ -1,3 +1,7 @@ |
212 |
+3 TODO |
213 |
+ + 38_all_libcpp-ar.patch |
214 |
+ + 39_all_whitespace-pa.patch |
215 |
+ |
216 |
2 02 Apr 2020 |
217 |
U 21_all_gcc5_isl-dl.patch |
218 |
+ 36_all_libsanitizer-p1.patch |