forked from xt-sys/xtchain
Update software and get rid of binutils
This commit is contained in:
parent
3342b87fd0
commit
9025a85bcc
@ -16,19 +16,14 @@ 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.27.6"
|
CMAKETAG="v3.29.3"
|
||||||
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-18.1.4"
|
LLVMTAG="llvmorg-18.1.5"
|
||||||
LLVMVCS="https://github.com/llvm/llvm-project.git"
|
LLVMVCS="https://github.com/llvm/llvm-project.git"
|
||||||
|
|
||||||
# Make Settings
|
# Make Settings
|
||||||
@ -45,12 +40,12 @@ MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
|||||||
|
|
||||||
# Ninja Settings
|
# Ninja Settings
|
||||||
NINJADIR="${SRCDIR}/ninja"
|
NINJADIR="${SRCDIR}/ninja"
|
||||||
NINJATAG="v1.11.1"
|
NINJATAG="v1.12.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-8.17"
|
WINETAG="wine-9.8"
|
||||||
WINEVCS="git://source.winehq.org/git/wine.git"
|
WINEVCS="git://source.winehq.org/git/wine.git"
|
||||||
|
|
||||||
|
|
||||||
@ -79,50 +74,6 @@ 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()
|
||||||
{
|
{
|
||||||
@ -575,12 +526,6 @@ 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
|
||||||
|
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
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 ;;
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user