diff --git a/Makefile.common b/Makefile.common index e7062f0c..7490df55 100644 --- a/Makefile.common +++ b/Makefile.common @@ -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 # diff --git a/toolchain/binutils-2.34-01-i386-pc-phoenix.patch b/toolchain/binutils-2.34-01-i386-pc-phoenix.patch deleted file mode 100644 index ba88336d..00000000 --- a/toolchain/binutils-2.34-01-i386-pc-phoenix.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur binutils-2.34/bfd/config.bfd binutils-2.34-phoenix/bfd/config.bfd ---- binutils-2.34/bfd/config.bfd 2020-01-18 14:55:47.000000000 +0100 -+++ binutils-2.34-phoenix/bfd/config.bfd 2020-03-18 14:08:26.037301292 +0100 -@@ -758,6 +758,10 @@ - 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 -Naur binutils-2.34/gas/configure.tgt binutils-2.34-phoenix/gas/configure.tgt ---- binutils-2.34/gas/configure.tgt 2020-01-18 14:55:47.000000000 +0100 -+++ binutils-2.34-phoenix/gas/configure.tgt 2020-03-18 14:09:53.368838497 +0100 -@@ -259,6 +259,7 @@ - i386-*-*nt*) fmt=coff em=pe ;; - i386-*-rdos*) fmt=elf ;; - i386-*-darwin*) fmt=macho ;; -+ i386-*-phoenix*) fmt=elf ;; - - ia16-*-elf*) fmt=elf ;; - -diff -Naur binutils-2.34/ld/configure.tgt binutils-2.34-phoenix/ld/configure.tgt ---- binutils-2.34/ld/configure.tgt 2020-01-18 14:55:48.000000000 +0100 -+++ binutils-2.34-phoenix/ld/configure.tgt 2020-03-18 14:11:13.700432001 +0100 -@@ -402,6 +402,9 @@ - ;; - 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 - ;; - i[3-7]86-*-nacl*) targ_emul=elf_i386_nacl -diff -Naur binutils-2.34/ld/emulparams/elf_i386_phoenix.sh binutils-2.34-phoenix/ld/emulparams/elf_i386_phoenix.sh ---- binutils-2.34/ld/emulparams/elf_i386_phoenix.sh 1970-01-01 01:00:00.000000000 +0100 -+++ binutils-2.34-phoenix/ld/emulparams/elf_i386_phoenix.sh 2020-03-18 14:12:39.096016999 +0100 -@@ -0,0 +1 @@ -+. ${srcdir}/emulparams/elf_i386.sh -diff -Naur binutils-2.34/ld/Makefile.am binutils-2.34-phoenix/ld/Makefile.am ---- binutils-2.34/ld/Makefile.am 2020-01-30 08:15:56.000000000 +0100 -+++ binutils-2.34-phoenix/ld/Makefile.am 2020-03-18 14:15:37.443195906 +0100 -@@ -295,6 +295,7 @@ - eelf_i386_nacl.c \ - eelf_i386_sol2.c \ - eelf_i386_vxworks.c \ -+ eelf_i386_phoenix.c \ - eelf_iamcu.c \ - eelf_s390.c \ - eh8300elf.c \ -@@ -783,6 +784,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_phoenix.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Pc@am__quote@ -diff -Naur binutils-2.34/ld/Makefile.in binutils-2.34-phoenix/ld/Makefile.in ---- binutils-2.34/ld/Makefile.in 2020-02-01 12:50:25.000000000 +0100 -+++ binutils-2.34-phoenix/ld/Makefile.in 2020-03-18 14:16:31.746955845 +0100 -@@ -785,6 +785,7 @@ - eelf_i386_nacl.c \ - eelf_i386_sol2.c \ - eelf_i386_vxworks.c \ -+ eelf_i386_phoenix.c \ - eelf_iamcu.c \ - eelf_s390.c \ - eh8300elf.c \ -@@ -1391,6 +1392,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.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_k1om.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om_fbsd.Po@am__quote@ -@@ -2387,6 +2389,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_phoenix.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Pc@am__quote@ diff --git a/toolchain/binutils-2.34-02-sparc-phoenix.patch b/toolchain/binutils-2.34-02-sparc-phoenix.patch deleted file mode 100644 index d23684ac..00000000 --- a/toolchain/binutils-2.34-02-sparc-phoenix.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur binutils-2.34/bfd/config.bfd binutils-2.34-phoenix/bfd/config.bfd ---- binutils-2.34/bfd/config.bfd 2020-01-18 14:55:47.000000000 +0100 -+++ binutils-2.34-phoenix/bfd/config.bfd 2020-03-18 14:08:26.037301292 +0100 -@@ -1317,6 +1317,10 @@ - sparc-*-vxworks*) - 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 -Naur binutils-2.34/gas/configure.tgt binutils-2.34-phoenix/gas/configure.tgt ---- binutils-2.34/gas/configure.tgt 2020-01-18 14:55:47.000000000 +0100 -+++ binutils-2.34-phoenix/gas/configure.tgt 2020-03-18 14:09:53.368838497 +0100 -@@ -396,4 +396,5 @@ - sparc-*-freebsd*) fmt=elf em=freebsd ;; - sparc-*-*bsd*) fmt=elf em=nbsd ;; -+ sparc-*-phoenix*) fmt=elf ;; - - spu-*-elf) fmt=elf ;; -diff -Naur binutils-2.34/ld/configure.tgt binutils-2.34-phoenix/ld/configure.tgt ---- binutils-2.34/ld/configure.tgt 2020-01-18 14:55:48.000000000 +0100 -+++ binutils-2.34-phoenix/ld/configure.tgt 2020-03-18 14:11:13.700432001 +0100 -@@ -879,4 +879,7 @@ - sparc*-*-vxworks*) targ_emul=elf32_sparc_vxworks - ;; -+sparc-*-phoenix*) targ_emul=elf32_sparc_phoenix -+ targ_extra_emuls=elf32_sparc -+ ;; - sparc*-*-*) targ_emul=elf32_sparc - ;; -diff -Naur binutils-2.34/ld/emulparams/elf32_sparc_phoenix.sh binutils-2.34-phoenix/ld/emulparams/elf32_sparc_phoenix.sh ---- binutils-2.34/ld/emulparams/elf32_sparc_phoenix.sh 1970-01-01 01:00:00.000000000 +0100 -+++ binutils-2.34-phoenix/ld/emulparams/elf32_sparc_phoenix.sh 2020-03-18 14:12:39.096016999 +0100 -@@ -0,0 +1 @@ -+. ${srcdir}/emulparams/elf32_sparc.sh -diff -Naur binutils-2.34/ld/Makefile.am binutils-2.34-phoenix/ld/Makefile.am ---- binutils-2.34/ld/Makefile.am 2020-01-30 08:15:56.000000000 +0100 -+++ binutils-2.34-phoenix/ld/Makefile.am 2020-03-18 14:15:37.443195906 +0100 -@@ -226,3 +226,4 @@ - eelf32_sparc_sol2.c \ - eelf32_sparc_vxworks.c \ -+ eelf32_sparc_phoenix.c \ - eelf32_spu.c \ -@@ -714,4 +715,5 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_sol2.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_vxworks.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_phoenix.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_spu.Pc@am__quote@ -diff -Naur binutils-2.34/ld/Makefile.in binutils-2.34-phoenix/ld/Makefile.in ---- binutils-2.34/ld/Makefile.in 2020-02-01 12:50:25.000000000 +0100 -+++ binutils-2.34-phoenix/ld/Makefile.in 2020-03-18 14:16:31.746955845 +0100 -@@ -715,4 +715,5 @@ - eelf32_sparc.c \ - eelf32_sparc_sol2.c \ - eelf32_sparc_vxworks.c \ -+ eelf32_sparc_phoenix.c \ - eelf32_spu.c \ -@@ -1271,6 +1272,7 @@ - @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@ -@@ -2319,6 +2321,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_sol2.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_vxworks.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_sparc_phoenix.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_spu.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_tic6x_be.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_tic6x_le.Pc@am__quote@ - \ No newline at end of file diff --git a/toolchain/binutils-2.43-01-i386-pc-phoenix.patch b/toolchain/binutils-2.43-01-i386-pc-phoenix.patch new file mode 100644 index 00000000..9d8674e1 --- /dev/null +++ b/toolchain/binutils-2.43-01-i386-pc-phoenix.patch @@ -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 +@@ -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 diff --git a/toolchain/binutils-2.43-02-sparc-phoenix.patch b/toolchain/binutils-2.43-02-sparc-phoenix.patch new file mode 100644 index 00000000..ff87dae6 --- /dev/null +++ b/toolchain/binutils-2.43-02-sparc-phoenix.patch @@ -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 diff --git a/toolchain/binutils-2.34-03-arm-phoenix-emul-fix.patch b/toolchain/binutils-2.43-03-arm-phoenix-emul-fix.patch similarity index 100% rename from toolchain/binutils-2.34-03-arm-phoenix-emul-fix.patch rename to toolchain/binutils-2.43-03-arm-phoenix-emul-fix.patch diff --git a/toolchain/build-toolchain.sh b/toolchain/build-toolchain.sh index 0167f2a1..c525efbb 100755 --- a/toolchain/build-toolchain.sh +++ b/toolchain/build-toolchain.sh @@ -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}"