Fix Cygwin toolchain build to be compatible with upstream workflow

Author: Blackhex

.github/scripts/build.sh

@@ -51,7 +51,7 @@ fi
 
 $ROOT_PATH/.github/scripts/toolchain/build-gcc.sh
 
-if [[ "$PLATFORM" =~ (mingw|cygwin) ]]; then
+if [[ "$PLATFORM" =~ mingw ]]; then
     $ROOT_PATH/.github/scripts/toolchain/build-mingw.sh
 fi
 if [[ "$PLATFORM" =~ cygwin ]]; then

.github/scripts/config.sh

@@ -15,7 +15,7 @@ MINGW_REPO=${MINGW_REPO:-Windows-on-ARM-Experiments/mingw-woarm64}
 MINGW_BRANCH=${MINGW_BRANCH:-woarm64}
 
 CYGWIN_REPO=${CYGWIN_REPO:-Windows-on-ARM-Experiments/newlib-cygwin}
-CYGWIN_BRANCH=${CYGWIN_BRANCH:-woarm64}
+CYGWIN_BRANCH=${CYGWIN_BRANCH:-upstream-workflow}
 
 CYGWIN_PACKAGES_REPO=${CYGWIN_PACKAGES_REPO:-Windows-on-ARM-Experiments/cygwin-packages}
 CYGWIN_PACKAGES_BRANCH=${CYGWIN_PACKAGES_BRANCH:-main}
@@ -128,3 +128,9 @@ if [[ "$CCACHE" = 1 ]]; then
     PATH=$CCACHE_LIB_DIR:$TOOLCHAIN_CCACHE_LIB_DIR:$PATH
     export CCACHE_DIR=$CCACHE_DIR_PATH
 fi
+
+# Cygwin toolchain is using only Win32 API headers from MinGW. Upstream Cygwin
+# is being built with 12.0.0 tag.
+if [[ "$PLATFORM" =~ cygwin ]]; then
+    MINGW_BRANCH=v12.0.0
+fi

.github/scripts/toolchain/build-cygwin.sh

@@ -31,7 +31,9 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$CYGWIN_BUILD_PATH/Makefile" ]]; then
 
         # ADDED: --disable-doc
         # ADDED: --disable-dumper
-        CXXFLAGS_FOR_TARGET="-Wno-error -Wno-narrowing" \
+        # -D_WIN64 is a workaround for missing https://github.com/Windows-on-ARM-Experiments/mingw-woarm64/blob/woarm64/mingw-w64-headers/crt/_cygwin.h#L32
+        # in v12.0.0 branch of MinGW.
+        CXXFLAGS_FOR_TARGET="$CXXFLAGS_FOR_TARGET -D_WIN64 -Wno-error -Wno-narrowing" \
         $CYGWIN_SOURCE_PATH/configure \
             --prefix=$TOOLCHAIN_PATH \
             --build=$HOST \

.github/scripts/toolchain/build-gcc-stage1.sh

@@ -42,6 +42,9 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
                     --enable-threads=posix \
                     --with-dwarf2 \
                     --with-system-zlib"
+                # Workaround for missing https://github.com/Windows-on-ARM-Experiments/mingw-woarm64/blob/woarm64/mingw-w64-headers/crt/_cygwin.h#L32
+                # in v12.0.0 branch of MinGW.
+                CFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET -D_WIN64"
                 ;;
             *mingw*)
                 TARGET_OPTIONS="$TARGET_OPTIONS \
@@ -76,7 +79,8 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
         --with-gnu-ld \
         --without-headers \
         $HOST_OPTIONS \
-        $TARGET_OPTIONS
+        $TARGET_OPTIONS \
+        CFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET"
     echo "::endgroup::"
 fi
 

.github/scripts/toolchain/build-gcc.sh

@@ -59,6 +59,9 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
                     --with-default-libstdcxx-abi=gcc4-compatible \
                     --without-libiconv-prefix \
                     --without-libintl-prefix"
+                # Workaround for missing https://github.com/Windows-on-ARM-Experiments/mingw-woarm64/blob/woarm64/mingw-w64-headers/crt/_cygwin.h#L32
+                # in v12.0.0 branch of MinGW.
+                CFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET -D_WIN64"
                 ;;
             *mingw*)
                 TARGET_OPTIONS="$TARGET_OPTIONS \
@@ -115,7 +118,8 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
             --with-gnu-as \
             --with-gnu-ld \
             $HOST_OPTIONS \
-            $TARGET_OPTIONS
+            $TARGET_OPTIONS \
+            CFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET"
     echo "::endgroup::"
 fi
 

.github/scripts/toolchain/build-mingw-crt.sh

@@ -37,6 +37,9 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_BUILD_PATH/Makefile" ]]; then
             *cygwin*)
                 TARGET_OPTIONS="$TARGET_OPTIONS \
                     --enable-w32api"
+                # Workaround for missing https://github.com/Windows-on-ARM-Experiments/mingw-woarm64/blob/woarm64/mingw-w64-headers/crt/_cygwin.h#L32
+                # in v12.0.0 branch of MinGW.
+                CFLAGS="$CFLAGS -D_WIN64"
                 ;;
             *mingw*)
                 TARGET_OPTIONS="$TARGET_OPTIONS \

.github/scripts/toolchain/build-mingw-headers.sh

@@ -21,19 +21,15 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_HEADERS_BUILD_PATH/Makefile" ]]; t
                 TARGET_OPTIONS="$TARGET_OPTIONS \
                     --enable-w32api"
                 ;;
-            *mingw*)
-                TARGET_OPTIONS="$TARGET_OPTIONS \
-                    --enable-sdk=all"
-                ;;
         esac
 
-        case "$CRT" in
-            ucrt)
+        case "$PLATFORM-$CRT" in
+            *mingw*-ucrt)
                 TARGET_OPTIONS="$TARGET_OPTIONS \
                     --with-default-win32-winnt=0x603 \
                     --with-default-msvcrt=ucrt"
             ;;
-            msvcrt)
+            *mingw*-msvcrt)
                 TARGET_OPTIONS="$TARGET_OPTIONS \
                     --with-default-win32-winnt=0x601 \
                     --with-default-msvcrt=msvcrt"
@@ -44,6 +40,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$MINGW_HEADERS_BUILD_PATH/Makefile" ]]; t
             --prefix=$TOOLCHAIN_PATH/$TARGET \
             --build=$BUILD \
             --host=$TARGET \
+            --enable-sdk=all \
             $HOST_OPTIONS \
             $TARGET_OPTIONS
     echo "::endgroup::"

.github/workflows/advanced.yml

@@ -78,7 +78,7 @@ env:
   MINGW_BRANCH: ${{ inputs.mingw_branch || 'woarm64' }}
 
   CYGWIN_REPO: Windows-on-ARM-Experiments/newlib-cygwin
-  CYGWIN_BRANCH: ${{ inputs.cygwin_branch || 'woarm64' }}
+  CYGWIN_BRANCH: ${{ inputs.cygwin_branch || 'upstream-workflow' }}
 
   CYGWIN_PACKAGES_REPO: Windows-on-ARM-Experiments/cygwin-packages
   CYGWIN_PACKAGES_BRANCH: ${{ inputs.cygwin_packages_branch || 'main' }}
@@ -212,7 +212,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: ${{ env.MINGW_REPO }}
-          ref: ${{ env.MINGW_BRANCH }}
+          ref: ${{ matrix.platform == 'pc-cygwin' && 'v12.0.0' || env.MINGW_BRANCH }}
           path: ${{ env.SOURCE_PATH }}/mingw
 
       - name: Checkout Cygwin
@@ -320,7 +320,7 @@ jobs:
           .github/scripts/toolchain/build-gcc.sh
 
       - name: Build MinGW
-        if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' && matrix.platform != 'pc-linux-gnu' }}
+        if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' && matrix.platform == 'w64-mingw32' }}
         run: |
           .github/scripts/toolchain/build-mingw.sh