Compare commits
44 Commits
Author | SHA1 | Date |
---|---|---|
Rafal Kupiec | 3342b87fd0 | |
Rafal Kupiec | cd4b20b701 | |
Rafal Kupiec | fc120f4f33 | |
Rafal Kupiec | b8d5a76ee7 | |
Rafal Kupiec | 009d4a3421 | |
Rafal Kupiec | 460d5820da | |
Rafal Kupiec | 83e84c3ebf | |
Pedro Valadés | eeb1953d87 | |
Rafal Kupiec | e9707563d7 | |
Rafal Kupiec | 11d0593c9e | |
Rafal Kupiec | 22a5abd279 | |
Rafal Kupiec | 8c047d6083 | |
Rafal Kupiec | 1832a39ed3 | |
Rafal Kupiec | 2a00526666 | |
Rafal Kupiec | 1f72016fc2 | |
Rafal Kupiec | a522cdc583 | |
Rafal Kupiec | 37230435aa | |
Rafal Kupiec | 737dda2960 | |
Rafal Kupiec | 0d468bf245 | |
Rafal Kupiec | b0baae79ba | |
Rafal Kupiec | ecd243ed0d | |
Rafal Kupiec | b9d0458a65 | |
Rafal Kupiec | 7fb2227034 | |
Rafal Kupiec | 0e49773bf4 | |
Rafal Kupiec | 5684623164 | |
Rafal Kupiec | 14f2f7cf1f | |
Rafal Kupiec | 37e38daf36 | |
Rafal Kupiec | b65a92d147 | |
Rafal Kupiec | 173b6d6dd0 | |
Rafal Kupiec | 2da20a4eba | |
Rafal Kupiec | c9ef8a6484 | |
Rafal Kupiec | be63d61cf4 | |
Rafal Kupiec | 9fd40e9617 | |
Rafal Kupiec | 116d309962 | |
Rafal Kupiec | 6845594e6a | |
Rafal Kupiec | 69ae9afb88 | |
Rafal Kupiec | 3ae3ceaabb | |
Rafal Kupiec | 361c0a1cdb | |
Rafal Kupiec | d6531be5ee | |
Rafal Kupiec | 771d3783fa | |
Rafal Kupiec | 2e7c7ec1d7 | |
Rafal Kupiec | 99f0b83ac7 | |
Rafal Kupiec | 9cc7d052dd | |
Rafal Kupiec | abefcf8fe2 |
14
.build.yml
14
.build.yml
|
@ -1,14 +0,0 @@
|
||||||
pipeline:
|
|
||||||
build:
|
|
||||||
image: codingworkshop/oscw-runner:latest
|
|
||||||
commands:
|
|
||||||
- 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)
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
name: Builds
|
||||||
|
run-name: ${{ github.actor }} runs Gitea Actions
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
XTChain:
|
||||||
|
runs-on: oscw
|
||||||
|
container:
|
||||||
|
image: codingworkshop/oscw-runner:latest
|
||||||
|
steps:
|
||||||
|
- name: Clone repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
- name: Build XTChain
|
||||||
|
run: CORES=10 ./build-linux.sh
|
||||||
|
- name: Publish binaries
|
||||||
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
|
env:
|
||||||
|
OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }}
|
||||||
|
OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }}
|
||||||
|
run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst)
|
|
@ -0,0 +1,3 @@
|
||||||
|
binaries/*
|
||||||
|
sources/*
|
||||||
|
xtchain-*.zst
|
25
README.md
25
README.md
|
@ -1,3 +1,26 @@
|
||||||
|
<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://git.codingworkshop.eu.org/xt-sys/xtchain/actions">
|
||||||
|
<img alt="Build Status" src="https://codingworkshop.eu.org/actions.php?project=xt-sys/xtchain">
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/xt-sys/xtchain/releases">
|
||||||
|
<img alt="Releases" src="https://img.shields.io/github/v/release/xt-sys/xtchain?label=Release&color=blueviolet">
|
||||||
|
</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
|
## XT Toolchain
|
||||||
This is a LLVM/Clang/LLD based mingw-w64 toolchain. It currently supports C and C++, and provides
|
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
|
a variety of tools including IDL, message and resource compilers. The XT Toolchain is also the
|
||||||
|
@ -11,10 +34,10 @@ Benefits of a LLVM based MinGW toolchain are:
|
||||||
|
|
||||||
This software includes:
|
This software includes:
|
||||||
* CMake
|
* CMake
|
||||||
|
* GNU Assembler
|
||||||
* LLVM
|
* LLVM
|
||||||
* Make
|
* Make
|
||||||
* Mingw-w64
|
* Mingw-w64
|
||||||
* NASM
|
|
||||||
* Ninja
|
* Ninja
|
||||||
* Wine
|
* Wine
|
||||||
|
|
||||||
|
|
170
build-linux.sh
170
build-linux.sh
|
@ -16,41 +16,41 @@ WRKDIR="$(pwd)"
|
||||||
ARCHS="aarch64 armv7 i686 x86_64"
|
ARCHS="aarch64 armv7 i686 x86_64"
|
||||||
GENERIC="generic-w64-mingw32"
|
GENERIC="generic-w64-mingw32"
|
||||||
|
|
||||||
|
# Binutils Settings
|
||||||
|
BINUTILSDIR="${SRCDIR}/binutils"
|
||||||
|
BINUTILSTAG="binutils-2_41"
|
||||||
|
BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
|
||||||
|
|
||||||
# CMake Settings
|
# CMake Settings
|
||||||
CMAKEDIR="${SRCDIR}/cmake"
|
CMAKEDIR="${SRCDIR}/cmake"
|
||||||
CMAKETAG="v3.23.1"
|
CMAKETAG="v3.27.6"
|
||||||
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
|
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
|
||||||
|
|
||||||
# LLVM Settings
|
# LLVM Settings
|
||||||
LLVMDIR="${SRCDIR}/llvm"
|
LLVMDIR="${SRCDIR}/llvm"
|
||||||
LLVMTAG="llvmorg-14.0.6"
|
LLVMTAG="llvmorg-18.1.4"
|
||||||
LLVMVCS="https://github.com/llvm/llvm-project.git"
|
LLVMVCS="https://github.com/llvm/llvm-project.git"
|
||||||
|
|
||||||
# Make Settings
|
# Make Settings
|
||||||
MAKEDIR="${SRCDIR}/make"
|
MAKEDIR="${SRCDIR}/make"
|
||||||
MAKETAG="4.3"
|
MAKETAG="4.4.1"
|
||||||
MAKEVCS="git://git.savannah.gnu.org/make"
|
MAKEVCS="git://git.savannah.gnu.org/make"
|
||||||
|
|
||||||
# Mingw-w64 Settings
|
# Mingw-w64 Settings
|
||||||
MINGWDIR="${SRCDIR}/mingw-w64"
|
MINGWDIR="${SRCDIR}/mingw-w64"
|
||||||
MINGWLIB="ucrt"
|
MINGWLIB="ucrt"
|
||||||
MINGWTAG="v10.0.0"
|
MINGWTAG="master"
|
||||||
MINGWNTV="0x601"
|
MINGWNTV="0x601"
|
||||||
MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
||||||
|
|
||||||
# NASM Settings
|
|
||||||
NASMDIR="${SRCDIR}/nasm"
|
|
||||||
NASMTAG="nasm-2.15.05"
|
|
||||||
NASMVCS="https://github.com/netwide-assembler/nasm.git"
|
|
||||||
|
|
||||||
# Ninja Settings
|
# Ninja Settings
|
||||||
NINJADIR="${SRCDIR}/ninja"
|
NINJADIR="${SRCDIR}/ninja"
|
||||||
NINJATAG="v1.11.0"
|
NINJATAG="v1.11.1"
|
||||||
NINJAVCS="https://github.com/ninja-build/ninja.git"
|
NINJAVCS="https://github.com/ninja-build/ninja.git"
|
||||||
|
|
||||||
# Wine Settings
|
# Wine Settings
|
||||||
WINEDIR="${SRCDIR}/wine"
|
WINEDIR="${SRCDIR}/wine"
|
||||||
WINETAG="wine-7.9"
|
WINETAG="wine-8.17"
|
||||||
WINEVCS="git://source.winehq.org/git/wine.git"
|
WINEVCS="git://source.winehq.org/git/wine.git"
|
||||||
|
|
||||||
|
|
||||||
|
@ -79,6 +79,50 @@ apply_patches()
|
||||||
fi
|
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 --depth 1 --branch ${BINUTILSTAG} ${BINUTILSVCS} ${BINUTILSDIR}
|
||||||
|
cd ${BINUTILSDIR}
|
||||||
|
apply_patches ${BINUTILSDIR##*/} ${BINUTILSTAG##*-}
|
||||||
|
cd ${WRKDIR}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# This function compiles and installs CMAKE
|
# This function compiles and installs CMAKE
|
||||||
cmake_build()
|
cmake_build()
|
||||||
{
|
{
|
||||||
|
@ -100,9 +144,8 @@ cmake_fetch()
|
||||||
{
|
{
|
||||||
if [ ! -d ${CMAKEDIR} ]; then
|
if [ ! -d ${CMAKEDIR} ]; then
|
||||||
echo ">>> Downloading CMAKE ..."
|
echo ">>> Downloading CMAKE ..."
|
||||||
git clone ${CMAKEVCS} ${CMAKEDIR}
|
git clone --depth 1 --branch ${CMAKETAG} ${CMAKEVCS} ${CMAKEDIR}
|
||||||
cd ${CMAKEDIR}
|
cd ${CMAKEDIR}
|
||||||
git checkout tags/${CMAKETAG}
|
|
||||||
apply_patches ${CMAKEDIR##*/} ${CMAKETAG}
|
apply_patches ${CMAKEDIR##*/} ${CMAKETAG}
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
fi
|
fi
|
||||||
|
@ -136,18 +179,18 @@ llvm_build()
|
||||||
done
|
done
|
||||||
mkdir -p ${LLVMDIR}/llvm/build
|
mkdir -p ${LLVMDIR}/llvm/build
|
||||||
cd ${LLVMDIR}/llvm/build
|
cd ${LLVMDIR}/llvm/build
|
||||||
cmake \
|
cmake -G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE="Release" \
|
-DCMAKE_BUILD_TYPE="Release" \
|
||||||
-DCMAKE_INSTALL_PREFIX=${BINDIR} \
|
-DCMAKE_INSTALL_PREFIX=${BINDIR} \
|
||||||
-DLLDB_INCLUDE_TESTS=FALSE \
|
-DLLDB_INCLUDE_TESTS=FALSE \
|
||||||
-DLLVM_ENABLE_ASSERTIONS=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_INSTALL_TOOLCHAIN_ONLY=ON \
|
||||||
-DLLVM_LINK_LLVM_DYLIB=ON \
|
-DLLVM_LINK_LLVM_DYLIB=ON \
|
||||||
-DLLVM_TARGETS_TO_BUILD="$(echo ${LLVM_ARCHS[@]} | tr ' ' ';')" \
|
-DLLVM_TARGETS_TO_BUILD="$(echo ${LLVM_ARCHS[@]} | tr ' ' ';')" \
|
||||||
-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" \
|
-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}
|
cd ${WRKDIR}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,15 +202,17 @@ llvm_build_libs()
|
||||||
[ -z ${CLEAN} ] || rm -rf ${LLVMDIR}/runtimes/build-${ARCH}
|
[ -z ${CLEAN} ] || rm -rf ${LLVMDIR}/runtimes/build-${ARCH}
|
||||||
mkdir -p ${LLVMDIR}/runtimes/build-${ARCH}
|
mkdir -p ${LLVMDIR}/runtimes/build-${ARCH}
|
||||||
cd ${LLVMDIR}/runtimes/build-${ARCH}
|
cd ${LLVMDIR}/runtimes/build-${ARCH}
|
||||||
cmake \
|
cmake -G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE="Release" \
|
-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_AR="${BINDIR}/bin/llvm-ar" \
|
||||||
-DCMAKE_C_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang" \
|
-DCMAKE_C_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang" \
|
||||||
-DCMAKE_C_COMPILER_WORKS=1 \
|
-DCMAKE_C_COMPILER_WORKS=1 \
|
||||||
|
-DCMAKE_C_FLAGS_INIT=-mguard=cf \
|
||||||
-DCMAKE_CXX_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang++" \
|
-DCMAKE_CXX_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang++" \
|
||||||
-DCMAKE_CXX_COMPILER_TARGET=${ARCH}-w64-windows-gnu \
|
-DCMAKE_CXX_COMPILER_TARGET=${ARCH}-w64-windows-gnu \
|
||||||
-DCMAKE_CXX_COMPILER_WORKS=1 \
|
-DCMAKE_CXX_COMPILER_WORKS=1 \
|
||||||
|
-DCMAKE_CXX_FLAGS_INIT=-mguard=cf \
|
||||||
-DCMAKE_CROSSCOMPILING=TRUE \
|
-DCMAKE_CROSSCOMPILING=TRUE \
|
||||||
-DCMAKE_RANLIB="${BINDIR}/bin/llvm-ranlib" \
|
-DCMAKE_RANLIB="${BINDIR}/bin/llvm-ranlib" \
|
||||||
-DCMAKE_SYSTEM_NAME="Windows" \
|
-DCMAKE_SYSTEM_NAME="Windows" \
|
||||||
|
@ -175,13 +220,13 @@ llvm_build_libs()
|
||||||
-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx" \
|
-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx" \
|
||||||
-DLIBUNWIND_USE_COMPILER_RT=TRUE \
|
-DLIBUNWIND_USE_COMPILER_RT=TRUE \
|
||||||
-DLIBUNWIND_ENABLE_SHARED=TRUE \
|
-DLIBUNWIND_ENABLE_SHARED=TRUE \
|
||||||
-DLIBUNWIND_ENABLE_STATIC=FALSE \
|
-DLIBUNWIND_ENABLE_STATIC=TRUE \
|
||||||
-DLIBCXX_USE_COMPILER_RT=ON \
|
-DLIBCXX_USE_COMPILER_RT=ON \
|
||||||
-DLIBCXX_ENABLE_SHARED=TRUE \
|
-DLIBCXX_ENABLE_SHARED=TRUE \
|
||||||
-DLIBCXX_ENABLE_STATIC=FALSE \
|
-DLIBCXX_ENABLE_STATIC=TRUE \
|
||||||
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
|
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
|
||||||
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
|
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
|
||||||
-DLIBCXX_CXX_ABI=libcxxabi \
|
-DLIBCXX_CXX_ABI="libcxxabi" \
|
||||||
-DLIBCXX_LIBDIR_SUFFIX="" \
|
-DLIBCXX_LIBDIR_SUFFIX="" \
|
||||||
-DLIBCXX_INCLUDE_TESTS=FALSE \
|
-DLIBCXX_INCLUDE_TESTS=FALSE \
|
||||||
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=FALSE \
|
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=FALSE \
|
||||||
|
@ -190,8 +235,8 @@ llvm_build_libs()
|
||||||
-DLIBCXXABI_LIBDIR_SUFFIX="" \
|
-DLIBCXXABI_LIBDIR_SUFFIX="" \
|
||||||
-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
|
-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
|
||||||
..
|
..
|
||||||
make -j${CORES}
|
ninja
|
||||||
make install
|
ninja install
|
||||||
done
|
done
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
}
|
}
|
||||||
|
@ -204,21 +249,28 @@ llvm_build_runtime()
|
||||||
[ -z ${CLEAN} ] || rm -rf ${LLVMDIR}/compiler-rt/build-${ARCH}
|
[ -z ${CLEAN} ] || rm -rf ${LLVMDIR}/compiler-rt/build-${ARCH}
|
||||||
mkdir -p ${LLVMDIR}/compiler-rt/build-${ARCH}
|
mkdir -p ${LLVMDIR}/compiler-rt/build-${ARCH}
|
||||||
cd ${LLVMDIR}/compiler-rt/build-${ARCH}
|
cd ${LLVMDIR}/compiler-rt/build-${ARCH}
|
||||||
cmake \
|
cmake -G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE="Release" \
|
-DCMAKE_BUILD_TYPE="Release" \
|
||||||
-DCMAKE_AR="${BINDIR}/bin/llvm-ar" \
|
-DCMAKE_AR="${BINDIR}/bin/llvm-ar" \
|
||||||
-DCMAKE_C_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang" \
|
-DCMAKE_C_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang" \
|
||||||
-DCMAKE_C_COMPILER_TARGET="${ARCH}-windows-gnu" \
|
-DCMAKE_C_COMPILER_TARGET="${ARCH}-windows-gnu" \
|
||||||
|
-DCMAKE_C_FLAGS_INIT="-mguard=cf" \
|
||||||
-DCMAKE_CXX_COMPILER="${BINDIR}/bin/${ARCH}-w64-mingw32-clang++" \
|
-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_RANLIB="${BINDIR}/bin/llvm-ranlib" \
|
||||||
-DCMAKE_SYSTEM_NAME="Windows" \
|
-DCMAKE_SYSTEM_NAME="Windows" \
|
||||||
|
-DCOMPILER_RT_BUILD_BUILTINS=TRUE \
|
||||||
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
|
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
|
||||||
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
|
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
|
||||||
-DSANITIZER_CXX_ABI=libc++ \
|
-DLLVM_CONFIG_PATH="" \
|
||||||
|
-DSANITIZER_CXX_ABI="libc++" \
|
||||||
../lib/builtins
|
../lib/builtins
|
||||||
make -j${CORES}
|
ninja
|
||||||
make install
|
ninja install
|
||||||
done
|
done
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
}
|
}
|
||||||
|
@ -228,9 +280,8 @@ llvm_fetch()
|
||||||
{
|
{
|
||||||
if [ ! -d ${LLVMDIR} ]; then
|
if [ ! -d ${LLVMDIR} ]; then
|
||||||
echo ">>> Downloading LLVM ..."
|
echo ">>> Downloading LLVM ..."
|
||||||
git clone ${LLVMVCS} ${LLVMDIR}
|
git clone --depth 1 --branch ${LLVMTAG} ${LLVMVCS} ${LLVMDIR}
|
||||||
cd ${LLVMDIR}
|
cd ${LLVMDIR}
|
||||||
git checkout tags/${LLVMTAG}
|
|
||||||
apply_patches ${LLVMDIR##*/} ${LLVMTAG##*-}
|
apply_patches ${LLVMDIR##*/} ${LLVMTAG##*-}
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
fi
|
fi
|
||||||
|
@ -265,9 +316,8 @@ make_fetch()
|
||||||
{
|
{
|
||||||
if [ ! -d ${MAKEDIR} ]; then
|
if [ ! -d ${MAKEDIR} ]; then
|
||||||
echo ">>> Downloading Make ..."
|
echo ">>> Downloading Make ..."
|
||||||
git clone ${MAKEVCS} ${MAKEDIR}
|
git clone --depth 1 --branch ${MAKETAG} ${MAKEVCS} ${MAKEDIR}
|
||||||
cd ${MAKEDIR}
|
cd ${MAKEDIR}
|
||||||
git checkout tags/${MAKETAG}
|
|
||||||
apply_patches ${MAKEDIR##*/} ${MAKETAG}
|
apply_patches ${MAKEDIR##*/} ${MAKETAG}
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
fi
|
fi
|
||||||
|
@ -302,6 +352,7 @@ mingw_build_crt()
|
||||||
--prefix=${BINDIR}/${ARCH}-w64-mingw32 \
|
--prefix=${BINDIR}/${ARCH}-w64-mingw32 \
|
||||||
--with-sysroot=${BINDIR} \
|
--with-sysroot=${BINDIR} \
|
||||||
--with-default-msvcrt=${MINGWLIB} \
|
--with-default-msvcrt=${MINGWLIB} \
|
||||||
|
--enable-cfguard \
|
||||||
${FLAGS}
|
${FLAGS}
|
||||||
make -j${CORES}
|
make -j${CORES}
|
||||||
make install
|
make install
|
||||||
|
@ -347,7 +398,9 @@ mingw_build_libs()
|
||||||
../configure \
|
../configure \
|
||||||
--host=${ARCH}-w64-mingw32 \
|
--host=${ARCH}-w64-mingw32 \
|
||||||
--prefix=${BINDIR}/${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 -j${CORES}
|
||||||
make install
|
make install
|
||||||
PATH="${ORIGPATH}"
|
PATH="${ORIGPATH}"
|
||||||
|
@ -383,38 +436,13 @@ mingw_fetch()
|
||||||
{
|
{
|
||||||
if [ ! -d ${MINGWDIR} ]; then
|
if [ ! -d ${MINGWDIR} ]; then
|
||||||
echo ">>> Downloading MinGW-w64 ..."
|
echo ">>> Downloading MinGW-w64 ..."
|
||||||
git clone ${MINGWVCS} ${MINGWDIR}
|
git clone --depth 1 --branch ${MINGWTAG} ${MINGWVCS} ${MINGWDIR}
|
||||||
cd ${MINGWDIR}
|
cd ${MINGWDIR}
|
||||||
git checkout tags/${MINGWTAG}
|
|
||||||
apply_patches ${MINGWDIR##*/} ${MINGWTAG}
|
apply_patches ${MINGWDIR##*/} ${MINGWTAG}
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
fi
|
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##*-}
|
|
||||||
cd ${WRKDIR}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# This function compiles and installs NINJA
|
# This function compiles and installs NINJA
|
||||||
ninja_build()
|
ninja_build()
|
||||||
{
|
{
|
||||||
|
@ -432,9 +460,8 @@ ninja_fetch()
|
||||||
{
|
{
|
||||||
if [ ! -d ${NINJADIR} ]; then
|
if [ ! -d ${NINJADIR} ]; then
|
||||||
echo ">>> Downloading NINJA ..."
|
echo ">>> Downloading NINJA ..."
|
||||||
git clone ${NINJAVCS} ${NINJADIR}
|
git clone --depth 1 --branch ${NINJATAG} ${NINJAVCS} ${NINJADIR}
|
||||||
cd ${NINJADIR}
|
cd ${NINJADIR}
|
||||||
git checkout tags/${NINJATAG}
|
|
||||||
apply_patches ${NINJADIR##*/} ${NINJATAG}
|
apply_patches ${NINJADIR##*/} ${NINJATAG}
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
fi
|
fi
|
||||||
|
@ -467,9 +494,8 @@ wine_fetch()
|
||||||
{
|
{
|
||||||
if [ ! -d ${WINEDIR} ]; then
|
if [ ! -d ${WINEDIR} ]; then
|
||||||
echo ">>> Downloading WINE ..."
|
echo ">>> Downloading WINE ..."
|
||||||
git clone ${WINEVCS} ${WINEDIR}
|
git clone --depth 1 --branch ${WINETAG} ${WINEVCS} ${WINEDIR}
|
||||||
cd ${WINEDIR}
|
cd ${WINEDIR}
|
||||||
git checkout tags/${WINETAG}
|
|
||||||
apply_patches ${WINEDIR##*/} ${WINETAG##*-}
|
apply_patches ${WINEDIR##*/} ${WINETAG##*-}
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
fi
|
fi
|
||||||
|
@ -493,7 +519,7 @@ xtchain_build()
|
||||||
for EXEC in dlltool ld objdump; do
|
for EXEC in dlltool ld objdump; do
|
||||||
ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
|
ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC}
|
||||||
done
|
done
|
||||||
for EXEC in windres xtcspecc; do
|
for EXEC in bin2c exetool windres xtcspecc; do
|
||||||
if [ ! -e ${BINDIR}/bin/${EXEC} ]; then
|
if [ ! -e ${BINDIR}/bin/${EXEC} ]; then
|
||||||
gcc ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
|
gcc ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
|
||||||
fi
|
fi
|
||||||
|
@ -528,12 +554,6 @@ llvm_fetch
|
||||||
# Build and install LLVM
|
# Build and install LLVM
|
||||||
llvm_build
|
llvm_build
|
||||||
|
|
||||||
# Download NASM
|
|
||||||
nasm_fetch
|
|
||||||
|
|
||||||
# Build and install NASM
|
|
||||||
nasm_build
|
|
||||||
|
|
||||||
# Download Mingw-W64
|
# Download Mingw-W64
|
||||||
mingw_fetch
|
mingw_fetch
|
||||||
|
|
||||||
|
@ -555,6 +575,12 @@ mingw_build_libs
|
||||||
# Build and install Mingw-W64 tools
|
# Build and install Mingw-W64 tools
|
||||||
mingw_build_tools
|
mingw_build_tools
|
||||||
|
|
||||||
|
# Download Binutils
|
||||||
|
binutils_fetch
|
||||||
|
|
||||||
|
# Build and install Binutils
|
||||||
|
binutils_build
|
||||||
|
|
||||||
# Download Wine
|
# Download Wine
|
||||||
wine_fetch
|
wine_fetch
|
||||||
|
|
||||||
|
@ -582,12 +608,12 @@ ninja_build
|
||||||
# Remove unneeded files to save disk space
|
# Remove unneeded files to save disk space
|
||||||
echo ">>> Removing 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}/{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
|
# Save XT Toolchain version
|
||||||
cd ${WRKDIR}
|
cd ${WRKDIR}
|
||||||
: ${XTCVER:=$(git describe --exact-match --tags 2>/dev/null)}
|
: ${XTCVER:=$(git describe --exact-match --tags 2>/dev/null)}
|
||||||
: ${XTCVER:=DEV}
|
: ${XTCVER:=DEVEL}
|
||||||
echo "${XTCVER}" > ${BINDIR}/Version
|
echo "${XTCVER}" > ${BINDIR}/Version
|
||||||
|
|
||||||
# Prepare archive
|
# Prepare archive
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
diff --git a/bfd/config.bfd b/bfd/config.bfd
|
||||||
|
index bdee53957c0..04fff6e7df4 100644
|
||||||
|
--- a/bfd/config.bfd
|
||||||
|
+++ b/bfd/config.bfd
|
||||||
|
@@ -407,6 +407,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-*-mingw*)
|
||||||
|
+ 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 3429f850d05..fa735da7ce6 100644
|
||||||
|
--- a/gas/configure.tgt
|
||||||
|
+++ b/gas/configure.tgt
|
||||||
|
@@ -164,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-*-mingw*) fmt=coff em=pe ;;
|
||||||
|
arm-*-fuchsia*) fmt=elf ;;
|
||||||
|
arm-*-haiku*) fmt=elf em=haiku ;;
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/src/job.c b/src/job.c
|
|
||||||
index d6e28d3..f8f6950 100644
|
|
||||||
--- a/src/job.c
|
|
||||||
+++ b/src/job.c
|
|
||||||
@@ -2391,7 +2391,7 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- cmd = (char *)find_in_given_path (argv[0], p, 0);
|
|
||||||
+ cmd = (char *)find_in_given_path (argv[0], p, 0, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!cmd)
|
|
|
@ -51,11 +51,24 @@ chbuild()
|
||||||
}
|
}
|
||||||
export -f chbuild
|
export -f chbuild
|
||||||
|
|
||||||
|
# Prints help
|
||||||
|
help()
|
||||||
|
{
|
||||||
|
version
|
||||||
|
echo "XTChain defines an internal list of commands:"
|
||||||
|
echo " * charch [arch] - sets the target CPU architecture [aarch64/armv7/i686/amd64]"
|
||||||
|
echo " * chbuild [type] - sets build type [debug/release]"
|
||||||
|
echo " * help - prints this message"
|
||||||
|
echo " * version - prints XTChain and its components version"
|
||||||
|
echo " * xbuild - builds an application with a Ninja build system"
|
||||||
|
}
|
||||||
|
export -f help
|
||||||
|
|
||||||
# Displays version banner
|
# Displays version banner
|
||||||
version()
|
version()
|
||||||
{
|
{
|
||||||
echo "###############################################################################"
|
echo "###############################################################################"
|
||||||
echo "# XT Toolchain v${XTCVER} for Linux #"
|
echo "# XT Toolchain v${XTCVER} for Linux #"
|
||||||
echo "# by Rafal Kupiec <belliash@codingworkshop.eu.org> #"
|
echo "# by Rafal Kupiec <belliash@codingworkshop.eu.org> #"
|
||||||
echo "###############################################################################"
|
echo "###############################################################################"
|
||||||
echo
|
echo
|
||||||
|
@ -66,9 +79,26 @@ version()
|
||||||
echo "Wine Message Compiler Version: $(${XTCDIR}/bin/wmc -V | grep 'version' | cut -d' ' -f5)"
|
echo "Wine Message Compiler Version: $(${XTCDIR}/bin/wmc -V | grep 'version' | cut -d' ' -f5)"
|
||||||
echo "Wine Resource Compiler Version: $(${XTCDIR}/bin/wrc --version | grep 'version' | cut -d' ' -f5)"
|
echo "Wine Resource Compiler Version: $(${XTCDIR}/bin/wrc --version | grep 'version' | cut -d' ' -f5)"
|
||||||
echo
|
echo
|
||||||
charch ${TARGET}
|
charch ${TARGET:-amd64}
|
||||||
chbuild DEBUG
|
chbuild ${BUILD_TYPE:-DEBUG}
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
}
|
}
|
||||||
export -f version
|
export -f version
|
||||||
|
|
||||||
|
# Builds application (wrapper to Ninja)
|
||||||
|
xbuild()
|
||||||
|
{
|
||||||
|
if [ ! -f build.arch ]; then
|
||||||
|
ninja "$@"
|
||||||
|
else
|
||||||
|
ARCH=$(cat build.arch)
|
||||||
|
if [ x"${ARCH}" != x"${TARGET}" ]; then
|
||||||
|
echo "Build is configured for '${ARCH}' while current target set to '${TARGET}'!"
|
||||||
|
echo "Cannot continue until conflict is resolved ..."
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
ninja "$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
export -f xbuild
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
/**
|
||||||
|
* PROJECT: XTchain
|
||||||
|
* LICENSE: See COPYING.md in the top level directory
|
||||||
|
* FILE: tools/bin2c.c
|
||||||
|
* DESCRIPTION: Binary to C converter
|
||||||
|
* DEVELOPERS: Rafal Kupiec <belliash@codingworkshop.eu.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "xtchain.h"
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
/* Check for proper number of arguments */
|
||||||
|
if(argc != 4)
|
||||||
|
{
|
||||||
|
printf("Usage: %s <input binary> <output file> <structure name>\n", argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Open the input binary file in binary mode */
|
||||||
|
FILE *inputFile = fopen(argv[1], "rb");
|
||||||
|
if(inputFile == NULL)
|
||||||
|
{
|
||||||
|
printf("Error: unable to open file %s\n", argv[1]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Open the destination source code file in text mode */
|
||||||
|
FILE *outputFile = fopen(argv[2], "w");
|
||||||
|
if(outputFile == NULL)
|
||||||
|
{
|
||||||
|
printf("Error: unable to open file %s\n", argv[2]);
|
||||||
|
fclose(inputFile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Get the size of the binary file */
|
||||||
|
fseek(inputFile, 0, SEEK_END);
|
||||||
|
long binSize = ftell(inputFile);
|
||||||
|
rewind(inputFile);
|
||||||
|
|
||||||
|
/* Allocate memory for the binary data */
|
||||||
|
unsigned char *binData = (unsigned char *)malloc(binSize);
|
||||||
|
if(binData == NULL)
|
||||||
|
{
|
||||||
|
printf("Error: unable to allocate memory for binary data\n");
|
||||||
|
fclose(inputFile);
|
||||||
|
fclose(outputFile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Read the binary data into memory */
|
||||||
|
fread(binData, sizeof(unsigned char), binSize, inputFile);
|
||||||
|
|
||||||
|
/* Write the C structure to the header file */
|
||||||
|
fprintf(outputFile, "unsigned char %s[] = {", argv[3]);
|
||||||
|
for(int i = 0; i < binSize; i++)
|
||||||
|
{
|
||||||
|
fprintf(outputFile, "0x%02X", binData[i]);
|
||||||
|
if(i < binSize - 1)
|
||||||
|
{
|
||||||
|
fprintf(outputFile, ",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fprintf(outputFile, "};\nunsigned int %s_size = %ld;\n", argv[3], binSize);
|
||||||
|
free(binData);
|
||||||
|
|
||||||
|
/* Close all open files */
|
||||||
|
fclose(inputFile);
|
||||||
|
fclose(outputFile);
|
||||||
|
|
||||||
|
printf("Binary data converted to C structure successfully.\n");
|
||||||
|
return 0;
|
||||||
|
}
|
|
@ -0,0 +1,182 @@
|
||||||
|
/**
|
||||||
|
* PROJECT: XTchain
|
||||||
|
* LICENSE: See COPYING.md in the top level directory
|
||||||
|
* FILE: tools/exetool.c
|
||||||
|
* DESCRIPTION: Portable Executable (PE) utility for changing its signature and subsystem
|
||||||
|
* DEVELOPERS: Rafal Kupiec <belliash@codingworkshop.eu.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "xtchain.h"
|
||||||
|
|
||||||
|
typedef struct _PE_SUBSYSTEM
|
||||||
|
{
|
||||||
|
int Identifier;
|
||||||
|
char *Name;
|
||||||
|
} PE_SUBSYSTEM, *PPE_SUBSYSTEM;
|
||||||
|
|
||||||
|
static PE_SUBSYSTEM SubSystems[] = {
|
||||||
|
{0x00, "INVALID_SUBSYSTEM"},
|
||||||
|
{0x01, "NT_NATIVE"},
|
||||||
|
{0x02, "WINDOWS_GUI"},
|
||||||
|
{0x03, "WINDOWS_CLI"},
|
||||||
|
{0x04, "WINDOWS_CE_OLD"},
|
||||||
|
{0x05, "OS2_CUI"},
|
||||||
|
{0x07, "POSIX_CUI"},
|
||||||
|
{0x08, "NATIVE_WINDOWS"},
|
||||||
|
{0x09, "WINDOWS_CE_GUI"},
|
||||||
|
{0x0A, "EFI_APPLICATION"},
|
||||||
|
{0x0B, "EFI_BOOT_SERVICE_DRIVER"},
|
||||||
|
{0x0C, "EFI_RUNTIME_DRIVER"},
|
||||||
|
{0x0D, "EFI_ROM"},
|
||||||
|
{0x0E, "XBOX"},
|
||||||
|
{0x10, "WINDOWS_BOOT_APPLICATION"},
|
||||||
|
{0x14, "XT_NATIVE_KERNEL"},
|
||||||
|
{0x15, "XT_NATIVE_APPLICATION"},
|
||||||
|
{0x16, "XT_NATIVE_DRIVER"},
|
||||||
|
{0x17, "XT_DYNAMIC_LIBRARY"},
|
||||||
|
{0x18, "XT_APPLICATION_CLI"},
|
||||||
|
{0x19, "XT_APPLICATION_GDI"}
|
||||||
|
};
|
||||||
|
|
||||||
|
PPE_SUBSYSTEM getSubSystem(char *Name)
|
||||||
|
{
|
||||||
|
int Index;
|
||||||
|
int SubSystemsCount;
|
||||||
|
PPE_SUBSYSTEM SubSystem;
|
||||||
|
|
||||||
|
/* Count number of subsystems avaialble */
|
||||||
|
SubSystemsCount = sizeof(SubSystems) / sizeof(PE_SUBSYSTEM);
|
||||||
|
|
||||||
|
/* Find subsystem */
|
||||||
|
for(Index = 0; Index < SubSystemsCount; Index++)
|
||||||
|
{
|
||||||
|
SubSystem = &SubSystems[Index];
|
||||||
|
if(strcasecmp(SubSystem->Name, Name) == 0)
|
||||||
|
{
|
||||||
|
/* Subsystem found, return its ID */
|
||||||
|
return SubSystem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* No valid subsystem found */
|
||||||
|
return &SubSystems[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
char *getSubSystemName(int Identifier)
|
||||||
|
{
|
||||||
|
int Index;
|
||||||
|
int SubSystemsCount;
|
||||||
|
PPE_SUBSYSTEM SubSystem;
|
||||||
|
|
||||||
|
/* Count number of subsystems avaialble */
|
||||||
|
SubSystemsCount = sizeof(SubSystems) / sizeof(PE_SUBSYSTEM);
|
||||||
|
|
||||||
|
/* Find subsystem */
|
||||||
|
for(Index = 0; Index < SubSystemsCount; Index++)
|
||||||
|
{
|
||||||
|
SubSystem = &SubSystems[Index];
|
||||||
|
if(SubSystem->Identifier == Identifier)
|
||||||
|
{
|
||||||
|
/* Subsystem found, return its ID */
|
||||||
|
return SubSystem->Name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* No valid subsystem found */
|
||||||
|
return SubSystems[0].Name;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
FILE *ExeFile;
|
||||||
|
unsigned char Signature[4];
|
||||||
|
unsigned int HeaderOffset;
|
||||||
|
unsigned int ImageSignature;
|
||||||
|
unsigned short SubSystem;
|
||||||
|
PPE_SUBSYSTEM NewSubSystem;
|
||||||
|
|
||||||
|
/* Check for proper number of arguments */
|
||||||
|
if(argc != 3)
|
||||||
|
{
|
||||||
|
printf("Usage: %s <filename> <new SubSystem>\n", argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Parse the new SubSystem value from the command line argument */
|
||||||
|
NewSubSystem = getSubSystem(argv[2]);
|
||||||
|
if(NewSubSystem->Identifier == 0)
|
||||||
|
{
|
||||||
|
/* Invalid SubSystem provided */
|
||||||
|
printf("Error: %s is not a valid PE SubSystem\n", argv[2]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Open the EXE file in binary mode */
|
||||||
|
ExeFile = fopen(argv[1], "r+b");
|
||||||
|
if(ExeFile == NULL)
|
||||||
|
{
|
||||||
|
/* Failed to open PE file */
|
||||||
|
printf("ERROR: Unable to open file %s\n", argv[1]);
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Verify that the input file has a valid DOS header */
|
||||||
|
fread(Signature, sizeof(unsigned char), 4, ExeFile);
|
||||||
|
if(Signature[0] != 'M' || Signature[1] != 'Z')
|
||||||
|
{
|
||||||
|
/* Invalid DOS header */
|
||||||
|
printf("ERROR: %s is not a valid EXE file\n", argv[1]);
|
||||||
|
fclose(ExeFile);
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Verify that the input file has a valid PE header */
|
||||||
|
fseek(ExeFile, 0x3C, SEEK_SET);
|
||||||
|
fread(&HeaderOffset, sizeof(unsigned int), 1, ExeFile);
|
||||||
|
fseek(ExeFile, HeaderOffset, SEEK_SET);
|
||||||
|
fread(Signature, sizeof(unsigned char), 4, ExeFile);
|
||||||
|
if((Signature[0] != 'P' || Signature[1] != 'E' || Signature[2] != 0 || Signature[3] != 0) &&
|
||||||
|
(Signature[0] != 'P' || Signature[1] != 'E' || Signature[2] != 'X' || Signature[3] != 'T'))
|
||||||
|
{
|
||||||
|
/* Invalid PE header */
|
||||||
|
printf("Error: %s is not a valid PE file\n", argv[1]);
|
||||||
|
fclose(ExeFile);
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Check if setting XT subsystem */
|
||||||
|
if(NewSubSystem->Identifier >= 0x14 && NewSubSystem->Identifier <= 0x19)
|
||||||
|
{
|
||||||
|
/* Write PEXT signature */
|
||||||
|
ImageSignature = 0x54584550;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Write PE00 signature */
|
||||||
|
ImageSignature = 0x00004550;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Seek back to header offset and write new signature */
|
||||||
|
fseek(ExeFile, HeaderOffset, SEEK_SET);
|
||||||
|
fwrite(&ImageSignature, sizeof(ImageSignature), 1, ExeFile);
|
||||||
|
|
||||||
|
/* Seek to the offset of the SubSystem field in the optional header */
|
||||||
|
fseek(ExeFile, HeaderOffset + 0x5C, SEEK_SET);
|
||||||
|
|
||||||
|
/* Read the current SubSystem value */
|
||||||
|
fread(&SubSystem, sizeof(unsigned short), 1, ExeFile);
|
||||||
|
|
||||||
|
/* Seek back to the SubSystem field in the optional header */
|
||||||
|
fseek(ExeFile, -sizeof(unsigned short), SEEK_CUR);
|
||||||
|
|
||||||
|
/* Write the new SubSystem value */
|
||||||
|
fwrite(&NewSubSystem->Identifier, sizeof(unsigned short), 1, ExeFile);
|
||||||
|
|
||||||
|
/* Close the file */
|
||||||
|
fclose(ExeFile);
|
||||||
|
|
||||||
|
/* Finished successfully */
|
||||||
|
printf("PE SubSystem modified: 0x%02X <%s> to 0x%02X <%s>\n",
|
||||||
|
SubSystem, getSubSystemName(SubSystem), NewSubSystem->Identifier, NewSubSystem->Name);
|
||||||
|
return 0;
|
||||||
|
}
|
Loading…
Reference in New Issue