From 9fd40e96171a5683fdd7e7cddc1836d21571d147 Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Sun, 26 Mar 2023 09:40:15 +0200
Subject: [PATCH] Import missing binutils patches

---
 .../binutils/2_40/001-fix-compilation.patch   | 32 ++++++++++
 .../2_40/002-add-arm-architectures.patch      | 60 +++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 patches/binutils/2_40/001-fix-compilation.patch
 create mode 100644 patches/binutils/2_40/002-add-arm-architectures.patch

diff --git a/patches/binutils/2_40/001-fix-compilation.patch b/patches/binutils/2_40/001-fix-compilation.patch
new file mode 100644
index 0000000..c89d0b9
--- /dev/null
+++ b/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
+
diff --git a/patches/binutils/2_40/002-add-arm-architectures.patch b/patches/binutils/2_40/002-add-arm-architectures.patch
new file mode 100644
index 0000000..251a3ba
--- /dev/null
+++ b/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
+