Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

!toolchain: update binutils to 2.43 #203

Merged
merged 2 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ $(info cleaning targets, make parallelism disabled)
.NOTPARALLEL:
endif

# Do not warn about RWX segments.
# binutils >= 2.39 required
LD_VERSION_MINOR := $(shell $(LD) $(LDFLAGS_PREFIX)--version 2> /dev/null | grep -Eo "[0-9][0-9]$$")
ifeq ($(shell expr $(LD_VERSION_MINOR) ">=" 39), 1)
LDFLAGS += $(LDFLAGS_PREFIX)--no-warn-rwx-segments
endif

#
# generic *FLAGS options
#
Expand Down
89 changes: 0 additions & 89 deletions toolchain/binutils-2.34-01-i386-pc-phoenix.patch

This file was deleted.

79 changes: 0 additions & 79 deletions toolchain/binutils-2.34-02-sparc-phoenix.patch

This file was deleted.

80 changes: 80 additions & 0 deletions toolchain/binutils-2.43-01-i386-pc-phoenix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 6553aac1e99..596867b1700 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -783,6 +783,10 @@ case "${targ}" in
targ_defvec=i386_elf32_vxworks_vec
targ_underscore=yes
;;
+ i[3-7]86-*-phoenix*)
+ targ_defvec=i386_elf32_vec
+ targ_selfvecs=
+ ;;

ia16-*-elf)
targ_defvec=i386_elf32_vec
diff --git a/gas/configure.tgt b/gas/configure.tgt
index d58f21873a3..0ce4759efda 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -267,6 +267,7 @@ case ${generic_target} in
i386-*-*nt*) fmt=coff em=pe ;;
i386-*-rdos*) fmt=elf ;;
i386-*-darwin*) fmt=macho ;;
+ i386-*-phoenix*) fmt=elf ;;

ia16-*-elf*) fmt=elf ;;

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 6a9833e5775..99ec9f7af3d 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
Darchiv marked this conversation as resolved.
Show resolved Hide resolved
@@ -283,6 +283,7 @@ ALL_EMULATION_SOURCES = \
eelf_i386_ldso.c \
eelf_i386_sol2.c \
eelf_i386_vxworks.c \
+ eelf_i386_phoenix.c \
eelf_iamcu.c \
eelf_s390.c \
eh8300elf.c \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 8639e782cdf..4425ec0b075 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -794,6 +794,7 @@ ALL_EMULATION_SOURCES = \
eelf_i386_ldso.c \
eelf_i386_sol2.c \
eelf_i386_vxworks.c \
+ eelf_i386_phoenix.c \
eelf_iamcu.c \
eelf_s390.c \
eh8300elf.c \
@@ -1484,6 +1485,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_phoenix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Po@am__quote@
diff --git a/ld/configure.tgt b/ld/configure.tgt
index f937f78b876..0245b92426b 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -448,6 +448,9 @@ i[3-7]86-*-haiku*) targ_emul=elf_i386_haiku
;;
i[3-7]86-*-vxworks*) targ_emul=elf_i386_vxworks
;;
+i[3-7]86-*-phoenix*) targ_emul=elf_i386_phoenix
+ targ_extra_emuls=elf_i386
+ ;;
i[3-7]86-*-chaos) targ_emul=elf_i386_chaos
;;
ia16-*-elf*) targ_emul=elf_i386
diff --git a/ld/emulparams/elf_i386_phoenix.sh b/ld/emulparams/elf_i386_phoenix.sh
new file mode 100644
index 00000000000..db38bcb3062
--- /dev/null
+++ b/ld/emulparams/elf_i386_phoenix.sh
@@ -0,0 +1 @@
+. ${srcdir}/emulparams/elf_i386.sh
80 changes: 80 additions & 0 deletions toolchain/binutils-2.43-02-sparc-phoenix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 596867b1700..bc65a681402 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -1390,6 +1390,10 @@ case "${targ}" in
targ_defvec=sparc_elf32_vxworks_vec
targ_selvecs="sparc_elf32_vec"
;;
+ sparc-*-phoenix*)
+ targ_defvec=sparc_elf32_vec
+ targ_selfvecs=
+ ;;
sparc*-*-*)
targ_defvec=sparc_elf32_vec
;;
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 0ce4759efda..ba42b2c8741 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -408,6 +408,7 @@ case ${generic_target} in
sparc-*-solaris*) fmt=elf em=solaris ;;
sparc-*-freebsd*) fmt=elf em=freebsd ;;
sparc-*-*bsd*) fmt=elf em=nbsd ;;
+ sparc-*-phoenix*) fmt=elf ;;

spu-*-elf) fmt=elf ;;

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 99ec9f7af3d..f43588155e4 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -218,6 +218,7 @@ ALL_EMULATION_SOURCES = \
eelf32_sparc.c \
eelf32_sparc_sol2.c \
eelf32_sparc_vxworks.c \
+ eelf32_sparc_phoenix.c \
eelf32_spu.c \
eelf32_tic6x_be.c \
eelf32_tic6x_elf_be.c \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 4425ec0b075..fbbe93cb83f 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -729,6 +729,7 @@ ALL_EMULATION_SOURCES = \
eelf32_sparc.c \
eelf32_sparc_sol2.c \
eelf32_sparc_vxworks.c \
+ eelf32_sparc_phoenix.c \
eelf32_spu.c \
eelf32_tic6x_be.c \
eelf32_tic6x_elf_be.c \
@@ -1354,6 +1355,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_sol2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_vxworks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_phoenix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_spu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_tic6x_be.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_tic6x_elf_be.Po@am__quote@
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 0245b92426b..0766e660e96 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -960,6 +960,9 @@ sparc-*-solaris2*) targ_emul=elf32_sparc_sol2
;;
sparc*-*-vxworks*) targ_emul=elf32_sparc_vxworks
;;
+sparc-*-phoenix*) targ_emul=elf32_sparc_phoenix
+ targ_extra_emuls=elf32_sparc
+ ;;
sparc*-*-*) targ_emul=elf32_sparc
;;
spu-*-elf*) targ_emul=elf32_spu
diff --git a/ld/emulparams/elf32_sparc_phoenix.sh b/ld/emulparams/elf32_sparc_phoenix.sh
new file mode 100644
index 00000000000..85f034424ea
--- /dev/null
+++ b/ld/emulparams/elf32_sparc_phoenix.sh
@@ -0,0 +1 @@
+. ${srcdir}/emulparams/elf32_sparc.sh
2 changes: 1 addition & 1 deletion toolchain/build-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fi
#BINUTILS=binutils-2.28
#GCC=gcc-7.1.0

BINUTILS=binutils-2.34
BINUTILS=binutils-2.43
GCC=gcc-9.5.0

TOOLCHAIN_PREFIX="${BUILD_ROOT}/${TARGET}"
Expand Down
Loading