[gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/

[Sam James]

commit: e0567416b1eb9ca23636be56d9b017e671881269
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 25 02:35:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 25 02:35:02 2022 +
URL:https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e0567416

12.0.0: update calloc patch (again again)

Bug: https://bugs.gentoo.org/828580
Signed-off-by: Sam James  gentoo.org>

 12.0.0/musl/50_all_calloc_libgccjit.patch | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/12.0.0/musl/50_all_calloc_libgccjit.patch 
b/12.0.0/musl/50_all_calloc_libgccjit.patch
index f50ef8f..876f186 100644
--- a/12.0.0/musl/50_all_calloc_libgccjit.patch
+++ b/12.0.0/musl/50_all_calloc_libgccjit.patch
@@ -1,5 +1,6 @@
 
https://git.alpinelinux.org/aports/plain/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
 https://bugs.gentoo.org/828580
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104799 (additional two hunks 
thrown in from here for 12)
 
 From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001
 From: Alex McGrath 
@@ -66,3 +67,24 @@ included #pragma GCC poison calloc
  
  #include "libgccjit.h"
  #include "jit-recording.h"
+--- a/libcc1/libcc1plugin.cc
 b/libcc1/libcc1plugin.cc
+@@ -17,6 +17,7 @@
+along with GCC; see the file COPYING3.  If not see
+.  */
+ 
++#include 
+ #include 
+ 
+ #undef PACKAGE_NAME
+--- a/libcc1/libcp1plugin.cc
 b/libcc1/libcp1plugin.cc
+@@ -18,6 +18,7 @@
+along with GCC; see the file COPYING3.  If not see
+.  */
+ 
++#include 
+ #include 
+ 
+ #undef PACKAGE_NAME
+

[gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/

[Sam James]

commit: e1b2fe74f2926ecc663804531227937a90315a80
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 25 01:10:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 25 01:12:06 2022 +
URL:https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e1b2fe74

12.0.0: update calloc patch (again)

Bug: https://bugs.gentoo.org/828580
Signed-off-by: Sam James  gentoo.org>

 12.0.0/musl/50_all_calloc_libgccjit.patch | 12 ++--
 12.0.0/musl/README.history|  8 
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/12.0.0/musl/50_all_calloc_libgccjit.patch 
b/12.0.0/musl/50_all_calloc_libgccjit.patch
index 756f622..f50ef8f 100644
--- a/12.0.0/musl/50_all_calloc_libgccjit.patch
+++ b/12.0.0/musl/50_all_calloc_libgccjit.patch
@@ -8,8 +8,8 @@ Subject: [PATCH] Fix attempt to use poisoned calloc error in 
libgccjit
 
 This moves usages of pthread.h to above any usage of system.h as it
 included #pragma GCC poison calloc
 a/gcc/jit/jit-playback.c
-+++ b/gcc/jit/jit-playback.c
+--- a/gcc/jit/jit-playback.cc
 b/gcc/jit/jit-playback.cc
 @@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public 
License
  along with GCC; see the file COPYING3.  If not see
  .  */
@@ -28,8 +28,8 @@ included #pragma GCC poison calloc
  #include "jit-playback.h"
  #include "jit-result.h"
  #include "jit-builtins.h"
 a/gcc/jit/jit-recording.c
-+++ b/gcc/jit/jit-recording.c
+--- a/gcc/jit/jit-recording.cc
 b/gcc/jit/jit-recording.cc
 @@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public 
License
  along with GCC; see the file COPYING3.  If not see
  .  */
@@ -48,8 +48,8 @@ included #pragma GCC poison calloc
  #include "jit-builtins.h"
  #include "jit-recording.h"
  #include "jit-playback.h"
 a/gcc/jit/libgccjit.c
-+++ b/gcc/jit/libgccjit.c
+--- a/gcc/jit/libgccjit.cc
 b/gcc/jit/libgccjit.cc
 @@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public 
License
  along with GCC; see the file COPYING3.  If not see
  .  */

diff --git a/12.0.0/musl/README.history b/12.0.0/musl/README.history
index bbddd5d..01e2278 100644
--- a/12.0.0/musl/README.history
+++ b/12.0.0/musl/README.history
@@ -1,3 +1,11 @@
+3   25 Apr 2022
+
+   - 25_all_multilib_pure64.patch
+   - 50_all_posix_memalign.patch
+   U 50_all_calloc_libgccjit.patch
+   - 50_all_cpu_indicator.patch
+   - nocross/50_all_libssp_unconditionally.patch
+
 2  25 Apr 2022
 
 - 25_all_multilib_pure64.patch

[gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/

[Sam James]

commit: e5cf99cfba2cb9de2d80a2823220b256445d033d
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 25 00:51:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 25 01:12:06 2022 +
URL:https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e5cf99cf

12.0.0: add musl calloc patch

Bug: https://bugs.gentoo.org/828580
Signed-off-by: Sam James  gentoo.org>

 12.0.0/musl/50_all_calloc_libgccjit.patch | 68 +++
 12.0.0/musl/README.history| 14 +++
 2 files changed, 82 insertions(+)

diff --git a/12.0.0/musl/50_all_calloc_libgccjit.patch 
b/12.0.0/musl/50_all_calloc_libgccjit.patch
new file mode 100644
index 000..756f622
--- /dev/null
+++ b/12.0.0/musl/50_all_calloc_libgccjit.patch
@@ -0,0 +1,68 @@
+https://git.alpinelinux.org/aports/plain/main/gcc/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+https://bugs.gentoo.org/828580
+
+From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001
+From: Alex McGrath 
+Date: Wed, 13 Oct 2021 23:24:27 +0100
+Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
+
+This moves usages of pthread.h to above any usage of system.h as it
+included #pragma GCC poison calloc
+--- a/gcc/jit/jit-playback.c
 b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public 
License
+ along with GCC; see the file COPYING3.  If not see
+ .  */
+ 
++#include 
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include 
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+--- a/gcc/jit/jit-recording.c
 b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public 
License
+ along with GCC; see the file COPYING3.  If not see
+ .  */
+ 
++#include 
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include 
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+--- a/gcc/jit/libgccjit.c
 b/gcc/jit/libgccjit.c
+@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public 
License
+ along with GCC; see the file COPYING3.  If not see
+ .  */
+ 
++#include 
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include 
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"

diff --git a/12.0.0/musl/README.history b/12.0.0/musl/README.history
new file mode 100644
index 000..bbddd5d
--- /dev/null
+++ b/12.0.0/musl/README.history
@@ -0,0 +1,14 @@
+2  25 Apr 2022
+
+- 25_all_multilib_pure64.patch
+- 50_all_posix_memalign.patch
+U 50_all_calloc_libgccjit.patch
+- 50_all_cpu_indicator.patch
+   - nocross/50_all_libssp_unconditionally.patch
+
+1  25 Apr 2022
+
+   + 25_all_multilib_pure64.patch
+   + 50_all_posix_memalign.patch
+   + 50_all_cpu_indicator.patch
+   + nocross/50_all_libssp_unconditionally.patch

[gentoo-commits] proj/gcc-patches:master commit in: 12.0.0/musl/, 12.0.0/gentoo/, /, 12.0.0/musl/nocross/

[Sam James]

commit: 1e1dff79a6968283d142703fb8b0ab2b46dccff8
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 24 23:15:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 25 00:13:49 2022 +
URL:https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=1e1dff79

12.0.0: cut patchset 5

- Rebase 20_all_libstdcxx-no-vtv.patch
- Add rebased musl patches

Bug: https://bugs.gentoo.org/840128
Closes: https://bugs.gentoo.org/840170
Signed-off-by: Sam James  gentoo.org>

 12.0.0/gentoo/20_all_libstdcxx-no-vtv.patch| 12 +--
 12.0.0/gentoo/README.history   | 19 +
 12.0.0/musl/25_all_multilib_pure64.patch   | 89 ++
 12.0.0/musl/50_all_cpu_indicator.patch | 35 +
 12.0.0/musl/50_all_posix_memalign.patch| 29 +++
 .../nocross/50_all_libssp_unconditionally.patch| 24 ++
 make-tarball.sh| 30 +++-
 7 files changed, 228 insertions(+), 10 deletions(-)

diff --git a/12.0.0/gentoo/20_all_libstdcxx-no-vtv.patch 
b/12.0.0/gentoo/20_all_libstdcxx-no-vtv.patch
index e557b35..2719e2d 100644
--- a/12.0.0/gentoo/20_all_libstdcxx-no-vtv.patch
+++ b/12.0.0/gentoo/20_all_libstdcxx-no-vtv.patch
@@ -10,9 +10,9 @@ Bug: https://gcc.gnu.org/PR85884
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXX) \
 -  $(VTV_CXXLINKFLAGS) \
-   $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
- 
- # Symbol versioning for shared libraries.
+   $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) \
+   $(LTLDFLAGS) $(LTLIBICONV) \
+   -o $@
 --- a/libstdc++-v3/src/Makefile.in
 +++ b/libstdc++-v3/src/Makefile.in
 @@ -642,7 +642,6 @@ CXXLINK = \
@@ -20,9 +20,9 @@ Bug: https://gcc.gnu.org/PR85884
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXX) \
 -  $(VTV_CXXLINKFLAGS) \
-   $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
- 
- @ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep)
+   $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) \
+   $(LTLDFLAGS) $(LTLIBICONV) \
+   -o $@
 --- a/libstdc++-v3/src/c++11/Makefile.am
 +++ b/libstdc++-v3/src/c++11/Makefile.am
 @@ -214,5 +214,4 @@ CXXLINK = \

diff --git a/12.0.0/gentoo/README.history b/12.0.0/gentoo/README.history
index 8d046ab..383b57a 100644
--- a/12.0.0/gentoo/README.history
+++ b/12.0.0/gentoo/README.history
@@ -1,3 +1,22 @@
+5  25 Apr 2022
+
+   - 01_all_default-fortify-source.patch
+   - 03_all_default-warn-trampolines.patch
+   - 05_all_alpha-mieee-default.patch
+   - 06_all_ia64_note.GNU-stack.patch
+   - 08_all_libiberty-pic.patch
+   - 09_all_nopie-all-flags.patch
+   - 10_all_sh-drop-sysroot-suffix.patch
+   - 11_all_ia64-TEXTREL.patch
+   - 12_all_disable-systemtap-switch.patch
+   - 13_all_m68k-textrel-on-libgcc.patch
+   - 14_all_respect-build-cxxflags.patch
+   U 20_all_libstdcxx-no-vtv.patch
+   - 22_all_default_ssp-buffer-size.patch
+   - 23_all_EXTRA_OPTIONS-z-now.patch
+   - 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+   - 26_all_plugin-objdump.patch
+
 4  26 Mar 2022
 
U 01_all_default-fortify-source.patch

diff --git a/12.0.0/musl/25_all_multilib_pure64.patch 
b/12.0.0/musl/25_all_multilib_pure64.patch
new file mode 100644
index 000..4ff0a25
--- /dev/null
+++ b/12.0.0/musl/25_all_multilib_pure64.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/675954
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
+
+diff -Naur gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux 
gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux
+--- gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux  2020-10-05 
02:59:12.767988285 -0700
 gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux   2020-10-05 
03:03:32.310816444 -0700
+@@ -22,7 +22,7 @@
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call 
if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call 
if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+diff -Naur gcc-9.3.0.orig/gcc/config/i386/t-linux64 
gcc-9.3.0/gcc/config/i386/t-linux64
+--- gcc-9.3.0.orig/gcc/config/i386/t-linux64   2020-10-05 02:59:12.757989347 
-0700
 gcc-9.3.0/gcc/config/i386/t-linux642020-10-05 03:24:58.878825272 
-0700
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS= $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo 
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call