Update used software list

Co-authored-by: belliash <belliash@codingworkshop.eu.org>
Reviewed-on: xt-sys/xtchain#3
Reviewed-by: Piotr Likoski <likoski@noreply.codingworkshop.git>

.build.yml

@@ -1,8 +1,14 @@
-kind: pipeline
-type: exec
-name: XT Toolchain Pipeline
-
-steps:
-- name: Compile XT Toolchain
+pipeline:
+  build:
+    image: codingworkshop/oscw-runner:latest
     commands:
-    - sh build-linux.sh
+      - CORES=10 ./build-linux.sh
+  publish:
+    image: codingworkshop/oscw-runner:latest
+    secrets:
+      - OSCW_GITHUB_USERNAME
+      - OSCW_GITHUB_PASSWORD
+    when:
+      event: tag
+    commands:
+      - github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst)

README.md

@@ -1,3 +1,23 @@
+<p align=center>
+  <a href="https://git.codingworkshop.eu.org/xt-sys/xtchain">
+    <img alt="GIT Repository" src="https://img.shields.io/badge/Source-GIT-purple">
+  </a>
+  <a href="https://ci.codingworkshop.eu.org/xt-sys/xtchain">
+    <img alt="Build Status" src="https://ci.codingworkshop.eu.org/api/badges/xt-sys/xtchain/status.svg">
+  </a>
+  <a href="https://git.codingworkshop.eu.org/xt-sys/xtchain/src/branch/master/COPYING.md">
+    <img alt="License" src="https://img.shields.io/badge/License-GPLv3-blue.svg">
+  </a>
+  <a href="https://github.com/sponsors/xt-sys/">
+    <img alt="Sponsors" src="https://img.shields.io/badge/Sponsor-%E2%9D%A4-red?logo=GitHub">
+  </a>
+  <a href="https://discord.com/invite/3zgjQDVmAe">
+    <img alt="Discord" src="https://img.shields.io/discord/723186294540206100?label=Chat">
+  </a>
+</p>
+
+---
+
 ## XT Toolchain
 This is a LLVM/Clang/LLD based mingw-w64 toolchain. It currently supports C and C++, and provides
 a variety of tools including IDL, message and resource compilers. The XT Toolchain is also the
@@ -11,10 +31,10 @@ Benefits of a LLVM based MinGW toolchain are:
 
 This software includes:
  * CMake
+ * GNU Assembler
  * LLVM
  * Make
  * Mingw-w64
- * NASM
  * Ninja
  * Wine
 

build-linux.sh

@@ -16,14 +16,19 @@ WRKDIR="$(pwd)"
 ARCHS="aarch64 armv7 i686 x86_64"
 GENERIC="generic-w64-mingw32"
 
+# Binutils Settings
+BINUTILSDIR="${SRCDIR}/binutils"
+BINUTILSTAG="binutils-2_40"
+BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
+
 # CMake Settings
 CMAKEDIR="${SRCDIR}/cmake"
-CMAKETAG="v3.23.1"
+CMAKETAG="v3.24.2"
 CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
 
 # LLVM Settings
 LLVMDIR="${SRCDIR}/llvm"
-LLVMTAG="llvmorg-14.0.6"
+LLVMTAG="llvmorg-16.0.0"
 LLVMVCS="https://github.com/llvm/llvm-project.git"
 
 # Make Settings
@@ -34,7 +39,7 @@ MAKEVCS="git://git.savannah.gnu.org/make"
 # Mingw-w64 Settings
 MINGWDIR="${SRCDIR}/mingw-w64"
 MINGWLIB="ucrt"
-MINGWTAG="v10.0.0"
+MINGWTAG="master"
 MINGWNTV="0x601"
 MINGWVCS="https://github.com/mirror/mingw-w64.git"
 
@@ -79,6 +84,51 @@ apply_patches()
     fi
 }
 
+# This function compiles and installs GNU BINUTILS
+binutils_build()
+{
+    echo ">>> Building BINUTILS ..."
+    for ARCH in ${ARCHS}; do
+        [ -z ${CLEAN} ] || rm -rf ${BINUTILSDIR}/build-${ARCH}
+        mkdir -p ${BINUTILSDIR}/build-${ARCH}
+        cd ${BINUTILSDIR}/build-${ARCH}
+        case ${ARCH} in
+            "armv7")
+                TARGET="arm"
+                ;;
+            *)
+                TARGET="${ARCH}"
+                ;;
+        esac
+        ../configure \
+            --target=${TARGET}-w64-mingw32 \
+            --disable-binutils \
+            --disable-gdb \
+            --disable-gprof \
+            --disable-ld \
+            --disable-multilib \
+            --disable-nls \
+            --disable-werror \
+            --with-zlib=yes
+        make -j${CORES}
+        cp ${BINUTILSDIR}/build-${ARCH}/gas/as-new ${BINDIR}/bin/${ARCH}-w64-mingw32-gas
+    done
+    cd ${WRKDIR}
+}
+
+# This function downloads GNU BINUTILS from VCS
+binutils_fetch()
+{
+    if [ ! -d ${BINUTILSDIR} ]; then
+        echo ">>> Downloading BINUTILS ..."
+        git clone ${BINUTILSVCS} ${BINUTILSDIR}
+        cd ${BINUTILSDIR}
+        git checkout tags/${BINUTILSTAG}
+        apply_patches ${BINUTILSDIR##*/} ${BINUTILSTAG##*-}
+        cd ${WRKDIR}
+    fi
+}
+
 # This function compiles and installs CMAKE
 cmake_build()
 {
@@ -136,18 +186,18 @@ llvm_build()
     done
     mkdir -p ${LLVMDIR}/llvm/build
     cd ${LLVMDIR}/llvm/build
-    cmake \
+    cmake -G Ninja \
         -DCMAKE_BUILD_TYPE="Release" \
         -DCMAKE_INSTALL_PREFIX=${BINDIR} \
         -DLLDB_INCLUDE_TESTS=FALSE \
         -DLLVM_ENABLE_ASSERTIONS=FALSE \
-        -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld" \
+        -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;lldb" \
         -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
         -DLLVM_LINK_LLVM_DYLIB=ON \
         -DLLVM_TARGETS_TO_BUILD="$(echo ${LLVM_ARCHS[@]} | tr ' ' ';')" \
-        -DLLVM_TOOLCHAIN_TOOLS="llvm-addr2line;llvm-ar;llvm-as;llvm-cov;llvm-cvtres;llvm-dlltool;llvm-ml;llvm-nm;llvm-objdump;llvm-objcopy;llvm-pdbutil;llvm-profdata;llvm-ranlib;llvm-rc;llvm-readelf;llvm-readobj;llvm-strings;llvm-strip;llvm-symbolizer;llvm-windres" \
+        -DLLVM_TOOLCHAIN_TOOLS="llvm-addr2line;llvm-ar;llvm-as;llvm-cov;llvm-cvtres;llvm-dlltool;llvm-lib;llvm-ml;llvm-nm;llvm-objdump;llvm-objcopy;llvm-pdbutil;llvm-profdata;llvm-ranlib;llvm-rc;llvm-readelf;llvm-readobj;llvm-strings;llvm-strip;llvm-symbolizer;llvm-windres" \
         ..
-        make -j${CORES} install/strip
+        ninja install/strip
         cd ${WRKDIR}
 }
 
@@ -159,15 +209,17 @@ llvm_build_libs()
         [ -z ${CLEAN} ] || rm -rf ${LLVMDIR}/runtimes/build-${ARCH}
         mkdir -p ${LLVMDIR}/runtimes/build-${ARCH}
         cd ${LLVMDIR}/runtimes/build-${ARCH}
-        cmake \
+        cmake -G Ninja \
             -DCMAKE_BUILD_TYPE="Release" \
-            -DCMAKE_INSTALL_PREFIX=${BINDIR}/${ARCH}-w64-mingw32 \
+            -DCMAKE_INSTALL_PREFIX="${BINDIR}/${ARCH}-w64-mingw32" \
             -DCMAKE_AR="${BINDIR}/bin/llvm-ar" \
             -DCMAKE_C_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang" \
             -DCMAKE_C_COMPILER_WORKS=1 \
+            -DCMAKE_C_FLAGS_INIT=-mguard=cf \
             -DCMAKE_CXX_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang++" \
             -DCMAKE_CXX_COMPILER_TARGET=${ARCH}-w64-windows-gnu \
             -DCMAKE_CXX_COMPILER_WORKS=1 \
+            -DCMAKE_CXX_FLAGS_INIT=-mguard=cf \
             -DCMAKE_CROSSCOMPILING=TRUE \
             -DCMAKE_RANLIB="${BINDIR}/bin/llvm-ranlib" \
             -DCMAKE_SYSTEM_NAME="Windows" \
@@ -175,13 +227,13 @@ llvm_build_libs()
             -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx" \
             -DLIBUNWIND_USE_COMPILER_RT=TRUE \
             -DLIBUNWIND_ENABLE_SHARED=TRUE \
-            -DLIBUNWIND_ENABLE_STATIC=FALSE \
+            -DLIBUNWIND_ENABLE_STATIC=TRUE \
             -DLIBCXX_USE_COMPILER_RT=ON \
             -DLIBCXX_ENABLE_SHARED=TRUE \
-            -DLIBCXX_ENABLE_STATIC=FALSE \
+            -DLIBCXX_ENABLE_STATIC=TRUE \
             -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
             -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
-            -DLIBCXX_CXX_ABI=libcxxabi \
+            -DLIBCXX_CXX_ABI="libcxxabi" \
             -DLIBCXX_LIBDIR_SUFFIX="" \
             -DLIBCXX_INCLUDE_TESTS=FALSE \
             -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=FALSE \
@@ -190,8 +242,8 @@ llvm_build_libs()
             -DLIBCXXABI_LIBDIR_SUFFIX="" \
             -DLIBCXXABI_USE_LLVM_UNWINDER=ON \
             ..
-        make -j${CORES}
-        make install
+        ninja
+        ninja install
     done
     cd ${WRKDIR}
 }
@@ -204,21 +256,28 @@ llvm_build_runtime()
         [ -z ${CLEAN} ] || rm -rf ${LLVMDIR}/compiler-rt/build-${ARCH}
         mkdir -p ${LLVMDIR}/compiler-rt/build-${ARCH}
         cd ${LLVMDIR}/compiler-rt/build-${ARCH}
-        cmake \
+        cmake -G Ninja \
             -DCMAKE_BUILD_TYPE="Release" \
             -DCMAKE_AR="${BINDIR}/bin/llvm-ar" \
             -DCMAKE_C_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang" \
             -DCMAKE_C_COMPILER_TARGET="${ARCH}-windows-gnu" \
+            -DCMAKE_C_FLAGS_INIT="-mguard=cf" \
             -DCMAKE_CXX_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang++" \
-            -DCMAKE_INSTALL_PREFIX=${BINDIR}/lib/clang/${LLVMTAG##*-} \
+            -DCMAKE_CXX_FLAGS_INIT="-mguard=cf" \
+            -DCMAKE_FIND_ROOT_PATH="${BINDIR}/${ARCH}-w64-mingw32" \
+            -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+            -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
+            -DCMAKE_INSTALL_PREFIX=$(${BINDIR}/bin/${ARCH}-w64-mingw32-clang --print-resource-dir) \
             -DCMAKE_RANLIB="${BINDIR}/bin/llvm-ranlib" \
             -DCMAKE_SYSTEM_NAME="Windows" \
+            -DCOMPILER_RT_BUILD_BUILTINS=TRUE \
             -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
             -DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
-            -DSANITIZER_CXX_ABI=libc++ \
+            -DLLVM_CONFIG_PATH="" \
+            -DSANITIZER_CXX_ABI="libc++" \
             ../lib/builtins
-            make -j${CORES}
-            make install
+            ninja
+            ninja install
     done
     cd ${WRKDIR}
 }
@@ -302,6 +361,7 @@ mingw_build_crt()
             --prefix=${BINDIR}/${ARCH}-w64-mingw32 \
             --with-sysroot=${BINDIR} \
             --with-default-msvcrt=${MINGWLIB} \
+            --enable-cfguard \
             ${FLAGS}
         make -j${CORES}
         make install
@@ -347,7 +407,9 @@ mingw_build_libs()
             ../configure \
                 --host=${ARCH}-w64-mingw32 \
                 --prefix=${BINDIR}/${ARCH}-w64-mingw32 \
-                --libdir=${BINDIR}/${ARCH}-w64-mingw32/lib
+                --libdir=${BINDIR}/${ARCH}-w64-mingw32/lib \
+                CFLAGS="-O2 -mguard=cf" \
+                CXXFLAGS="-O2 -mguard=cf"
             make -j${CORES}
             make install
             PATH="${ORIGPATH}"
@@ -385,32 +447,10 @@ mingw_fetch()
         echo ">>> Downloading MinGW-w64 ..."
         git clone ${MINGWVCS} ${MINGWDIR}
         cd ${MINGWDIR}
+        if [ x"${MINGWTAG}" != x"master" ]; then
             git checkout tags/${MINGWTAG}
-        apply_patches ${MINGWDIR##*/} ${MINGWTAG}
-        cd ${WRKDIR}
         fi
-}
-
-# This function compiles and installs NASM
-nasm_build()
-{
-    cd ${NASMDIR}
-    ./autogen.sh
-    ./configure
-    make -j${CORES}
-    install nasm ndisasm ${BINDIR}/bin/
-    cd ${WRKDIR}
-}
-
-# This function downloads NASM from VCS
-nasm_fetch()
-{
-    if [ ! -d ${NASMDIR} ]; then
-        echo ">>> Downloading NASM ..."
-        git clone ${NASMVCS} ${NASMDIR}
-        cd ${NASMDIR}
-        git checkout tags/${NASMTAG}
-        apply_patches ${NASMDIR##*/} ${NASMTAG##*-}
+        apply_patches ${MINGWDIR##*/} ${MINGWTAG}
         cd ${WRKDIR}
     fi
 }
@@ -448,6 +488,7 @@ wine_build()
     cd ${WINEDIR}/build
     ../configure \
         -enable-win64 \
+        --without-freetype \
         --without-x
     for TOOL in winedump wmc wrc; do
         make -j${CORES} tools/${TOOL}/all
@@ -499,6 +540,7 @@ xtchain_build()
             ln -sf ${EXEC} ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
         done
     done
+    cp ${WRKDIR}/scripts/exetool ${BINDIR}/bin/
     cp ${WRKDIR}/scripts/xtclib ${BINDIR}/lib/xtchain/
     cp ${WRKDIR}/scripts/xtchain ${BINDIR}/
 }
@@ -507,16 +549,12 @@ xtchain_build()
 # Exit immediately on any failure
 set -e
 
-# Check if script launched as root
-if [ "$(whoami)" = "root" ]; then
-    echo "This script cannot be run as root!"
-    exit 1
-fi
-
 # Check number of CPU cores available
+if [[ ! -n ${CORES} ]]; then
 	: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
 	: ${CORES:=$(nproc 2>/dev/null)}
 	: ${CORES:=1}
+fi
 
 # Create working directories
 mkdir -p ${BINDIR}
@@ -531,12 +569,6 @@ llvm_fetch
 # Build and install LLVM
 llvm_build
 
-# Download NASM
-nasm_fetch
-
-# Build and install NASM
-nasm_build
-
 # Download Mingw-W64
 mingw_fetch
 
@@ -558,6 +590,12 @@ mingw_build_libs
 # Build and install Mingw-W64 tools
 mingw_build_tools
 
+# Download Binutils
+binutils_fetch
+
+# Build and install Binutils
+binutils_build
+
 # Download Wine
 wine_fetch
 
@@ -585,12 +623,12 @@ ninja_build
 # Remove unneeded files to save disk space
 echo ">>> Removing unneeded files to save disk space ..."
 rm -rf ${BINDIR}/{doc,include,share/{bash-completion,emacs,info,locale,man,vim}}
-rm -rf ${BINDIR}/bin/{clang-{check,exdef-mapping,import-test,offload-*,rename,scan-deps},hmaptool,ld64.lld,wasm-ld}
+rm -rf ${BINDIR}/bin/amdgpu-arch,{clang-{check,exdef-mapping,import-test,offload-*,rename,scan-deps},diagtool,hmaptool,ld64.lld,modularize,nxptx-arch,wasm-ld}
 
 # Save XT Toolchain version
 cd ${WRKDIR}
 : ${XTCVER:=$(git describe --exact-match --tags 2>/dev/null)}
-: ${XTCVER:=DEV}
+: ${XTCVER:=DEVEL}
 echo "${XTCVER}" > ${BINDIR}/Version
 
 # Prepare archive

patches/binutils/2_40/001-fix-compilation.patch

@@ -0,0 +1,32 @@
+diff --git a/gas/Makefile.in b/gas/Makefile.in
+index 8319181b472..e4386b38621 100644
+--- a/gas/Makefile.in
++++ b/gas/Makefile.in
+@@ -2231,7 +2231,7 @@ de-stage3:
+ 
+ doc/asconfig.texi: doc/$(CONFIG).texi doc/$(am__dirstamp)
+ 	$(AM_V_at)rm -f doc/asconfig.texi
+-	$(AM_V_GEN)cp $(srcdir)/doc/$(CONFIG).texi doc/asconfig.texi
++	$(AM_V_GEN)cp -p $(srcdir)/doc/$(CONFIG).texi doc/asconfig.texi
+ 	$(AM_V_at)chmod u+w doc/asconfig.texi
+ 
+ # Maintenance
+diff --git a/gas/doc/.dirstamp b/gas/doc/.dirstamp
+deleted file mode 100644
+index e69de29bb2d..00000000000
+diff --git a/gas/doc/local.mk b/gas/doc/local.mk
+index f611a50913c..de13e3ca8b8 100644
+--- a/gas/doc/local.mk
++++ b/gas/doc/local.mk
+@@ -41,7 +41,7 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I %D% -I "$(srcdir)/../libiberty" \
+ 
+ %D%/asconfig.texi: %D%/$(CONFIG).texi %D%/$(am__dirstamp)
+ 	$(AM_V_at)rm -f %D%/asconfig.texi
+-	$(AM_V_GEN)cp $(srcdir)/%D%/$(CONFIG).texi %D%/asconfig.texi
++	$(AM_V_GEN)cp -p $(srcdir)/%D%/$(CONFIG).texi %D%/asconfig.texi
+ 	$(AM_V_at)chmod u+w %D%/asconfig.texi
+ 
+ CPU_DOCS = \
+-- 
+2.39.2
+

patches/binutils/2_40/002-add-arm-architectures.patch

@@ -0,0 +1,60 @@
+From ec231dd4c9ceb09140178b79e30ed0917bb2c955 Mon Sep 17 00:00:00 2001
+From: belliash <belliash@codingworkshop.eu.org>
+Date: Sat, 25 Mar 2023 19:33:33 +0100
+Subject: [PATCH] test2
+
+---
+ bfd/config.bfd    | 8 +++++++-
+ gas/configure.tgt | 3 ++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/bfd/config.bfd b/bfd/config.bfd
+index 1b0111fd410..ada7889d362 100644
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -249,7 +249,7 @@ case "${targ}" in
+     targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_le_vec aarch64_pe_le_vec"
+     want64=true
+     ;;
+-  aarch64-*-pe*)
++  aarch64-*-pe* | aarch64-*-mingw32)
+     targ_defvec=aarch64_pe_le_vec
+     targ_selvecs="aarch64_pe_le_vec aarch64_pei_le_vec"
+     want64=true
+@@ -409,6 +409,12 @@ case "${targ}" in
+     targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
+     targ_underscore=yes
+     ;;
++  arm-*-mingw32)
++    targ_defvec=arm_pe_le_vec
++    targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
++    targ_underscore=no
++    targ_cflags="-DARM_COFF_BUGFIX"
++    ;;
+   arm-*-phoenix*)
+     targ_defvec=arm_elf32_le_vec
+     targ_selvecs=arm_elf32_be_vec
+diff --git a/gas/configure.tgt b/gas/configure.tgt
+index 765ba73633d..9bfef1f72e8 100644
+--- a/gas/configure.tgt
++++ b/gas/configure.tgt
+@@ -136,6 +136,7 @@ case ${generic_target} in
+   aarch64*-*-netbsd*)			fmt=elf em=nbsd;;
+   aarch64*-*-openbsd*)			fmt=elf;;
+   aarch64*-*-pe*)			fmt=coff em=pepaarch64 ;;
++  aarch64*-*-mingw32)		fmt=coff em=pepaarch64 ;;
+   alpha-*-*vms*)			fmt=evax ;;
+   alpha-*-osf*)				fmt=ecoff ;;
+   alpha-*-linux*ecoff*)			fmt=ecoff ;;
+@@ -163,7 +164,7 @@ case ${generic_target} in
+   arm-*-nto*)				fmt=elf ;;
+   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
+ 					fmt=coff em=wince-pe ;;
+-  arm-*-pe)				fmt=coff em=pe ;;
++  arm-*-pe | arm-*-mingw32)	fmt=coff em=pe ;;
+   arm-*-fuchsia*)			fmt=elf ;;
+   arm-*-haiku*)				fmt=elf em=haiku ;;
+ 
+-- 
+2.39.2
+

patches/cmake/v3.24.2/001-add-xtc-version-suffix.patch

@@ -0,0 +1,13 @@
+diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
+index 818109f0b7..749377d193 100644
+--- a/Source/CMakeVersion.cmake
++++ b/Source/CMakeVersion.cmake
+@@ -7,7 +7,7 @@ set(CMake_VERSION_IS_DIRTY 0)
+ 
+ # Start with the full version number used in tags.  It has no dev info.
+ set(CMake_VERSION
+-  "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
++  "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}-XTC")
+ if(DEFINED CMake_VERSION_RC)
+   set(CMake_VERSION "${CMake_VERSION}-rc${CMake_VERSION_RC}")
+ endif()

scripts/exetool

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+
+import sys
+import struct
+
+if len(sys.argv) < 3:
+    print("XTChain ExeTool for modifying PE/COFF image subsystem\nNot sufficient parametrs. '[PE/COFF Image File]' '[SubSystem]'")
+    sys.exit(1)
+
+ImageFile = sys.argv[1]
+Subsystem = sys.argv[2].upper()
+
+# Set proper subsystem
+if Subsystem == "UNKNOWN":
+    ImageSubsystem = 0x00
+elif Subsystem == "NT_NATIVE":
+    ImageSubsystem = 0x01
+elif Subsystem == "WINDOWS_GUI":
+    ImageSubsystem = 0x02
+elif Subsystem == "WINDOWS_CLI":
+    ImageSubsystem = 0x03
+elif Subsystem == "WINDOWS_CE_OLD":
+    ImageSubsystem = 0x04
+elif Subsystem == "OS2_CUI":
+    ImageSubsystem = 0x05
+elif Subsystem == "POSIX_CUI":
+    ImageSubsystem = 0x07
+elif Subsystem == "NATIVE_WINDOWS":
+    ImageSubsystem = 0x08
+elif Subsystem == "WINDOWS_CE_GUI":
+    ImageSubsystem = 0x09
+elif Subsystem == "EFI_APPLICATION":
+    ImageSubsystem = 0x0A
+elif Subsystem == "EFI_BOOT_SERVICE_DRIVER":
+    ImageSubsystem = 0x0B
+elif Subsystem == "EFI_RUNTIME_DRIVER":
+    ImageSubsystem = 0x0C
+elif Subsystem == "EFI_ROM":
+    ImageSubsystem = 0x0D
+elif Subsystem == "XBOX":
+    ImageSubsystem = 0x0E
+elif Subsystem == "WINDOWS_BOOT_APPLICATION":
+    ImageSubsystem = 0x10
+elif Subsystem == "XT_NATIVE_KERNEL":
+    ImageSubsystem = 0x14
+elif Subsystem == "XT_NATIVE_APPLICATION":
+    ImageSubsystem = 0x15
+elif Subsystem == "XT_NATIVE_DRIVER":
+    ImageSubsystem = 0x16
+elif Subsystem == "XT_DYNAMIC_LIBRARY":
+    ImageSubsystem = 0x17
+elif Subsystem == "XT_APPLICATION_CLI":
+    ImageSubsystem = 0x18
+elif Subsystem == "XT_APPLICATION_GDI":
+    ImageSubsystem = 0x19
+else:
+    print("Invalid subsystem privided")
+    exit(2)
+
+# Open PE/COFF image file
+PeImage = open(sys.argv[1], "r+b")
+
+# Get PE header
+PeImage.seek(0x3C)
+(PeHeader,)=struct.unpack("H", PeImage.read(2))
+
+# Get PE signature
+PeImage.seek(PeHeader)
+(PeSignature,)=struct.unpack("I", PeImage.read(4))
+if PeSignature != 0x4550:
+    print("Invalid or corrupted PE header")
+
+# Set new image subsystem
+PeImage.seek(PeHeader + 0x5C)
+print("Setting subsystem to " + str(ImageSubsystem))
+PeImage.write(struct.pack("H", ImageSubsystem))
+
+# Close PE/COFF image file
+PeImage.close()

scripts/xtchain

@@ -6,12 +6,6 @@
 # DEVELOPERS:  Rafal Kupiec <belliash@codingworkshop.eu.org>
 
 
-# Check if script launched as root
-if [ "$(whoami)" = "root" ]; then
-    echo "This script cannot be run as root!"
-    exit 1
-fi
-
 # Get the absolute path to the XTchain
 export XTCDIR="$(realpath $(dirname ${0}))"