Merge pull request #659 from starg2/mcf

Add support for mcf thread model
niXman · Oct 1, 2023 · b876df9 · b876df9
2 parents 036f2f5 + 63d0980
commit b876df9
Show file tree

Hide file tree

Showing 14 changed files with 3,111 additions and 6 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -30,6 +30,11 @@ jobs:
             artifact: "x86_64-13.2.0-release-win32-seh-ucrt-rt_v11-rev0.7z",
             build_cmd: "--mode=gcc-13.2.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
           }
+        - {
+            name: "x86_64 mcf seh ucrt",
+            artifact: "x86_64-13.2.0-release-mcf-seh-ucrt-rt_v11-rev0.7z",
+            build_cmd: "--mode=gcc-13.2.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=mcf --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
+          }
         - {
             name: "i686 posix dwarf msvcrt",
             artifact: "i686-13.2.0-release-posix-dwarf-msvcrt-rt_v11-rev0.7z",
@@ -50,6 +55,11 @@ jobs:
             artifact: "i686-13.2.0-release-win32-dwarf-ucrt-rt_v11-rev0.7z",
             build_cmd: "--mode=gcc-13.2.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
           }
+        - {
+            name: "i686 mcf dwarf ucrt",
+            artifact: "i686-13.2.0-release-mcf-dwarf-ucrt-rt_v11-rev0.7z",
+            build_cmd: "--mode=gcc-13.2.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=mcf --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
+          }
 
     steps:
     - uses: actions/checkout@v3
@@ -118,6 +128,10 @@ jobs:
             name: "x86_64 win32 seh ucrt",
             artifact: "x86_64-13.2.0-release-win32-seh-ucrt-rt_v11-rev0.7z"
           }
+        - {
+            name: "x86_64 mcf seh ucrt",
+            artifact: "x86_64-13.2.0-release-mcf-seh-ucrt-rt_v11-rev0.7z"
+          }
         - {
             name: "i686 posix dwarf msvcrt",
             artifact: "i686-13.2.0-release-posix-dwarf-msvcrt-rt_v11-rev0.7z"
@@ -134,6 +148,10 @@ jobs:
             name: "i686 win32 dwarf ucrt",
             artifact: "i686-13.2.0-release-win32-dwarf-ucrt-rt_v11-rev0.7z"
           }
+        - {
+            name: "i686 mcf dwarf ucrt",
+            artifact: "i686-13.2.0-release-mcf-dwarf-ucrt-rt_v11-rev0.7z"
+          }
 
     needs: release
 

diff --git a/build b/build
@@ -67,7 +67,7 @@ readonly RUN_ARGS="$@"
 	echo "    --bootstrapall             - bootstraping GCC & all prerequisites"
 	echo "    --no-multilib              - build GCC without multilib support"
 	echo "    --rev=N                    - specifies number of the build revision"
-	echo "    --threads=<model>          - specifies the threads model for GCC/libstdc++, available: win32, posix"
+	echo "    --threads=<model>          - specifies the threads model for GCC/libstdc++, available: win32, posix, mcf"
 	echo "    --static-gcc               - build static GCC"
 	echo "    --with-default-msvcrt=     - specifies msvc version the toolchain will target"
 	echo "                                 <msvcrt|msvcr80|msvcr90|msvcr100|msvcr110|msvcr120|ucrt>"
@@ -375,10 +375,10 @@ while [[ $# > 0 ]]; do
 		--threads=*)
 			THREADS_MODEL=${1/--threads=/}
 			case $THREADS_MODEL in
-				win32|posix)
+				win32|posix|mcf)
 				;;
 				*)
-					die "\"$THREADS_MODEL\" is not valid threads model. available models: posix, win32. terminate"
+					die "\"$THREADS_MODEL\" is not valid threads model. available models: posix, win32, mcf. terminate"
 				;;
 			esac
 		;;
@@ -522,6 +522,10 @@ esac
 	die "\"$EXCEPTIONS_MODEL\" exceptions not allowed on multilib architecture. terminate."
 }
 
+[[ $BUILD_MODE == gcc && $THREADS_MODEL == mcf && `func_map_gcc_name_to_gcc_version $BUILD_MODE_VERSION | cut -d. -f1` -lt 13 ]] && {
+	die "\"$THREADS_MODEL\" thread model requires GCC 13 or later. terminate."
+}
+
 [[ $BUILD_MODE != gcc && $COMPRESSING_SRCS == yes ]] && {
 	die "compressing sources for \"$BUILD_MODE\" mode is currently unimplemented. terminate."
 }
@@ -662,6 +666,10 @@ case $BUILD_ARCHITECTURE in
 	;;
 esac
 
+[[ $THREADS_MODEL == mcf ]] && {
+	export PATH=$PREREQ_DIR/$BUILD_ARCHITECTURE-mcfgthread/bin:$PATH
+}
+
 [[ $LINK_TYPE_SUFFIX == shared ]] && {
 	export PATH=$PREREQ_DIR/$HOST-$LINK_TYPE_SUFFIX/bin:$PREREQ_DIR/$BUILD_ARCHITECTURE-libiconv-$LINK_TYPE_SUFFIX/bin:$PREREQ_DIR/$BUILD_ARCHITECTURE-zlib-$LINK_TYPE_SUFFIX/bin:$PATH
 }

diff --git a/library/subtargets.sh b/library/subtargets.sh
@@ -59,6 +59,16 @@ function func_get_subtargets {
 		$( [[ $1 == clang || $2 == 4* ]] && echo cloog )
 		mingw-w64-download
 		mingw-w64-api
+		$( \
+			[[ $THREADS_MODEL == mcf ]] && { \
+				[[ $USE_MULTILIB == yes ]] && { \
+					echo "mcfgthread|$BUILD_ARCHITECTURE"; \
+					echo "mcfgthread|$REVERSE_ARCHITECTURE"; \
+				} || { \
+					echo mcfgthread; \
+				} \
+			} \
+		)
 		mingw-w64-crt
 		$( \
 			[[ $USE_MULTILIB == yes ]] && { \