From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91FE61581B9 for ; Wed, 01 Oct 2025 23:53:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7AD55340E3B for ; Wed, 01 Oct 2025 23:53:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4DD791103CB; Wed, 01 Oct 2025 23:53:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 42D7B1103CB for ; Wed, 01 Oct 2025 23:53:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81508340E3B for ; Wed, 01 Oct 2025 23:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CEF4939FD for ; Wed, 01 Oct 2025 23:53:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1759362725.92a0f40c3b36b818573174b30b9b94630ca01c0d.sam@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 15.2.0/musl/, 15.2.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 15.2.0/gentoo/01_all_default-fortify-source.patch 15.2.0/gentoo/02_all_default-warn-format-security.patch 15.2.0/gentoo/03_all_default-warn-trampolines.patch 15.2.0/gentoo/04_all_nossp-on-nostdlib.patch 15.2.0/gentoo/05_all_alpha-mieee-default.patch 15.2.0/gentoo/06_all_ia64_note.GNU-stack.patch 15.2.0/gentoo/08_all_libiberty-pic.patch 15.2.0/gentoo/09_all_esysroot.patch 15.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch 15.2.0/gentoo/11_all_ia64-TEXTREL.patch 15.2.0/gentoo/14_all_respect-build-cxxflags.patch 15.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch 15.2.0/gentoo/20_all_libstdcxx-no-vtv.patch 15.2.0/gentoo/22_all_default_ssp-buffer-size.patch 15.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch 15.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch 15.2.0/gentoo/26_all_enable-cet.patch 15.2.0/gentoo/28_all_drop_CFLAGS_sed.patch 15.2.0/gentoo/29_all_msgfmt-libstdc++-link.patch 15.2.0/gentoo/30_all_tar_libstdc++-link.patch 15.2.0/gentoo/31_all_testsui te-fortran-pass-Wcomplain-wrong-lang-where-ap.patch 15.2.0/gentoo/32_all_time64.patch 15.2.0/gentoo/33_all_PR80677-cross-limits.patch 15.2.0/gentoo/34_all_time64_ssemath.patch 15.2.0/gentoo/35_all_checking-gc-use-heuristics.patch 15.2.0/gentoo/76_all_PR117854-config-nvptx-fix-bashisms-with-gen-copyright.sh-use.patch 15.2.0/gentoo/84_all_PR116975-GDCFLAGS.patch 15.2.0/gentoo/README.history 15.2.0/musl/25_all_multilib_pure64.patch 15.2.0/musl/50_all_libdruntime_32bit.patch 15.2.0/musl/50_all_libssp_unconditionally.patch 15.2.0/musl/50_all_posix_memalign.patch 15.2.0/musl/README.history X-VCS-Directories: 15.2.0/gentoo/ 15.2.0/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 92a0f40c3b36b818573174b30b9b94630ca01c0d X-VCS-Branch: master Date: Wed, 01 Oct 2025 23:53:19 +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: e2df7471-8abf-42ae-bef8-b2db997f90f6 X-Archives-Hash: 62c1e88b85ce9b1f5a050f613d3620ff commit: 92a0f40c3b36b818573174b30b9b94630ca01c0d Author: Sam James gentoo org> AuthorDate: Wed Oct 1 23:52:05 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 1 23:52:05 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=92a0f40c 15.2.0: add Signed-off-by: Sam James gentoo.org> 15.2.0/gentoo/01_all_default-fortify-source.patch | 26 + .../02_all_default-warn-format-security.patch | 21 + .../gentoo/03_all_default-warn-trampolines.patch | 13 + 15.2.0/gentoo/04_all_nossp-on-nostdlib.patch | 29 + 15.2.0/gentoo/05_all_alpha-mieee-default.patch | 39 + 15.2.0/gentoo/06_all_ia64_note.GNU-stack.patch | 92 +++ 15.2.0/gentoo/08_all_libiberty-pic.patch | 10 + 15.2.0/gentoo/09_all_esysroot.patch | 94 +++ 15.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch | 26 + 15.2.0/gentoo/11_all_ia64-TEXTREL.patch | 22 + 15.2.0/gentoo/14_all_respect-build-cxxflags.patch | 39 + .../15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch | 14 + 15.2.0/gentoo/20_all_libstdcxx-no-vtv.patch | 61 ++ 15.2.0/gentoo/22_all_default_ssp-buffer-size.patch | 14 + 15.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch | 26 + ...ll_DEF_GENTOO_SCP-fstack-clash-protection.patch | 65 ++ 15.2.0/gentoo/26_all_enable-cet.patch | 193 +++++ 15.2.0/gentoo/28_all_drop_CFLAGS_sed.patch | 67 ++ 15.2.0/gentoo/29_all_msgfmt-libstdc++-link.patch | 39 + 15.2.0/gentoo/30_all_tar_libstdc++-link.patch | 57 ++ ...ortran-pass-Wcomplain-wrong-lang-where-ap.patch | 108 +++ 15.2.0/gentoo/32_all_time64.patch | 39 + 15.2.0/gentoo/33_all_PR80677-cross-limits.patch | 38 + 15.2.0/gentoo/34_all_time64_ssemath.patch | 43 ++ .../gentoo/35_all_checking-gc-use-heuristics.patch | 22 + ...tx-fix-bashisms-with-gen-copyright.sh-use.patch | 68 ++ 15.2.0/gentoo/84_all_PR116975-GDCFLAGS.patch | 320 ++++++++ 15.2.0/gentoo/README.history | 29 + 15.2.0/musl/25_all_multilib_pure64.patch | 83 ++ 15.2.0/musl/50_all_libdruntime_32bit.patch | 832 +++++++++++++++++++++ 15.2.0/musl/50_all_libssp_unconditionally.patch | 24 + 15.2.0/musl/50_all_posix_memalign.patch | 28 + 15.2.0/musl/README.history | 6 + 33 files changed, 2587 insertions(+) diff --git a/15.2.0/gentoo/01_all_default-fortify-source.patch b/15.2.0/gentoo/01_all_default-fortify-source.patch new file mode 100644 index 0000000..4cdf5f6 --- /dev/null +++ b/15.2.0/gentoo/01_all_default-fortify-source.patch @@ -0,0 +1,26 @@ +Taken Debian's patch and removed docs matches: + https://salsa.debian.org/toolchain-team/gcc.git +Also see https://bugs.gentoo.org/621036 where +initially Gentoo used too complicated macro. + +# DP: Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, ObjC++, +# DP: if the optimization level is > 0 +--- a/gcc/c-family/c-cppbuiltin.cc ++++ b/gcc/c-family/c-cppbuiltin.cc +@@ -1510,6 +1510,16 @@ c_cpp_builtins (cpp_reader *pfile) + builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0); + builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0); + ++#if !defined(ACCEL_COMPILER) ++ #ifndef GENTOO_FORTIFY_SOURCE_LEVEL ++ #define GENTOO_FORTIFY_SOURCE_LEVEL 2 ++ #endif ++ ++ /* F_S enabled by default for optimization levels > 0, except for ASAN: https://github.com/google/sanitizers/issues/247 */ ++ if (optimize && ! (flag_sanitize & SANITIZE_ADDRESS)) ++ builtin_define_with_int_value ("_FORTIFY_SOURCE", GENTOO_FORTIFY_SOURCE_LEVEL); ++#endif ++ + /* Misc. */ + if (flag_gnu89_inline) + cpp_define (pfile, "__GNUC_GNU_INLINE__"); diff --git a/15.2.0/gentoo/02_all_default-warn-format-security.patch b/15.2.0/gentoo/02_all_default-warn-format-security.patch new file mode 100644 index 0000000..439d9d8 --- /dev/null +++ b/15.2.0/gentoo/02_all_default-warn-format-security.patch @@ -0,0 +1,21 @@ +Enable -Wformat and -Wformat-security by default. +--- a/gcc/c-family/c.opt ++++ b/gcc/c-family/c.opt +@@ -770,7 +770,7 @@ Warn about function calls with format strings that write past the end + of the destination region. + + Wformat-security +-C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0) ++C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0) + Warn about possible security problems with format functions. + + Wformat-signedness +@@ -795,7 +795,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++ + Warn about zero-length formats. + + Wformat= +-C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2) ++C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2) + Warn about printf/scanf/strftime/strfmon format string anomalies. + + Wframe-address diff --git a/15.2.0/gentoo/03_all_default-warn-trampolines.patch b/15.2.0/gentoo/03_all_default-warn-trampolines.patch new file mode 100644 index 0000000..fb6d8bc --- /dev/null +++ b/15.2.0/gentoo/03_all_default-warn-trampolines.patch @@ -0,0 +1,13 @@ +Enable -Wtrampolines by default. + +--- a/gcc/common.opt ++++ b/gcc/common.opt +@@ -798,7 +798,7 @@ Common Var(warn_system_headers) Warning + Do not suppress warnings from system headers. + + Wtrampolines +-Common Var(warn_trampolines) Warning ++Common Var(warn_trampolines) Init(1) Warning + Warn whenever a trampoline is generated. + + Wtrivial-auto-var-init diff --git a/15.2.0/gentoo/04_all_nossp-on-nostdlib.patch b/15.2.0/gentoo/04_all_nossp-on-nostdlib.patch new file mode 100644 index 0000000..4462c0e --- /dev/null +++ b/15.2.0/gentoo/04_all_nossp-on-nostdlib.patch @@ -0,0 +1,29 @@ +Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding + +https://bugs.gentoo.org/484714 +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -984,6 +984,12 @@ proper position among the other output files. */ + #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}" + #endif + ++#ifdef ENABLE_DEFAULT_SSP ++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} -foffload-options=-fno-stack-protector " ++#else ++#define NO_SSP_SPEC "" ++#endif ++ + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ +@@ -1286,7 +1292,7 @@ static const char *cc1_options = + %{-version:--version}\ + %{-help=*:--help=%*}\ + %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\ +- %{fsyntax-only:-o %j} %{-param*}\ ++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\ + %{coverage:-fprofile-arcs -ftest-coverage}\ + %{fprofile-arcs|fcondition-coverage|fprofile-generate*|coverage:\ + %{!fprofile-update=single:\ +-- +2.44.0 diff --git a/15.2.0/gentoo/05_all_alpha-mieee-default.patch b/15.2.0/gentoo/05_all_alpha-mieee-default.patch new file mode 100644 index 0000000..fd1de71 --- /dev/null +++ b/15.2.0/gentoo/05_all_alpha-mieee-default.patch @@ -0,0 +1,39 @@ +Set the default behavior on alpha to use -mieee since the large majority of +time we want this (bad/weird things can happen with packages built without +it). + +To satisfy those people who may not want -mieee forced on them all the time, +we also provide -mno-ieee. + +Patch by Mike Frysinger + +Note: upstream doesn't want to take this due to long standing behavior, and +because it'd make behavior across OS's inconsistent: + https://gcc.gnu.org/ml/gcc-patches/2003-07/msg02144.html + +This makes sense for upstream, but Gentoo is more concerned about packages +behaving the same across arches under Linux. + +--- a/gcc/config/alpha/alpha.h ++++ b/gcc/config/alpha/alpha.h +@@ -94,6 +94,8 @@ along with GCC; see the file COPYING3. If not see + while (0) + #endif + ++#define CPP_SPEC "%{!no-ieee:-mieee}" ++ + /* Run-time compilation parameters selecting different hardware subsets. */ + + /* Which processor to schedule for. The cpu attribute defines a list that +--- a/gcc/config/alpha/alpha.opt ++++ b/gcc/config/alpha/alpha.opt +@@ -35,7 +35,7 @@ + Request IEEE-conformant math library routines (OSF/1). + + mieee +-Target RejectNegative Mask(IEEE) ++Target Mask(IEEE) + Emit IEEE-conformant code, without inexact exceptions. + + mieee-with-inexact + diff --git a/15.2.0/gentoo/06_all_ia64_note.GNU-stack.patch b/15.2.0/gentoo/06_all_ia64_note.GNU-stack.patch new file mode 100644 index 0000000..7a1d4c6 --- /dev/null +++ b/15.2.0/gentoo/06_all_ia64_note.GNU-stack.patch @@ -0,0 +1,92 @@ +http://gcc.gnu.org/PR21098 + + +2004-09-20 Jakub Jelinek + + * config/rs6000/ppc-asm.h: Add .note.GNU-stack section also + on ppc64-linux. + + * config/ia64/lib1funcs.asm: Add .note.GNU-stack section on + ia64-linux. + * config/ia64/crtbegin.asm: Likewise. + * config/ia64/crtend.asm: Likewise. + * config/ia64/crti.asm: Likewise. + * config/ia64/crtn.asm: Likewise. + +2004-05-14 Jakub Jelinek + + * config/ia64/linux.h (TARGET_ASM_FILE_END): Define. + + +--- a/gcc/config/ia64/linux.h ++++ b/gcc/config/ia64/linux.h +@@ -23,6 +23,8 @@ a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + ++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack ++ + /* This is for -profile to use -lc_p instead of -lc. */ + #undef CC1_SPEC + #define CC1_SPEC "%{profile:-p} %{G*}" +--- a/gcc/config/rs6000/ppc-asm.h ++++ b/gcc/config/rs6000/ppc-asm.h +@@ -384,7 +384,7 @@ GLUE(.L,name): \ + #endif + #endif + +-#if defined __linux__ && !defined __powerpc64__ ++#if defined __linux__ + .section .note.GNU-stack + .previous + #endif +--- a/libgcc/config/ia64/crtbegin.S ++++ b/libgcc/config/ia64/crtbegin.S +@@ -185,3 +185,7 @@ __do_jv_register_classes: + .weak __cxa_finalize + #endif + .weak _Jv_RegisterClasses ++ ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/libgcc/config/ia64/crtend.S ++++ b/libgcc/config/ia64/crtend.S +@@ -114,3 +114,6 @@ __do_global_ctors_aux: + + br.ret.sptk.many rp + .endp __do_global_ctors_aux ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/libgcc/config/ia64/crti.S ++++ b/libgcc/config/ia64/crti.S +@@ -49,5 +49,8 @@ _fini: + .save rp, r33 + mov r33 = b0 + .body ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif + + # end of crti.S +--- a/libgcc/config/ia64/crtn.S ++++ b/libgcc/config/ia64/crtn.S +@@ -39,5 +39,8 @@ + .restore sp + mov r12 = r35 + br.ret.sptk.many b0 ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif + + # end of crtn.S +--- a/libgcc/config/ia64/lib1funcs.S ++++ b/libgcc/config/ia64/lib1funcs.S +@@ -793,3 +793,6 @@ __floattitf: + .endp __floattitf + #endif + #endif ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif diff --git a/15.2.0/gentoo/08_all_libiberty-pic.patch b/15.2.0/gentoo/08_all_libiberty-pic.patch new file mode 100644 index 0000000..3f0bae1 --- /dev/null +++ b/15.2.0/gentoo/08_all_libiberty-pic.patch @@ -0,0 +1,10 @@ +--- a/libiberty/Makefile.in ++++ b/libiberty/Makefile.in +@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) + $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ + $(RANLIB) $(TARGETLIB); \ ++ cp $(TARGETLIB) ../ ; \ + cd ..; \ + else true; fi + diff --git a/15.2.0/gentoo/09_all_esysroot.patch b/15.2.0/gentoo/09_all_esysroot.patch new file mode 100644 index 0000000..31568ab --- /dev/null +++ b/15.2.0/gentoo/09_all_esysroot.patch @@ -0,0 +1,94 @@ +From c012b20eca546ec60878058094e59267ebfba1a9 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Mon, 23 Dec 2024 16:50:25 +0000 +Subject: [PATCH 3/3] Allow setting target sysroot with ESYSROOT env var for + cross-compilers + +The variable is ignored for native compilers, when it matches BROOT, and +when the target machine does not match CHOST (if set). The --sysroot +command line option takes precedence. + +The CHOST check is necessary for a Canadian Cross. In that case, two +cross-compilers are invoked, but only the one matching CHOST should have +its sysroot set by ESYSROOT. + +Bug: https://bugs.gentoo.org/942672 +Closes: https://github.com/gentoo/gcc-patches/pull/7 +Signed-off-by: James Le Cuirot +--- + gcc/doc/invoke.texi | 11 +++++++++++ + gcc/gcc.cc | 29 +++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+) + +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 0a7a81b20..d66f53b65 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -19355,6 +19355,10 @@ for this option. If your linker does not support this option, the + header file aspect of @option{--sysroot} still works, but the + library aspect does not. + ++On Gentoo Linux, this option can also be set for cross-compilers using the ++@env{ESYSROOT} environmnent variable. The command line option takes ++precedence. ++ + @opindex no-sysroot-suffix + @item --no-sysroot-suffix + For some targets, a suffix is added to the root directory specified +@@ -37590,6 +37594,13 @@ using GCC also uses these directories when searching for ordinary + libraries for the @option{-l} option (but directories specified with + @option{-L} come first). + ++@vindex ESYSROOT ++@item ESYSROOT ++On Gentoo Linux, this variable sets the logical root directory for headers and ++libraries for cross-compilers. It is ignored for native compilers, when it ++matches @env{BROOT}, and when the target machine does not match @env{CHOST} ++(if set). The @option{--sysroot} option takes precedence. ++ + @vindex LANG + @cindex locale definition + @item LANG +diff --git a/gcc/gcc.cc b/gcc/gcc.cc +index 4188f0049..e88c7067f 100644 +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -5486,6 +5486,35 @@ process_command (unsigned int decoded_options_count, + gcc_assert (!compare_debug_opt); + } + ++ if (*cross_compile == '1' && !target_system_root_changed) ++ { ++ const char *esysroot = env.get("ESYSROOT"); ++ const char *chost = env.get("CHOST"); ++ if (esysroot && (!chost || strcmp(chost, spec_machine) == 0)) ++ { ++ char *my_esysroot = lrealpath(esysroot); ++ if (my_esysroot[0] == '\0') ++ my_esysroot = xstrdup("/"); ++ ++ if (!target_system_root || ++ !filename_eq(my_esysroot, target_system_root[0] == '\0' ? "/" : target_system_root)) ++ { ++ const char *broot = env.get("BROOT"); ++ char *my_broot = (!broot || broot[0] == '\0') ? xstrdup("/") : lrealpath(broot); ++ ++ if (!filename_eq(my_esysroot, my_broot)) ++ { ++ target_system_root = esysroot; ++ target_system_root_changed = 1; ++ } ++ ++ free(my_broot); ++ } ++ ++ free(my_esysroot); ++ } ++ } ++ + /* Set up the search paths. We add directories that we expect to + contain GNU Toolchain components before directories specified by + the machine description so that we will find GNU components (like +-- +2.47.1 + diff --git a/15.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch b/15.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch new file mode 100644 index 0000000..e778f81 --- /dev/null +++ b/15.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch @@ -0,0 +1,26 @@ +From 5eeeff19bb4978a8d3c0d53bc81744bc25d82993 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sat, 14 Apr 2018 13:07:39 +0100 +Subject: [PATCH] gcc/config.gcc: sh-*: Disable sysroot-suffix (PR42947) + +sh-* is a multilib target. It is also one of 2 sysroot-prefix targets. +Unfortunately two options do not mix well. Attempt to use default +multilib flavour always prepends sysroot-prefix. + +Bug: https://bugs.gentoo.org/511548 +Bug: https://gcc.gnu.org/PR42947 +Signed-off-by: Sergei Trofimovich +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -3328,8 +3328,6 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ + if test x${enable_incomplete_targets} = xyes ; then + tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1" + fi +- tm_file="$tm_file ./sysroot-suffix.h" +- tmake_file="$tmake_file t-sysroot-suffix" + ;; + sh-*-rtems*) + tmake_file="${tmake_file} sh/t-sh sh/t-rtems" +-- +2.17.0 + diff --git a/15.2.0/gentoo/11_all_ia64-TEXTREL.patch b/15.2.0/gentoo/11_all_ia64-TEXTREL.patch new file mode 100644 index 0000000..f5d0a99 --- /dev/null +++ b/15.2.0/gentoo/11_all_ia64-TEXTREL.patch @@ -0,0 +1,22 @@ +Fix textrels on -rdynamic binaries: +Bug: https://gcc.gnu.org/PR84553 +Bug: https://bugs.gentoo.org/566118 +--- a/gcc/config/ia64/ia64.cc ++++ b/gcc/config/ia64/ia64.cc +@@ -10840,12 +10840,14 @@ ia64_hpux_reloc_rw_mask (void) + + /* For others, relax this so that relocations to local data goes in + read-only segments, but we still cannot allow global relocations +- in read-only segments. */ ++ in read-only segments. Except that use of -rdynamic at link time ++ may make any local data global, so we can't allow local data in ++ read-only segments either. */ + + static int + ia64_reloc_rw_mask (void) + { +- return flag_pic ? 3 : 2; ++ return flag_pic ? 3 : 3; + } + + /* Return the section to use for X. The only special thing we do here diff --git a/15.2.0/gentoo/14_all_respect-build-cxxflags.patch b/15.2.0/gentoo/14_all_respect-build-cxxflags.patch new file mode 100644 index 0000000..1f9a774 --- /dev/null +++ b/15.2.0/gentoo/14_all_respect-build-cxxflags.patch @@ -0,0 +1,39 @@ +Pass CXXFLAGS as CXXFLAGS_FOR_BUILD to stage1. + +Fixes build failure when CXXFLAGS contains +TARGET-specific flags. + +Tested on x86_64-pc-linux-gnu host as: + # CFLAGS='-O2 -mfpu=neon-vfpv4' CXXFLAGS='-O2 -mfpu=neon-vfpv4' \ + armv7a-unknown-linux-gnueabihf-emerge -v1 sys-devel/gcc --quiet-build=n + +Fix by Peter Levine. +https://bugs.gentoo.org/581406 +--- a/Makefile.in ++++ b/Makefile.in +@@ -176,6 +176,7 @@ + # built for the build system to override those in BASE_FLAGS_TO_PASS. + EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ ++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" + + # This is the list of directories to built for the host system. +@@ -842,6 +843,7 @@ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ ++ "CXXFLAGS_FOR_BUILD=$(CXXFLAGS_FOR_BUILD)" \ + "EXPECT=$(EXPECT)" \ + "FLEX=$(FLEX)" \ + "INSTALL=$(INSTALL)" \ +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -179,6 +179,7 @@ + # built for the build system to override those in BASE_FLAGS_TO_PASS. + EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ ++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" + + # This is the list of directories to built for the host system. diff --git a/15.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch b/15.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch new file mode 100644 index 0000000..8e9e19b --- /dev/null +++ b/15.2.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/876895 +--- a/gcc/c-family/c-cppbuiltin.cc ++++ b/gcc/c-family/c-cppbuiltin.cc +@@ -957,6 +957,10 @@ c_cpp_builtins (cpp_reader *pfile) + cpp_define (pfile, "__cpp_rtti=199711L"); + } + ++ #if defined(DEF_GENTOO_GLIBCXX_ASSERTIONS) && !defined(ACCEL_COMPILER) ++ cpp_define (pfile, "_GLIBCXX_ASSERTIONS"); ++ #endif ++ + if (cxx_dialect >= cxx11) + cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__"); + diff --git a/15.2.0/gentoo/20_all_libstdcxx-no-vtv.patch b/15.2.0/gentoo/20_all_libstdcxx-no-vtv.patch new file mode 100644 index 0000000..2719e2d --- /dev/null +++ b/15.2.0/gentoo/20_all_libstdcxx-no-vtv.patch @@ -0,0 +1,61 @@ +Final libstdc++.so should not contain rpath to make libvtv usable. +It's up to final binaries to link against proper libvtv. + +Bug: https://bugs.gentoo.org/582524 +Bug: https://gcc.gnu.org/PR85884 +--- a/libstdc++-v3/src/Makefile.am ++++ b/libstdc++-v3/src/Makefile.am +@@ -277,7 +277,6 @@ CXXLINK = \ + $(LIBTOOL) --tag CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXX) \ +- $(VTV_CXXLINKFLAGS) \ + $(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 = \ + $(LIBTOOL) --tag CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXX) \ +- $(VTV_CXXLINKFLAGS) \ + $(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 = \ + $(LIBTOOL) --tag CXX --tag disable-shared \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXX) \ +- $(VTV_CXXLINKFLAGS) \ + $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ +--- a/libstdc++-v3/src/c++11/Makefile.in ++++ b/libstdc++-v3/src/c++11/Makefile.in +@@ -588,7 +588,6 @@ CXXLINK = \ + $(LIBTOOL) --tag CXX --tag disable-shared \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXX) \ +- $(VTV_CXXLINKFLAGS) \ + $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ + + all: all-am +--- a/libstdc++-v3/src/c++98/Makefile.am ++++ b/libstdc++-v3/src/c++98/Makefile.am +@@ -268,5 +268,4 @@ CXXLINK = \ + $(LIBTOOL) --tag CXX --tag disable-shared \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXX) \ +- $(VTV_CXXLINKFLAGS) \ + $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ +--- a/libstdc++-v3/src/c++98/Makefile.in ++++ b/libstdc++-v3/src/c++98/Makefile.in +@@ -590,7 +590,6 @@ CXXLINK = \ + $(LIBTOOL) --tag CXX --tag disable-shared \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXX) \ +- $(VTV_CXXLINKFLAGS) \ + $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ + + all: all-am diff --git a/15.2.0/gentoo/22_all_default_ssp-buffer-size.patch b/15.2.0/gentoo/22_all_default_ssp-buffer-size.patch new file mode 100644 index 0000000..0e0dd42 --- /dev/null +++ b/15.2.0/gentoo/22_all_default_ssp-buffer-size.patch @@ -0,0 +1,14 @@ +Change the minimal SSP buffer size. + +https://bugs.gentoo.org/484714 +--- a/gcc/params.opt ++++ b/gcc/params.opt +@@ -1012,7 +1012,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim + The maximum number of SSA_NAME assignments to follow in determining a value. + + -param=ssp-buffer-size= +-Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization ++Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization + The lower bound for a buffer to be considered for stack smashing protection. + + -param=stack-clash-protection-guard-size= diff --git a/15.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch b/15.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch new file mode 100644 index 0000000..2ed7968 --- /dev/null +++ b/15.2.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch @@ -0,0 +1,26 @@ +If requested we add -z now + +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -1001,6 +1001,12 @@ proper position among the other output files. */ + #endif + #endif + ++#ifdef DEF_GENTOO_ZNOW ++#define LINK_NOW_SPEC "%{!nonow:-z now} " ++#else ++#define LINK_NOW_SPEC "" ++#endif ++ + #ifdef ENABLE_DEFAULT_PIE + #define PIE_SPEC "!no-pie" + #define NO_FPIE1_SPEC "fno-pie" +@@ -1161,7 +1167,7 @@ proper position among the other output files. */ + %(linker) " \ + LINK_PLUGIN_SPEC \ + "%{flto|flto=*:% +Subject: [PATCH] Enable CET (-fcf-protection=full) by default + +Needs: +- CET to be enabled for GCC +- -DEXTRA_OPTIONS_CF to be passed during build (via toolchain.eclass). + +Only supported on amd64. +--- a/gcc/cp/lang-specs.h ++++ b/gcc/cp/lang-specs.h +@@ -57,7 +57,7 @@ along with GCC; see the file COPYING3. If not see + " %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}" + " %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}" + " %{fmodules*:-fmodule-header %{fpreprocessed:-fdirectives-only}}" +- " %(cc1_options) %2" ++ " %(cc1_options) %(default_flag_cf_spec) %2" + " %{!fsyntax-only:" + " %{!S:-o %g.s}" + " %{!fmodule-*:%{!fmodules*:%{!fdump-ada-spec*:" +@@ -78,7 +78,7 @@ along with GCC; see the file COPYING3. If not see + " %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}" + " %{fmodules*:-fmodule-header=system" + " %{fpreprocessed:-fdirectives-only}}" +- " %(cc1_options) %2" ++ " %(cc1_options) %(default_flag_cf_spec) %2" + " %{!fsyntax-only:" + " %{!S:-o %g.s}" + " %{!fmodule-*:%{!fmodules*:%{!fdump-ada-spec*:" +@@ -98,7 +98,7 @@ along with GCC; see the file COPYING3. If not see + " %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}" + " %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}" + " %{fmodules*:-fmodule-header=user %{fpreprocessed:-fdirectives-only}}" +- " %(cc1_options) %2" ++ " %(cc1_options) %(default_flag_cf_spec) %2" + " %{!fsyntax-only:" + " %{!S:-o %g.s}" + " %{!fmodule-*:%{!fmodules*:%{!fdump-ada-spec*:" +@@ -113,7 +113,7 @@ along with GCC; see the file COPYING3. If not see + " cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed" + " %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}" + " %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}" +- " %(cc1_options) %2" ++ " %(cc1_options) %(default_flag_cf_spec) %2" + " %{!fsyntax-only:" + " %{fmodule-only:%{!S:-o %g.s%V}}" + " %{!fmodule-only:%(invoke_as)}}" +@@ -122,7 +122,7 @@ along with GCC; see the file COPYING3. If not see + {".ii", "@c++-cpp-output", 0, 0, 0}, + {"@c++-cpp-output", + "%{!E:%{!M:%{!MM:" +- " cc1plus -fpreprocessed %i %(cc1_options) %2" ++ " cc1plus -fpreprocessed %i %(cc1_options) %(default_flag_cf_spec) %2" + " %{!fsyntax-only:" + " %{fmodule-only:%{!S:-o %g.s%V}}" + " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -1011,6 +1011,18 @@ proper position among the other output files. */ + #define LINK_NOW_SPEC "" + #endif + ++/* Default value for flag_cf_protection when flag_cf_protection is ++ initialized to CF_FULL. ++ ++ We use a new option (EXTRA_OPTIONS_CF) here to avoid turning ++ this on accidentally for other arches. */ ++#if defined(EXTRA_OPTIONS_CF) && !defined(ACCEL_COMPILER) ++#define DEFAULT_FLAG_CF_SPEC " %{!m16:%{!m32:%{!fcf-protection*:%{!fno-cf-protection:-fcf-protection}}}} -foffload-options=-fcf-protection=none" ++#endif ++#ifndef DEFAULT_FLAG_CF_SPEC ++#define DEFAULT_FLAG_CF_SPEC "" ++#endif ++ + #ifdef ENABLE_DEFAULT_PIE + #define PIE_SPEC "!no-pie" + #define NO_FPIE1_SPEC "fno-pie" +@@ -1217,6 +1229,7 @@ static const char *cpp_spec = CPP_SPEC; + static const char *cc1_spec = CC1_SPEC OS_CC1_SPEC; + static const char *cc1plus_spec = CC1PLUS_SPEC; + static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC; ++static const char *default_flag_cf_spec = DEFAULT_FLAG_CF_SPEC; + static const char *link_ssp_spec = LINK_SSP_SPEC; + static const char *asm_spec = ASM_SPEC; + static const char *asm_final_spec = ASM_FINAL_SPEC; +@@ -1277,7 +1290,7 @@ static const char *cpp_options = + "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ + %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ + %{!fno-working-directory:-fworking-directory}}} %{O*}\ +- %{undef} %{save-temps*:-fpch-preprocess}"; ++ %{undef} %{save-temps*:-fpch-preprocess} %(default_flag_cf_spec)"; + + /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. + +@@ -1471,9 +1484,9 @@ static const struct compiler default_compilers[] = + %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \ + %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\ + cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \ +- %(cc1_options)}\ ++ %(cc1_options)%(default_flag_cf_spec)}\ + %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\ +- cc1 %(cpp_unique_options) %(cc1_options)}}}\ ++ cc1 %(cpp_unique_options) %(cc1_options) %(default_flag_cf_spec)}}}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1}, + {"-", + "%{!E:%e-E or -x required when input is from standard input}\ +@@ -1498,7 +1511,7 @@ static const struct compiler default_compilers[] = + %W{o*:--output-pch %w%*}}%{!S:%V}}}}}}}}", 0, 0, 0}, + {".i", "@cpp-output", 0, 0, 0}, + {"@cpp-output", +- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ++ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(default_flag_cf_spec) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {".s", "@assembler", 0, 0, 0}, + {"@assembler", + "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, +@@ -1730,6 +1743,7 @@ static struct spec_list static_specs[] = + INIT_STATIC_SPEC ("cc1_options", &cc1_options), + INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec), + INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec), ++ INIT_STATIC_SPEC ("default_flag_cf_spec", &default_flag_cf_spec), + INIT_STATIC_SPEC ("link_ssp", &link_ssp_spec), + INIT_STATIC_SPEC ("endfile", &endfile_spec), + INIT_STATIC_SPEC ("link", &link_spec), +--- a/gcc/objc/lang-specs.h ++++ b/gcc/objc/lang-specs.h +@@ -29,9 +29,9 @@ along with GCC; see the file COPYING3. If not see + %{traditional|traditional-cpp:\ + %eGNU Objective C no longer supports traditional compilation}\ + %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\ +- cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\ ++ cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %(default_flag_cf_spec) %{print-objc-runtime-info} %{gen-decls}}\ + %{!save-temps*:%{!no-integrated-cpp:\ +- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\ ++ cc1obj %(cpp_unique_options) %(cc1_options) %(default_flag_cf_spec) %{print-objc-runtime-info} %{gen-decls}}}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {"@objective-c-header", + "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\ +@@ -40,18 +40,18 @@ along with GCC; see the file COPYING3. If not see + %{traditional|traditional-cpp:\ + %eGNU Objective C no longer supports traditional compilation}\ + %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\ +- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ ++ cc1obj -fpreprocessed %b.mi %(cc1_options) %(default_flag_cf_spec) %{print-objc-runtime-info} %{gen-decls}\ + -o %g.s %{!o*:--output-pch %i.gch}\ + %W{o*:--output-pch %*}%V}\ + %{!save-temps*:%{!no-integrated-cpp:\ +- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ ++ cc1obj %(cpp_unique_options) %(cc1_options) %(default_flag_cf_spec) %{print-objc-runtime-info} %{gen-decls}\ + -o %g.s %{!o*:--output-pch %i.gch}\ + %W{o*:--output-pch %*}%V}}}}}", 0, 0, 0}, + {".mi", "@objective-c-cpp-output", 0, 0, 0}, + {"@objective-c-cpp-output", +- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ ++ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(default_flag_cf_spec) %{print-objc-runtime-info} %{gen-decls}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {"@objc-cpp-output", + "%nobjc-cpp-output is deprecated; please use objective-c-cpp-output instead\n\ +- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ ++ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(default_flag_cf_spec) %{print-objc-runtime-info} %{gen-decls}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +--- a/gcc/objcp/lang-specs.h ++++ b/gcc/objcp/lang-specs.h +@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see + %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\ + cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\ + %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ +- %(cc1_options) %2\ ++ %(cc1_options) %(default_flag_cf_spec) %2\ + -o %g.s %{!o*:--output-pch %i.gch} %W{o*:--output-pch %*}%V}}}", + CPLUSPLUS_CPP_SPEC, 0, 0}, + {"@objective-c++", +@@ -46,16 +46,16 @@ along with GCC; see the file COPYING3. If not see + %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\ + cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\ + %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ +- %(cc1_options) %2\ ++ %(cc1_options) %(default_flag_cf_spec) %2\ + %{!fsyntax-only:%(invoke_as)}}}}", + CPLUSPLUS_CPP_SPEC, 0, 0}, + {".mii", "@objective-c++-cpp-output", 0, 0, 0}, + {"@objective-c++-cpp-output", + "%{!M:%{!MM:%{!E:\ +- cc1objplus -fpreprocessed %i %(cc1_options) %2\ ++ cc1objplus -fpreprocessed %i %(cc1_options) %(default_flag_cf_spec) %2\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {"@objc++-cpp-output", + "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-output instead\n\ + %{!M:%{!MM:%{!E:\ +- cc1objplus -fpreprocessed %i %(cc1_options) %2\ ++ cc1objplus -fpreprocessed %i %(cc1_options) %(default_flag_cf_spec) %2\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, diff --git a/15.2.0/gentoo/28_all_drop_CFLAGS_sed.patch b/15.2.0/gentoo/28_all_drop_CFLAGS_sed.patch new file mode 100644 index 0000000..b160c92 --- /dev/null +++ b/15.2.0/gentoo/28_all_drop_CFLAGS_sed.patch @@ -0,0 +1,67 @@ +https://bugs.gentoo.org/849722 +https://github.com/InBetweenNames/gentooLTO/issues/846 +https://github.com/vaeth/portage-bashrc-mv/issues/11 +--- a/gcc/configure ++++ b/gcc/configure +@@ -5473,29 +5473,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +-# Remove all -O flags: for historical reasons, unless bootstrapping we prefer +-# optimizations to be activated explicitly by the toplevel. +-case "$CC" in +- */prev-gcc/xgcc*) ;; +- *) +- new_CFLAGS= +- for flag in $CFLAGS; do +- case $flag in +- -O*) ;; +- *) new_CFLAGS="$new_CFLAGS $flag" ;; +- esac +- done +- CFLAGS=$new_CFLAGS +- new_CXXFLAGS= +- for flag in $CXXFLAGS; do +- case $flag in +- -O*) ;; +- *) new_CXXFLAGS="$new_CXXFLAGS $flag" ;; +- esac +- done +- CXXFLAGS=$new_CXXFLAGS +- ;; +-esac + + + +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -463,29 +463,6 @@ ACX_PROG_GDC([-I"$srcdir"/d]) + # Do configure tests with the C++ compiler, since that's what we build with. + AC_LANG(C++) + +-# Remove all -O flags: for historical reasons, unless bootstrapping we prefer +-# optimizations to be activated explicitly by the toplevel. +-case "$CC" in +- */prev-gcc/xgcc*) ;; +- *) +- new_CFLAGS= +- for flag in $CFLAGS; do +- case $flag in +- -O*) ;; +- *) new_CFLAGS="$new_CFLAGS $flag" ;; +- esac +- done +- CFLAGS=$new_CFLAGS +- new_CXXFLAGS= +- for flag in $CXXFLAGS; do +- case $flag in +- -O*) ;; +- *) new_CXXFLAGS="$new_CXXFLAGS $flag" ;; +- esac +- done +- CXXFLAGS=$new_CXXFLAGS +- ;; +-esac + AC_SUBST(CFLAGS) + AC_SUBST(CXXFLAGS) + AC_SUBST(GDCFLAGS) diff --git a/15.2.0/gentoo/29_all_msgfmt-libstdc++-link.patch b/15.2.0/gentoo/29_all_msgfmt-libstdc++-link.patch new file mode 100644 index 0000000..0d2f113 --- /dev/null +++ b/15.2.0/gentoo/29_all_msgfmt-libstdc++-link.patch @@ -0,0 +1,39 @@ +Ensure that msgfmt doesn't encounter problems during gcc bootstrapping. + +Solves error messages like the following: + +msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6) + +The libgcc_s.so used during build doesn't satisfy the needs of the +libstdc++.so that msgfmt is linked against. On the other hand, msgfmt +is used as a stand-alone application here, and what library it uses +behind the scenes is of no concern to the gcc build process. +Therefore, simply invoking it "as usual", i.e. without any special +library path, will make it work as expected here. + +2011-09-19 Martin von Gagern + +References: +https://bugs.gentoo.org/372377 +https://bugs.gentoo.org/295480 +https://bugs.gentoo.org/843119 +--- a/libstdc++-v3/po/Makefile.am ++++ b/libstdc++-v3/po/Makefile.am +@@ -39,6 +39,7 @@ MSGFMT = msgfmt + EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN) + + .po.mo: ++ env --unset=LD_LIBRARY_PATH \ + $(MSGFMT) -o $@ $< + + all-local: all-local-$(USE_NLS) +--- a/libstdc++-v3/po/Makefile.in ++++ b/libstdc++-v3/po/Makefile.in +@@ -419,6 +419,7 @@ uninstall-am: uninstall-info-am + + + .po.mo: ++ env --unset=LD_LIBRARY_PATH \ + $(MSGFMT) -o $@ $< + + all-local: all-local-$(USE_NLS) diff --git a/15.2.0/gentoo/30_all_tar_libstdc++-link.patch b/15.2.0/gentoo/30_all_tar_libstdc++-link.patch new file mode 100644 index 0000000..adb414a --- /dev/null +++ b/15.2.0/gentoo/30_all_tar_libstdc++-link.patch @@ -0,0 +1,57 @@ +From eae11e896edef4199a128bf6720b5bd4e5edc2f9 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 17 Dec 2022 02:42:59 +0000 +Subject: [PATCH] Fix calling libarchive's tar + +https://bugs.gentoo.org/886447 + +Very similar to 33_all_msgfmt-libstdc++-link.patch, whose description is: +""" +Ensure that msgfmt doesn't encounter problems during gcc bootstrapping. + +Solves error messages like the following: + +msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6) + +The libgcc_s.so used during build doesn't satisfy the needs of the +libstdc++.so that msgfmt is linked against. On the other hand, msgfmt +is used as a stand-alone application here, and what library it uses +behind the scenes is of no concern to the gcc build process. +Therefore, simply invoking it "as usual", i.e. without any special +library path, will make it work as expected here. + +2011-09-19 Martin von Gagern + +References: +https://bugs.gentoo.org/372377 +https://bugs.gentoo.org/295480 +https://bugs.gentoo.org/843119 +""" + +Signed-off-by: Sam James +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3955,10 +3955,10 @@ install-headers-tar: stmp-int-hdrs install-include-dir + # Unless a full pathname is provided, some shells would print the new CWD, + # found in CDPATH, corrupting the output. We could just redirect the + # output of `cd', but some shells lose on redirection within `()'s +- (cd `${PWD_COMMAND}`/include ; \ +- tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - ) +- (cd `${PWD_COMMAND}`/include-fixed ; \ +- tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - ) ++ (unset LD_LIBRARY_PATH ; cd `${PWD_COMMAND}`/include ; \ ++ tar -cf - .; exit 0) | (unset LD_LIBRARY_PATH ; cd $(DESTDIR)$(libsubdir)/include; tar xpf - ) ++ (unset LD_LIBRARY_PATH ; cd `${PWD_COMMAND}`/include-fixed ; \ ++ tar -cf - .; exit 0) | (unset LD_LIBRARY_PATH ; cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - ) + # /bin/sh on some systems returns the status of the first tar, + # and that can lose with GNU tar which always writes a full block. + # So use `exit 0' to ignore its exit status. +@@ -3979,7 +3979,7 @@ install-headers-cp: stmp-int-hdrs install-include-dir + # Targets without dependencies, for use in prev-gcc during bootstrap. + real-install-headers-tar: + (cd `${PWD_COMMAND}`/include-fixed ; \ +- tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - ) ++ unset LD_LIBRARY_PATH; tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; unset LD_LIBRARY_PATH; tar xpf - ) + + real-install-headers-cpio: + cd `${PWD_COMMAND}`/include-fixed ; \ diff --git a/15.2.0/gentoo/31_all_testsuite-fortran-pass-Wcomplain-wrong-lang-where-ap.patch b/15.2.0/gentoo/31_all_testsuite-fortran-pass-Wcomplain-wrong-lang-where-ap.patch new file mode 100644 index 0000000..ba6d67f --- /dev/null +++ b/15.2.0/gentoo/31_all_testsuite-fortran-pass-Wcomplain-wrong-lang-where-ap.patch @@ -0,0 +1,108 @@ +https://inbox.sourceware.org/gcc-patches/87v80cn24t.fsf@gentoo.org/ + +See also d4c98533530d9478391b0593fd84cf37ac9c97cb in ::gentoo. + +From 1e216be94b87d607cafd6f35fd2ece5ba5004a76 Mon Sep 17 00:00:00 2001 +Message-ID: <1e216be94b87d607cafd6f35fd2ece5ba5004a76.1723114981.git.sam@gentoo.org> +From: Sam James +Date: Thu, 8 Aug 2024 12:00:41 +0100 +Subject: [PATCH] testsuite: fortran: pass -Wcomplain-wrong-lang where + appropriate + +These tests expect the diagnostic from -Wcomplain-wrong-lang but +don't explicitly enable it. This causes issues if running the testsuite +with -Wno-complain-wrong-lang. + +gcc/testsuite/ChangeLog: + * gfortran.dg/ISO_Fortran_binding_17.f90: Pass -Wcomplain-wrong-lang. + * gfortran.dg/c-interop/allocate-errors.f90: Likewise. + * gfortran.dg/c-interop/establish-errors.f90: Likewise. + * gfortran.dg/c-interop/section-errors.f90: Likewise. + * gfortran.dg/c-interop/select-errors.f90: Likewise. + * gfortran.dg/c-interop/setpointer-errors.f90: Likewise. +--- + gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.f90 | 2 +- + gcc/testsuite/gfortran.dg/c-interop/allocate-errors.f90 | 2 +- + gcc/testsuite/gfortran.dg/c-interop/establish-errors.f90 | 2 +- + gcc/testsuite/gfortran.dg/c-interop/section-errors.f90 | 2 +- + gcc/testsuite/gfortran.dg/c-interop/select-errors.f90 | 2 +- + gcc/testsuite/gfortran.dg/c-interop/setpointer-errors.f90 | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.f90 b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.f90 +index c399e710ce97..c321c7a61f54 100644 +--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.f90 ++++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.f90 +@@ -1,6 +1,6 @@ + ! { dg-do run } + ! { dg-additional-sources ISO_Fortran_binding_17.c } +-! { dg-options "-fcheck=all" } ++! { dg-options "-Wcomplain-wrong-lang -fcheck=all" } + ! { dg-warning "command-line option '-fcheck=all' is valid for Fortran but not for C" "" { target *-*-* } 0 } + ! + ! PR fortran/92470 +diff --git a/gcc/testsuite/gfortran.dg/c-interop/allocate-errors.f90 b/gcc/testsuite/gfortran.dg/c-interop/allocate-errors.f90 +index a58d05a33681..1cf3fbd9fdd7 100644 +--- a/gcc/testsuite/gfortran.dg/c-interop/allocate-errors.f90 ++++ b/gcc/testsuite/gfortran.dg/c-interop/allocate-errors.f90 +@@ -1,6 +1,6 @@ + ! { dg-do run } + ! { dg-additional-sources "allocate-errors-c.c dump-descriptors.c" } +-! { dg-additional-options "-Wno-error -fcheck=all" } ++! { dg-additional-options "-Wno-error -Wcomplain-wrong-lang -fcheck=all" } + ! { dg-warning "command-line option '-fcheck=all' is valid for Fortran but not for C" "" { target *-*-* } 0 } + ! + ! This program tests that the CFI_allocate and CFI_deallocate functions +diff --git a/gcc/testsuite/gfortran.dg/c-interop/establish-errors.f90 b/gcc/testsuite/gfortran.dg/c-interop/establish-errors.f90 +index 307a2664b743..c505c1904c75 100644 +--- a/gcc/testsuite/gfortran.dg/c-interop/establish-errors.f90 ++++ b/gcc/testsuite/gfortran.dg/c-interop/establish-errors.f90 +@@ -1,7 +1,7 @@ + ! PR101317 + ! { dg-do run } + ! { dg-additional-sources "establish-errors-c.c dump-descriptors.c" } +-! { dg-additional-options "-Wno-error -fcheck=all" } ++! { dg-additional-options "-Wno-error -Wcomplain-wrong-lang -fcheck=all" } + ! { dg-warning "command-line option '-fcheck=all' is valid for Fortran but not for C" "" { target *-*-* } 0 } + ! + ! This program tests that the CFI_establish function properly detects +diff --git a/gcc/testsuite/gfortran.dg/c-interop/section-errors.f90 b/gcc/testsuite/gfortran.dg/c-interop/section-errors.f90 +index 28328b799b30..699fa8940849 100644 +--- a/gcc/testsuite/gfortran.dg/c-interop/section-errors.f90 ++++ b/gcc/testsuite/gfortran.dg/c-interop/section-errors.f90 +@@ -1,6 +1,6 @@ + ! { dg-do run } + ! { dg-additional-sources "section-errors-c.c dump-descriptors.c" } +-! { dg-additional-options "-Wno-error -fcheck=all" } ++! { dg-additional-options "-Wno-error -Wcomplain-wrong-lang -fcheck=all" } + ! { dg-warning "command-line option '-fcheck=all' is valid for Fortran but not for C" "" { target *-*-* } 0 } + ! + ! This program tests that the CFI_section function properly detects +diff --git a/gcc/testsuite/gfortran.dg/c-interop/select-errors.f90 b/gcc/testsuite/gfortran.dg/c-interop/select-errors.f90 +index b719c9e68679..199f314ed359 100644 +--- a/gcc/testsuite/gfortran.dg/c-interop/select-errors.f90 ++++ b/gcc/testsuite/gfortran.dg/c-interop/select-errors.f90 +@@ -1,6 +1,6 @@ + ! { dg-do run } + ! { dg-additional-sources "select-errors-c.c dump-descriptors.c" } +-! { dg-additional-options "-Wno-error -fcheck=all" } ++! { dg-additional-options "-Wno-error -Wcomplain-wrong-lang -fcheck=all" } + ! { dg-warning "command-line option '-fcheck=all' is valid for Fortran but not for C" "" { target *-*-* } 0 } + ! + ! This program tests that the CFI_select_part function properly detects +diff --git a/gcc/testsuite/gfortran.dg/c-interop/setpointer-errors.f90 b/gcc/testsuite/gfortran.dg/c-interop/setpointer-errors.f90 +index 84a01ce16b12..3af7cc7f0e0f 100644 +--- a/gcc/testsuite/gfortran.dg/c-interop/setpointer-errors.f90 ++++ b/gcc/testsuite/gfortran.dg/c-interop/setpointer-errors.f90 +@@ -1,7 +1,7 @@ + ! PR 101317 + ! { dg-do run } + ! { dg-additional-sources "setpointer-errors-c.c dump-descriptors.c" } +-! { dg-additional-options "-Wno-error -fcheck=all" } ++! { dg-additional-options "-Wno-error -Wcomplain-wrong-lang -fcheck=all" } + ! { dg-warning "command-line option '-fcheck=all' is valid for Fortran but not for C" "" { target *-*-* } 0 } + ! + ! This program tests that the CFI_setpointer function properly detects +-- +2.45.2 + diff --git a/15.2.0/gentoo/32_all_time64.patch b/15.2.0/gentoo/32_all_time64.patch new file mode 100644 index 0000000..ac972b9 --- /dev/null +++ b/15.2.0/gentoo/32_all_time64.patch @@ -0,0 +1,39 @@ +From b2ee3846dfcea638e0fbf2d550234f1c7594fcdb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 1 Nov 2024 07:48:37 +0100 +Subject: [PATCH] Support forcing _TIME_BITS=64 for time64 profiles +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Support forcing _TIME_BITS=64 and _FILE_OFFSET_BITS=64 +via -D_GENTOO_TIME64_FORCE=1, for time64 profiles. + +Signed-off-by: Michał Górny +--- + gcc/c-family/c-cppbuiltin.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc +index 8bbfe84b2..962cbd414 100644 +--- a/gcc/c-family/c-cppbuiltin.cc ++++ b/gcc/c-family/c-cppbuiltin.cc +@@ -1593,6 +1593,15 @@ c_cpp_builtins (cpp_reader *pfile) + builtin_define_with_int_value ("_FORTIFY_SOURCE", GENTOO_FORTIFY_SOURCE_LEVEL); + #endif + ++#ifndef _GENTOO_TIME64_FORCE ++ #define _GENTOO_TIME64_FORCE 0 ++#endif ++ ++ if (_GENTOO_TIME64_FORCE) { ++ cpp_define (pfile, "_FILE_OFFSET_BITS=64"); ++ cpp_define (pfile, "_TIME_BITS=64"); ++ } ++ + /* Misc. */ + if (flag_gnu89_inline) + cpp_define (pfile, "__GNUC_GNU_INLINE__"); +-- +2.47.0 + diff --git a/15.2.0/gentoo/33_all_PR80677-cross-limits.patch b/15.2.0/gentoo/33_all_PR80677-cross-limits.patch new file mode 100644 index 0000000..3cbef01 --- /dev/null +++ b/15.2.0/gentoo/33_all_PR80677-cross-limits.patch @@ -0,0 +1,38 @@ +https://gcc.gnu.org/PR80677 +--- a/gcc/limitx.h ++++ b/gcc/limitx.h +@@ -29,7 +29,7 @@ + #ifndef _GCC_LIMITS_H_ /* Terminated in limity.h. */ + #define _GCC_LIMITS_H_ + +-#ifndef _LIBC_LIMITS_H_ ++#if !defined(_LIBC_LIMITS_H_) && __has_include_next() + /* Use "..." so that we find syslimits.h only in this same directory. */ + #include "syslimits.h" + #endif +--- a/gcc/limity.h ++++ b/gcc/limity.h +@@ -3,7 +3,7 @@ + + #else /* not _GCC_LIMITS_H_ */ + +-#ifdef _GCC_NEXT_LIMITS_H ++#if defined(_GCC_NEXT_LIMITS_H) && __has_include_next() + #include_next /* recurse down to the real one */ + #endif + +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3344,11 +3344,7 @@ stmp-int-hdrs: $(STMP_FIXINC) $(T_GLIMITS_H) $(T_STDINT_GCC_H) $(USER_H) fixinc_ + sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \ + multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \ + include_dir=include$${multi_dir}; \ +- if $(LIMITS_H_TEST) ; then \ +- cat $(srcdir)/limitx.h $(T_GLIMITS_H) $(srcdir)/limity.h > tmp-xlimits.h; \ +- else \ +- cat $(T_GLIMITS_H) > tmp-xlimits.h; \ +- fi; \ ++ cat $(srcdir)/limitx.h $(T_GLIMITS_H) $(srcdir)/limity.h > tmp-xlimits.h; \ + $(mkinstalldirs) $${include_dir}; \ + chmod a+rx $${include_dir} || true; \ + $(SHELL) $(srcdir)/../move-if-change \ diff --git a/15.2.0/gentoo/34_all_time64_ssemath.patch b/15.2.0/gentoo/34_all_time64_ssemath.patch new file mode 100644 index 0000000..3701b6b --- /dev/null +++ b/15.2.0/gentoo/34_all_time64_ssemath.patch @@ -0,0 +1,43 @@ +From 33ba5944f2b887fe8bddd541790645b74f1f2655 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 24 Nov 2024 14:45:37 +0100 +Subject: [PATCH] Default to -mfpmath=sse on x86 with time64 + +Our time64 stages already default to `-mfpmath=sse`, so let's have +the time64 flag implicitly enable it as the default to make things more +consistent. Furthermore, this also improves compatibility with clang +that always enables it whenever the target architectures supports SSE. + +Note that this works only if `-march=` with SSE support is specified. +We could technically improve the consistency even further by raising +the default `-march=`, but that seems a bit intrusive and probably +unnecessary, given that the vast majority of Gentoo users and/or +upstream projects will specify `-march=`. + +See also: +https://public-inbox.gentoo.org/gentoo-dev/ce894afe6c2b324fef012da9bb9387cfde7aed03.camel@gentoo.org/ +https://public-inbox.gentoo.org/gentoo-dev/baa1ca92da4941b0999ea2feecf02334b5b20ade.camel@gentoo.org/ +--- + gcc/config/i386/i386-options.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc +index 6c212a8ed..03801f382 100644 +--- a/gcc/config/i386/i386-options.cc ++++ b/gcc/config/i386/i386-options.cc +@@ -2881,7 +2881,11 @@ ix86_option_override_internal (bool main_args_p, + Also -mfpmath=387 is overall a lot more compact (bout 4-5%) than SSE + codegen. We may switch to 387 with -ffast-math for size optimized + functions. */ +- else if (fast_math_flags_set_p (&global_options) ++#ifndef _GENTOO_TIME64_FORCE ++ #define _GENTOO_TIME64_FORCE 0 ++#endif ++ ++ else if ((fast_math_flags_set_p (&global_options) || _GENTOO_TIME64_FORCE) + && TARGET_SSE2_P (opts->x_ix86_isa_flags)) + opts->x_ix86_fpmath = FPMATH_SSE; + else +-- +2.47.0 + diff --git a/15.2.0/gentoo/35_all_checking-gc-use-heuristics.patch b/15.2.0/gentoo/35_all_checking-gc-use-heuristics.patch new file mode 100644 index 0000000..35ba553 --- /dev/null +++ b/15.2.0/gentoo/35_all_checking-gc-use-heuristics.patch @@ -0,0 +1,22 @@ +GCC's --enable-checking=yes includes 'gc' which also then disables the +default (already conservative) GC threshold heuristics. +--- a/gcc/ggc-common.cc ++++ b/gcc/ggc-common.cc +@@ -1029,7 +1029,7 @@ mmap_gt_pch_use_address (void *&base, size_t size, int fd, size_t offset) + } + #endif /* HAVE_MMAP_FILE */ + +-#if !defined ENABLE_GC_CHECKING && !defined ENABLE_GC_ALWAYS_COLLECT ++#if !defined ENABLE_GC_ALWAYS_COLLECT + + /* Modify the bound based on rlimits. */ + static double +@@ -1126,7 +1126,7 @@ ggc_min_heapsize_heuristic (void) + void + init_ggc_heuristics (void) + { +-#if !defined ENABLE_GC_CHECKING && !defined ENABLE_GC_ALWAYS_COLLECT ++#if !defined ENABLE_GC_ALWAYS_COLLECT + param_ggc_min_expand = ggc_min_expand_heuristic (); + param_ggc_min_heapsize = ggc_min_heapsize_heuristic (); + #endif diff --git a/15.2.0/gentoo/76_all_PR117854-config-nvptx-fix-bashisms-with-gen-copyright.sh-use.patch b/15.2.0/gentoo/76_all_PR117854-config-nvptx-fix-bashisms-with-gen-copyright.sh-use.patch new file mode 100644 index 0000000..263204e --- /dev/null +++ b/15.2.0/gentoo/76_all_PR117854-config-nvptx-fix-bashisms-with-gen-copyright.sh-use.patch @@ -0,0 +1,68 @@ +From f6959883aecd1500698ea969de631ffa010ce833 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Sam James +Date: Fri, 6 Dec 2024 09:11:11 +0000 +Subject: [PATCH] config: nvptx: fix bashisms with gen-copyright.sh use + +Providing parameters to `.` when sourcing is a bashism and not supported +by POSIX shell which causes a build failure when compiling a toolchain +for nvptx-none with dash as /bin/sh. + +gen-copyright.sh takes a parameter for the format of copyright notice +required. Switch that to using an environment variable `NVPTX_GEN_COPYRIGHT`, +although this could be changed to a function if desired (just more churn +in gen-copyright.sh then). + +gcc/ChangeLog: + PR target/117854 + + * config/nvptx/gen-copyright.sh: Read NVPTX_GEN_COPYRIGHT envvar. + * config/nvptx/gen-h.sh: Set NVPTX_GEN_COPYRIGHT. + * config/nvptx/gen-opt.sh: Ditto. +--- + gcc/config/nvptx/gen-copyright.sh | 2 +- + gcc/config/nvptx/gen-h.sh | 2 +- + gcc/config/nvptx/gen-opt.sh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gcc/config/nvptx/gen-copyright.sh b/gcc/config/nvptx/gen-copyright.sh +index d0a86acb832c..b140de0eb76d 100644 +--- a/gcc/config/nvptx/gen-copyright.sh ++++ b/gcc/config/nvptx/gen-copyright.sh +@@ -18,7 +18,7 @@ + # along with GCC; see the file COPYING3. If not see + # . + +-style="$1" ++style="${NVPTX_GEN_COPYRIGHT}" + case $style in + opt) + ;; +diff --git a/gcc/config/nvptx/gen-h.sh b/gcc/config/nvptx/gen-h.sh +index bc4ce9af1e2a..a5c18d864504 100644 +--- a/gcc/config/nvptx/gen-h.sh ++++ b/gcc/config/nvptx/gen-h.sh +@@ -36,7 +36,7 @@ EOF + # Separator. + echo + +-. $gen_copyright_sh c ++NVPTX_GEN_COPYRIGHT=c . $gen_copyright_sh + + # Separator. + echo +diff --git a/gcc/config/nvptx/gen-opt.sh b/gcc/config/nvptx/gen-opt.sh +index 103bcddc02b5..40c949425f27 100644 +--- a/gcc/config/nvptx/gen-opt.sh ++++ b/gcc/config/nvptx/gen-opt.sh +@@ -40,7 +40,7 @@ EOF + # Separator. + echo + +-. $gen_copyright_sh opt ++NVPTX_GEN_COPYRIGHT=opt . $gen_copyright_sh + + # Not emitting the following here (in addition to having it in 'nvptx.opt'), as + # we'll otherwise run into: +-- +2.47.1 diff --git a/15.2.0/gentoo/84_all_PR116975-GDCFLAGS.patch b/15.2.0/gentoo/84_all_PR116975-GDCFLAGS.patch new file mode 100644 index 0000000..443cb0f --- /dev/null +++ b/15.2.0/gentoo/84_all_PR116975-GDCFLAGS.patch @@ -0,0 +1,320 @@ +https://inbox.sourceware.org/gcc-patches/20250303221451.131585-1-ibuclaw@gdcproject.org/ + +From 17de0be9cff1a33289736b3b86cd0428e17aa9aa Mon Sep 17 00:00:00 2001 +Message-ID: <17de0be9cff1a33289736b3b86cd0428e17aa9aa.1744276017.git.sam@gentoo.org> +From: Iain Buclaw +Date: Mon, 3 Mar 2025 23:14:51 +0100 +Subject: [PATCH] Makefile.tpl: Implement per-stage GDCFLAGS [PR116975] + +Hi, + +This patch implements STAGE1_GDCFLAGS and others to the configure +machinery, allowing the GDCFLAGS for each bootstrap stage of building +gdc to be overriden, as is the case with CXXFLAGS for other front-ends. + +This is limited to just the generation of recipes for the +configure-stage-gcc and all-stage-gcc, as a D compiler is not optionally +needed by any other module. + +OK for mainline? + +Regards, +Iain. +--- + Makefile.in | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.tpl | 15 +++++++++++++-- + 2 files changed, 64 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b1ed67d3d4f1..202a504e565f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -620,6 +620,26 @@ STAGE1_CONFIGURE_FLAGS = $(STAGE1_CHECKING) \ + --disable-build-format-warnings + + @if target-libphobos-bootstrap ++# Defaults for each stage if we're bootstrapping D. ++ ++STAGE1_GDCFLAGS = $(GDCFLAGS) ++ ++STAGE2_GDCFLAGS = $(GDCFLAGS) ++ ++STAGE3_GDCFLAGS = $(GDCFLAGS) ++ ++STAGE4_GDCFLAGS = $(GDCFLAGS) ++ ++STAGEprofile_GDCFLAGS = $(GDCFLAGS) ++ ++STAGEtrain_GDCFLAGS = $(GDCFLAGS) ++ ++STAGEfeedback_GDCFLAGS = $(GDCFLAGS) ++ ++STAGEautoprofile_GDCFLAGS = $(GDCFLAGS) ++ ++STAGEautofeedback_GDCFLAGS = $(GDCFLAGS) ++ + STAGE1_CONFIGURE_FLAGS += --with-libphobos-druntime-only + STAGE2_CONFIGURE_FLAGS += --with-libphobos-druntime-only + @endif target-libphobos-bootstrap +@@ -633,6 +653,10 @@ STAGE2_CFLAGS += -fno-checking + STAGE2_TFLAGS += -fno-checking + STAGE3_CFLAGS += -fchecking=1 + STAGE3_TFLAGS += -fchecking=1 ++@if target-libphobos-bootstrap ++STAGE2_GDCFLAGS += -fno-checking ++STAGE3_GDCFLAGS += -fchecking=1 ++@endif target-libphobos-bootstrap + + STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate + STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) +@@ -922,38 +946,47 @@ BASE_FLAGS_TO_PASS = \ + "LEAN=$(LEAN)" \ + "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \ + "STAGE1_CXXFLAGS=$(STAGE1_CXXFLAGS)" \ ++ "STAGE1_GDCFLAGS=$(STAGE1_GDCFLAGS)" \ + "STAGE1_GENERATOR_CFLAGS=$(STAGE1_GENERATOR_CFLAGS)" \ + "STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \ + "STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \ + "STAGE2_CXXFLAGS=$(STAGE2_CXXFLAGS)" \ ++ "STAGE2_GDCFLAGS=$(STAGE2_GDCFLAGS)" \ + "STAGE2_GENERATOR_CFLAGS=$(STAGE2_GENERATOR_CFLAGS)" \ + "STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \ + "STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \ + "STAGE3_CXXFLAGS=$(STAGE3_CXXFLAGS)" \ ++ "STAGE3_GDCFLAGS=$(STAGE3_GDCFLAGS)" \ + "STAGE3_GENERATOR_CFLAGS=$(STAGE3_GENERATOR_CFLAGS)" \ + "STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \ + "STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \ + "STAGE4_CXXFLAGS=$(STAGE4_CXXFLAGS)" \ ++ "STAGE4_GDCFLAGS=$(STAGE4_GDCFLAGS)" \ + "STAGE4_GENERATOR_CFLAGS=$(STAGE4_GENERATOR_CFLAGS)" \ + "STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \ + "STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \ + "STAGEprofile_CXXFLAGS=$(STAGEprofile_CXXFLAGS)" \ ++ "STAGEprofile_GDCFLAGS=$(STAGEprofile_GDCFLAGS)" \ + "STAGEprofile_GENERATOR_CFLAGS=$(STAGEprofile_GENERATOR_CFLAGS)" \ + "STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \ + "STAGEtrain_CFLAGS=$(STAGEtrain_CFLAGS)" \ + "STAGEtrain_CXXFLAGS=$(STAGEtrain_CXXFLAGS)" \ ++ "STAGEtrain_GDCFLAGS=$(STAGEtrain_GDCFLAGS)" \ + "STAGEtrain_GENERATOR_CFLAGS=$(STAGEtrain_GENERATOR_CFLAGS)" \ + "STAGEtrain_TFLAGS=$(STAGEtrain_TFLAGS)" \ + "STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \ + "STAGEfeedback_CXXFLAGS=$(STAGEfeedback_CXXFLAGS)" \ ++ "STAGEfeedback_GDCFLAGS=$(STAGEfeedback_GDCFLAGS)" \ + "STAGEfeedback_GENERATOR_CFLAGS=$(STAGEfeedback_GENERATOR_CFLAGS)" \ + "STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \ + "STAGEautoprofile_CFLAGS=$(STAGEautoprofile_CFLAGS)" \ + "STAGEautoprofile_CXXFLAGS=$(STAGEautoprofile_CXXFLAGS)" \ ++ "STAGEautoprofile_GDCFLAGS=$(STAGEautoprofile_GDCFLAGS)" \ + "STAGEautoprofile_GENERATOR_CFLAGS=$(STAGEautoprofile_GENERATOR_CFLAGS)" \ + "STAGEautoprofile_TFLAGS=$(STAGEautoprofile_TFLAGS)" \ + "STAGEautofeedback_CFLAGS=$(STAGEautofeedback_CFLAGS)" \ + "STAGEautofeedback_CXXFLAGS=$(STAGEautofeedback_CXXFLAGS)" \ ++ "STAGEautofeedback_GDCFLAGS=$(STAGEautofeedback_GDCFLAGS)" \ + "STAGEautofeedback_GENERATOR_CFLAGS=$(STAGEautofeedback_GENERATOR_CFLAGS)" \ + "STAGEautofeedback_TFLAGS=$(STAGEautofeedback_TFLAGS)" \ + $(CXX_FOR_TARGET_FLAG_TO_PASS) \ +@@ -12134,6 +12167,7 @@ configure-stage1-gcc: + $(HOST_EXPORTS) \ + CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGE1_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12168,6 +12202,7 @@ configure-stage2-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGE2_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12202,6 +12237,7 @@ configure-stage3-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGE3_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12236,6 +12272,7 @@ configure-stage4-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGE4_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12270,6 +12307,7 @@ configure-stageprofile-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGEprofile_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12304,6 +12342,7 @@ configure-stagetrain-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGEtrain_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage train in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12338,6 +12377,7 @@ configure-stagefeedback-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGEfeedback_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12372,6 +12412,7 @@ configure-stageautoprofile-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGEautoprofile_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage autoprofile in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12406,6 +12447,7 @@ configure-stageautofeedback-gcc: + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \ ++ GDCFLAGS="$(STAGEautofeedback_GDCFLAGS)"; export GDCFLAGS; \ + LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage autofeedback in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ +@@ -12468,6 +12510,7 @@ all-stage1-gcc: configure-stage1-gcc + CFLAGS="$(STAGE1_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGE1_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGE1_GDCFLAGS)" \ + LIBCFLAGS="$(LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12513,6 +12556,7 @@ all-stage2-gcc: configure-stage2-gcc + CFLAGS="$(STAGE2_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGE2_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGE2_GDCFLAGS)" \ + LIBCFLAGS="$(STAGE2_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12556,6 +12600,7 @@ all-stage3-gcc: configure-stage3-gcc + CFLAGS="$(STAGE3_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGE3_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGE3_GDCFLAGS)" \ + LIBCFLAGS="$(STAGE3_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12599,6 +12644,7 @@ all-stage4-gcc: configure-stage4-gcc + CFLAGS="$(STAGE4_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGE4_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGE4_GDCFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12642,6 +12688,7 @@ all-stageprofile-gcc: configure-stageprofile-gcc + CFLAGS="$(STAGEprofile_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGEprofile_GDCFLAGS)" \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12685,6 +12732,7 @@ all-stagetrain-gcc: configure-stagetrain-gcc + CFLAGS="$(STAGEtrain_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGEtrain_GDCFLAGS)" \ + LIBCFLAGS="$(STAGEtrain_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12728,6 +12776,7 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc + CFLAGS="$(STAGEfeedback_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGEfeedback_GDCFLAGS)" \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12771,6 +12820,7 @@ all-stageautoprofile-gcc: configure-stageautoprofile-gcc + CFLAGS="$(STAGEautoprofile_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGEautoprofile_GDCFLAGS)" \ + LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +@@ -12814,6 +12864,7 @@ all-stageautofeedback-gcc: configure-stageautofeedback-gcc + CFLAGS="$(STAGEautofeedback_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \ + CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \ ++ GDCFLAGS="$(STAGEautofeedback_GDCFLAGS)" \ + LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ +diff --git a/Makefile.tpl b/Makefile.tpl +index 7dccf91ed8ec..15b99ef31eed 100644 +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -543,6 +543,10 @@ STAGE1_CONFIGURE_FLAGS = $(STAGE1_CHECKING) \ + --disable-build-format-warnings + + @if target-libphobos-bootstrap ++# Defaults for each stage if we're bootstrapping D. ++[+ FOR bootstrap-stage +] ++STAGE[+id+]_GDCFLAGS = $(GDCFLAGS) ++[+ ENDFOR bootstrap-stage +] + STAGE1_CONFIGURE_FLAGS += --with-libphobos-druntime-only + STAGE2_CONFIGURE_FLAGS += --with-libphobos-druntime-only + @endif target-libphobos-bootstrap +@@ -556,6 +560,10 @@ STAGE2_CFLAGS += -fno-checking + STAGE2_TFLAGS += -fno-checking + STAGE3_CFLAGS += -fchecking=1 + STAGE3_TFLAGS += -fchecking=1 ++@if target-libphobos-bootstrap ++STAGE2_GDCFLAGS += -fno-checking ++STAGE3_GDCFLAGS += -fchecking=1 ++@endif target-libphobos-bootstrap + + STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate + STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) +@@ -710,6 +718,7 @@ BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \ + "[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \ + "STAGE[+id+]_CFLAGS=$(STAGE[+id+]_CFLAGS)" \ + "STAGE[+id+]_CXXFLAGS=$(STAGE[+id+]_CXXFLAGS)" \ ++ "STAGE[+id+]_GDCFLAGS=$(STAGE[+id+]_GDCFLAGS)" \ + "STAGE[+id+]_GENERATOR_CFLAGS=$(STAGE[+id+]_GENERATOR_CFLAGS)" \ + "STAGE[+id+]_TFLAGS=$(STAGE[+id+]_TFLAGS)"[+ ENDFOR bootstrap-stage +] \ + $(CXX_FOR_TARGET_FLAG_TO_PASS) \ +@@ -1237,7 +1246,8 @@ configure-stage[+id+]-[+prefix+][+module+]: + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;[+ ELSE prefix +] \ + CFLAGS="$(STAGE[+id+]_CFLAGS)"; export CFLAGS; \ +- CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"; export CXXFLAGS;[+ IF prev +] \ ++ CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"; export CXXFLAGS;[+ IF (= (get "module") "gcc") +] \ ++ GDCFLAGS="$(STAGE[+id+]_GDCFLAGS)"; export GDCFLAGS;[+ ENDIF +][+ IF prev +] \ + LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \ + LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+ + ENDIF prefix +] [+extra_exports+] \ +@@ -1307,7 +1317,8 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+] + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"[+ ELSE prefix +] \ + CFLAGS="$(STAGE[+id+]_CFLAGS)" \ + GENERATOR_CFLAGS="$(STAGE[+id+]_GENERATOR_CFLAGS)" \ +- CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"[+ IF prev +] \ ++ CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"[+ IF (= (get "module") "gcc") +] \ ++ GDCFLAGS="$(STAGE[+id+]_GDCFLAGS)"[+ ENDIF +][+ IF prev +] \ + LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \ + LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +][+ ENDIF prefix +] \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + +base-commit: 72dff34bcdd6f05b64bbf07739ab815e673b5946 +-- +2.49.0 + diff --git a/15.2.0/gentoo/README.history b/15.2.0/gentoo/README.history new file mode 100644 index 0000000..63975a5 --- /dev/null +++ b/15.2.0/gentoo/README.history @@ -0,0 +1,29 @@ +1 2 October 2025 + + + 01_all_default-fortify-source.patch + + 02_all_default-warn-format-security.patch + + 03_all_default-warn-trampolines.patch + + 04_all_nossp-on-nostdlib.patch + + 05_all_alpha-mieee-default.patch + + 06_all_ia64_note.GNU-stack.patch + + 08_all_libiberty-pic.patch + + 09_all_esysroot.patch + + 10_all_sh-drop-sysroot-suffix.patch + + 11_all_ia64-TEXTREL.patch + + 14_all_respect-build-cxxflags.patch + + 15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch + + 20_all_libstdcxx-no-vtv.patch + + 22_all_default_ssp-buffer-size.patch + + 23_all_DEF_GENTOO_ZNOW-z-now.patch + + 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch + + 26_all_enable-cet.patch + + 28_all_drop_CFLAGS_sed.patch + + 29_all_msgfmt-libstdc++-link.patch + + 30_all_tar_libstdc++-link.patch + + 31_all_testsuite-fortran-pass-Wcomplain-wrong-lang-where-ap.patch + + 32_all_time64.patch + + 33_all_PR80677-cross-limits.patch + + 34_all_time64_ssemath.patch + + 35_all_checking-gc-use-heuristics.patch + + 76_all_PR117854-config-nvptx-fix-bashisms-with-gen-copyright.sh-use.patch + + 84_all_PR116975-GDCFLAGS.patch diff --git a/15.2.0/musl/25_all_multilib_pure64.patch b/15.2.0/musl/25_all_multilib_pure64.patch new file mode 100644 index 0000000..d55c04c --- /dev/null +++ b/15.2.0/musl/25_all_multilib_pure64.patch @@ -0,0 +1,83 @@ +https://bugs.gentoo.org/675954 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077 + +--- a/gcc/config/aarch64/t-aarch64-linux ++++ b/gcc/config/aarch64/t-aarch64-linux +@@ -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) +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 +@@ -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 if_multiarch,:i386-linux-gnu) +-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 ++MULTILIB_OSDIRNAMES+= mx32=../libx32 +--- a/gcc/config/rs6000/t-linux ++++ b/gcc/config/rs6000/t-linux +@@ -2,7 +2,8 @@ + # or soft-float. + ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) + ifneq (,$(findstring powerpc64,$(target))) +-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + else + MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) + endif +@@ -10,7 +11,8 @@ + MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) + endif + ifneq (,$(findstring powerpc64le,$(target))) +-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + endif + endif + +--- a/gcc/config/rs6000/t-linux64 ++++ b/gcc/config/rs6000/t-linux64 +@@ -28,8 +28,8 @@ + MULTILIB_OPTIONS := m64/m32 + MULTILIB_DIRNAMES := 64 32 + MULTILIB_EXTRA_OPTS := +-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) +-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + + rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c + $(COMPILE) $< +--- a/gcc/config/rs6000/t-linux64bele ++++ b/gcc/config/rs6000/t-linux64bele +@@ -2,6 +2,6 @@ + + MULTILIB_OPTIONS += mlittle + MULTILIB_DIRNAMES += le +-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) +-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 + MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} +--- a/gcc/config/rs6000/t-linux64lebe ++++ b/gcc/config/rs6000/t-linux64lebe +@@ -2,6 +2,6 @@ + + MULTILIB_OPTIONS += mbig + MULTILIB_DIRNAMES += be +-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) +-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} diff --git a/15.2.0/musl/50_all_libdruntime_32bit.patch b/15.2.0/musl/50_all_libdruntime_32bit.patch new file mode 100644 index 0000000..be3ca1a --- /dev/null +++ b/15.2.0/musl/50_all_libdruntime_32bit.patch @@ -0,0 +1,832 @@ +These changes are meant to fix gcc-15 for some musl-32 bit platforms. +They involve fixing some declarations (e.g define readdir, not +readdir64) and correcting the layout of some structs from time32 to +time64. + +The fixes for the function declarations come from +https://github.com/dlang/dmd/pull/21639 and the struct definitions +come from https://github.com/dlang/dmd/pull/21249, but with a slighter +older version compared to the one that was merged in order to support +older compilers that don't have bitfields support. + +Lastly there's a small improvement to try to fix the butchered API by +making the timespec struct constructible with either 1 or 2 +arguments. Outside of musl the struct is constructible with 0, 1, or 2 +arguments. With the bitfield variant of the fix this issue is +resolved, but, with older compilers it is not accessible. +####################################################################### + +From f86a7ea815856bc66d2e6d6cc5b12293763e0445 Mon Sep 17 00:00:00 2001 +From: Iain Buclaw +Date: Sun, 3 Aug 2025 12:42:14 +0200 +Subject: [PR-21639] [PATCH] druntime, musl: Remove unused __USE_FILE_OFFSET64 bindings + +As pointed out in #21249, Musl doesn't implement *64 versions of these +functions because off_t is always 64 bits. However there are aliases +defined if `_USE_LARGEFILE64_SOURCE` is true. + +--- a/libphobos/libdruntime/core/sys/posix/dirent.d ++++ b/libphobos/libdruntime/core/sys/posix/dirent.d +@@ -394,16 +394,14 @@ else version (CRuntime_Musl) + + struct DIR + { ++ // Managed by OS + } + +- static if ( __USE_FILE_OFFSET64 ) ++ dirent* readdir(DIR*); ++ ++ static if (__USE_LARGEFILE64) + { +- dirent* readdir64(DIR*); +- alias readdir64 readdir; +- } +- else +- { +- dirent* readdir(DIR*); ++ alias readdir64 = readdir; + } + } + else version (CRuntime_UClibc) +--- a/libphobos/libdruntime/core/sys/posix/dlfcn.d ++++ b/libphobos/libdruntime/core/sys/posix/dlfcn.d +@@ -189,8 +189,7 @@ version (CRuntime_Glibc) + void* dli_saddr; + } + } +-else +-version (CRuntime_Musl) ++else version (CRuntime_Musl) + { + enum RTLD_LAZY = 1; + enum RTLD_NOW = 2; +@@ -402,30 +401,6 @@ else version (CRuntime_Bionic) + void* dli_saddr; + } + } +-else version (CRuntime_Musl) +-{ +- enum { +- RTLD_LAZY = 1, +- RTLD_NOW = 2, +- RTLD_NOLOAD = 4, +- RTLD_NODELETE = 4096, +- RTLD_GLOBAL = 256, +- RTLD_LOCAL = 0, +- } +- int dlclose(void*); +- const(char)* dlerror(); +- void* dlopen(const scope char*, int); +- void* dlsym(void*, const scope char*); +- +- int dladdr(scope const void *addr, Dl_info *info); +- struct Dl_info +- { +- const(char)* dli_fname; +- void* dli_fbase; +- const(char)* dli_sname; +- void* dli_saddr; +- } +-} + else version (CRuntime_UClibc) + { + version (X86_Any) +--- a/libphobos/libdruntime/core/sys/posix/stdio.d ++++ b/libphobos/libdruntime/core/sys/posix/stdio.d +@@ -182,33 +182,20 @@ else version (CRuntime_UClibc) + } + else version (CRuntime_Musl) + { +- static if ( __USE_FILE_OFFSET64 ) ++ int fgetpos(FILE*, fpos_t *); ++ FILE* fopen(const scope char*, const scope char*); ++ FILE* freopen(const scope char*, const scope char*, FILE*); ++ int fseek(FILE*, c_long, int); ++ int fsetpos(FILE*, const scope fpos_t*); ++ FILE* tmpfile(); ++ ++ static if (__USE_LARGEFILE64) + { +- int fgetpos64(FILE*, fpos_t *); +- alias fgetpos64 fgetpos; +- +- FILE* fopen64(const scope char*, const scope char*); +- alias fopen64 fopen; +- +- FILE* freopen64(const scope char*, const scope char*, FILE*); +- alias freopen64 freopen; +- +- int fseek(FILE*, c_long, int); +- +- int fsetpos64(FILE*, const scope fpos_t*); +- alias fsetpos64 fsetpos; +- +- FILE* tmpfile64(); +- alias tmpfile64 tmpfile; +- } +- else +- { +- int fgetpos(FILE*, fpos_t *); +- FILE* fopen(const scope char*, const scope char*); +- FILE* freopen(const scope char*, const scope char*, FILE*); +- int fseek(FILE*, c_long, int); +- int fsetpos(FILE*, const scope fpos_t*); +- FILE* tmpfile(); ++ alias fgetpos64 = fgetpos; ++ alias fopen64 = fopen; ++ alias freopen64 = freopen; ++ alias fsetpos64 = fsetpos; ++ alias tmpfile64 = tmpfile; + } + } + else version (Solaris) +@@ -320,24 +307,13 @@ else version (CRuntime_Musl) + { + enum L_ctermid = 20; + +- static if ( __USE_FILE_OFFSET64 ) +- { +- int fseeko64(FILE*, off_t, int); +- alias fseeko64 fseeko; +- } +- else +- { +- int fseeko(FILE*, off_t, int); +- } ++ int fseeko(FILE*, off_t, int); ++ off_t ftello(FILE*); + +- static if ( __USE_FILE_OFFSET64 ) ++ static if (__USE_LARGEFILE64) + { +- off_t ftello64(FILE*); +- alias ftello64 ftello; +- } +- else +- { +- off_t ftello(FILE*); ++ alias fseeko64 = fseeko; ++ alias ftello64 = ftello; + } + + ssize_t getdelim(char**, size_t*, int, FILE*); +--- a/libphobos/libdruntime/core/sys/posix/stdlib.d ++++ b/libphobos/libdruntime/core/sys/posix/stdlib.d +@@ -603,17 +603,12 @@ else version (CRuntime_Musl) + void srand48(c_long); + void srandom(uint); + int unlockpt(int); +- +- static if ( __USE_LARGEFILE64 ) +- { +- int mkstemp64(char*); +- alias mkstemp64 mkstemp; +- } +- else +- { + int mkstemp(char*); +- } + ++ static if (__USE_LARGEFILE64) ++ { ++ alias mkstemp64 = mkstemp; ++ } + } + else version (Solaris) + { +--- a/libphobos/libdruntime/core/sys/posix/sys/mman.d ++++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d +@@ -293,12 +293,13 @@ else version (CRuntime_Bionic) + } + else version (CRuntime_Musl) + { +- static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t); +- static if (__USE_FILE_OFFSET64) +- alias mmap = mmap64; +- else +- void* mmap(void*, size_t, int, int, int, off_t); ++ void* mmap(void*, size_t, int, int, int, off_t); + int munmap(void*, size_t); ++ ++ static if (__USE_LARGEFILE64) ++ { ++ alias mmap64 = mmap; ++ } + } + else version (CRuntime_UClibc) + { +--- a/libphobos/libdruntime/core/sys/posix/sys/statvfs.d ++++ b/libphobos/libdruntime/core/sys/posix/sys/statvfs.d +@@ -97,7 +97,7 @@ else version (CRuntime_Musl) + fsfilcnt_t f_files; + fsfilcnt_t f_ffree; + fsfilcnt_t f_favail; +- static if (true /+__BYTE_ORDER == __LITTLE_ENDIAN+/) ++ version (LittleEndian) + { + c_ulong f_fsid; + byte[2*int.sizeof-c_long.sizeof] __padding; +@@ -133,8 +133,8 @@ else version (CRuntime_Musl) + int statvfs (const char * file, statvfs_t* buf); + int fstatvfs (int fildes, statvfs_t *buf); + +- alias statvfs statvfs64; +- alias fstatvfs fstatvfs64; ++ alias statvfs64 = statvfs; ++ alias fstatvfs64 = fstatvfs; + } + else version (NetBSD) + { + +From e186f4ea5300e34791f5b3c444adacc0277ec02e Mon Sep 17 00:00:00 2001 +From: Sertonix +Date: Wed, 16 Apr 2025 23:31:17 +0200 +Subject: [PR-21249] [PATCH 1/3] druntime: set __USE_FILE_OFFSET64=true for musl + +off_t needs to be 64-bits on all arches + +Reverts b31aa942a27e fix: mmap64 error (#16361) + +--- a/libphobos/libdruntime/core/sys/posix/config.d ++++ b/libphobos/libdruntime/core/sys/posix/config.d +@@ -87,8 +87,8 @@ else version (CRuntime_Musl) + // Not present in Musl sources + enum __REDIRECT = false; + +- // Those three are irrelevant for Musl as it always uses 64 bits off_t +- enum __USE_FILE_OFFSET64 = false; ++ // Always use code paths that are compatible with 64 bits off_t ++ enum __USE_FILE_OFFSET64 = true; + enum __USE_LARGEFILE = __USE_FILE_OFFSET64 && !__REDIRECT; + enum __USE_LARGEFILE64 = __USE_FILE_OFFSET64 && !__REDIRECT; + +--- a/libphobos/libdruntime/core/sys/posix/sys/types.d ++++ b/libphobos/libdruntime/core/sys/posix/sys/types.d +@@ -111,6 +111,7 @@ version (linux) + + version (CRuntime_Musl) + { ++ static assert(off_t.sizeof == 8); + /** + * Musl versions before v1.2.0 (up to v1.1.24) had different + * definitions for `time_t` for 32 bits. + +From 0307cefd7c563aaaf86eccedd56b8b872f8566c3 Mon Sep 17 00:00:00 2001 +From: Sertonix +Date: Wed, 16 Apr 2025 23:59:37 +0200 +Subject: [PR-21249] [PATCH 2/3] druntime: fix timespec size on musl + +The struct is passed to the kernel by musl which causes out of bounds +memory access when the struct isn't padded correctly. + +Ref https://git.musl-libc.org/cgit/musl/commit/?id=9b2921bea1d5017832e1b45d1fd64220047a9802 + +--- a/libphobos/libdruntime/core/sys/posix/time.d ++++ b/libphobos/libdruntime/core/sys/posix/time.d +@@ -200,8 +200,20 @@ version (linux) + { + struct timespec + { ++ version (CRuntime_Musl) ++ this(time_t tv_sec_, c_long tv_nsec_) @safe pure nothrow ++ { ++ tv_sec = tv_sec_; ++ tv_nsec = tv_nsec_; ++ } + time_t tv_sec; ++ version (CRuntime_Musl) ++ version (BigEndian) ++ byte[time_t.sizeof - c_long.sizeof] __pad1; + c_long tv_nsec; ++ version (CRuntime_Musl) ++ version (LittleEndian) ++ byte[time_t.sizeof - c_long.sizeof] __pad2; + } + } + else version (Darwin) +@@ -461,6 +473,8 @@ else version (CRuntime_Bionic) + } + else version (CRuntime_Musl) + { ++ static assert(timespec.sizeof == 16); ++ + alias int clockid_t; + alias void* timer_t; + + +From 8a95b3b912f425df5c3ba1b849be838dde03a6a2 Mon Sep 17 00:00:00 2001 +From: Sertonix +Date: Thu, 17 Apr 2025 00:07:42 +0200 +Subject: [PR-21249] [PATCH 3/3] druntime: fix stat_t on arm/x86/mips musl + +--- a/libphobos/libdruntime/core/sys/posix/sys/stat.d ++++ b/libphobos/libdruntime/core/sys/posix/sys/stat.d +@@ -72,29 +72,38 @@ version (linux) + { + version (X86) + { +- struct stat_t ++ version (CRuntime_Musl) + { +- dev_t st_dev; +- ushort __pad1; +- static if (!__USE_FILE_OFFSET64) ++ struct stat_t + { ++ dev_t st_dev; ++ ushort __pad1; ++ static if (!__USE_FILE_OFFSET64) ++ { ++ ino_t st_ino; ++ } ++ else ++ { ++ uint __st_ino; ++ } ++ mode_t st_mode; ++ nlink_t st_nlink; ++ uid_t st_uid; ++ gid_t st_gid; ++ dev_t st_rdev; ++ ushort __pad2; ++ off_t st_size; ++ blksize_t st_blksize; ++ blkcnt_t st_blocks; ++ private struct __timespec32 ++ { ++ c_long tv_sec; ++ c_long tv_nsec; ++ } ++ __timespec32 __st_atim32; ++ __timespec32 __st_mtim32; ++ __timespec32 __st_ctim32; + ino_t st_ino; +- } +- else +- { +- uint __st_ino; +- } +- mode_t st_mode; +- nlink_t st_nlink; +- uid_t st_uid; +- gid_t st_gid; +- dev_t st_rdev; +- ushort __pad2; +- off_t st_size; +- blksize_t st_blksize; +- blkcnt_t st_blocks; +- static if (_DEFAULT_SOURCE || _XOPEN_SOURCE >= 700) +- { + timespec st_atim; + timespec st_mtim; + timespec st_ctim; +@@ -105,23 +114,61 @@ version (linux) + ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; } + } + } +- else ++ static assert(stat_t.sizeof == 144); ++ } ++ else ++ { ++ struct stat_t + { +- time_t st_atime; +- ulong_t st_atimensec; +- time_t st_mtime; +- ulong_t st_mtimensec; +- time_t st_ctime; +- ulong_t st_ctimensec; +- } +- static if (__USE_FILE_OFFSET64) +- { +- ino_t st_ino; +- } +- else +- { +- c_ulong __unused4; +- c_ulong __unused5; ++ dev_t st_dev; ++ ushort __pad1; ++ static if (!__USE_FILE_OFFSET64) ++ { ++ ino_t st_ino; ++ } ++ else ++ { ++ uint __st_ino; ++ } ++ mode_t st_mode; ++ nlink_t st_nlink; ++ uid_t st_uid; ++ gid_t st_gid; ++ dev_t st_rdev; ++ ushort __pad2; ++ off_t st_size; ++ blksize_t st_blksize; ++ blkcnt_t st_blocks; ++ static if (_DEFAULT_SOURCE || _XOPEN_SOURCE >= 700) ++ { ++ timespec st_atim; ++ timespec st_mtim; ++ timespec st_ctim; ++ extern(D) @safe @property inout pure nothrow ++ { ++ ref inout(time_t) st_atime() return { return st_atim.tv_sec; } ++ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; } ++ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; } ++ } ++ } ++ else ++ { ++ time_t st_atime; ++ ulong_t st_atimensec; ++ time_t st_mtime; ++ ulong_t st_mtimensec; ++ time_t st_ctime; ++ ulong_t st_ctimensec; ++ } ++ static if (__USE_FILE_OFFSET64) ++ { ++ ino_t st_ino; ++ } ++ else ++ { ++ c_ulong __unused4; ++ c_ulong __unused5; ++ } + } + } + } +@@ -261,29 +308,31 @@ version (linux) + } + else version (MIPS_O32) + { +- struct stat_t ++ version (CRuntime_Musl) + { +- c_ulong st_dev; +- c_long[3] st_pad1; +- ino_t st_ino; +- mode_t st_mode; +- nlink_t st_nlink; +- uid_t st_uid; +- gid_t st_gid; +- c_ulong st_rdev; +- static if (!__USE_FILE_OFFSET64) ++ struct stat_t + { +- c_long[2] st_pad2; ++ dev_t st_dev; ++ c_long[2] __pad1; ++ ino_t st_ino; ++ mode_t st_mode; ++ nlink_t st_nlink; ++ uid_t st_uid; ++ gid_t st_gid; ++ dev_t st_rdev; ++ c_long[2] __pad2; + off_t st_size; +- c_long st_pad3; +- } +- else +- { +- c_long[3] st_pad2; +- off_t st_size; +- } +- static if (_DEFAULT_SOURCE || _XOPEN_SOURCE >= 700) +- { ++ private struct __timespec32 ++ { ++ c_long tv_sec; ++ c_long tv_nsec; ++ } ++ __timespec32 __st_atim32; ++ __timespec32 __st_mtim32; ++ __timespec32 __st_ctim32; ++ blksize_t st_blksize; ++ c_long __pad3; ++ blkcnt_t st_blocks; + timespec st_atim; + timespec st_mtim; + timespec st_ctim; +@@ -293,27 +342,65 @@ version (linux) + ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; } + ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; } + } ++ c_long[2] __pad4; + } +- else ++ } ++ else ++ { ++ struct stat_t + { +- time_t st_atime; +- c_ulong st_atimensec; +- time_t st_mtime; +- c_ulong st_mtimensec; +- time_t st_ctime; +- c_ulong st_ctimensec; ++ c_ulong st_dev; ++ c_long[3] st_pad1; ++ ino_t st_ino; ++ mode_t st_mode; ++ nlink_t st_nlink; ++ uid_t st_uid; ++ gid_t st_gid; ++ c_ulong st_rdev; ++ static if (!__USE_FILE_OFFSET64) ++ { ++ c_long[2] st_pad2; ++ off_t st_size; ++ c_long st_pad3; ++ } ++ else ++ { ++ c_long[3] st_pad2; ++ off_t st_size; ++ } ++ static if (_DEFAULT_SOURCE || _XOPEN_SOURCE >= 700) ++ { ++ timespec st_atim; ++ timespec st_mtim; ++ timespec st_ctim; ++ extern(D) @safe @property inout pure nothrow ++ { ++ ref inout(time_t) st_atime() return { return st_atim.tv_sec; } ++ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; } ++ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; } ++ } ++ } ++ else ++ { ++ time_t st_atime; ++ c_ulong st_atimensec; ++ time_t st_mtime; ++ c_ulong st_mtimensec; ++ time_t st_ctime; ++ c_ulong st_ctimensec; ++ } ++ blksize_t st_blksize; ++ static if (!__USE_FILE_OFFSET64) ++ { ++ blkcnt_t st_blocks; ++ } ++ else ++ { ++ c_long st_pad4; ++ blkcnt_t st_blocks; ++ } ++ c_long[14] st_pad6; + } +- blksize_t st_blksize; +- static if (!__USE_FILE_OFFSET64) +- { +- blkcnt_t st_blocks; +- } +- else +- { +- c_long st_pad4; +- blkcnt_t st_blocks; +- } +- c_long[14] st_pad5; + } + static if (!__USE_FILE_OFFSET64) + static assert(stat_t.sizeof == 144); +@@ -564,67 +651,34 @@ version (linux) + } + else version (ARM) + { +- private ++ version (CRuntime_Musl) + { +- alias __dev_t = ulong; +- alias __ino_t = c_ulong; +- alias __ino64_t = ulong; +- alias __mode_t = uint; +- alias __nlink_t = size_t; +- alias __uid_t = uint; +- alias __gid_t = uint; +- alias __off_t = c_long; +- alias __off64_t = long; +- alias __blksize_t = c_long; +- alias __blkcnt_t = c_long; +- alias __blkcnt64_t = long; +- alias __timespec = timespec; +- alias __time_t = time_t; +- } +- struct stat_t +- { +- __dev_t st_dev; +- ushort __pad1; +- +- static if (!__USE_FILE_OFFSET64) ++ struct stat_t + { +- __ino_t st_ino; +- } +- else +- { +- __ino_t __st_ino; +- } +- __mode_t st_mode; +- __nlink_t st_nlink; +- __uid_t st_uid; +- __gid_t st_gid; +- __dev_t st_rdev; +- ushort __pad2; +- +- static if (!__USE_FILE_OFFSET64) +- { +- __off_t st_size; +- } +- else +- { +- __off64_t st_size; +- } +- __blksize_t st_blksize; +- +- static if (!__USE_FILE_OFFSET64) +- { +- __blkcnt_t st_blocks; +- } +- else +- { +- __blkcnt64_t st_blocks; +- } +- +- static if ( _DEFAULT_SOURCE || _XOPEN_SOURCE >= 700) +- { +- __timespec st_atim; +- __timespec st_mtim; +- __timespec st_ctim; ++ dev_t st_dev; ++ ushort __pad1; ++ c_long __st_ino; ++ mode_t st_mode; ++ nlink_t st_nlink; ++ uid_t st_uid; ++ gid_t st_gid; ++ dev_t st_rdev; ++ ushort __pad2; ++ off_t st_size; ++ blksize_t st_blksize; ++ blkcnt_t st_blocks; ++ private struct __timespec32 ++ { ++ c_long tv_sec; ++ c_long tv_nsec; ++ } ++ __timespec32 __st_atim32; ++ __timespec32 __st_mtim32; ++ __timespec32 __st_ctim32; ++ ino_t st_ino; ++ timespec st_atim; ++ timespec st_mtim; ++ timespec st_ctim; + extern(D) @safe @property inout pure nothrow + { + ref inout(time_t) st_atime() return { return st_atim.tv_sec; } +@@ -632,30 +686,103 @@ version (linux) + ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; } + } + } +- else +- { +- __time_t st_atime; +- c_ulong st_atimensec; +- __time_t st_mtime; +- c_ulong st_mtimensec; +- __time_t st_ctime; +- c_ulong st_ctimensec; +- } +- +- static if (!__USE_FILE_OFFSET64) +- { +- c_ulong __unused4; +- c_ulong __unused5; +- } +- else +- { +- __ino64_t st_ino; +- } ++ static assert(stat_t.sizeof == 152); + } +- static if (__USE_FILE_OFFSET64) +- static assert(stat_t.sizeof == 104); + else +- static assert(stat_t.sizeof == 88); ++ { ++ private ++ { ++ alias __dev_t = ulong; ++ alias __ino_t = c_ulong; ++ alias __ino64_t = ulong; ++ alias __mode_t = uint; ++ alias __nlink_t = size_t; ++ alias __uid_t = uint; ++ alias __gid_t = uint; ++ alias __off_t = c_long; ++ alias __off64_t = long; ++ alias __blksize_t = c_long; ++ alias __blkcnt_t = c_long; ++ alias __blkcnt64_t = long; ++ alias __timespec = timespec; ++ alias __time_t = time_t; ++ } ++ struct stat_t ++ { ++ __dev_t st_dev; ++ ushort __pad1; ++ ++ static if (!__USE_FILE_OFFSET64) ++ { ++ __ino_t st_ino; ++ } ++ else ++ { ++ __ino_t __st_ino; ++ } ++ __mode_t st_mode; ++ __nlink_t st_nlink; ++ __uid_t st_uid; ++ __gid_t st_gid; ++ __dev_t st_rdev; ++ ushort __pad2; ++ ++ static if (!__USE_FILE_OFFSET64) ++ { ++ __off_t st_size; ++ } ++ else ++ { ++ __off64_t st_size; ++ } ++ __blksize_t st_blksize; ++ ++ static if (!__USE_FILE_OFFSET64) ++ { ++ __blkcnt_t st_blocks; ++ } ++ else ++ { ++ __blkcnt64_t st_blocks; ++ } ++ ++ static if ( _DEFAULT_SOURCE || _XOPEN_SOURCE >= 700) ++ { ++ __timespec st_atim; ++ __timespec st_mtim; ++ __timespec st_ctim; ++ extern(D) @safe @property inout pure nothrow ++ { ++ ref inout(time_t) st_atime() return { return st_atim.tv_sec; } ++ ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; } ++ ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; } ++ } ++ } ++ else ++ { ++ __time_t st_atime; ++ c_ulong st_atimensec; ++ __time_t st_mtime; ++ c_ulong st_mtimensec; ++ __time_t st_ctime; ++ c_ulong st_ctimensec; ++ } ++ ++ static if (!__USE_FILE_OFFSET64) ++ { ++ c_ulong __unused4; ++ c_ulong __unused5; ++ } ++ else ++ { ++ __ino64_t st_ino; ++ } ++ } ++ static if (__USE_FILE_OFFSET64) ++ static assert(stat_t.sizeof == 104); ++ else ++ static assert(stat_t.sizeof == 88); ++ } + } + else version (AArch64) + { + +Author: Andrei Horodniceanu +Subject: Improve timespec API issue on Musl + +--- a/libphobos/libdruntime/core/sys/posix/time.d ++++ b/libphobos/libdruntime/core/sys/posix/time.d +@@ -201,7 +201,7 @@ version (linux) + struct timespec + { + version (CRuntime_Musl) +- this(time_t tv_sec_, c_long tv_nsec_) @safe pure nothrow ++ this(time_t tv_sec_, c_long tv_nsec_ = 0) @safe pure nothrow + { + tv_sec = tv_sec_; + tv_nsec = tv_nsec_; diff --git a/15.2.0/musl/50_all_libssp_unconditionally.patch b/15.2.0/musl/50_all_libssp_unconditionally.patch new file mode 100644 index 0000000..a3b5984 --- /dev/null +++ b/15.2.0/musl/50_all_libssp_unconditionally.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/706210 +https://bugs.gentoo.org/747346 + +Author: Timo Teräs + +"Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, +as otherwise we get link failures if some objects are -fstack-protector built +and final link happens with -fno-stack-protector. This seems to be the common +case when bootstrapping gcc, the piepatches do not seem to fully fix the +crosstoolchain and bootstrap sequence wrt. stack-protector flag usage." + +(We do the same in Gentoo.) +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -870,8 +870,7 @@ + + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP +-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ +- "|fstack-protector-strong|fstack-protector-explicit:}" ++#define LINK_SSP_SPEC "-lssp_nonshared" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ + "|fstack-protector-strong|fstack-protector-explicit" \ diff --git a/15.2.0/musl/50_all_posix_memalign.patch b/15.2.0/musl/50_all_posix_memalign.patch new file mode 100644 index 0000000..dd75a93 --- /dev/null +++ b/15.2.0/musl/50_all_posix_memalign.patch @@ -0,0 +1,28 @@ +--- a/gcc/config/i386/pmm_malloc.h ++++ b/gcc/config/i386/pmm_malloc.h +@@ -27,12 +27,13 @@ + #include + + /* We can't depend on since the prototype of posix_memalign +- may not be visible. */ ++ may not be visible and we can't pollute the namespace either. */ + #ifndef __cplusplus +-extern int posix_memalign (void **, size_t, size_t); ++extern int __gcc_posix_memalign (void **, size_t, size_t) + #else +-extern "C" int posix_memalign (void **, size_t, size_t) throw (); ++extern "C" int __gcc_posix_memalign (void **, size_t, size_t) throw () + #endif ++__asm__("posix_memalign"); + + static __inline void * + _mm_malloc (size_t __size, size_t __alignment) +@@ -42,7 +43,7 @@ + return malloc (__size); + if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4)) + __alignment = sizeof (void *); +- if (posix_memalign (&__ptr, __alignment, __size) == 0) ++ if (__gcc_posix_memalign (&__ptr, __alignment, __size) == 0) + return __ptr; + else + return NULL; diff --git a/15.2.0/musl/README.history b/15.2.0/musl/README.history new file mode 100644 index 0000000..93d83f3 --- /dev/null +++ b/15.2.0/musl/README.history @@ -0,0 +1,6 @@ +1 2 October 2025 + + + 25_all_multilib_pure64.patch + + 50_all_libdruntime_32bit.patch + + 50_all_libssp_unconditionally.patch + + 50_all_posix_memalign.patch