6 files changed, 7 insertions, 14 deletions
diff --git a/rtems/config/5/rtems-default.bset b/rtems/config/5/rtems-default.bset
index 6f70b7c..1056e2c 100644
--- a/rtems/config/5/rtems-default.bset
+++ b/rtems/config/5/rtems-default.bset
@@ -11,7 +11,7 @@
 
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.29-1
-tools/rtems-gcc-7.2.0-newlib-2.5.0.20170922-1
+tools/rtems-gcc
 tools/rtems-gdb-8.0.1-1
 tools/rtems-tools-5-1
 tools/rtems-kernel-5
diff --git a/rtems/config/5/rtems-epiphany.bset b/rtems/config/5/rtems-epiphany.bset
index 181c158..940e1d4 100644
--- a/rtems/config/5/rtems-epiphany.bset
+++ b/rtems/config/5/rtems-epiphany.bset
@@ -9,25 +9,18 @@
 #
 # Get GNU tools from external repositories.
 #
-%define binutils_external 1
-%define gcc_external 1
 %define gdb_external 1
 
 #
 # Expanded names of the GNU tools
 #
-%define binutils_expand_name epiphany-binutils-gdb-b6c483b4a98424731e6e44558cb4b9863751fb1b
-%define gcc_expand_name epiphany-gcc-f7051762470c42ce7f01baa7edeb113d51c7dd72
 %define gdb_expand_name epiphany-binutils-gdb-f05996c7c42e6b2781946acbab153a481ce3fd0b
 
 #
 # Fetch GNU tools from external repos (temporarly).
 #
-%source set binutils https://github.com/adapteva/epiphany-binutils-gdb/archive/b6c483b4a98424731e6e44558cb4b9863751fb1b.zip
-%source set gcc https://github.com/adapteva/epiphany-gcc/archive/f7051762470c42ce7f01baa7edeb113d51c7dd72.zip
 %source set gdb https://github.com/adapteva/epiphany-binutils-gdb/archive/f05996c7c42e6b2781946acbab153a481ce3fd0b.zip
 
-%hash sha512 f7051762470c42ce7f01baa7edeb113d51c7dd72.zip ae26ec61f90978dec724234a6c89d63a0a1437c0d9dcc2d81462199e96daa557feef0f3655b3782ea4be0b90957e677ba835e6c22166ff80e9e322307450ef3e
 %hash sha256 f05996c7c42e6b2781946acbab153a481ce3fd0b.zip 2b2034fd12f2fd5108205ade66400c175ede8cef8141a38ae03fc78bf2d65325
 
 #
@@ -40,7 +33,7 @@
 #
 5/rtems-autotools
 devel/expat-2.1.0-1
-tools/rtems-binutils-2.23.1-1
-tools/rtems-gcc-4.9.2-newlib-2.5.0.20170922-1.cfg
+tools/rtems-binutils-2.29-1
+tools/rtems-gcc
 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 34667fd..9141403 100644
--- a/rtems/config/5/rtems-m32c.bset
+++ b/rtems/config/5/rtems-m32c.bset
@@ -41,6 +41,6 @@
 5/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.29-1
-tools/rtems-gcc-4.8.3-newlib-2.5.0.20170922-1
+tools/rtems-gcc-m32c
 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 b4cbdec..8b20380 100644
--- a/rtems/config/5/rtems-or1k.bset
+++ b/rtems/config/5/rtems-or1k.bset
@@ -33,6 +33,6 @@
 5/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.29-1
-tools/rtems-gcc-4.9.3-newlib-2.5.0.20170922-1
+tools/rtems-gcc-or1k
 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 3c11da1..6ec33e8 100644
--- a/rtems/config/5/rtems-riscv32.bset
+++ b/rtems/config/5/rtems-riscv32.bset
@@ -11,6 +11,6 @@
 
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.29-1
-tools/rtems-gcc-7.2.0-newlib-2.5.0.20170922-1
+tools/rtems-gcc
 tools/rtems-tools-5-1
 tools/rtems-kernel-5
diff --git a/rtems/config/5/rtems-riscv64.bset b/rtems/config/5/rtems-riscv64.bset
index c599481..57176fe 100644
--- a/rtems/config/5/rtems-riscv64.bset
+++ b/rtems/config/5/rtems-riscv64.bset
@@ -11,6 +11,6 @@
 
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.29-1
-tools/rtems-gcc-7.2.0-newlib-2.5.0.20170922-1
+tools/rtems-gcc
 tools/rtems-tools-5-1
 tools/rtems-kernel-5