8 files changed, 33 insertions, 11 deletions
diff --git a/rtems/config/5/rtems-default.bset b/rtems/config/5/rtems-default.bset
index dcafbdc..eed39fd 100644
--- a/rtems/config/5/rtems-default.bset
+++ b/rtems/config/5/rtems-default.bset
@@ -10,7 +10,7 @@
 5/rtems-autotools
 
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.30
+tools/rtems-binutils-2.31.1
 tools/rtems-gcc-7.3.0-newlib-3.0.0
 tools/rtems-gdb-8.0.1-1
 tools/rtems-tools-5-1
diff --git a/rtems/config/5/rtems-epiphany.bset b/rtems/config/5/rtems-epiphany.bset
index b7ac799..566cb1a 100644
--- a/rtems/config/5/rtems-epiphany.bset
+++ b/rtems/config/5/rtems-epiphany.bset
@@ -33,7 +33,7 @@
 #
 5/rtems-autotools
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.30
+tools/rtems-binutils-2.31.1
 tools/rtems-gcc-7.3.0-newlib-3.0.0
 tools/rtems-gdb-7.8.1-1
 tools/rtems-tools-5-1
diff --git a/rtems/config/5/rtems-m32c.bset b/rtems/config/5/rtems-m32c.bset
index addce75..63fb260 100644
--- a/rtems/config/5/rtems-m32c.bset
+++ b/rtems/config/5/rtems-m32c.bset
@@ -40,7 +40,7 @@
 #
 5/rtems-autotools
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.30
+tools/rtems-binutils-2.31.1
 tools/rtems-gcc-4.8.3-newlib-3.0.0
 tools/rtems-gdb-8.0.1-1
 tools/rtems-tools-5-1
diff --git a/rtems/config/5/rtems-or1k.bset b/rtems/config/5/rtems-or1k.bset
index 15be88e..d29bb85 100644
--- a/rtems/config/5/rtems-or1k.bset
+++ b/rtems/config/5/rtems-or1k.bset
@@ -32,7 +32,7 @@
 #
 5/rtems-autotools
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.30
+tools/rtems-binutils-2.31.1
 tools/rtems-gcc-4.9.3-newlib-3.0.0
 tools/rtems-tools-5-1
 tools/rtems-gdb-7.11-2
diff --git a/rtems/config/5/rtems-riscv32.bset b/rtems/config/5/rtems-riscv32.bset
index 07853b5..5dce1da 100644
--- a/rtems/config/5/rtems-riscv32.bset
+++ b/rtems/config/5/rtems-riscv32.bset
@@ -10,7 +10,7 @@
 5/rtems-autotools
 
 devel/expat-2.1.0-1
-tools/rtems-binutils-160d1b3d74593bf42155da24569f54a6e7140f65
+tools/rtems-binutils-2.31.1
 tools/rtems-gcc-2e2052934b0c82e0726ed44de4a9b0a29ed6b276-newlib-3.0.0
 tools/rtems-gdb-160d1b3d74593bf42155da24569f54a6e7140f65
 tools/rtems-tools-5-1
diff --git a/rtems/config/5/rtems-riscv64.bset b/rtems/config/5/rtems-riscv64.bset
index 0b4e676..6d4ff2b 100644
--- a/rtems/config/5/rtems-riscv64.bset
+++ b/rtems/config/5/rtems-riscv64.bset
@@ -10,7 +10,7 @@
 5/rtems-autotools
 
 devel/expat-2.1.0-1
-tools/rtems-binutils-160d1b3d74593bf42155da24569f54a6e7140f65
+tools/rtems-binutils-2.31.1
 tools/rtems-gcc-2e2052934b0c82e0726ed44de4a9b0a29ed6b276-newlib-3.0.0
 tools/rtems-gdb-160d1b3d74593bf42155da24569f54a6e7140f65
 tools/rtems-tools-5-1
diff --git a/rtems/config/5/rtems-x86_64.bset b/rtems/config/5/rtems-x86_64.bset
index 6041971..9b92538 100644
--- a/rtems/config/5/rtems-x86_64.bset
+++ b/rtems/config/5/rtems-x86_64.bset
@@ -14,9 +14,4 @@
 %patch add gcc --rsb-file=gcc-f8fd78279d353f6959e75ac25571c1b7b2dec110.patch https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=libgcc/config.host;h=f8fd78279d353f6959e75ac25571c1b7b2dec110;hp=11b4acaff55e00ee6bd3c182e9da5dc597ac57c4;hb=ab55f7db3694293e4799d58f7e1a556c0eae863a;hpb=344c180cca810c50f38fd545bb9a102fb39306b7
 %hash sha512 gcc-f8fd78279d353f6959e75ac25571c1b7b2dec110.patch aef76f9d45a53096a021521375fc302a907f78545cc57683a7a00ec61608b8818115720f605a6b1746f479c8568963b380138520e259cbb9e8951882c2f1567f
 
-#
-# Binutils PEI target for UEFI support
-#
-%patch add binutils --rsb-file=binutils-f8ca72b332396939c7c04a8774ce4c54f5a82d42.patch https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blobdiff_plain;f=bfd/config.bfd;h=f8ca72b332396939c7c04a8774ce4c54f5a82d42;hp=0db8ed4562b2c11ce51e6a3b138c317f4014a1aa;hb=421acf18739edb54111b64d2b328ea2e7bf19889;hpb=f7c6f42310233479ea6339430b7c1ca1f9ec68e1
-%hash sha512 binutils-f8ca72b332396939c7c04a8774ce4c54f5a82d42.patch f8af6906871a95a6fb234d0c72c44e9b1823ed835ec91bd84b466aad1f2f5f021ff5fb37835e6132899dcaa6c7e52e3e73f5a2dc9f0efab97aa6fffce2f06d9e
 %include 5/rtems-default.bset
diff --git a/rtems/config/tools/rtems-binutils-2.31.1.cfg b/rtems/config/tools/rtems-binutils-2.31.1.cfg
new file mode 100644
index 0000000..121736e
--- /dev/null
+++ b/rtems/config/tools/rtems-binutils-2.31.1.cfg
@@ -0,0 +1,27 @@
+#
+# Binutils 2.31.1
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define binutils_version 2.31.1
+
+%hash sha512 binutils-%{binutils_version}.tar.bz2 b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd
+
+#
+# Enable deterministic archives by default. This will be the default
+# there all tools using this binutils will create deterministic
+# archives.
+#
+%define with_deterministic_archives 1
+
+#
+# Enable 64-bit BFD support
+#
+%define with_64_bit_bfd 1
+
+#
+# The binutils build instructions. We use 2.xx Release 1.
+#
+%include %{_configdir}/binutils-2-1.cfg