From: ljsebald <ljs...@us...> - 2023-09-18 02:31:36
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A pseudo Operating System for the Dreamcast.". The branch, master has been updated via 087000153fe2186d2cc274a4559c89f6fa849876 (commit) via 11f8d921fe0cf85ad08b2dd9b7574f1e2d1b11d3 (commit) via 039f8cd5727b9158feb74159579af059ee6245d4 (commit) via 25aaa77e5b97bb638d09ccf78e931acda56d4f0b (commit) via 5d25b0b8e3795ab1ba4edabc707f604c7756ad44 (commit) via 57b82b67fe5fdfe9d4e55b647b4918a7c6d54bc6 (commit) from 468b40885ea409f01bc5eab897f55a0f8c11b5c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 087000153fe2186d2cc274a4559c89f6fa849876 Merge: 11f8d92 25aaa77 Author: Lawrence Sebald <ljs...@us...> Date: Sun Sep 17 22:28:26 2023 -0400 Merge pull request #309 from KallistiOS/kos-w-9.5.0 Add new "WinXP-Latest" toolchain configuration commit 11f8d921fe0cf85ad08b2dd9b7574f1e2d1b11d3 Merge: 468b408 039f8cd Author: Lawrence Sebald <ljs...@us...> Date: Sun Sep 17 22:26:48 2023 -0400 Merge pull request #310 from KallistiOS/cmake_atomics CMake toolchain support for C11/C++11 atomics commit 039f8cd5727b9158feb74159579af059ee6245d4 Author: Falco Girgis <gyr...@gm...> Date: Sun Sep 17 15:47:26 2023 -0500 CMake toolchain support for C11/C++11 atomics - Forgot to add the -matomic-model=soft-imask flag to our CMake toolchain to enable atomics there too. commit 25aaa77e5b97bb638d09ccf78e931acda56d4f0b Author: darc <da...@pr...> Date: Sun Sep 17 15:20:49 2023 -0500 Adjust GCC 9.5.0 support as WinXP-Latest commit 5d25b0b8e3795ab1ba4edabc707f604c7756ad44 Author: darcagn <da...@pr...> Date: Wed Aug 9 13:00:16 2023 -0500 Make GCC custom dependencies for 9.5.0 config match the download_prerequisites versions commit 57b82b67fe5fdfe9d4e55b647b4918a7c6d54bc6 Author: darc <da...@pr...> Date: Wed Aug 9 08:28:50 2023 -0500 Add up-to-date GCC 9.5.0 config/patch for DreamSDK ----------------------------------------------------------------------- Summary of changes: utils/cmake/dreamcast.toolchain.cmake | 2 +- utils/dc-chain/config/README.md | 1 + ....9.3.0.sample => config.mk.winxp-latest.sample} | 8 ++-- .../{gcc-8.4.0-kos.diff => gcc-9.5.0-kos.diff} | 12 +++--- .../{gcc-9.3.0-kos.diff => gcc-9.5.0-kos.diff} | 46 +++++++++++----------- 5 files changed, 35 insertions(+), 34 deletions(-) copy utils/dc-chain/config/{config.mk.9.3.0.sample => config.mk.winxp-latest.sample} (98%) copy utils/dc-chain/patches/arm-Darwin/{gcc-8.4.0-kos.diff => gcc-9.5.0-kos.diff} (65%) copy utils/dc-chain/patches/{gcc-9.3.0-kos.diff => gcc-9.5.0-kos.diff} (72%) diff --git a/utils/cmake/dreamcast.toolchain.cmake b/utils/cmake/dreamcast.toolchain.cmake index 21b4cd1..f0a44f0 100644 --- a/utils/cmake/dreamcast.toolchain.cmake +++ b/utils/cmake/dreamcast.toolchain.cmake @@ -83,7 +83,7 @@ else() endif() ##### Configure Build Flags ##### -add_compile_options(-ml -m4-single-only -ffunction-sections -fdata-sections -ftls-model=local-exec) +add_compile_options(-ml -m4-single-only -ffunction-sections -fdata-sections -matomic-model=soft-imask -ftls-model=local-exec) set(ENABLE_DEBUG_FLAGS $<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>) set(ENABLE_RELEASE_FLAGS $<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>>) diff --git a/utils/dc-chain/config/README.md b/utils/dc-chain/config/README.md index f4e6ee1..8674b15 100644 --- a/utils/dc-chain/config/README.md +++ b/utils/dc-chain/config/README.md @@ -4,6 +4,7 @@ The available templates include the following configurations: |---------:|:-------:|:----------:|:------------:|:-------:|:----------------:|:------| | config.mk.legacy.sample | 4.7.4 | 2.0.0 | 2.34 | 4.7.4 | 2.34 | older toolchain based on GCC 4<br />former "stable" / "legacy" configuration<br /> [some issues may happen in C++](https://dcemulation.org/phpBB/viewtopic.php?f=29&t=104724) | | config.mk.9.3.0.sample | 9.3.0 | 3.3.0 | 2.34 | 8.4.0 | 2.34 | older toolchain based on GCC 9<br />former "stable" configuration | +| config.mk.winxp-latest.sample | 9.5.0 | 4.3.0 | 2.34 | 8.5.0 | 2.34 | latest WinXP-compatible toolchain with GCC 9 | | config.mk.10.5.0.sample | 10.5.0 | 4.3.0 | 2.41 | 8.5.0 | 2.41 | modern toolchain with GCC 10 | | config.mk.11.4.0.sample | 11.4.0 | 4.3.0 | 2.41 | 8.5.0 | 2.41 | modern toolchain with GCC 11 | | config.mk.12.3.0.sample | 12.3.0 | 4.3.0 | 2.41 | 8.5.0 | 2.41 | modern toolchain with GCC 12 | diff --git a/utils/dc-chain/config/config.mk.9.3.0.sample b/utils/dc-chain/config/config.mk.winxp-latest.sample similarity index 98% copy from utils/dc-chain/config/config.mk.9.3.0.sample copy to utils/dc-chain/config/config.mk.winxp-latest.sample index 4b2866c..50a638b 100644 --- a/utils/dc-chain/config/config.mk.9.3.0.sample +++ b/utils/dc-chain/config/config.mk.winxp-latest.sample @@ -7,9 +7,9 @@ # Toolchain versions for SH sh_binutils_ver=2.34 -sh_gcc_ver=9.3.0 -newlib_ver=3.3.0 -gdb_ver=9.2 +sh_gcc_ver=9.5.0 +newlib_ver=4.3.0.20230120 +gdb_ver=13.2 # Tarball extensions to download for SH sh_binutils_download_type=xz @@ -21,7 +21,7 @@ gdb_download_type=xz # The ARM version of gcc/binutils is separated as support for the ARM7DI core # used in the Dreamcast's AICA is not available in versions of GCC beyond 8.5.0. arm_binutils_ver=2.34 -arm_gcc_ver=8.4.0 +arm_gcc_ver=8.5.0 # Tarball extensions to download for ARM arm_binutils_download_type=xz diff --git a/utils/dc-chain/patches/arm-Darwin/gcc-8.4.0-kos.diff b/utils/dc-chain/patches/arm-Darwin/gcc-9.5.0-kos.diff similarity index 65% copy from utils/dc-chain/patches/arm-Darwin/gcc-8.4.0-kos.diff copy to utils/dc-chain/patches/arm-Darwin/gcc-9.5.0-kos.diff index 8e48e13..f396b6d 100644 --- a/utils/dc-chain/patches/arm-Darwin/gcc-8.4.0-kos.diff +++ b/utils/dc-chain/patches/arm-Darwin/gcc-9.5.0-kos.diff @@ -1,6 +1,6 @@ -diff --color -ruN gcc-8.4.0/gcc/config/host-darwin.c gcc-8.4.0-kos/gcc/config/host-darwin.c ---- gcc-8.4.0/gcc/config/host-darwin.c 2023-03-11 14:18:43 -+++ gcc-8.4.0-kos/gcc/config/host-darwin.c 2023-03-11 14:20:47 +diff --color -ruN gcc-9.5.0/gcc/config/host-darwin.c gcc-9.5.0-kos/gcc/config/host-darwin.c +--- gcc-9.5.0/gcc/config/host-darwin.c 2023-03-11 14:28:07 ++++ gcc-9.5.0-kos/gcc/config/host-darwin.c 2023-03-11 14:28:57 @@ -22,6 +22,10 @@ #include "coretypes.h" #include "diagnostic-core.h" @@ -12,9 +12,9 @@ diff --color -ruN gcc-8.4.0/gcc/config/host-darwin.c gcc-8.4.0-kos/gcc/config/ho /* Yes, this is really supposed to work. */ static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096))); -diff --color -ruN gcc-8.4.0/gcc/config.host gcc-8.4.0-kos/gcc/config.host ---- gcc-8.4.0/gcc/config.host 2023-03-11 14:18:55 -+++ gcc-8.4.0-kos/gcc/config.host 2023-03-11 14:21:25 +diff --color -ruN gcc-9.5.0/gcc/config.host gcc-9.5.0-kos/gcc/config.host +--- gcc-9.5.0/gcc/config.host 2023-03-11 14:28:19 ++++ gcc-9.5.0-kos/gcc/config.host 2023-03-11 14:29:14 @@ -93,8 +93,8 @@ case ${host} in *-darwin*) diff --git a/utils/dc-chain/patches/gcc-9.3.0-kos.diff b/utils/dc-chain/patches/gcc-9.5.0-kos.diff similarity index 72% copy from utils/dc-chain/patches/gcc-9.3.0-kos.diff copy to utils/dc-chain/patches/gcc-9.5.0-kos.diff index c1e49bd..7f322d9 100644 --- a/utils/dc-chain/patches/gcc-9.3.0-kos.diff +++ b/utils/dc-chain/patches/gcc-9.5.0-kos.diff @@ -1,6 +1,6 @@ -diff --color -ruN gcc-9.3.0/gcc/config/sh/sh-c.c gcc-9.3.0-kos/gcc/config/sh/sh-c.c ---- gcc-9.3.0/gcc/config/sh/sh-c.c 2023-06-04 20:52:27.261256884 -0500 -+++ gcc-9.3.0-kos/gcc/config/sh/sh-c.c 2023-06-04 20:52:36.936287786 -0500 +diff --color -ruN gcc-9.5.0/gcc/config/sh/sh-c.c gcc-9.5.0-kos/gcc/config/sh/sh-c.c +--- gcc-9.5.0/gcc/config/sh/sh-c.c 2023-06-05 16:31:29.396332076 -0500 ++++ gcc-9.5.0-kos/gcc/config/sh/sh-c.c 2023-06-05 16:31:31.707339829 -0500 @@ -141,4 +141,11 @@ cpp_define_formatted (pfile, "__SH_ATOMIC_MODEL_%s__", @@ -13,9 +13,9 @@ diff --color -ruN gcc-9.3.0/gcc/config/sh/sh-c.c gcc-9.3.0-kos/gcc/config/sh/sh- + /* Toolchain supports setting up stack for 32MB */ + builtin_define ("__KOS_GCC_32MB__"); } -diff --color -ruN gcc-9.3.0/gcc/configure gcc-9.3.0-kos/gcc/configure ---- gcc-9.3.0/gcc/configure 2023-06-04 20:52:27.441257459 -0500 -+++ gcc-9.3.0-kos/gcc/configure 2023-06-04 20:52:36.938287792 -0500 +diff --color -ruN gcc-9.5.0/gcc/configure gcc-9.5.0-kos/gcc/configure +--- gcc-9.5.0/gcc/configure 2023-06-05 16:31:31.219338192 -0500 ++++ gcc-9.5.0-kos/gcc/configure 2023-06-05 16:31:31.712339846 -0500 @@ -11862,7 +11862,7 @@ target_thread_file='single' ;; @@ -25,9 +25,9 @@ diff --color -ruN gcc-9.3.0/gcc/configure gcc-9.3.0-kos/gcc/configure target_thread_file=${enable_threads} ;; *) -diff --color -ruN gcc-9.3.0/libgcc/config/sh/t-sh gcc-9.3.0-kos/libgcc/config/sh/t-sh ---- gcc-9.3.0/libgcc/config/sh/t-sh 2023-06-04 20:52:26.518254511 -0500 -+++ gcc-9.3.0-kos/libgcc/config/sh/t-sh 2023-06-04 20:52:36.938287792 -0500 +diff --color -ruN gcc-9.5.0/libgcc/config/sh/t-sh gcc-9.5.0-kos/libgcc/config/sh/t-sh +--- gcc-9.5.0/libgcc/config/sh/t-sh 2023-06-05 16:31:31.318338524 -0500 ++++ gcc-9.5.0-kos/libgcc/config/sh/t-sh 2023-06-05 16:31:31.712339846 -0500 @@ -23,6 +23,8 @@ $(LIB1ASMFUNCS_CACHE) LIB1ASMFUNCS_CACHE = _ic_invalidate _ic_invalidate_array @@ -37,10 +37,10 @@ diff --color -ruN gcc-9.3.0/libgcc/config/sh/t-sh gcc-9.3.0-kos/libgcc/config/sh crt1.o: $(srcdir)/config/sh/crt1.S $(gcc_compile) -c $< -diff --color -ruN gcc-9.3.0/libgcc/configure gcc-9.3.0-kos/libgcc/configure ---- gcc-9.3.0/libgcc/configure 2023-06-04 20:52:26.562254651 -0500 -+++ gcc-9.3.0-kos/libgcc/configure 2023-06-04 20:52:36.939287795 -0500 -@@ -5550,6 +5550,7 @@ +diff --color -ruN gcc-9.5.0/libgcc/configure gcc-9.5.0-kos/libgcc/configure +--- gcc-9.5.0/libgcc/configure 2023-06-05 16:31:31.323338541 -0500 ++++ gcc-9.5.0-kos/libgcc/configure 2023-06-05 16:31:31.713339849 -0500 +@@ -5602,6 +5602,7 @@ tpf) thread_header=config/s390/gthr-tpf.h ;; vxworks) thread_header=config/gthr-vxworks.h ;; win32) thread_header=config/i386/gthr-win32.h ;; @@ -48,9 +48,9 @@ diff --color -ruN gcc-9.3.0/libgcc/configure gcc-9.3.0-kos/libgcc/configure esac -diff --color -ruN gcc-9.3.0/libobjc/Makefile.in gcc-9.3.0-kos/libobjc/Makefile.in ---- gcc-9.3.0/libobjc/Makefile.in 2023-06-04 20:52:26.580254709 -0500 -+++ gcc-9.3.0-kos/libobjc/Makefile.in 2023-06-04 20:52:36.939287795 -0500 +diff --color -ruN gcc-9.5.0/libobjc/Makefile.in gcc-9.5.0-kos/libobjc/Makefile.in +--- gcc-9.5.0/libobjc/Makefile.in 2023-06-05 16:31:29.138331210 -0500 ++++ gcc-9.5.0-kos/libobjc/Makefile.in 2023-06-05 16:31:31.713339849 -0500 @@ -307,14 +307,16 @@ $(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) @@ -81,9 +81,9 @@ diff --color -ruN gcc-9.3.0/libobjc/Makefile.in gcc-9.3.0-kos/libobjc/Makefile.i mostlyclean: -$(LIBTOOL_CLEAN) rm -f libobjc$(libsuffix).la libobjc_gc$(libsuffix).la *.lo -diff --color -ruN gcc-9.3.0/libstdc++-v3/config/cpu/sh/atomicity.h gcc-9.3.0-kos/libstdc++-v3/config/cpu/sh/atomicity.h ---- gcc-9.3.0/libstdc++-v3/config/cpu/sh/atomicity.h 2023-06-04 20:52:26.780255348 -0500 -+++ gcc-9.3.0-kos/libstdc++-v3/config/cpu/sh/atomicity.h 2023-06-04 20:52:36.939287795 -0500 +diff --color -ruN gcc-9.5.0/libstdc++-v3/config/cpu/sh/atomicity.h gcc-9.5.0-kos/libstdc++-v3/config/cpu/sh/atomicity.h +--- gcc-9.5.0/libstdc++-v3/config/cpu/sh/atomicity.h 2023-06-05 16:31:31.373338708 -0500 ++++ gcc-9.5.0-kos/libstdc++-v3/config/cpu/sh/atomicity.h 2023-06-05 16:31:31.714339853 -0500 @@ -22,14 +22,40 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // <http://www.gnu.org/licenses/>. @@ -134,10 +134,10 @@ diff --color -ruN gcc-9.3.0/libstdc++-v3/config/cpu/sh/atomicity.h gcc-9.3.0-kos + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace -diff --color -ruN gcc-9.3.0/libstdc++-v3/configure gcc-9.3.0-kos/libstdc++-v3/configure ---- gcc-9.3.0/libstdc++-v3/configure 2023-06-04 20:52:27.100256370 -0500 -+++ gcc-9.3.0-kos/libstdc++-v3/configure 2023-06-04 20:52:36.943287808 -0500 -@@ -15629,6 +15629,7 @@ +diff --color -ruN gcc-9.5.0/libstdc++-v3/configure gcc-9.5.0-kos/libstdc++-v3/configure +--- gcc-9.5.0/libstdc++-v3/configure 2023-06-05 16:31:31.657339661 -0500 ++++ gcc-9.5.0-kos/libstdc++-v3/configure 2023-06-05 16:31:31.720339873 -0500 +@@ -15631,6 +15631,7 @@ tpf) thread_header=config/s390/gthr-tpf.h ;; vxworks) thread_header=config/gthr-vxworks.h ;; win32) thread_header=config/i386/gthr-win32.h ;; hooks/post-receive -- A pseudo Operating System for the Dreamcast. |