This commit is contained in:
parent
37230435aa
commit
a522cdc583
@ -18,22 +18,22 @@ GENERIC="generic-w64-mingw32"
|
||||
|
||||
# Binutils Settings
|
||||
BINUTILSDIR="${SRCDIR}/binutils"
|
||||
BINUTILSTAG="binutils-2_40"
|
||||
BINUTILSTAG="binutils-2_41"
|
||||
BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
|
||||
|
||||
# CMake Settings
|
||||
CMAKEDIR="${SRCDIR}/cmake"
|
||||
CMAKETAG="v3.24.2"
|
||||
CMAKETAG="v3.27.6"
|
||||
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
|
||||
|
||||
# LLVM Settings
|
||||
LLVMDIR="${SRCDIR}/llvm"
|
||||
LLVMTAG="llvmorg-17.0.1"
|
||||
LLVMTAG="llvmorg-17.0.2"
|
||||
LLVMVCS="https://github.com/llvm/llvm-project.git"
|
||||
|
||||
# Make Settings
|
||||
MAKEDIR="${SRCDIR}/make"
|
||||
MAKETAG="4.3"
|
||||
MAKETAG="4.4.1"
|
||||
MAKEVCS="git://git.savannah.gnu.org/make"
|
||||
|
||||
# Mingw-w64 Settings
|
||||
@ -45,12 +45,12 @@ MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
||||
|
||||
# Ninja Settings
|
||||
NINJADIR="${SRCDIR}/ninja"
|
||||
NINJATAG="v1.11.0"
|
||||
NINJATAG="v1.11.1"
|
||||
NINJAVCS="https://github.com/ninja-build/ninja.git"
|
||||
|
||||
# Wine Settings
|
||||
WINEDIR="${SRCDIR}/wine"
|
||||
WINETAG="wine-7.9"
|
||||
WINETAG="wine-8.17"
|
||||
WINEVCS="git://source.winehq.org/git/wine.git"
|
||||
|
||||
|
||||
|
@ -1,32 +0,0 @@
|
||||
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
|
||||
|
@ -1,60 +0,0 @@
|
||||
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
|
||||
|
30
patches/binutils/2_41/001-add-arm-architectures.patch
Normal file
30
patches/binutils/2_41/001-add-arm-architectures.patch
Normal file
@ -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 ;;
|
||||
|
@ -1,13 +0,0 @@
|
||||
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()
|
@ -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)
|
Loading…
Reference in New Issue
Block a user