6 files changed, 30 insertions, 10 deletions
diff --git a/rtems/config/5/rtems-aarch64.bset b/rtems/config/5/rtems-aarch64.bset
deleted file mode 100644
index f38aff3..0000000
--- a/rtems/config/5/rtems-aarch64.bset
+++ /dev/null
@@ -1,4 +0,0 @@
-%define release 1
-%define rtems_arch aarch64
-%define with_libgomp
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-all.bset b/rtems/config/5/rtems-all.bset
index 00ccfae..81076e4 100644
--- a/rtems/config/5/rtems-all.bset
+++ b/rtems/config/5/rtems-all.bset
@@ -1,11 +1,9 @@
-5/rtems-aarch64
 5/rtems-arm
 5/rtems-bfin
 5/rtems-epiphany
 5/rtems-i386
 5/rtems-lm32
 5/rtems-m68k
-5/rtems-microblaze
 5/rtems-mips
 5/rtems-moxie
 5/rtems-nios2
diff --git a/rtems/config/5/rtems-microblaze.bset b/rtems/config/5/rtems-microblaze.bset
deleted file mode 100644
index e5c23af..0000000
--- a/rtems/config/5/rtems-microblaze.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch microblaze
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-tier-4.bset b/rtems/config/5/rtems-tier-4.bset
index 24d392d..042f2a0 100644
--- a/rtems/config/5/rtems-tier-4.bset
+++ b/rtems/config/5/rtems-tier-4.bset
@@ -5,6 +5,5 @@
 # anyone working on adding a BSP.
 #
 5/rtems-epiphany
-5/rtems-microblaze
 5/rtems-riscv
 5/rtems-x86_64
diff --git a/source-builder/config/gcc-4.6-1.cfg b/source-builder/config/gcc-4.6-1.cfg
new file mode 100644
index 0000000..cecfdb5
--- /dev/null
+++ b/source-builder/config/gcc-4.6-1.cfg
@@ -0,0 +1,28 @@
+#
+# GCC 4.6 Version 1.
+#
+# This configuration file configure's, make's and install's gcc. It uses
+# newlib, MPFR, MPC, and GMP in a one-tree build configuration.
+#
+
+#
+# Source
+#
+#
+# GCC core and G++
+#
+%source set gcc https://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_version}.tar.bz2
+
+%if %{enable_cxx}
+ %source add gcc https://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_version}.tar.gz
+%endif
+
+#
+# Newlib
+#
+%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
+
+#
+# GCC Common build script.
+#
+%include %{_configdir}/gcc-common-1.cfg
diff --git a/source-builder/sb/version.py b/source-builder/sb/version.py
index 12a60e3..007f3b6 100644
--- a/source-builder/sb/version.py
+++ b/source-builder/sb/version.py
@@ -94,6 +94,8 @@ _top_dir = None
 def _top():
     if _top_dir is None:
         top = path.dirname(sys.argv[0])
+        if top.endswith('source-builder/sb'):
+            top = path.dirname(path.dirname(top))
     else:
         top = _top_dir
     if len(top) == 0: