diff --git a/rtems/config/4.12/rtems-aarch64.bset b/rtems/config/4.12/rtems-aarch64.bset
new file mode 100644
index 0000000..98fc6b4
--- /dev/null
+++ b/rtems/config/4.12/rtems-aarch64.bset
@@ -0,0 +1,4 @@
+%define release 1
+%define rtems_arch aarch64
+%define with_libgomp
+%include 4.12/rtems-default.bset
diff --git a/rtems/config/4.12/rtems-default.bset b/rtems/config/4.12/rtems-default.bset
index a471cd6..7305946 100644
--- a/rtems/config/4.12/rtems-default.bset
+++ b/rtems/config/4.12/rtems-default.bset
@@ -3,6 +3,6 @@
 4.12/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.26-1
-tools/rtems-gcc-6-20160124-newlib-2.3.0.20160104-1
+tools/rtems-gcc-6-20160228-newlib-2.3.0.20160226-1
 tools/rtems-gdb-7.9-1
 tools/rtems-tools-4.12-1
diff --git a/rtems/config/4.12/rtems-x86_64.bset b/rtems/config/4.12/rtems-x86_64.bset
new file mode 100644
index 0000000..d91748d
--- /dev/null
+++ b/rtems/config/4.12/rtems-x86_64.bset
@@ -0,0 +1,4 @@
+%define release 1
+%define rtems_arch x86_64
+%define with_libgomp
+%include 4.12/rtems-default.bset
diff --git a/rtems/config/tools/rtems-binutils-2.26-1.cfg b/rtems/config/tools/rtems-binutils-2.26-1.cfg
index 78f6522..37ec3d5 100644
--- a/rtems/config/tools/rtems-binutils-2.26-1.cfg
+++ b/rtems/config/tools/rtems-binutils-2.26-1.cfg
@@ -9,6 +9,12 @@
 
 %hash sha512 binutils-%{binutils_version}.tar.bz2 e77e1b8dbbcbaf9ac2fae95c4403615808af3be03b2e1d32448cd3a7d32c43273f8bcace3f2de84ec120a982879295673029da306e2885dbf5f990584932cfc7
 
+#
+# Patches for x86_64 and aarch64
+#
+%patch add binutils -p1 %{rtems_binutils_patches}/binutils-2.26-rtems-aarch64-x86_64.patch
+%hash sha512 binutils-2.26-rtems-aarch64-x86_64.patch 2236cc22dda60d5c18a2ab5abc0f44bf487794f7c0899382bf49233e789e1fb34ce28b0f7a85069642f7cc06bd34d7634a441a8d92bf890de57bb89cc398349f
+
 #
 # Enable deterministic archives by default. This will be the default
 # there all tools using this binutils will create deterministic
diff --git a/rtems/config/tools/rtems-gcc-6-20160228-newlib-2.3.0.20160226-1.cfg b/rtems/config/tools/rtems-gcc-6-20160228-newlib-2.3.0.20160226-1.cfg
new file mode 100644
index 0000000..b35e2ce
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-6-20160228-newlib-2.3.0.20160226-1.cfg
@@ -0,0 +1,22 @@
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gcc_version    6-20160228
+%define newlib_version 2.3.0.20160226
+%define mpfr_version   2.4.2
+%define mpc_version    0.8.1
+%define gmp_version    4.3.2
+
+%hash sha512 gcc-6-20160228.tar.bz2 cc768440bf6b89ad58fb64cf2fd93898929f63cd212cdb54443543135be9e713c409f9e2740531376510cad59172b197cad769df14345834bc1cd17b33976a57
+%hash sha512 newlib-2.3.0.20160226.tar.gz f3862b9e8622997cb47688115fa919a0ce933211b590e72f6ab8f7de2d6d1cfa30de405f6a02cf227e81dace94abee8018b80861b291361d1b95062ba67a5175
+%hash sha512 mpfr-2.4.2.tar.bz2 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e
+%hash sha512 mpc-0.8.1.tar.gz 14cb9ae3d33caed24d5ae648eed28b2e00ad047a8baeff25981129af88245b4def2948573d7a00d65c5bd34e53524aa6a7351b76703c9f888b41830c1a1daae2
+%hash sha512 gmp-4.3.2.tar.bz2 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
+
+%define with_threads 1
+%define with_plugin  0
+%define with_iconv   1
+
+%source set gcc ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_version}/gcc-%{gcc_version}.tar.bz2
+
+%include %{_configdir}/gcc-6-1.cfg
diff --git a/rtems/config/tools/rtems-gdb-7.9-1.cfg b/rtems/config/tools/rtems-gdb-7.9-1.cfg
index 9850bf7..81e5a27 100644
--- a/rtems/config/tools/rtems-gdb-7.9-1.cfg
+++ b/rtems/config/tools/rtems-gdb-7.9-1.cfg
@@ -24,6 +24,13 @@
 #%patch add gdb %{sourceware_binutils_gdb};h=63413d85873c450fa4ed2494f21fb1a65bdaf554
 #%patch add gdb %{sourceware_binutils_gdb};h=03b7960334677d33ee7410f2c819f78820c32024
 
+#
+# aarch64 and x86_64 support.
+#
+%patch add gdb -p1 %{rtems_gdb_patches}/gdb-7.9-aarch64-x86_64.patch
+%hash md5 gdb-7.9-aarch64-x86_64.patch e809ccb4fffa0188cb985512695e0f48
+
+
 %if %{_build_os} == freebsd
  %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py
  %hash  md5 patch-gdb-python-python-config.py c0260fcca4c1a5509635049c0094eee3