From 7dc187fdb152fd10ff5e24d0c06abda3e5c1b5fa Mon Sep 17 00:00:00 2001 From: Bananymous Date: Thu, 19 Jun 2025 19:39:37 +0300 Subject: [PATCH] ports: Update gcc 12.2.0->15.1.0 Also enable threading :) --- ports/gcc/build.sh | 5 +- ports/gcc/patches/gcc-12.2.0.patch | 1 - ports/gcc/patches/gcc-15.1.0.patch | 1 + toolchain/gcc-12.2.0.patch | 226 ----------------------------- 4 files changed, 4 insertions(+), 229 deletions(-) delete mode 120000 ports/gcc/patches/gcc-12.2.0.patch create mode 120000 ports/gcc/patches/gcc-15.1.0.patch delete mode 100644 toolchain/gcc-12.2.0.patch diff --git a/ports/gcc/build.sh b/ports/gcc/build.sh index c508e3e2..789b9218 100755 --- a/ports/gcc/build.sh +++ b/ports/gcc/build.sh @@ -1,14 +1,15 @@ #!/bin/bash ../install.sh NAME='gcc' -VERSION='12.2.0' -DOWNLOAD_URL="https://ftp.gnu.org/gnu/gcc/gcc-$VERSION/gcc-$VERSION.tar.gz#ac6b317eb4d25444d87cf29c0d141dedc1323a1833ec9995211b13e1a851261c" +VERSION='15.1.0' +DOWNLOAD_URL="https://ftp.gnu.org/gnu/gcc/gcc-$VERSION/gcc-$VERSION.tar.gz#51b9919ea69c980d7a381db95d4be27edf73b21254eb13d752a08003b4d013b1" DEPENDENCIES=('binutils' 'gmp' 'mpfr' 'mpc') CONFIGURE_OPTIONS=( "--target=$BANAN_TOOLCHAIN_TRIPLE" '--with-sysroot=/' "--with-build-sysroot=$BANAN_SYSROOT" '--enable-initfini-array' + '--enable-threads=posix' '--enable-shared' '--enable-lto' '--disable-nls' diff --git a/ports/gcc/patches/gcc-12.2.0.patch b/ports/gcc/patches/gcc-12.2.0.patch deleted file mode 120000 index bf982d19..00000000 --- a/ports/gcc/patches/gcc-12.2.0.patch +++ /dev/null @@ -1 +0,0 @@ -../../../toolchain/gcc-12.2.0.patch \ No newline at end of file diff --git a/ports/gcc/patches/gcc-15.1.0.patch b/ports/gcc/patches/gcc-15.1.0.patch new file mode 120000 index 00000000..65780abe --- /dev/null +++ b/ports/gcc/patches/gcc-15.1.0.patch @@ -0,0 +1 @@ +../../../toolchain/gcc-15.1.0.patch \ No newline at end of file diff --git a/toolchain/gcc-12.2.0.patch b/toolchain/gcc-12.2.0.patch deleted file mode 100644 index b6bc9e59..00000000 --- a/toolchain/gcc-12.2.0.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -ruN gcc-12.2.0/config.sub gcc-12.2.0-banan_os/config.sub ---- gcc-12.2.0/config.sub 2022-08-19 11:09:52.128656687 +0300 -+++ gcc-12.2.0-banan_os/config.sub 2025-06-17 12:35:06.156871785 +0300 -@@ -1749,7 +1749,7 @@ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ -- | fiwix* ) -+ | fiwix* | banan_os* ) - ;; - # This one is extra strict with allowed versions - sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -diff -ruN gcc-12.2.0/fixincludes/mkfixinc.sh gcc-12.2.0-banan_os/fixincludes/mkfixinc.sh ---- gcc-12.2.0/fixincludes/mkfixinc.sh 2022-08-19 11:09:52.160657095 +0300 -+++ gcc-12.2.0-banan_os/fixincludes/mkfixinc.sh 2025-06-17 12:35:06.733929038 +0300 -@@ -11,6 +11,7 @@ - - # Check for special fix rules for particular targets - case $machine in -+ *-*-banan_os* | \ - i?86-*-cygwin* | \ - i?86-*-mingw32* | \ - x86_64-*-mingw32* | \ -diff -ruN gcc-12.2.0/gcc/config/banan_os.h gcc-12.2.0-banan_os/gcc/config/banan_os.h ---- gcc-12.2.0/gcc/config/banan_os.h 1970-01-01 02:00:00.000000000 +0200 -+++ gcc-12.2.0-banan_os/gcc/config/banan_os.h 2025-06-17 12:35:06.734144150 +0300 -@@ -0,0 +1,35 @@ -+/* Useful if you wish to make target-specific GCC changes. */ -+#undef TARGET_BANAN_OS -+#define TARGET_BANAN_OS 1 -+ -+/* Default arguments you want when running your -+ *-banan_os-gcc toolchain */ -+#undef LIB_SPEC -+#define LIB_SPEC "-lc" /* link against C standard library */ -+ -+/* Files that are linked before user code. -+ The %s tells GCC to look for these files in the library directory. */ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC "%{!shared:crt0.o%s} crti.o%s %{shared|static-pie|!no-pie:crtbeginS.o%s; :crtbegin.o%s}" -+ -+/* Files that are linked after user code. */ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC "%{shared|static-pie|!no-pie:crtendS.o%s; :crtend.o%s} crtn.o%s" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{shared:-shared} %{static:-static} %{!shared: %{!static: %{rdynamic:-export-dynamic}}}" -+ -+/* We don't have separate math library so don't link it. */ -+#undef MATH_LIBRARY -+#define MATH_LIBRARY "" -+ -+/* Additional predefined macros. */ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do { \ -+ builtin_define ("__banan_os__"); \ -+ builtin_define ("__unix__"); \ -+ builtin_assert ("system=banan_os"); \ -+ builtin_assert ("system=unix"); \ -+ builtin_assert ("system=posix"); \ -+ } while(0); -diff -ruN gcc-12.2.0/gcc/config/banan_os.opt gcc-12.2.0-banan_os/gcc/config/banan_os.opt ---- gcc-12.2.0/gcc/config/banan_os.opt 1970-01-01 02:00:00.000000000 +0200 -+++ gcc-12.2.0-banan_os/gcc/config/banan_os.opt 2025-06-17 12:39:24.453332208 +0300 -@@ -0,0 +1,32 @@ -+; banan_os options. -+ -+; Copyright (C) 2025 Oskari Alaranta -+; -+; This file is part of GCC. -+; -+; GCC is free software; you can redistribute it and/or modify it under -+; the terms of the GNU General Public License as published by the Free -+; Software Foundation; either version 3, or (at your option) any later -+; version. -+; -+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+; WARRANTY; without even the implied warranty of MERCHANTABILITY or -+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+; for more details. -+; -+; You should have received a copy of the GNU General Public License -+; along with GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+posix -+Driver -+ -+pthread -+Driver -+ -+; This comment is to ensure we retain the blank line above. -diff -ruN gcc-12.2.0/gcc/config.gcc gcc-12.2.0-banan_os/gcc/config.gcc ---- gcc-12.2.0/gcc/config.gcc 2022-08-19 11:09:52.552662114 +0300 -+++ gcc-12.2.0-banan_os/gcc/config.gcc 2025-06-17 12:35:48.277616505 +0300 -@@ -673,6 +673,14 @@ - - # Common parts for widely ported systems. - case ${target} in -+*-*-banan_os*) -+ gas=yes -+ gnu_ld=yes -+ default_use_cxa_atexit=yes -+ extra_options="${extra_options} banan_os.opt" -+ use_gcc_stdint=provide -+ tmake_file="t-slibgcc" -+ ;; - *-*-darwin*) - tmake_file="t-darwin " - tm_file="${tm_file} darwin.h" -@@ -1870,6 +1878,12 @@ - dwarf2=no - fi - ;; -+i[34567]86-*-banan_os*) -+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h glibc-stdint.h i386/i386elf.h banan_os.h" -+ ;; -+x86_64-*-banan_os*) -+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h glibc-stdint.h i386/i386elf.h i386/x86-64.h banan_os.h" -+ ;; - i[34567]86-*-darwin1[89]* | i[34567]86-*-darwin2*) - echo "Error: 32bit target is not supported after Darwin17" 1>&2 - ;; -diff -ruN gcc-12.2.0/libgcc/config.host gcc-12.2.0-banan_os/libgcc/config.host ---- gcc-12.2.0/libgcc/config.host 2022-08-19 11:09:54.664689148 +0300 -+++ gcc-12.2.0-banan_os/libgcc/config.host 2025-06-17 12:35:06.787664288 +0300 -@@ -698,6 +698,14 @@ - hppa*-*-netbsd*) - tmake_file="$tmake_file pa/t-netbsd" - ;; -+i[34567]86-*-banan_os*) -+ extra_parts="$extra_parts crti.o crtbegin.o crtbeginS.o crtend.o crtendS.o crtn.o" -+ tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic t-slibgcc" -+ ;; -+x86_64-*-banan_os*) -+ extra_parts="$extra_parts crti.o crtbegin.o crtbeginS.o crtend.o crtendS.o crtn.o" -+ tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic t-slibgcc" -+ ;; - i[34567]86-*-darwin*) - tmake_file="$tmake_file i386/t-crtpc t-crtfm i386/t-msabi" - tm_file="$tm_file i386/darwin-lib.h" -diff -ruN gcc-12.2.0/libgcc/config/t-slibgcc gcc-12.2.0-banan_os/libgcc/config/t-slibgcc ---- gcc-12.2.0/libgcc/config/t-slibgcc 2022-08-19 11:09:54.724689916 +0300 -+++ gcc-12.2.0-banan_os/libgcc/config/t-slibgcc 2024-09-04 23:06:14.275389818 +0300 -@@ -26,7 +26,6 @@ - SHLIB_OBJS = @shlib_objs@ - SHLIB_DIR = @multilib_dir@ - SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ --SHLIB_LC = -lc - SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK) - SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ - $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) -diff -ruN gcc-12.2.0/libstdc++-v3/acinclude.m4 gcc-12.2.0-banan_os/libstdc++-v3/acinclude.m4 ---- gcc-12.2.0/libstdc++-v3/acinclude.m4 2022-08-19 11:09:55.380698313 +0300 -+++ gcc-12.2.0-banan_os/libstdc++-v3/acinclude.m4 2025-06-17 12:35:06.788273518 +0300 -@@ -1380,7 +1380,7 @@ - ac_has_nanosleep=yes - ac_has_sched_yield=yes - ;; -- openbsd*) -+ openbsd*|banan_os*) - ac_has_clock_monotonic=yes - ac_has_clock_realtime=yes - ac_has_nanosleep=yes -diff -ruN gcc-12.2.0/libstdc++-v3/configure gcc-12.2.0-banan_os/libstdc++-v3/configure ---- gcc-12.2.0/libstdc++-v3/configure 2022-08-19 11:09:55.416698774 +0300 -+++ gcc-12.2.0-banan_os/libstdc++-v3/configure 2025-06-17 12:35:06.793867910 +0300 -@@ -11904,6 +11904,11 @@ - lt_cv_dlopen_self=yes - ;; - -+ banan_os*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= -@@ -15603,8 +15608,8 @@ - glibcxx_compiler_shared_flag="-D_GLIBCXX_SHARED" - - else -- glibcxx_lt_pic_flag= -- glibcxx_compiler_pic_flag= -+ glibcxx_lt_pic_flag="-prefer-pic" -+ glibcxx_compiler_pic_flag="$lt_prog_compiler_pic_CXX" - glibcxx_compiler_shared_flag= - fi - -@@ -20575,7 +20580,7 @@ - ac_has_nanosleep=yes - ac_has_sched_yield=yes - ;; -- openbsd*) -+ openbsd*|banan_os*) - ac_has_clock_monotonic=yes - ac_has_clock_realtime=yes - ac_has_nanosleep=yes -@@ -29245,7 +29250,7 @@ - # This is a freestanding configuration; there is nothing to do here. - ;; - -- avr*-*-*) -+ avr*-*-* | *banan_os* ) - $as_echo "#define HAVE_ACOSF 1" >>confdefs.h - - $as_echo "#define HAVE_ASINF 1" >>confdefs.h -diff -ruN gcc-12.2.0/libstdc++-v3/crossconfig.m4 gcc-12.2.0-banan_os/libstdc++-v3/crossconfig.m4 ---- gcc-12.2.0/libstdc++-v3/crossconfig.m4 2022-08-19 11:09:55.420698825 +0300 -+++ gcc-12.2.0-banan_os/libstdc++-v3/crossconfig.m4 2025-06-17 12:35:06.796633433 +0300 -@@ -9,7 +9,7 @@ - # This is a freestanding configuration; there is nothing to do here. - ;; - -- avr*-*-*) -+ avr*-*-* | *banan_os* ) - AC_DEFINE(HAVE_ACOSF) - AC_DEFINE(HAVE_ASINF) - AC_DEFINE(HAVE_ATAN2F)