209 files changed, 6207 insertions, 9995 deletions

diff --git a/meta-microblaze/conf/layer.conf b/meta-microblaze/conf/layer.conf
index bccf61d0..d1443c16 100644
--- a/meta-microblaze/conf/layer.conf
+++ b/meta-microblaze/conf/layer.conf
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_xilinx-microblaze = "5"
 
 LAYERDEPENDS_xilinx-microblaze = "core"
 
-LAYERSERIES_COMPAT_xilinx-microblaze = "langdale"
+LAYERSERIES_COMPAT_xilinx-microblaze = "scarthgap"
 
 # Microblaze does not support stack-protector!
 SECURITY_STACK_PROTECTOR:microblaze = ""
@@ -19,3 +19,17 @@ SECURITY_STACK_PROTECTOR:microblaze = ""
 OLDEST_KERNEL:microblaze = "3.15"
 
 INHERIT += "rust_microblaze"
+
+# We want to use gcc 12.x for the microblaze stuff, and 13.x for any host tooling
+GCCVERSION:microblaze = "12.2.%"
+SDKGCCVERSION:microblaze = "13.%"
+
+GDBVERSION:microblaze = "12.1"
+# canon-prefix-map doesn't exist in gcc 12.x
+DEBUG_PREFIX_MAP:remove:microblaze = "-fcanon-prefix-map"
+
+MICROBLAZE_SKIP_MSG = ""
+MICROBLAZE_SKIP_MSG:microblaze = "This recipe does not currently work on microblaze."
+
+# ../../../alsa-lib-1.2.9/src/control/control.c:3648:1: error: symver is only supported on ELF platforms
+SKIP_RECIPE[alsa-lib] = "${MICROBLAZE_SKIP_MSG}"
diff --git a/meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend b/meta-microblaze/recipes-core/glibc/glibc_%.bbappend
index d42bcca5..d42bcca5 100644
--- a/meta-microblaze/recipes-core/glibc/glibc_2.36.bbappend
+++ b/meta-microblaze/recipes-core/glibc/glibc_%.bbappend
diff --git a/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch
index 584aab11..31076208 100644
--- a/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch
@@ -17,6 +17,9 @@ Changelog
   * microblaze/configure: Likewise.
 
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
+
+Upstream-Status: Pending
+
 ---
  libgloss/config/microblaze.mt    | 30 ++++++++++++++++++++++++++++++
  libgloss/microblaze/configure    |  2 +-
@@ -24,11 +27,10 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
  3 files changed, 32 insertions(+), 2 deletions(-)
  create mode 100644 libgloss/config/microblaze.mt
 
-diff --git a/libgloss/config/microblaze.mt b/libgloss/config/microblaze.mt
-new file mode 100644
-index 000000000..e8fb922dd
+Index: git/libgloss/config/microblaze.mt
+===================================================================
 --- /dev/null
-+++ b/libgloss/config/microblaze.mt
++++ git/libgloss/config/microblaze.mt
 @@ -0,0 +1,30 @@
 +#
 +# Match default.mt to compile generic objects but continue building
@@ -60,32 +62,27 @@ index 000000000..e8fb922dd
 +       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
 +write.o: ${srcdir}/../write.c
 +       $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $?
-diff --git a/libgloss/microblaze/configure b/libgloss/microblaze/configure
-index 05f68682c..faa23c584 100755
---- a/libgloss/microblaze/configure
-+++ b/libgloss/microblaze/configure
-@@ -2550,7 +2550,7 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
- 
- 
- host_makefile_frag=${srcdir}/../config/default.mh
--target_makefile_frag=${srcdir}/../config/default.mt
-+target_makefile_frag=${srcdir}/../config/microblaze.mt
+Index: git/libgloss/configure
+===================================================================
+--- git.orig/libgloss/configure
++++ git/libgloss/configure
+@@ -2909,6 +2909,7 @@ case "${target}" in
+        ac_config_files="$ac_config_files microblaze/Makefile"
  
- host_makefile_frag_path=$host_makefile_frag
- 
-diff --git a/libgloss/microblaze/configure.ac b/libgloss/microblaze/configure.ac
-index 5eda42e73..d5c789d40 100644
---- a/libgloss/microblaze/configure.ac
-+++ b/libgloss/microblaze/configure.ac
-@@ -35,7 +35,7 @@ LIB_AM_PROG_AS
- AC_SUBST(bsp_prefix)
- 
- host_makefile_frag=${srcdir}/../config/default.mh
--target_makefile_frag=${srcdir}/../config/default.mt
-+target_makefile_frag=${srcdir}/../config/microblaze.mt
- 
- dnl We have to assign the same value to other variables because autoconf
- dnl doesn't provide a mechanism to substitute a replacement keyword with
--- 
-2.37.1 (Apple Git-137.1)
-
+        subdirs="$subdirs microblaze"
++       target_makefile_frag=${srcdir}/config/microblaze.mt
+        ;;
+   mt-*-*)
+        ac_config_files="$ac_config_files mt/Makefile"
+Index: git/libgloss/configure.ac
+===================================================================
+--- git.orig/libgloss/configure.ac
++++ git/libgloss/configure.ac
+@@ -172,6 +172,7 @@ case "${target}" in
+   microblaze*-*-*)
+        AC_CONFIG_FILES([microblaze/Makefile])
+        subdirs="$subdirs microblaze"
++       target_makefile_frag=${srcdir}/config/microblaze.mt
+        ;;
+   mt-*-*)
+        AC_CONFIG_FILES([mt/Makefile])
diff --git a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch b/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
index e39ee5b7..3c940329 100644
--- a/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0002-Patch-microblaze-Modified-_exceptional_handler.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 02/11] [Patch, microblaze]: Modified _exceptional_handler
  to Superviosry call
 
 Signed-off-by:Nagaraju Mekala<nmekala@xilix.com>
+
+Upstream-Status: Pending
 ---
  libgloss/microblaze/_exception_handler.S | 1 -
  1 file changed, 1 deletion(-)
diff --git a/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch b/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
index e6404369..96b83269 100644
--- a/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 03/11] [LOCAL]: Add missing declarations for xil_printf to
 
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 
+Upstream-Status: Pending
+
 Conflicts:
         newlib/libc/include/stdio.h
 ---
diff --git a/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch b/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
index 4fa3da7f..6d398bdc 100644
--- a/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0004-Local-deleting-the-xil_printf.c-file-as-now-it-part-.patch
@@ -4,6 +4,8 @@ Date: Mon, 23 Jan 2017 15:42:11 +0530
 Subject: [PATCH 04/11] [Local]: deleting the xil_printf.c file as now it part
  of BSP
 
+Upstream-Status: Pending
+
 ---
  libgloss/microblaze/xil_printf.c | 284 -------------------------------
  1 file changed, 284 deletions(-)
diff --git a/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch b/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
index 025f7192..1576e54d 100644
--- a/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0005-Local-deleting-the-xil_printf.o-from-MAKEFILE.patch
@@ -3,6 +3,8 @@ From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 23 Jan 2017 15:44:17 +0530
 Subject: [PATCH 05/11] [Local]: deleting the xil_printf.o from MAKEFILE
 
+Upstream-Status: Pending
+
 ---
  libgloss/microblaze/Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch b/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
index 805e755e..779580b6 100644
--- a/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0006-MB-X-intial-commit.patch
@@ -3,6 +3,8 @@ From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Fri, 27 Jul 2018 16:10:36 +0530
 Subject: [PATCH 06/11] MB-X intial commit
 
+Upstream-Status: Pending
+
 ---
  libgloss/microblaze/crt0.S              | 2 +-
  libgloss/microblaze/crt1.S              | 2 +-
diff --git a/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch b/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
index ee7037a7..f3e20253 100644
--- a/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0007-Patch-Microblaze-newlib-port-for-microblaze-m64-flag.patch
@@ -4,6 +4,8 @@ Date: Tue, 11 Sep 2018 14:32:20 +0530
 Subject: [PATCH 07/11] [Patch, Microblaze]: newlib port for microblaze m64
  flag...
 
+Upstream-Status: Pending
+
 Conflicts:
         libgloss/microblaze/_hw_exception_handler.S
         libgloss/microblaze/_interrupt_handler.S
diff --git a/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch b/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
index 915a26ef..b82d7b5c 100644
--- a/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0008-fixing-the-bug-in-crt-files-added-addlik-instead-of-.patch
@@ -4,6 +4,8 @@ Date: Fri, 28 Sep 2018 12:07:43 +0530
 Subject: [PATCH 08/11] fixing the bug in crt files, added addlik instead of
  lli insn
 
+Upstream-Status: Pending
+
 ---
  libgloss/microblaze/crt0.S | 6 +++---
  libgloss/microblaze/crt1.S | 6 +++---
diff --git a/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
index 40d69465..1a89c31b 100644
--- a/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0009-Patch-MicroBlaze-Added-MB-64-support-to-strcmp-strcp.patch
@@ -4,6 +4,8 @@ Date: Tue, 17 Nov 2020 13:06:41 +0530
 Subject: [PATCH 09/11] [Patch,MicroBlaze] : Added MB-64 support to
  strcmp/strcpy/strlen files Signed-off-by:Mahesh Bodapati<mbodapat@xilinx.com>
 
+Upstream-Status: Pending
+
 ---
  newlib/libc/machine/microblaze/strcmp.c | 63 ++++++++++++++++++++++++-
  newlib/libc/machine/microblaze/strcpy.c | 57 ++++++++++++++++++++++
diff --git a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch b/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
index cd98dfa1..aaa2a009 100644
--- a/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0010-Patch-MicroBlaze-Removing-the-Assembly-implementatio.patch
@@ -5,6 +5,8 @@ Subject: [PATCH 10/11] [Patch,MicroBlaze] : Removing the Assembly
  implementation of 64bit string function.
 
 Revisit in next release and fix it
+
+Upstream-Status: Pending
 ---
  newlib/libc/machine/microblaze/mb_endian.h |  4 +
  newlib/libc/machine/microblaze/strcmp.c    | 95 ++++++++--------------
diff --git a/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch b/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
index ba5fcb8c..5e89db18 100644
--- a/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
+++ b/meta-microblaze/recipes-core/newlib/files/0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch
@@ -3,6 +3,8 @@ From: Nagaraju <nmekala@xilinx.com>
 Date: Tue, 14 Jan 2020 22:32:30 +0530
 Subject: [PATCH 11/11] Fixed the bug in crtinit.s for MB-64
 
+Upstream-Status: Pending
+
 ---
  libgloss/microblaze/crtinit.S | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend
index 15be1732..15be1732 100644
--- a/meta-microblaze/recipes-core/newlib/libgloss_4.2.%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/libgloss_%.bbappend
diff --git a/meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_%.bbappend
index d30e61ec..d30e61ec 100644
--- a/meta-microblaze/recipes-core/newlib/newlib_4.2.%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/newlib_%.bbappend
diff --git a/meta-microblaze/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/meta-microblaze/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
index 27001c4a..8be39fe2 100644
--- a/meta-microblaze/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
+++ b/meta-microblaze/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
@@ -3,8 +3,12 @@ RUSTTOOLS:microblaze ?= ""
 GSTEXAMPLES:microblaze ?= ""
 X11GLTOOLS:microblaze ?= ""
 3GTOOLS:microblaze ?= ""
+KEXECTOOLS:microblaze = ""
 
 RDEPENDS:${PN}:remove:microblaze = "\
+alsa-utils-amixer \
+alsa-utils-aplay \
+ltp \
 connman-tools \
 connman-tests \
 connman-client \
diff --git a/meta-microblaze/recipes-core/systemd/files/0001-architecture-Add-Microblaze-architecture-to-systemd-.patch b/meta-microblaze/recipes-core/systemd/files/0001-architecture-Add-Microblaze-architecture-to-systemd-.patch
index a29214d5..88373e2b 100644
--- a/meta-microblaze/recipes-core/systemd/files/0001-architecture-Add-Microblaze-architecture-to-systemd-.patch
+++ b/meta-microblaze/recipes-core/systemd/files/0001-architecture-Add-Microblaze-architecture-to-systemd-.patch
@@ -8,6 +8,8 @@ Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
 Applied to current version of systemd
 Reworked to split microblaze and microblazeel
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
  src/basic/architecture.c | 3 +++
diff --git a/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch b/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch
index ecbf1f79..157b008a 100644
--- a/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch
+++ b/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch
@@ -1,28 +1,37 @@
-Microblaze does not support stack-protector:
+From ec286a0b613a9fa487be75b7c1c01e5c8ce62a1a Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Fri, 22 Sep 2023 11:01:16 -0600
+Subject: [PATCH] meson.build: Microblaze does not support stack-protector
 
 | cc1: warning: '-fstack-protector' not supported for this target
 | ninja: build stopped: subcommand failed.
 
+Upstream-Status: Inappropriate [Configuration]
+
 Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
+---
+ meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
 
-Index: git/meson.build
-===================================================================
---- git.orig/meson.build
-+++ git/meson.build
-@@ -403,7 +403,6 @@ possible_link_flags = [
-         '-Wl,--fatal-warnings',
-         '-Wl,-z,now',
-         '-Wl,-z,relro',
--        '-fstack-protector',
- ]
+diff --git a/meson.build b/meson.build
+index 395eca1943..8b87c5b3a2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -405,14 +405,11 @@ possible_common_cc_flags = [
  
- if get_option('b_sanitize') == 'none'
-@@ -423,8 +422,6 @@ possible_cc_flags = possible_common_cc_f
          '-fdiagnostics-show-option',
          '-fno-common',
-         '-fno-strict-aliasing',
 -        '-fstack-protector',
 -        '-fstack-protector-strong',
-         '-fvisibility=hidden',
+         '-fstrict-flex-arrays',
          '--param=ssp-buffer-size=4',
  ]
+ 
+ possible_common_link_flags = [
+-        '-fstack-protector',
+ ]
+ 
+ c_args = get_option('c_args')
+-- 
+2.34.1
+
diff --git a/meta-microblaze/recipes-core/systemd/files/microblaze-once-macro.patch b/meta-microblaze/recipes-core/systemd/files/microblaze-once-macro.patch
index 8cb618ec..3862803b 100644
--- a/meta-microblaze/recipes-core/systemd/files/microblaze-once-macro.patch
+++ b/meta-microblaze/recipes-core/systemd/files/microblaze-once-macro.patch
@@ -1,40 +1,49 @@
-For microblaze, replace the ONCE macro
+From 239d51b5b02ba766f34b3fce9803f8fd13097471 Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Fri, 22 Sep 2023 11:09:50 -0600
+Subject: [PATCH] macro-funcamental.h: Microblaze does not have atomic
+ functions
 
 For some reason the systemd developers decided that needed to hardcode
-the usage of __sync_bool_compare_and_swap, however not all architectures
+the usage of __atomic_exchange functions, however not all architectures
 define this.  Microblaze is one such architecture, so we fall back to
-a less 'safe' way of doing the work.  However a quick inspection of
-the ONCE users shows that even if we end up with a race condition the
+a less safe way of doing the same thing.  A quick inspection of
+the ONCE users show that even if we end up with a race condition the
 worst expected behavior could be multiple log messages.
 
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
+Upstream-Status: Pending
 
-Index: git/src/fundamental/macro-fundamental.h
-===================================================================
---- git.orig/src/fundamental/macro-fundamental.h
-+++ git/src/fundamental/macro-fundamental.h
-@@ -109,11 +109,28 @@
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ src/fundamental/macro-fundamental.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
+index 1d49765fce..f45f55cdfe 100644
+--- a/src/fundamental/macro-fundamental.h
++++ b/src/fundamental/macro-fundamental.h
+@@ -116,11 +116,28 @@
   * on this macro will run concurrently to all other code conditionalized
   * the same way, there's no ordering or completion enforced. */
  #define ONCE __ONCE(UNIQ_T(_once_, UNIQ))
 +#if !defined (__microblaze__)
- #define __ONCE(o)                                                       \
-         ({                                                              \
-                 static sd_bool (o) = sd_false;                          \
-                 __sync_bool_compare_and_swap(&(o), sd_false, sd_true);  \
+ #define __ONCE(o)                                                  \
+         ({                                                         \
+                 static bool (o) = false;                           \
+                 __atomic_exchange_n(&(o), true, __ATOMIC_SEQ_CST); \
          })
 +#else
-+  /* Microblaze does not contain __sync_bool_compare_and_swap, so we do it
++  /* Microblaze does not contain __atomic_exchange_n*, so we do it
 +   * the old fashioned way.  Note, it's possible that ONCE may run more
 +   * then ONCE due to possible races, however it is not expected to cause
-+   * an issue. */
++   * an issue with systemd usage. */
 +#define __ONCE(o)                                                       \
 +        ({                                                              \
-+                static bool (o) = sd_false;                             \
-+                bool rc = sd_false;                                     \
-+                if ((o) == sd_false) {                                  \
-+                        (o) = sd_true;                                  \
-+                        rc = sd_true;                                   \
++                static bool (o) = false;                             \
++                bool rc = false;                                     \
++                if ((o) == false) {                                  \
++                        (o) = true;                                  \
++                        rc = true;                                   \
 +                }                                                       \
 +                rc;                                                     \
 +        })
@@ -42,3 +51,6 @@ Index: git/src/fundamental/macro-fundamental.h
  
  #undef MAX
  #define MAX(a, b) __MAX(UNIQ, (a), UNIQ, (b))
+-- 
+2.34.1
+
diff --git a/meta-microblaze/recipes-core/systemd/files/microblaze-syscalls.patch b/meta-microblaze/recipes-core/systemd/files/microblaze-syscalls.patch
index 3bf75d32..75e0300b 100644
--- a/meta-microblaze/recipes-core/systemd/files/microblaze-syscalls.patch
+++ b/meta-microblaze/recipes-core/systemd/files/microblaze-syscalls.patch
@@ -1,12 +1,24 @@
-Add microblaze syscalls to systemd
+From 2bd273c3a474b04b60c08c98fb7859fce28eac6d Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@amd.com>
+Date: Fri, 22 Sep 2023 10:26:47 -0600
+Subject: [PATCH] syscalls-microblaze.txt: Add microblaze syscalls to systemd
 
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
+Upstream-Status: Pending
 
-Index: git/src/basic/meson.build
-===================================================================
---- git.orig/src/basic/meson.build
-+++ git/src/basic/meson.build
-@@ -347,6 +347,7 @@ arch_list = [
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ src/basic/meson.build             |   1 +
+ src/basic/missing_syscall_def.h   |  33 ++
+ src/basic/missing_syscalls.py     |   2 +
+ src/basic/syscalls-microblaze.txt | 598 ++++++++++++++++++++++++++++++
+ 4 files changed, 634 insertions(+)
+ create mode 100644 src/basic/syscalls-microblaze.txt
+
+diff --git a/src/basic/meson.build b/src/basic/meson.build
+index 3af013b014..e77f7cef16 100644
+--- a/src/basic/meson.build
++++ b/src/basic/meson.build
+@@ -190,6 +190,7 @@ arch_list = [
          'ia64',
          'loongarch64',
          'm68k',
@@ -14,10 +26,10 @@ Index: git/src/basic/meson.build
          'mips64',
          'mips64n32',
          'mipso32',
-Index: git/src/basic/missing_syscall_def.h
-===================================================================
---- git.orig/src/basic/missing_syscall_def.h
-+++ git/src/basic/missing_syscall_def.h
+diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h
+index 402fdd00dc..94f41c1522 100644
+--- a/src/basic/missing_syscall_def.h
++++ b/src/basic/missing_syscall_def.h
 @@ -16,6 +16,7 @@
  #  elif defined(__ia64__)
  #  elif defined(__loongarch64)
@@ -26,7 +38,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #    elif _MIPS_SIM == _MIPS_SIM_NABI32
-@@ -58,6 +59,8 @@
+@@ -59,6 +60,8 @@
  #    define systemd_NR_bpf 280
  #  elif defined(__m68k__)
  #    define systemd_NR_bpf 354
@@ -35,7 +47,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_bpf 4355
-@@ -124,6 +127,8 @@ assert_cc(__NR_bpf == systemd_NR_bpf);
+@@ -127,6 +130,8 @@ assert_cc(__NR_bpf == systemd_NR_bpf);
  #    define systemd_NR_close_range 436
  #  elif defined(__m68k__)
  #    define systemd_NR_close_range 436
@@ -44,7 +56,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_close_range 4436
-@@ -190,6 +195,8 @@ assert_cc(__NR_close_range == systemd_NR
+@@ -195,6 +200,8 @@ assert_cc(__NR_close_range == systemd_NR_close_range);
  #    define systemd_NR_copy_file_range 285
  #  elif defined(__m68k__)
  #    define systemd_NR_copy_file_range 376
@@ -53,16 +65,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_copy_file_range 4360
-@@ -256,6 +263,8 @@ assert_cc(__NR_copy_file_range == system
- #    define systemd_NR_epoll_pwait2 441
- #  elif defined(__m68k__)
- #    define systemd_NR_epoll_pwait2 441
-+#  elif defined(__microblaze__)
-+#    define systemd_NR_epoll_pwait2 441
- #  elif defined(_MIPS_SIM)
- #    if _MIPS_SIM == _MIPS_SIM_ABI32
- #      define systemd_NR_epoll_pwait2 4441
-@@ -322,6 +331,8 @@ assert_cc(__NR_epoll_pwait2 == systemd_N
+@@ -263,6 +270,8 @@ assert_cc(__NR_copy_file_range == systemd_NR_copy_file_range);
  #    define systemd_NR_getrandom 278
  #  elif defined(__m68k__)
  #    define systemd_NR_getrandom 352
@@ -71,7 +74,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_getrandom 4353
-@@ -388,6 +399,8 @@ assert_cc(__NR_getrandom == systemd_NR_g
+@@ -331,6 +340,8 @@ assert_cc(__NR_getrandom == systemd_NR_getrandom);
  #    define systemd_NR_memfd_create 279
  #  elif defined(__m68k__)
  #    define systemd_NR_memfd_create 353
@@ -80,7 +83,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_memfd_create 4354
-@@ -454,6 +467,8 @@ assert_cc(__NR_memfd_create == systemd_N
+@@ -399,6 +410,8 @@ assert_cc(__NR_memfd_create == systemd_NR_memfd_create);
  #    define systemd_NR_mount_setattr 442
  #  elif defined(__m68k__)
  #    define systemd_NR_mount_setattr 442
@@ -89,7 +92,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_mount_setattr 4442
-@@ -520,6 +535,8 @@ assert_cc(__NR_mount_setattr == systemd_
+@@ -467,6 +480,8 @@ assert_cc(__NR_mount_setattr == systemd_NR_mount_setattr);
  #    define systemd_NR_move_mount 429
  #  elif defined(__m68k__)
  #    define systemd_NR_move_mount 429
@@ -98,7 +101,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_move_mount 4429
-@@ -586,6 +603,8 @@ assert_cc(__NR_move_mount == systemd_NR_
+@@ -535,6 +550,8 @@ assert_cc(__NR_move_mount == systemd_NR_move_mount);
  #    define systemd_NR_name_to_handle_at 264
  #  elif defined(__m68k__)
  #    define systemd_NR_name_to_handle_at 340
@@ -107,7 +110,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_name_to_handle_at 4339
-@@ -652,6 +671,8 @@ assert_cc(__NR_name_to_handle_at == syst
+@@ -603,6 +620,8 @@ assert_cc(__NR_name_to_handle_at == systemd_NR_name_to_handle_at);
  #    define systemd_NR_open_tree 428
  #  elif defined(__m68k__)
  #    define systemd_NR_open_tree 428
@@ -116,7 +119,16 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_open_tree 4428
-@@ -784,6 +805,8 @@ assert_cc(__NR_openat2 == systemd_NR_ope
+@@ -671,6 +690,8 @@ assert_cc(__NR_open_tree == systemd_NR_open_tree);
+ #    define systemd_NR_openat2 437
+ #  elif defined(__m68k__)
+ #    define systemd_NR_openat2 437
++#  elif defined(__microblaze__)
++#    define systemd_NR_openat2 437
+ #  elif defined(_MIPS_SIM)
+ #    if _MIPS_SIM == _MIPS_SIM_ABI32
+ #      define systemd_NR_openat2 4437
+@@ -739,6 +760,8 @@ assert_cc(__NR_openat2 == systemd_NR_openat2);
  #    define systemd_NR_pidfd_open 434
  #  elif defined(__m68k__)
  #    define systemd_NR_pidfd_open 434
@@ -125,7 +137,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_pidfd_open 4434
-@@ -850,6 +873,8 @@ assert_cc(__NR_pidfd_open == systemd_NR_
+@@ -807,6 +830,8 @@ assert_cc(__NR_pidfd_open == systemd_NR_pidfd_open);
  #    define systemd_NR_pidfd_send_signal 424
  #  elif defined(__m68k__)
  #    define systemd_NR_pidfd_send_signal 424
@@ -134,7 +146,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_pidfd_send_signal 4424
-@@ -916,6 +941,8 @@ assert_cc(__NR_pidfd_send_signal == syst
+@@ -875,6 +900,8 @@ assert_cc(__NR_pidfd_send_signal == systemd_NR_pidfd_send_signal);
  #    define systemd_NR_pkey_mprotect 288
  #  elif defined(__m68k__)
  #    define systemd_NR_pkey_mprotect 381
@@ -143,7 +155,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_pkey_mprotect 4363
-@@ -982,6 +1009,8 @@ assert_cc(__NR_pkey_mprotect == systemd_
+@@ -943,6 +970,8 @@ assert_cc(__NR_pkey_mprotect == systemd_NR_pkey_mprotect);
  #    define systemd_NR_renameat2 276
  #  elif defined(__m68k__)
  #    define systemd_NR_renameat2 351
@@ -152,7 +164,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_renameat2 4351
-@@ -1048,6 +1077,8 @@ assert_cc(__NR_renameat2 == systemd_NR_r
+@@ -1011,6 +1040,8 @@ assert_cc(__NR_renameat2 == systemd_NR_renameat2);
  #    define systemd_NR_setns 268
  #  elif defined(__m68k__)
  #    define systemd_NR_setns 344
@@ -161,7 +173,7 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_setns 4344
-@@ -1114,6 +1145,8 @@ assert_cc(__NR_setns == systemd_NR_setns
+@@ -1079,6 +1110,8 @@ assert_cc(__NR_setns == systemd_NR_setns);
  #    define systemd_NR_statx 291
  #  elif defined(__m68k__)
  #    define systemd_NR_statx 379
@@ -170,11 +182,11 @@ Index: git/src/basic/missing_syscall_def.h
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_statx 4366
-Index: git/src/basic/missing_syscalls.py
-===================================================================
---- git.orig/src/basic/missing_syscalls.py
-+++ git/src/basic/missing_syscalls.py
-@@ -64,6 +64,8 @@ DEF_TEMPLATE_B = '''\
+diff --git a/src/basic/missing_syscalls.py b/src/basic/missing_syscalls.py
+index 5ccf02adec..e09023abe1 100644
+--- a/src/basic/missing_syscalls.py
++++ b/src/basic/missing_syscalls.py
+@@ -63,6 +63,8 @@ DEF_TEMPLATE_B = '''\
  #    define systemd_NR_{syscall} {nr_loongarch64}
  #  elif defined(__m68k__)
  #    define systemd_NR_{syscall} {nr_m68k}
@@ -183,10 +195,11 @@ Index: git/src/basic/missing_syscalls.py
  #  elif defined(_MIPS_SIM)
  #    if _MIPS_SIM == _MIPS_SIM_ABI32
  #      define systemd_NR_{syscall} {nr_mipso32}
-Index: git/src/basic/syscalls-microblaze.txt
-===================================================================
+diff --git a/src/basic/syscalls-microblaze.txt b/src/basic/syscalls-microblaze.txt
+new file mode 100644
+index 0000000000..3fc4cd6aef
 --- /dev/null
-+++ git/src/basic/syscalls-microblaze.txt
++++ b/src/basic/syscalls-microblaze.txt
 @@ -0,0 +1,598 @@
 +_llseek        140
 +_newselect     142
@@ -786,3 +799,6 @@ Index: git/src/basic/syscalls-microblaze.txt
 +waitpid        7
 +write  4
 +writev 146
+-- 
+2.34.1
+
diff --git a/meta-microblaze/recipes-core/util-linux/util-linux/util-linux-microblaze.patch b/meta-microblaze/recipes-core/util-linux/util-linux/util-linux-microblaze.patch
new file mode 100644
index 00000000..07712c98
--- /dev/null
+++ b/meta-microblaze/recipes-core/util-linux/util-linux/util-linux-microblaze.patch
@@ -0,0 +1,17 @@
+SECCOMP / Audit support needs to know about the microblaze architecture.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
+--- util-linux-2.39.1/include/audit-arch.h.orig 2023-08-23 14:55:54.318732126 -0600
++++ util-linux-2.39.1/include/audit-arch.h      2023-08-23 15:02:51.058552660 -0600
+@@ -57,6 +57,8 @@
+ #    else
+ #       define SECCOMP_ARCH_NATIVE AUDIT_ARCH_LOONGARCH64
+ #    endif
++#elif __microblaze__
++#    define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MICROBLAZE
+ #else
+ #    error Unknown target architecture
+ #endif
diff --git a/meta-microblaze/recipes-core/util-linux/util-linux_%.bbappend b/meta-microblaze/recipes-core/util-linux/util-linux_%.bbappend
new file mode 100644
index 00000000..7774dda5
--- /dev/null
+++ b/meta-microblaze/recipes-core/util-linux/util-linux_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/util-linux"
+SRC_URI:append:microblaze = " file://util-linux-microblaze.patch"
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
index 5e85eedc..3701d245 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
@@ -1,41 +1,4 @@
 FILESEXTRAPATHS:append := ":${THISDIR}/binutils"
 
-SRC_URI:append = " \
-     file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
-     file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \
-     file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
-     file://0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch \
-     file://0005-upstream-change-to-garbage-collection-sweep-causes-m.patch \
-     file://0006-Fix-bug-in-TLSTPREL-Relocation.patch \
-     file://0007-Added-Address-extension-instructions.patch \
-     file://0008-Add-new-bit-field-instructions.patch \
-     file://0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch \
-     file://0010-fixing-the-constant-range-check-issue.patch \
-     file://0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch \
-     file://0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch \
-     file://0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch \
-     file://0014-Added-relocations-for-MB-X.patch \
-     file://0015-Fixed-MB-x-relocation-issues.patch \
-     file://0016-Fixing-the-branch-related-issues.patch \
-     file://0017-Fixed-address-computation-issues-with-64bit-address.patch \
-     file://0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch \
-     file://0019-fixing-the-.bss-relocation-issue.patch \
-     file://0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch \
-     file://0021-Revert-ld-Remove-unused-expression-state.patch \
-     file://0022-fixing-the-long-long-long-mingw-toolchain-issue.patch \
-     file://0023-Added-support-to-new-arithmetic-single-register-inst.patch \
-     file://0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch \
-     file://0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch \
-     file://0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch \
-     file://0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch \
-     file://0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch \
-     file://0029-gas-revert-moving-of-md_pseudo_table-from-const.patch \
-     file://0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch \
-     file://0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch \
-     file://0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch \
-     file://0033-Patch-MB-MB-binutils-Upstream-port-issues.patch \
-     file://0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch \
-     "
-
 LDGOLD_ALTS:microblaze = ""
 USE_ALTERNATIVES_FOR:remove:microblaze = "gprof"
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch
deleted file mode 100644
index d5fa21ce..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 38ae9c3ae1270b9873e1cfa4397bae4a5269d1aa Mon Sep 17 00:00:00 2001
-From: David Holsgrove <david.holsgrove@xilinx.com>
-Date: Wed, 8 May 2013 11:03:36 +1000
-Subject: [PATCH 01/34] Add wdc.ext.clear and wdc.ext.flush insns
-
-Added two new instructions, wdc.ext.clear and wdc.ext.flush,
-to enable MicroBlaze to flush an external cache, which is
-used with the new coherency support for multiprocessing.
-
-Signed-off-by:nagaraju <nmekala@xilix.com>
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
----
- opcodes/microblaze-opc.h  | 5 ++++-
- opcodes/microblaze-opcm.h | 4 ++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index ffb0f08c692..b8a0cf82516 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -91,6 +91,7 @@
- #define OPCODE_MASK_H3  0xFC000600  /* High 6 bits and bits 21, 22.  */
- #define OPCODE_MASK_H32 0xFC00FC00  /* High 6 bits and bit 16-21.  */
- #define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits.  */
-+#define OPCODE_MASK_H35B 0xFC0004FF /* High 6 bits and low 9 bits.  */
- #define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26.  */
- 
- /* New Mask for msrset, msrclr insns.  */
-@@ -101,7 +102,7 @@
- #define DELAY_SLOT 1
- #define NO_DELAY_SLOT 0
- 
--#define MAX_OPCODES 289
-+#define MAX_OPCODES 291
- 
- const struct op_code_struct
- {
-@@ -174,7 +175,9 @@ const struct op_code_struct
-   {"wic",   INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000068, OPCODE_MASK_H34B, wic, special_inst },
-   {"wdc",   INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000064, OPCODE_MASK_H34B, wdc, special_inst },
-   {"wdc.clear", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000066, OPCODE_MASK_H34B, wdcclear, special_inst },
-+  {"wdc.ext.clear", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000466, OPCODE_MASK_H35B, wdcextclear, special_inst },
-   {"wdc.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000074, OPCODE_MASK_H34B, wdcflush, special_inst },
-+  {"wdc.ext.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000476, OPCODE_MASK_H35B, wdcextflush, special_inst },
-   {"mts",   INST_TYPE_SPECIAL_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MTS, 0x9400C000, OPCODE_MASK_H13S, mts, special_inst },
-   {"mfs",   INST_TYPE_RD_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MFS, 0x94008000, OPCODE_MASK_H23S, mfs, special_inst },
-   {"br",    INST_TYPE_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98000000, OPCODE_MASK_H124, br, branch_inst },
-diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index 8e293465fec..e56c1d2d47c 100644
---- a/opcodes/microblaze-opcm.h
-+++ b/opcodes/microblaze-opcm.h
-@@ -33,8 +33,8 @@ enum microblaze_instr
-   /* 'or/and/xor' are C++ keywords.  */
-   microblaze_or, microblaze_and, microblaze_xor,
-   andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16,
--  wic, wdc, wdcclear, wdcflush, mts, mfs, mbar, br, brd,
--  brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt,
-+  wic, wdc, wdcclear, wdcextclear, wdcflush, wdcextflush, mts, mfs, mbar, br,
-+  brd, brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt,
-   bltd, ble, bled, bgt, bgtd, bge, bged, ori, andi, xori, andni,
-   imm, rtsd, rtid, rtbd, rted, bri, brid, brlid, brai, braid, bralid,
-   brki, beqi, beqid, bnei, bneid, blti, bltid, blei, bleid, bgti,
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0002-Add-mlittle-endian-and-mbig-endian-flags.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0002-Add-mlittle-endian-and-mbig-endian-flags.patch
deleted file mode 100644
index 836d5b08..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0002-Add-mlittle-endian-and-mbig-endian-flags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d5645c82ce39b1950a6d0ee279088d10af390642 Mon Sep 17 00:00:00 2001
-From: nagaraju <nmekala@xilix.com>
-Date: Tue, 19 Mar 2013 17:18:23 +0530
-Subject: [PATCH 02/34] Add mlittle-endian and mbig-endian flags
-
-Added support in gas for mlittle-endian and mbig-endian flags
-as options.
-
-Updated show usage for MicroBlaze specific assembler options
-to include new entries.
-
-Signed-off-by:nagaraju <nmekala@xilix.com>
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
----
- gas/config/tc-microblaze.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 3db17a76ee7..c927331ea0a 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -37,6 +37,8 @@
- 
- #define OPTION_EB (OPTION_MD_BASE + 0)
- #define OPTION_EL (OPTION_MD_BASE + 1)
-+#define OPTION_LITTLE (OPTION_MD_BASE + 2)
-+#define OPTION_BIG (OPTION_MD_BASE + 3)
- 
- void microblaze_generate_symbol (char *sym);
- static bool check_spl_reg (unsigned *);
-@@ -1854,6 +1856,8 @@ struct option md_longopts[] =
- {
-   {"EB", no_argument, NULL, OPTION_EB},
-   {"EL", no_argument, NULL, OPTION_EL},
-+  {"mlittle-endian", no_argument, NULL, OPTION_LITTLE},
-+  {"mbig-endian", no_argument, NULL, OPTION_BIG},
-   { NULL,          no_argument, NULL, 0}
- };
- 
-@@ -2507,9 +2511,11 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
-   switch (c)
-     {
-     case OPTION_EB:
-+    case OPTION_BIG:
-       target_big_endian = 1;
-       break;
-     case OPTION_EL:
-+    case OPTION_LITTLE:
-       target_big_endian = 0;
-       break;
-     default:
-@@ -2524,6 +2530,9 @@ md_show_usage (FILE * stream ATTRIBUTE_UNUSED)
-   /*  fprintf(stream, _("\
-       MicroBlaze options:\n\
-       -noSmall         Data in the comm and data sections do not go into the small data section\n")); */
-+  fprintf (stream, _(" MicroBlaze specific assembler options:\n"));
-+  fprintf (stream, "  -%-23s%s\n", "mbig-endian", N_("assemble for a big endian cpu"));
-+  fprintf (stream, "  -%-23s%s\n", "mlittle-endian", N_("assemble for a little endian cpu"));
- }
- 
- 
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0003-Disable-the-warning-message-for-eh_frame_hdr.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0003-Disable-the-warning-message-for-eh_frame_hdr.patch
deleted file mode 100644
index 156f5c78..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0003-Disable-the-warning-message-for-eh_frame_hdr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6f53d25f9817f4d9fbc8d838b36d7026d184e63f Mon Sep 17 00:00:00 2001
-From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
-Date: Fri, 22 Jun 2012 01:20:20 +0200
-Subject: [PATCH 03/34] Disable the warning message for eh_frame_hdr
-
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-
-Conflicts:
-        bfd/elf-eh-frame.c
----
- bfd/elf-eh-frame.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
-index 2e22d0c9215..db470ed43c3 100644
---- a/bfd/elf-eh-frame.c
-+++ b/bfd/elf-eh-frame.c
-@@ -1044,10 +1044,13 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info,
-   goto success;
- 
-  free_no_table:
-+/* FIXME: Remove the microblaze specifics when relaxing gets fixed.  */
-+if (bfd_get_arch(abfd) != bfd_arch_microblaze) {
-   _bfd_error_handler
-     /* xgettext:c-format */
-     (_("error in %pB(%pA); no .eh_frame_hdr table will be created"),
-      abfd, sec);
-+}
-   hdr_info->u.dwarf.table = false;
-   free (sec_info);
-  success:
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch
deleted file mode 100644
index e0bd25b9..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-From f7c540994e73e430e73d220109e911dff5961f16 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Tue, 8 Nov 2016 11:54:08 +0530
-Subject: [PATCH 04/34] [LOCAL]: Fix relaxation of assembler resolved
- references,Fixup debug_loc sections after linker relaxation Adds a new
- reloctype R_MICROBLAZE_32_NONE, used for passing reloc info from the
- assembler to the linker when the linker manages to fully resolve a local
- symbol reference.
-
-This is a workaround for design flaws in the assembler to
-linker interface with regards to linker relaxation.
-
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-
-Conflicts:
-        bfd/elf32-microblaze.c
-        binutils/readelf.c
-        include/elf/microblaze.h
-
-Conflicts:
-        binutils/readelf.c
-
-Conflicts:
-        bfd/elf32-microblaze.c
----
- bfd/bfd-in2.h              |   5 ++
- bfd/elf32-microblaze.c     | 126 ++++++++++++++++++++++++++++---------
- bfd/libbfd.h               |   1 +
- bfd/reloc.c                |   6 ++
- binutils/readelf.c         |   4 ++
- gas/config/tc-microblaze.c |   4 ++
- include/elf/microblaze.h   |   2 +
- 7 files changed, 119 insertions(+), 29 deletions(-)
-
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 1f0f18a7e75..26e3bb2b34b 100644
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -5379,6 +5379,11 @@ value relative to the read-write small data area anchor  */
- expressions of the form "Symbol Op Symbol"  */
-   BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM,
- 
-+/* This is a 32 bit reloc that stores the 32 bit pc relative
-+value in two words (with an imm instruction).No relocation is 
-+done here - only used for relaxing  */
-+  BFD_RELOC_MICROBLAZE_32_NONE,
-+
- /* This is a 64 bit reloc that stores the 32 bit pc relative
- value in two words (with an imm instruction).  No relocation is
- done here - only used for relaxing  */
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 013c32a1e51..7cf1b6eab5b 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -175,6 +175,20 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
-          false),               /* PC relative offset?  */
- 
-    /* This reloc does nothing. Used for relaxation.  */
-+   HOWTO (R_MICROBLAZE_32_NONE,        /* Type.  */
-+          0,                   /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          32,                  /* Bitsize.  */
-+          true,                        /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_bitfield,  /* Complain on overflow.  */
-+          NULL,                  /* Special Function.  */
-+          "R_MICROBLAZE_32_NONE",/* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0,                   /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
-+
-    HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
-          0,                    /* Rightshift.  */
-          0,                    /* Size.  */
-@@ -560,7 +574,10 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
-     case BFD_RELOC_NONE:
-       microblaze_reloc = R_MICROBLAZE_NONE;
-       break;
--    case BFD_RELOC_MICROBLAZE_64_NONE:
-+    case BFD_RELOC_MICROBLAZE_32_NONE:
-+      microblaze_reloc = R_MICROBLAZE_32_NONE;
-+      break;
-+     case BFD_RELOC_MICROBLAZE_64_NONE:
-       microblaze_reloc = R_MICROBLAZE_64_NONE;
-       break;
-     case BFD_RELOC_32:
-@@ -1954,18 +1971,26 @@ microblaze_elf_relax_section (bfd *abfd,
-                }
-              break;
-            case R_MICROBLAZE_NONE:
-+           case R_MICROBLAZE_32_NONE:
-              {
-                /* This was a PC-relative instruction that was
-                   completely resolved.  */
-                size_t sfix, efix;
-+                unsigned int val;
-                bfd_vma target_address;
-                target_address = irel->r_addend + irel->r_offset;
-                sfix = calc_fixup (irel->r_offset, 0, sec);
-                efix = calc_fixup (target_address, 0, sec);
--               irel->r_addend -= (efix - sfix);
--               /* Should use HOWTO.  */
--               microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset,
--                                                  irel->r_addend);
-+
-+                /* Validate the in-band val.  */
-+                val = bfd_get_32 (abfd, contents + irel->r_offset);
-+                if (val != irel->r_addend && ELF32_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
-+                    fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
-+                }
-+               irel->r_addend -= (efix - sfix);
-+               /* Should use HOWTO.  */
-+               microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset,
-+                                                  irel->r_addend);
-              }
-              break;
-            case R_MICROBLAZE_64_NONE:
-@@ -2009,30 +2034,73 @@ microblaze_elf_relax_section (bfd *abfd,
-          irelscanend = irelocs + o->reloc_count;
-          for (irelscan = irelocs; irelscan < irelscanend; irelscan++)
-            {
--             if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
--               {
--                 isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
-+              if (1 && ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_NONE)
-+                {
-+                  unsigned int val;
-+
-+                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
-+
-+                  /* hax: We only do the following fixup for debug location lists.  */
-+                  if (strcmp(".debug_loc", o->name))
-+                    continue;
-+
-+                  /* This was a PC-relative instruction that was completely resolved.  */
-+                  if (ocontents == NULL)
-+                    {
-+                     if (elf_section_data (o)->this_hdr.contents != NULL)
-+                         ocontents = elf_section_data (o)->this_hdr.contents;
-+                     else
-+                       {
-+                         /* We always cache the section contents.
-+                            Perhaps, if info->keep_memory is FALSE, we
-+                            should free them, if we are permitted to.  */
-+
-+                         if (o->rawsize == 0)
-+                             o->rawsize = o->size;
-+                         ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                         if (ocontents == NULL)
-+                             goto error_return;
-+                         if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                         (file_ptr) 0,
-+                                                         o->rawsize))
-+                              goto error_return;
-+                         elf_section_data (o)->this_hdr.contents = ocontents;
-+                       }
-+                   }
- 
--                 /* Look at the reloc only if the value has been resolved.  */
--                 if (isym->st_shndx == shndx
--                     && (ELF32_ST_TYPE (isym->st_info) == STT_SECTION))
--                   {
--                     if (ocontents == NULL)
--                       {
--                         if (elf_section_data (o)->this_hdr.contents != NULL)
--                           ocontents = elf_section_data (o)->this_hdr.contents;
--                         else
--                           {
--                             /* We always cache the section contents.
--                                Perhaps, if info->keep_memory is FALSE, we
--                                should free them, if we are permitted to.  */
--                             if (o->rawsize == 0)
--                               o->rawsize = o->size;
--                             ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
--                             if (ocontents == NULL)
--                               goto error_return;
--                             if (!bfd_get_section_contents (abfd, o, ocontents,
--                                                            (file_ptr) 0,
-+                  val = bfd_get_32 (abfd, ocontents + irelscan->r_offset);
-+                  if (val != irelscan->r_addend) {
-+                       fprintf(stderr, "%d: CORRUPT relax reloc! %x %lx\n", __LINE__, val, irelscan->r_addend);
-+                  }
-+
-+                  irelscan->r_addend -= calc_fixup (irelscan->r_addend, 0, sec);
-+                  microblaze_bfd_write_imm_value_32 (abfd, ocontents + irelscan->r_offset,
-+                                                     irelscan->r_addend);
-+              }
-+              if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
-+                {
-+                 isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
-+
-+                  /* Look at the reloc only if the value has been resolved.  */
-+                  if (isym->st_shndx == shndx
-+                      && (ELF32_ST_TYPE (isym->st_info) == STT_SECTION))
-+                    {
-+                      if (ocontents == NULL)
-+                        {
-+                          if (elf_section_data (o)->this_hdr.contents != NULL)
-+                            ocontents = elf_section_data (o)->this_hdr.contents;
-+                          else
-+                            {
-+                              /* We always cache the section contents.
-+                                 Perhaps, if info->keep_memory is FALSE, we
-+                                 should free them, if we are permitted to.  */
-+                             if (o->rawsize == 0)
-+                               o->rawsize = o->size;
-+                              ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                              if (ocontents == NULL)
-+                                goto error_return;
-+                              if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                             (file_ptr) 0,
-                                                             o->rawsize))
-                                goto error_return;
-                              elf_section_data (o)->this_hdr.contents = ocontents;
-@@ -2068,7 +2136,7 @@ microblaze_elf_relax_section (bfd *abfd,
-                              elf_section_data (o)->this_hdr.contents = ocontents;
-                            }
-                        }
--                     irelscan->r_addend -= calc_fixup (irel->r_addend
-+                     irelscan->r_addend -= calc_fixup (irelscan->r_addend
-                                                        + isym->st_value,
-                                                        0,
-                                                        sec);
-diff --git a/bfd/libbfd.h b/bfd/libbfd.h
-index 29e8187f95f..ea2507d1879 100644
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -2989,6 +2989,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
-   "BFD_RELOC_MICROBLAZE_32_ROSDA",
-   "BFD_RELOC_MICROBLAZE_32_RWSDA",
-   "BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM",
-+  "BFD_RELOC_MICROBLAZE_32_NONE",
-   "BFD_RELOC_MICROBLAZE_64_NONE",
-   "BFD_RELOC_MICROBLAZE_64_GOTPC",
-   "BFD_RELOC_MICROBLAZE_64_GOT",
-diff --git a/bfd/reloc.c b/bfd/reloc.c
-index 36999fe9a40..5ac8a8536a7 100644
---- a/bfd/reloc.c
-+++ b/bfd/reloc.c
-@@ -6867,6 +6867,12 @@ ENUM
- ENUMDOC
-   This is a 32 bit reloc for the microblaze to handle
-   expressions of the form "Symbol Op Symbol"
-+ENUM
-+  BFD_RELOC_MICROBLAZE_32_NONE
-+ENUMDOC
-+  This is a 32 bit reloc that stores the 32 bit pc relative
-+  value in two words (with an imm instruction).  No relocation is
-+  done here - only used for relaxing
- ENUM
-   BFD_RELOC_MICROBLAZE_64_NONE
- ENUMDOC
-diff --git a/binutils/readelf.c b/binutils/readelf.c
-index 0f5977bc072..acd12713361 100644
---- a/binutils/readelf.c
-+++ b/binutils/readelf.c
-@@ -14621,6 +14621,10 @@ is_8bit_abs_reloc (Filedata * filedata, unsigned int reloc_type)
-       return reloc_type == 1;  /* R_Z80_8.  */
-     default:
-       return false;
-+    case EM_MICROBLAZE:
-+      return reloc_type == 33 /* R_MICROBLAZE_32_NONE.  */
-+             || reloc_type == 0 /* R_MICROBLAZE_NONE.  */
-+             || reloc_type == 9; /* R_MICROBLAZE_64_NONE.  */
-     }
- }
- 
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index c927331ea0a..8018d1f5686 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -2211,9 +2211,12 @@ md_apply_fix (fixS *   fixP,
-         moves code around due to relaxing.  */
-       if (fixP->fx_r_type == BFD_RELOC_64_PCREL)
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
-+      else if (fixP->fx_r_type == BFD_RELOC_32)
-+       fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE;
-       else
-        fixP->fx_r_type = BFD_RELOC_NONE;
-       fixP->fx_addsy = section_symbol (absolute_section);
-+      fixP->fx_done = 0;
-     }
-   return;
- }
-@@ -2434,6 +2437,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
-   switch (fixp->fx_r_type)
-     {
-     case BFD_RELOC_NONE:
-+    case BFD_RELOC_MICROBLAZE_32_NONE:
-     case BFD_RELOC_MICROBLAZE_64_NONE:
-     case BFD_RELOC_32:
-     case BFD_RELOC_MICROBLAZE_32_LO:
-diff --git a/include/elf/microblaze.h b/include/elf/microblaze.h
-index 43ad3ad3904..a2e1ce4580f 100644
---- a/include/elf/microblaze.h
-+++ b/include/elf/microblaze.h
-@@ -61,6 +61,8 @@ START_RELOC_NUMBERS (elf_microblaze_reloc_type)
-   RELOC_NUMBER (R_MICROBLAZE_TEXTPCREL_64, 30)  /* PC-relative TEXT offset.  */
-   RELOC_NUMBER (R_MICROBLAZE_TEXTREL_64, 31)    /* TEXT Entry offset 64-bit.  */
-   RELOC_NUMBER (R_MICROBLAZE_TEXTREL_32_LO, 32) /* TEXT Entry offset 32-bit.  */
-+  RELOC_NUMBER (R_MICROBLAZE_32_NONE, 33)
-+   
- END_RELOC_NUMBERS (R_MICROBLAZE_max)
- 
- /* Global base address names.  */
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0005-upstream-change-to-garbage-collection-sweep-causes-m.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0005-upstream-change-to-garbage-collection-sweep-causes-m.patch
deleted file mode 100644
index 20dd1859..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0005-upstream-change-to-garbage-collection-sweep-causes-m.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f27701e5c8bd1784e1c814fb527a1f8f7755ad9 Mon Sep 17 00:00:00 2001
-From: David Holsgrove <david.holsgrove@xilinx.com>
-Date: Wed, 27 Feb 2013 13:56:11 +1000
-Subject: [PATCH 05/34] upstream change to garbage collection sweep causes mb
- regression
-
-Upstream change for PR13177 now clears the def_regular during gc_sweep of a
-section. (All other archs in binutils/bfd/elf32-*.c received an update
-to a warning about unresolvable relocations - this warning is not present
-in binutils/bfd/elf32-microblaze.c, but this warning check would not
-prevent the error being seen)
-
-The visible issue with this change is when running a c++ application
-in Petalinux which links libstdc++.so for exception handling it segfaults
-on execution.
-
-This does not occur if static linking libstdc++.a, so its during the
-relocations for a shared lib with garbage collection this occurs
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-
-Conflicts:
-        bfd/elflink.c
----
- bfd/elflink.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/bfd/elflink.c b/bfd/elflink.c
-index 2b1450fa4e1..c50919060b3 100644
---- a/bfd/elflink.c
-+++ b/bfd/elflink.c
-@@ -6576,7 +6576,6 @@ elf_gc_sweep_symbol (struct elf_link_hash_entry *h, void *data)
- 
-       inf = (struct elf_gc_sweep_symbol_info *) data;
-       (*inf->hide_symbol) (inf->info, h, true);
--      h->def_regular = 0;
-       h->ref_regular = 0;
-       h->ref_regular_nonweak = 0;
-     }
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0006-Fix-bug-in-TLSTPREL-Relocation.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0006-Fix-bug-in-TLSTPREL-Relocation.patch
deleted file mode 100644
index 68a5d684..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0006-Fix-bug-in-TLSTPREL-Relocation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 63c56c953483dd62a2c2ac8e750947a4673f9e86 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Mon, 15 Jun 2015 16:50:30 +0530
-Subject: [PATCH 06/34] Fix bug in TLSTPREL Relocation
-
-Fixed the problem related to the fixup/relocations TLSTPREL.
-When the fixup is applied the addend is not added at the correct offset
-of the instruction. The offset is hard coded considering its big endian
-and it fails for Little endian. This patch allows support for both
-big & little-endian compilers
----
- bfd/elf32-microblaze.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 7cf1b6eab5b..edde04bafe4 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -1484,9 +1484,9 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-              relocation += addend;
-              relocation -= dtprel_base(info);
-              bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
--                         contents + offset + 2);
-+                         contents + offset + endian);
-              bfd_put_16 (input_bfd, relocation & 0xffff,
--                         contents + offset + 2 + INST_WORD_SIZE);
-+                         contents + offset + endian + INST_WORD_SIZE);
-              break;
-            case (int) R_MICROBLAZE_TEXTREL_64:
-            case (int) R_MICROBLAZE_TEXTREL_32_LO:
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0007-Added-Address-extension-instructions.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0007-Added-Address-extension-instructions.patch
deleted file mode 100644
index ffaf6236..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0007-Added-Address-extension-instructions.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 7e1cbc2f96a1905eecf3a211153735ed915a5ad5 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Mon, 18 Jan 2016 12:28:21 +0530
-Subject: [PATCH 07/34] Added Address extension instructions
-
-This patch adds the support of new instructions which are required
-for supporting Address extension feature.
-
-Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
-
-ChangeLog:
-  2016-01-18 Nagaraju Mekala <nmekala@xilix.com>
-
-  *microblaze-opc.h (op_code_struct): Update
-     Added new instructions
-  *microblaze-opcm.h (microblaze_instr): Update
-     Added new instructions
-
-Conflicts:
-        opcodes/microblaze-opcm.h
----
- opcodes/microblaze-opc.h  | 11 +++++++++++
- opcodes/microblaze-opcm.h | 10 +++++-----
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index b8a0cf82516..d3f8e36199e 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -178,8 +178,11 @@ const struct op_code_struct
-   {"wdc.ext.clear", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000466, OPCODE_MASK_H35B, wdcextclear, special_inst },
-   {"wdc.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000074, OPCODE_MASK_H34B, wdcflush, special_inst },
-   {"wdc.ext.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000476, OPCODE_MASK_H35B, wdcextflush, special_inst },
-+  {"wdc.clear.ea", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900000E6, OPCODE_MASK_H34B, wdcclearea, special_inst },
-   {"mts",   INST_TYPE_SPECIAL_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MTS, 0x9400C000, OPCODE_MASK_H13S, mts, special_inst },
-+  {"mtse",  INST_TYPE_SPECIAL_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MTS, 0x9500C000, OPCODE_MASK_H13S, mtse,special_inst },
-   {"mfs",   INST_TYPE_RD_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MFS, 0x94008000, OPCODE_MASK_H23S, mfs, special_inst },
-+  {"mfse",  INST_TYPE_RD_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MFS, 0x94088000, OPCODE_MASK_H23S, mfse, special_inst },
-   {"br",    INST_TYPE_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98000000, OPCODE_MASK_H124, br, branch_inst },
-   {"brd",   INST_TYPE_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98100000, OPCODE_MASK_H124, brd, branch_inst },
-   {"brld",  INST_TYPE_RD_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98140000, OPCODE_MASK_H24, brld, branch_inst },
-@@ -229,18 +232,24 @@ const struct op_code_struct
-   {"bgeid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBEA00000, OPCODE_MASK_H1, bgeid, branch_inst },
-   {"lbu",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC0000000, OPCODE_MASK_H4, lbu, memory_load_inst },
-   {"lbur",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC0000200, OPCODE_MASK_H4, lbur, memory_load_inst },
-+  {"lbuea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC0000080, OPCODE_MASK_H4, lbuea, memory_load_inst },
-   {"lhu",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC4000000, OPCODE_MASK_H4, lhu, memory_load_inst },
-   {"lhur",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC4000200, OPCODE_MASK_H4, lhur, memory_load_inst },
-+  {"lhuea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC4000080, OPCODE_MASK_H4, lhuea, memory_load_inst },
-   {"lw",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000000, OPCODE_MASK_H4, lw, memory_load_inst },
-   {"lwr",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000200, OPCODE_MASK_H4, lwr, memory_load_inst },
-   {"lwx",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000400, OPCODE_MASK_H4, lwx, memory_load_inst },
-+  {"lwea",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000080, OPCODE_MASK_H4, lwea, memory_load_inst },
-   {"sb",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD0000000, OPCODE_MASK_H4, sb, memory_store_inst },
-   {"sbr",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD0000200, OPCODE_MASK_H4, sbr, memory_store_inst },
-+  {"sbea",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD0000080, OPCODE_MASK_H4, sbea, memory_store_inst },
-   {"sh",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD4000000, OPCODE_MASK_H4, sh, memory_store_inst },
-   {"shr",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD4000200, OPCODE_MASK_H4, shr, memory_store_inst },
-+  {"shea",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD4000080, OPCODE_MASK_H4, shea, memory_store_inst },
-   {"sw",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000000, OPCODE_MASK_H4, sw, memory_store_inst },
-   {"swr",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000200, OPCODE_MASK_H4, swr, memory_store_inst },
-   {"swx",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000400, OPCODE_MASK_H4, swx, memory_store_inst },
-+  {"swea",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000080, OPCODE_MASK_H4, swea, memory_store_inst },
-   {"lbui",  INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE0000000, OPCODE_MASK_H, lbui, memory_load_inst },
-   {"lhui",  INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE4000000, OPCODE_MASK_H, lhui, memory_load_inst },
-   {"lwi",   INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE8000000, OPCODE_MASK_H, lwi, memory_load_inst },
-@@ -405,6 +414,8 @@ const struct op_code_struct
-   {"clz",       INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900000E0, OPCODE_MASK_H34,  clz,       special_inst },
-   {"mbar",      INST_TYPE_IMM5,  INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8020004, OPCODE_MASK_HN,   mbar,      special_inst },
-   {"sleep",     INST_TYPE_NONE,  INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBA020004, OPCODE_MASK_HN,   invalid_inst, special_inst }, /* translates to mbar 16.  */
-+  {"hibernate", INST_TYPE_NONE,  INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB9020004, OPCODE_MASK_HN,   invalid_inst, special_inst }, /* translates to mbar 8.   */
-+  {"suspend",   INST_TYPE_NONE,  INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBB020004, OPCODE_MASK_HN,   invalid_inst, special_inst }, /* translates to mbar 24.  */
-   {"swapb",     INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E0, OPCODE_MASK_H4,   swapb,     arithmetic_inst },
-   {"swaph",     INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E2, OPCODE_MASK_H4,   swaph,     arithmetic_inst },
-   {"", 0, 0, 0, 0, 0, 0, 0, 0},
-diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index e56c1d2d47c..ad964560c17 100644
---- a/opcodes/microblaze-opcm.h
-+++ b/opcodes/microblaze-opcm.h
-@@ -33,13 +33,13 @@ enum microblaze_instr
-   /* 'or/and/xor' are C++ keywords.  */
-   microblaze_or, microblaze_and, microblaze_xor,
-   andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16,
--  wic, wdc, wdcclear, wdcextclear, wdcflush, wdcextflush, mts, mfs, mbar, br,
--  brd, brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt,
--  bltd, ble, bled, bgt, bgtd, bge, bged, ori, andi, xori, andni,
-+  wic, wdc, wdcclear, wdcextclear, wdcflush, wdcextflush, wdcclearea, mts, mtse,
-+  mfs, mfse, mbar, br, brd, brld, bra, brad, brald, microblaze_brk, beq, beqd,
-+  bne, bned, blt, bltd, ble, bled, bgt, bgtd, bge, bged, ori, andi, xori, andni,
-   imm, rtsd, rtid, rtbd, rted, bri, brid, brlid, brai, braid, bralid,
-   brki, beqi, beqid, bnei, bneid, blti, bltid, blei, bleid, bgti,
--  bgtid, bgei, bgeid, lbu, lbur, lhu, lhur, lw, lwr, lwx, sb, sbr, sh,
--  shr, sw, swr, swx, lbui, lhui, lwi,
-+  bgtid, bgei, bgeid, lbu, lbuea, lbur, lhu, lhuea, lhur, lw, lwea, lwr, lwx,
-+  sb, sbea, sbr, sh, shea, shr, sw, swea, swr, swx, lbui, lhui, lwi,
-   sbi, shi, swi, msrset, msrclr, tuqula, mbi_fadd, frsub, mbi_fmul, mbi_fdiv,
-   fcmp_lt, fcmp_eq, fcmp_le, fcmp_gt, fcmp_ne, fcmp_ge, fcmp_un, flt,
-   /* 'fsqrt' is a glibc:math.h symbol.  */
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0008-Add-new-bit-field-instructions.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0008-Add-new-bit-field-instructions.patch
deleted file mode 100644
index 3966566d..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0008-Add-new-bit-field-instructions.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From c02813b6a27e6eed281609e5d696bb67ac74c804 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Mon, 18 Jul 2016 12:24:28 +0530
-Subject: [PATCH 08/34] Add new bit-field instructions
-
-This patches adds new bsefi and bsifi instructions.
-BSEFI- The instruction shall extract a bit field from a
-register and place it right-adjusted in the destination register.
-The other bits in the destination register shall be set to zero
-BSIFI- The instruction shall insert a right-adjusted bit field
-from a register at another position in the destination register.
-The rest of the bits in the destination register shall be unchanged
-
-Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
-
-Conflicts:
-        opcodes/microblaze-dis.c
-
-Conflicts:
-        gas/config/tc-microblaze.c
-        opcodes/microblaze-opc.h
----
- gas/config/tc-microblaze.c | 71 +++++++++++++++++++++++++++++++++++++-
- opcodes/microblaze-dis.c   | 20 +++++++++--
- opcodes/microblaze-opc.h   | 12 ++++++-
- opcodes/microblaze-opcm.h  |  6 +++-
- 4 files changed, 104 insertions(+), 5 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 8018d1f5686..1cb9b2519c3 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -917,7 +917,7 @@ md_assemble (char * str)
-   unsigned reg2;
-   unsigned reg3;
-   unsigned isize;
--  unsigned int immed = 0, temp;
-+  unsigned int immed = 0, immed2 = 0, temp;
-   expressionS exp;
-   char name[20];
- 
-@@ -1178,7 +1178,76 @@ md_assemble (char * str)
-       inst |= (reg2 << RA_LOW) & RA_MASK;
-       inst |= (immed << IMM_LOW) & IMM5_MASK;
-       break;
-+ case INST_TYPE_RD_R1_IMM5_IMM5:
-+      if (strcmp (op_end, ""))
-+        op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
-+      else
-+       {
-+          as_fatal (_("Error in statement syntax"));
-+          reg1 = 0;
-+        }
-+      if (strcmp (op_end, ""))
-+        op_end = parse_reg (op_end + 1, &reg2);  /* Get r1.  */
-+      else
-+       {
-+          as_fatal (_("Error in statement syntax"));
-+          reg2 = 0;
-+        }
-+
-+      /* Check for spl registers.  */
-+      if (check_spl_reg (&reg1))
-+        as_fatal (_("Cannot use special register with this instruction"));
-+      if (check_spl_reg (&reg2))
-+        as_fatal (_("Cannot use special register with this instruction"));
- 
-+      /* Width immediate value.  */
-+      if (strcmp (op_end, ""))
-+        op_end = parse_imm (op_end + 1, &exp, MIN_IMM_WIDTH, MAX_IMM_WIDTH);
-+      else
-+        as_fatal (_("Error in statement syntax"));
-+      if (exp.X_op != O_constant)
-+       {
-+          as_warn (_("Symbol used as immediate width value for bit field instruction"));
-+          immed = 1;
-+        }
-+      else
-+        immed = exp.X_add_number;
-+      if (opcode->instr == bsefi && immed > 31)
-+        as_fatal (_("Width value must be less than 32"));
-+
-+      /* Shift immediate value.  */
-+      if (strcmp (op_end, ""))
-+        op_end = parse_imm (op_end + 1, &exp, MIN_IMM, MAX_IMM);
-+      else
-+        as_fatal (_("Error in statement syntax"));
-+      if (exp.X_op != O_constant)
-+           {
-+          as_warn (_("Symbol used as immediate shift value for bit field instruction"));
-+          immed2 = 0;
-+        }
-+      else
-+           {
-+          output = frag_more (isize);
-+          immed2 = exp.X_add_number;
-+           }
-+      if (immed2 != (immed2 % 32))
-+           {
-+          as_warn (_("Shift value greater than 32. using <value %% 32>"));
-+          immed2 = immed2 % 32;
-+        }
-+
-+      /* Check combined value.  */
-+      if (immed + immed2 > 32)
-+        as_fatal (_("Width value + shift value must not be greater than 32"));
-+
-+      inst |= (reg1 << RD_LOW) & RD_MASK;
-+      inst |= (reg2 << RA_LOW) & RA_MASK;
-+      if (opcode->instr == bsefi)
-+        inst |= (immed & IMM5_MASK) << IMM_WIDTH_LOW; /* bsefi */
-+      else
-+        inst |= ((immed + immed2 - 1) & IMM5_MASK) << IMM_WIDTH_LOW; /* bsifi */
-+      inst |= (immed2 << IMM_LOW) & IMM5_MASK;
-+      break;
-     case INST_TYPE_R1_R2:
-       if (strcmp (op_end, ""))
-         op_end = parse_reg (op_end + 1, &reg1);  /* Get r1.  */
-diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index b057492ba93..f57b98fc9f7 100644
---- a/opcodes/microblaze-dis.c
-+++ b/opcodes/microblaze-dis.c
-@@ -91,7 +91,19 @@ get_field_imm5_mbar (struct string_buf *buf, long instr)
- }
- 
- static char *
--get_field_rfsl (struct string_buf *buf, long instr)
-+get_field_imm5width (struct string_buf *buf, long instr)
-+{
-+  char *p = strbuf (buf);
-+
-+  if (instr & 0x00004000)
-+    sprintf (p, "%d", (short)(((instr & IMM5_WIDTH_MASK) >> IMM_WIDTH_LOW))); /* bsefi */
-+ else
-+    sprintf (p, "%d", (short)(((instr & IMM5_WIDTH_MASK) >> IMM_WIDTH_LOW) - ((instr & IMM5_MASK) >> IMM_LOW) + 1)); /* bsifi */
-+  return p;
-+}
-+
-+static char *
-+get_field_rfsl (struct string_buf *buf,long instr)
- {
-   char *p = strbuf (buf);
- 
-@@ -427,7 +439,11 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-          /* For mbar 16 or sleep insn.  */
-        case INST_TYPE_NONE:
-          break;
--         /* For tuqula instruction */
-+        /* For bit field insns.  */
-+       case INST_TYPE_RD_R1_IMM5_IMM5:
-+          print_func (stream, "\t%s, %s, %s, %s", get_field_rd (&buf, inst),get_field_r1(&buf, inst),get_field_imm5width (&buf, inst), get_field_imm5 (&buf, inst));
-+            break;
-+       /* For tuqula instruction */
-        case INST_TYPE_RD:
-          print_func (stream, "\t%s", get_field_rd (&buf, inst));
-          break;
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index d3f8e36199e..825c639a41e 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -59,6 +59,9 @@
- /* For mbar.  */
- #define INST_TYPE_IMM5 20
- 
-+/* For bsefi and bsifi */
-+#define INST_TYPE_RD_R1_IMM5_IMM5  21
-+
- #define INST_TYPE_NONE 25
- 
- 
-@@ -89,7 +92,9 @@
- #define OPCODE_MASK_H124  0xFFFF07FF /* High 16, and low 11 bits.  */
- #define OPCODE_MASK_H1234 0xFFFFFFFF /* All 32 bits.  */
- #define OPCODE_MASK_H3  0xFC000600  /* High 6 bits and bits 21, 22.  */
-+#define OPCODE_MASK_H3B 0xFC00C600  /* High 6 bits and bits 16, 17, 21, 22.  */
- #define OPCODE_MASK_H32 0xFC00FC00  /* High 6 bits and bit 16-21.  */
-+#define OPCODE_MASK_H32B 0xFC00C000  /* High 6 bits and bit 16, 17.  */
- #define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits.  */
- #define OPCODE_MASK_H35B 0xFC0004FF /* High 6 bits and low 9 bits.  */
- #define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26.  */
-@@ -102,7 +107,7 @@
- #define DELAY_SLOT 1
- #define NO_DELAY_SLOT 0
- 
--#define MAX_OPCODES 291
-+#define MAX_OPCODES 301
- 
- const struct op_code_struct
- {
-@@ -159,6 +164,8 @@ const struct op_code_struct
-   {"bslli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000400, OPCODE_MASK_H3, bslli, barrel_shift_inst },
-   {"bsrai", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000200, OPCODE_MASK_H3, bsrai, barrel_shift_inst },
-   {"bsrli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000000, OPCODE_MASK_H3, bsrli, barrel_shift_inst },
-+  {"bsefi", INST_TYPE_RD_R1_IMM5_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64004000, OPCODE_MASK_H32B, bsefi, barrel_shift_inst },
-+  {"bsifi", INST_TYPE_RD_R1_IMM5_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64008000, OPCODE_MASK_H32B, bsifi, barrel_shift_inst },
-   {"or",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x80000000, OPCODE_MASK_H4, microblaze_or, logical_inst },
-   {"and",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x84000000, OPCODE_MASK_H4, microblaze_and, logical_inst },
-   {"xor",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x88000000, OPCODE_MASK_H4, microblaze_xor, logical_inst },
-@@ -438,5 +445,8 @@ char pvr_register_prefix[] = "rpvr";
- #define MIN_IMM5  ((int) 0x00000000)
- #define MAX_IMM5  ((int) 0x0000001f)
- 
-+#define MIN_IMM_WIDTH  ((int) 0x00000001)
-+#define MAX_IMM_WIDTH  ((int) 0x00000020)
-+
- #endif /* MICROBLAZE_OPC */
- 
-diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index ad964560c17..aa3401610d9 100644
---- a/opcodes/microblaze-opcm.h
-+++ b/opcodes/microblaze-opcm.h
-@@ -29,7 +29,7 @@ enum microblaze_instr
-   addi, rsubi, addic, rsubic, addik, rsubik, addikc, rsubikc, mul,
-   mulh, mulhu, mulhsu,swapb,swaph,
-   idiv, idivu, bsll, bsra, bsrl, get, put, nget, nput, cget, cput,
--  ncget, ncput, muli, bslli, bsrai, bsrli, mului,
-+  ncget, ncput, muli, bslli, bsrai, bsrli, bsefi, bsifi, mului,
-   /* 'or/and/xor' are C++ keywords.  */
-   microblaze_or, microblaze_and, microblaze_xor,
-   andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16,
-@@ -130,6 +130,7 @@ enum microblaze_instr_type
- #define RB_LOW  11 /* Low bit for RB.  */
- #define IMM_LOW  0 /* Low bit for immediate.  */
- #define IMM_MBAR 21 /* low bit for mbar instruction.  */
-+#define IMM_WIDTH_LOW 6 /* Low bit for immediate width */
- 
- #define RD_MASK 0x03E00000
- #define RA_MASK 0x001F0000
-@@ -142,6 +143,9 @@ enum microblaze_instr_type
- /* Imm mask for mbar.  */
- #define IMM5_MBAR_MASK 0x03E00000
- 
-+/* Imm mask for extract/insert width. */
-+#define IMM5_WIDTH_MASK 0x000007C0
-+
- /* FSL imm mask for get, put instructions.  */
- #define  RFSL_MASK 0x000000F
- 
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
deleted file mode 100644
index 47caf9ed..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 81fc7ef231ca2890dfa827b4e8f3d0da107f9be2 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Fri, 29 Sep 2017 18:00:23 +0530
-Subject: [PATCH 09/34] [Patch,Microblaze]: fixed bug in GCC so that It will
- support .long 0U and .long 0u
-
----
- gas/expr.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/gas/expr.c b/gas/expr.c
-index 6ad8bee2733..a1281ef71a8 100644
---- a/gas/expr.c
-+++ b/gas/expr.c
-@@ -832,6 +832,15 @@ operand (expressionS *expressionP, enum expr_mode mode)
-              break;
-            }
-        }
-+      if ((*input_line_pointer == 'U') || (*input_line_pointer == 'u'))
-+      {
-+      input_line_pointer--;
-+
-+      integer_constant ((NUMBERS_WITH_SUFFIX || flag_m68k_mri)
-+                        ? 0 : 10,
-+                        expressionP);
-+      break;
-+      }
-       c = *input_line_pointer;
-       switch (c)
-        {
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-constant-range-check-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-constant-range-check-issue.patch
deleted file mode 100644
index 1b279f7e..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-constant-range-check-issue.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From adfa8ca9782799670d87d03a01414aca5d9cc9e5 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Mon, 16 Oct 2017 15:44:23 +0530
-Subject: [PATCH 10/34] fixing the constant range check issue sample error: not
- in range ffffffff80000000..7fffffff, not ffffffff70000000
-
----
- gas/config/tc-microblaze.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 1cb9b2519c3..086f8704156 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -757,7 +757,7 @@ parse_imm (char * s, expressionS * e, offsetT min, offsetT max)
-       if ((e->X_add_number >> 31) == 1)
-        e->X_add_number |= -((addressT) (1U << 31));
- 
--      if (e->X_add_number < min || e->X_add_number > max)
-+      if ((int)e->X_add_number < min || (int)e->X_add_number > max)
-        {
-          as_fatal (_("operand must be absolute in range %lx..%lx, not %lx"),
-                    (long) min, (long) max, (long) e->X_add_number);
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
deleted file mode 100644
index 81949e66..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3efcb580af783ace64a9485af6bfee6dc18499ba Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Wed, 21 Feb 2018 12:32:02 +0530
-Subject: [PATCH 11/34] [Patch,Microblaze]: Compiler will give error messages
- in more detail for mxl-gp-opt flag..
-
----
- ld/ldmain.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index ea72b14a301..4e63b8fdf3b 100644
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -1564,6 +1564,18 @@ reloc_overflow (struct bfd_link_info *info,
-          break;
-        case bfd_link_hash_defined:
-        case bfd_link_hash_defweak:
-+
-+         if((strcmp(reloc_name,"R_MICROBLAZE_SRW32") == 0) &&  entry->type == bfd_link_hash_defined)
-+         {
-+         einfo (_(" relocation truncated to fit: don't enable small data pointer optimizations[mxl-gp-opt] if extern or multiple declarations used: "
-+                "%s against symbol `%T' defined in %A section in %B"),
-+                 reloc_name, entry->root.string,
-+                 entry->u.def.section,
-+                 entry->u.def.section == bfd_abs_section_ptr
-+                  ? info->output_bfd : entry->u.def.section->owner);
-+             break;
-+         }
-+
-          einfo (_(" relocation truncated to fit: "
-                   "%s against symbol `%pT' defined in %pA section in %pB"),
-                 reloc_name, entry->root.string,
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch
deleted file mode 100644
index e0166274..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch
+++ /dev/null
@@ -1,5247 +0,0 @@
-From 6d3b976c0f75225614d299faca766f9043bbd2d0 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 1 Nov 2021 19:06:53 +0530
-Subject: [PATCH 12/34] [Patch,MicroBlaze] : initial support for MicroBlaze 64
- bit [-m64]
-
-Conflicts:
-        bfd/elf32-microblaze.c
-        include/elf/common.h
-        ld/Makefile.am
-        ld/Makefile.in
-signed-off-by:Nagaraju Mekala<nmekala@xilinx.com>
-              Mahesh Bodapati<mbodapat@xilinx.com>
----
- bfd/Makefile.am                    |    2 +
- bfd/Makefile.in                    |    3 +
- bfd/bfd-in2.h                      |   10 +
- bfd/config.bfd                     |    4 +
- bfd/configure                      |    2 +
- bfd/configure.ac                   |    2 +
- bfd/cpu-microblaze.c               |   53 +-
- bfd/elf32-microblaze.c             |   59 +-
- bfd/elf64-microblaze.c             | 3612 ++++++++++++++++++++++++++++
- bfd/libbfd.h                       |    2 +
- bfd/reloc.c                        |   12 +
- bfd/targets.c                      |    6 +
- gas/config/tc-microblaze.c         |  419 +++-
- gas/config/tc-microblaze.h         |    4 +-
- include/elf/common.h               |    1 +
- include/elf/microblaze.h           |    2 +
- ld/Makefile.am                     |    4 +
- ld/Makefile.in                     |    6 +
- ld/configure.tgt                   |    3 +
- ld/emulparams/elf64microblaze.sh   |   23 +
- ld/emulparams/elf64microblazeel.sh |   23 +
- opcodes/microblaze-dis.c           |   36 +-
- opcodes/microblaze-opc.h           |  162 +-
- opcodes/microblaze-opcm.h          |   24 +-
- 24 files changed, 4408 insertions(+), 66 deletions(-)
- create mode 100644 bfd/elf64-microblaze.c
- create mode 100644 ld/emulparams/elf64microblaze.sh
- create mode 100644 ld/emulparams/elf64microblazeel.sh
-
-diff --git a/bfd/Makefile.am b/bfd/Makefile.am
-index 670e0598f55..c76adec960a 100644
---- a/bfd/Makefile.am
-+++ b/bfd/Makefile.am
-@@ -563,6 +563,7 @@ BFD64_BACKENDS = \
-        elf64-riscv.lo \
-        elfxx-riscv.lo \
-        elf64-s390.lo \
-+       elf64-microblaze.lo \
-        elf64-sparc.lo \
-        elf64-tilegx.lo \
-        elf64-x86-64.lo \
-@@ -600,6 +601,7 @@ BFD64_BACKENDS_CFILES = \
-        elf64-nfp.c \
-        elf64-ppc.c \
-        elf64-s390.c \
-+       elf64-microblaze.c \
-        elf64-sparc.c \
-        elf64-tilegx.c \
-        elf64-x86-64.c \
-diff --git a/bfd/Makefile.in b/bfd/Makefile.in
-index a26f74d7199..b0420bd440f 100644
---- a/bfd/Makefile.in
-+++ b/bfd/Makefile.in
-@@ -1027,6 +1027,7 @@ BFD64_BACKENDS = \
-        elf64-riscv.lo \
-        elfxx-riscv.lo \
-        elf64-s390.lo \
-+       elf64-microblaze.lo \
-        elf64-sparc.lo \
-        elf64-tilegx.lo \
-        elf64-x86-64.lo \
-@@ -1064,6 +1065,7 @@ BFD64_BACKENDS_CFILES = \
-        elf64-nfp.c \
-        elf64-ppc.c \
-        elf64-s390.c \
-+       elf64-microblaze.c \
-        elf64-sparc.c \
-        elf64-tilegx.c \
-        elf64-x86-64.c \
-@@ -1647,6 +1649,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-ppc.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-riscv.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-s390.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-microblaze.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-sparc.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-tilegx.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-x86-64.Plo@am__quote@
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 26e3bb2b34b..6cf701abf10 100644
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -5389,11 +5389,21 @@ value in two words (with an imm instruction).  No relocation is
- done here - only used for relaxing  */
-   BFD_RELOC_MICROBLAZE_64_NONE,
- 
-+/* This is a 64 bit reloc that stores the 32 bit pc relative
-+ *  +value in two words (with an imml instruction).  No relocation is
-+ *   +done here - only used for relaxing  */
-+    BFD_RELOC_MICROBLAZE_64,
-+
- /* This is a 64 bit reloc that stores the 32 bit pc relative
- value in two words (with an imm instruction).  The relocation is
- PC-relative GOT offset  */
-   BFD_RELOC_MICROBLAZE_64_GOTPC,
- 
-+/* This is a 64 bit reloc that stores the 32 bit pc relative
-+value in two words (with an imml instruction).  The relocation is
-+PC-relative GOT offset  */
-+  BFD_RELOC_MICROBLAZE_64_GPC,
-+
- /* This is a 64 bit reloc that stores the 32 bit pc relative
- value in two words (with an imm instruction).  The relocation is
- GOT offset  */
-diff --git a/bfd/config.bfd b/bfd/config.bfd
-index a4c6c8e8854..49208534de3 100644
---- a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -855,11 +855,15 @@ case "${targ}" in
-   microblazeel*-*)
-     targ_defvec=microblaze_elf32_le_vec
-     targ_selvecs=microblaze_elf32_vec
-+    targ64_selvecs=microblaze_elf64_vec
-+    targ64_selvecs=microblaze_elf64_le_vec
-     ;;
- 
-   microblaze*-*)
-     targ_defvec=microblaze_elf32_vec
-     targ_selvecs=microblaze_elf32_le_vec
-+    targ64_selvecs=microblaze_elf64_vec
-+    targ64_selvecs=microblaze_elf64_le_vec
-     ;;
- 
- #ifdef BFD64
-diff --git a/bfd/configure b/bfd/configure
-index 4f591b750d8..efeb1c2d717 100755
---- a/bfd/configure
-+++ b/bfd/configure
-@@ -13546,6 +13546,8 @@ do
-     s390_elf64_vec)             tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
-     score_elf32_be_vec)                 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo elf64.lo $elf"; want64=true; target_size=64 ;;
-     score_elf32_le_vec)                 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo elf64.lo $elf"; want64=true; target_size=64 ;;
-+    microblaze_elf64_vec)       tb="$tb elf64-microblaze.lo elf64.lo $elf"; target_size=64 ;;
-+    microblaze_elf64_le_vec)    tb="$tb elf64-microblaze.lo elf64.lo $elf"; target_size=64 ;;
-     sh_coff_vec)                tb="$tb coff-sh.lo $coff" ;;
-     sh_coff_le_vec)             tb="$tb coff-sh.lo $coff" ;;
-     sh_coff_small_vec)          tb="$tb coff-sh.lo $coff" ;;
-diff --git a/bfd/configure.ac b/bfd/configure.ac
-index 6146efb5ae3..387a0af3703 100644
---- a/bfd/configure.ac
-+++ b/bfd/configure.ac
-@@ -603,6 +603,8 @@ do
-     s390_elf64_vec)             tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
-     score_elf32_be_vec)                 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo elf64.lo $elf"; want64=true; target_size=64 ;;
-     score_elf32_le_vec)                 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo elf64.lo $elf"; want64=true; target_size=64 ;;
-+    microblaze_elf64_vec)       tb="$tb elf64-microblaze.lo elf64.lo $elf"; target_size=64 ;;
-+    microblaze_elf64_le_vec)    tb="$tb elf64-microblaze.lo elf64.lo $elf"; target_size=64 ;;
-     sh_coff_vec)                tb="$tb coff-sh.lo $coff" ;;
-     sh_coff_le_vec)             tb="$tb coff-sh.lo $coff" ;;
-     sh_coff_small_vec)          tb="$tb coff-sh.lo $coff" ;;
-diff --git a/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c
-index 0c1d2b1aa69..a9abb9166cc 100644
---- a/bfd/cpu-microblaze.c
-+++ b/bfd/cpu-microblaze.c
-@@ -23,7 +23,24 @@
- #include "bfd.h"
- #include "libbfd.h"
- 
--const bfd_arch_info_type bfd_microblaze_arch =
-+const bfd_arch_info_type bfd_microblaze_arch[] =
-+{
-+#if BFD_DEFAULT_TARGET_SIZE == 64
-+{
-+  64,                          /* 32 bits in a word.  */
-+  64,                          /* 32 bits in an address.  */
-+  8,                           /* 8 bits in a byte.  */
-+  bfd_arch_microblaze,                 /* Architecture.  */
-+  0,                           /* Machine number - 0 for now.  */
-+  "microblaze",                        /* Architecture name.  */
-+  "MicroBlaze",                        /* Printable name.  */
-+  3,                           /* Section align power.  */
-+  false,                               /* Is this the default architecture ?  */
-+  bfd_default_compatible,      /* Architecture comparison function.  */
-+  bfd_default_scan,            /* String to architecture conversion.  */
-+  bfd_arch_default_fill,       /* Default fill.  */
-+  &bfd_microblaze_arch[1]      /* Next in list.  */
-+},
- {
-   32,                          /* Bits in a word.  */
-   32,                          /* Bits in an address.  */
-@@ -39,4 +56,38 @@ const bfd_arch_info_type bfd_microblaze_arch =
-   bfd_arch_default_fill,       /* Default fill.  */
-   NULL,                                /* Next in list.  */
-   0 /* Maximum offset of a reloc from the start of an insn.  */
-+}
-+#else
-+{
-+  32,                          /* 32 bits in a word.  */
-+  32,                          /* 32 bits in an address.  */
-+  8,                           /* 8 bits in a byte.  */
-+  bfd_arch_microblaze,                 /* Architecture.  */
-+  0,                           /* Machine number - 0 for now.  */
-+  "microblaze",                        /* Architecture name.  */
-+  "MicroBlaze",                        /* Printable name.  */
-+  3,                           /* Section align power.  */
-+  true,                                /* Is this the default architecture ?  */
-+  bfd_default_compatible,      /* Architecture comparison function.  */
-+  bfd_default_scan,            /* String to architecture conversion.  */
-+  bfd_arch_default_fill,       /* Default fill.  */
-+  &bfd_microblaze_arch[1]      /* Next in list.  */
-+},
-+{
-+  64,                          /* 32 bits in a word.  */
-+  64,                          /* 32 bits in an address.  */
-+  8,                           /* 8 bits in a byte.  */
-+  bfd_arch_microblaze,                 /* Architecture.  */
-+  0,                           /* Machine number - 0 for now.  */
-+  "microblaze",                        /* Architecture name.  */
-+  "MicroBlaze",                        /* Printable name.  */
-+  3,                           /* Section align power.  */
-+  false,                               /* Is this the default architecture ?  */
-+  bfd_default_compatible,      /* Architecture comparison function.  */
-+  bfd_default_scan,            /* String to architecture conversion.  */
-+  bfd_arch_default_fill,       /* Default fill.  */
-+  NULL,                                /* Next in list.  */
-+  0  /* Maximum offset of a reloc from the start of an insn.  */
-+}
-+#endif
- };
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index edde04bafe4..f20adb6fd73 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -114,6 +114,20 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
-          0x0000ffff,           /* Dest Mask.  */
-          true),                /* PC relative offset?  */
- 
-+   HOWTO (R_MICROBLAZE_IMML_64,        /* Type.  */
-+          0,                   /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          16,                  /* Bitsize.  */
-+          true,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_IMML_64",      /* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
-+
-    /* A 64 bit relocation.  Table entry not really used.  */
-    HOWTO (R_MICROBLAZE_64,     /* Type.  */
-          0,                    /* Rightshift.  */
-@@ -278,6 +292,21 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
-          0x0000ffff,           /* Dest Mask.  */
-          true),                /* PC relative offset?  */
- 
-+   /* A 64 bit GOTPC relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GPC_64,         /* Type.  */
-+          0,                   /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          16,                  /* Bitsize.  */
-+          true,                        /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,       /* Special Function.  */
-+          "R_MICROBLAZE_GPC_64",       /* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
-+          true),               /* PC relative offset?  */
-+
-    /* A 64 bit GOT relocation.  Table-entry not really used.  */
-    HOWTO (R_MICROBLAZE_GOT_64,  /* Type.  */
-          0,                    /* Rightshift.  */
-@@ -617,9 +646,15 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
-     case BFD_RELOC_VTABLE_ENTRY:
-       microblaze_reloc = R_MICROBLAZE_GNU_VTENTRY;
-       break;
-+    case BFD_RELOC_MICROBLAZE_64:
-+      microblaze_reloc = R_MICROBLAZE_IMML_64;
-+      break;
-     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-       microblaze_reloc = R_MICROBLAZE_GOTPC_64;
-       break;
-+    case BFD_RELOC_MICROBLAZE_64_GPC:
-+      microblaze_reloc = R_MICROBLAZE_GPC_64;
-+      break;
-     case BFD_RELOC_MICROBLAZE_64_GOT:
-       microblaze_reloc = R_MICROBLAZE_GOT_64;
-       break;
-@@ -1500,7 +1535,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                if (r_symndx == STN_UNDEF || (input_section->flags & SEC_ALLOC) == 0)
-                  {
-                    relocation += addend;
--                   if (r_type == R_MICROBLAZE_32)
-+                   if (r_type == R_MICROBLAZE_32)// || r_type == R_MICROBLAZE_IMML_64)
-                      bfd_put_32 (input_bfd, relocation, contents + offset);
-                    else
-                      {
-@@ -1970,6 +2005,28 @@ microblaze_elf_relax_section (bfd *abfd,
-                    irel->r_addend -= calc_fixup (irel->r_addend, 0, sec);
-                }
-              break;
-+           case R_MICROBLAZE_IMML_64:
-+             {
-+               /* This was a PC-relative instruction that was
-+                  completely resolved.  */
-+               int sfix, efix;
-+            unsigned int val;
-+               bfd_vma target_address;
-+               target_address = irel->r_addend + irel->r_offset;
-+               sfix = calc_fixup (irel->r_offset, 0, sec);
-+               efix = calc_fixup (target_address, 0, sec);
-+
-+            /* Validate the in-band val.  */
-+            val = bfd_get_32 (abfd, contents + irel->r_offset);
-+            if (val != irel->r_addend && ELF64_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
-+               fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
-+            }
-+               irel->r_addend -= (efix - sfix);
-+               /* Should use HOWTO.  */
-+               microblaze_bfd_write_imm_value_64 (abfd, contents + irel->r_offset,
-+                                                  irel->r_addend);
-+             }
-+             break;
-            case R_MICROBLAZE_NONE:
-            case R_MICROBLAZE_32_NONE:
-              {
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-new file mode 100644
-index 00000000000..0faa8de73c8
---- /dev/null
-+++ b/bfd/elf64-microblaze.c
-@@ -0,0 +1,3612 @@
-+/* Xilinx MicroBlaze-specific support for 32-bit ELF
-+
-+   Copyright (C) 2009-2021 Free Software Foundation, Inc.
-+
-+   This file is part of BFD, the Binary File Descriptor library.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the
-+   Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-+   Boston, MA 02110-1301, USA.  */
-+
-+
-+#include "sysdep.h"
-+#include "bfd.h"
-+#include "bfdlink.h"
-+#include "libbfd.h"
-+#include "elf-bfd.h"
-+#include "elf/microblaze.h"
-+#include <assert.h>
-+
-+#define        USE_RELA        /* Only USE_REL is actually significant, but this is
-+                          here are a reminder...  */
-+#define INST_WORD_SIZE 4
-+
-+static int ro_small_data_pointer = 0;
-+static int rw_small_data_pointer = 0;
-+
-+static reloc_howto_type * microblaze_elf_howto_table [(int) R_MICROBLAZE_max];
-+
-+static reloc_howto_type microblaze_elf_howto_raw[] =
-+{
-+   /* This reloc does nothing.  */
-+   HOWTO (R_MICROBLAZE_NONE,   /* Type.  */
-+         0,                    /* Rightshift.  */
-+         0,                    /* Size.  */
-+         0,                    /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont,  /* Complain on overflow.  */
-+         NULL,                  /* Special Function.  */
-+         "R_MICROBLAZE_NONE",  /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0,                    /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* A standard 32 bit relocation.  */
-+   HOWTO (R_MICROBLAZE_32,     /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         32,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_bitfield, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_32",    /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0xffffffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* A standard PCREL 32 bit relocation.  */
-+   HOWTO (R_MICROBLAZE_32_PCREL,/* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         32,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_bitfield, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_32_PCREL",      /* Name.  */
-+         true,                 /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0xffffffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /* A 64 bit PCREL relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_64_PCREL,/* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_64_PCREL",      /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /* The low half of a PCREL 32 bit relocation.  */
-+   HOWTO (R_MICROBLAZE_32_PCREL_LO,    /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_signed, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,        /* Special Function.  */
-+         "R_MICROBLAZE_32_PCREL_LO",   /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   HOWTO (R_MICROBLAZE_IMML_64,        /* Type.  */
-+          0,                   /* Rightshift.  */
-+          4,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          64,                  /* Bitsize.  */
-+          true,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_IMML_64",      /* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
-+
-+   /* A 64 bit relocation.  Table entry not really used.  */
-+   HOWTO (R_MICROBLAZE_64,             /* Type.  */
-+          0,                   /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          16,                  /* Bitsize.  */
-+          false,               /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_64",           /* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
-+
-+   /* The low half of a 32 bit relocation.  */
-+   HOWTO (R_MICROBLAZE_32_LO,  /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_signed, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_32_LO", /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* Read-only small data section relocation.  */
-+   HOWTO (R_MICROBLAZE_SRO32,  /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_bitfield, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_SRO32", /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* Read-write small data area relocation.  */
-+   HOWTO (R_MICROBLAZE_SRW32,  /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_bitfield, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_SRW32", /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* This reloc does nothing. Used for relaxation.  */
-+   HOWTO (R_MICROBLAZE_32_NONE,        /* Type.  */
-+          0,                   /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          32,                  /* Bitsize.  */
-+          true,                        /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_bitfield,  /* Complain on overflow.  */
-+          NULL,                  /* Special Function.  */
-+          "R_MICROBLAZE_32_NONE",/* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0,                   /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
-+
-+   /* This reloc does nothing.  Used for relaxation.  */
-+   HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
-+         0,                    /* Rightshift.  */
-+         0,                    /* Size.  */
-+         0,                    /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         NULL,                  /* Special Function.  */
-+         "R_MICROBLAZE_64_NONE",/* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0,                    /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* Symbol Op Symbol relocation.  */
-+   HOWTO (R_MICROBLAZE_32_SYM_OP_SYM,          /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         32,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_bitfield, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_32_SYM_OP_SYM",         /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0xffffffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* GNU extension to record C++ vtable hierarchy.  */
-+   HOWTO (R_MICROBLAZE_GNU_VTINHERIT, /* Type.  */
-+         0,                     /* Rightshift.  */
-+         4,                     /* Size.  */
-+         0,                     /* Bitsize.  */
-+         false,                 /* PC_relative.  */
-+         0,                     /* Bitpos.  */
-+         complain_overflow_dont,/* Complain on overflow.  */
-+         NULL,                  /* Special Function.  */
-+         "R_MICROBLAZE_GNU_VTINHERIT", /* Name.  */
-+         false,                 /* Partial Inplace.  */
-+         0,                     /* Source Mask.  */
-+         0,                     /* Dest Mask.  */
-+         false),                /* PC relative offset?  */
-+
-+   /* GNU extension to record C++ vtable member usage.  */
-+   HOWTO (R_MICROBLAZE_GNU_VTENTRY,   /* Type.  */
-+         0,                     /* Rightshift.  */
-+         4,                     /* Size.  */
-+         0,                     /* Bitsize.  */
-+         false,                 /* PC_relative.  */
-+         0,                     /* Bitpos.  */
-+         complain_overflow_dont,/* Complain on overflow.  */
-+         _bfd_elf_rel_vtable_reloc_fn,  /* Special Function.  */
-+         "R_MICROBLAZE_GNU_VTENTRY", /* Name.  */
-+         false,                 /* Partial Inplace.  */
-+         0,                     /* Source Mask.  */
-+         0,                     /* Dest Mask.  */
-+         false),                /* PC relative offset?  */
-+
-+   /* A 64 bit GOTPC relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GOTPC_64,       /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,        /* Special Function.  */
-+         "R_MICROBLAZE_GOTPC_64",      /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+     /* A 64 bit TEXTPCREL relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_TEXTPCREL_64,   /* Type.  */
-+         0,                    /* Rightshift.  */
-+         2,                    /* Size (0 = byte, 1 = short, 2 = long).  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,        /* Special Function.  */
-+         "R_MICROBLAZE_TEXTPCREL_64",  /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /* A 64 bit GOTPC relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GPC_64,         /* Type.  */
-+          0,                   /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          16,                  /* Bitsize.  */
-+          true,                        /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,       /* Special Function.  */
-+          "R_MICROBLAZE_GPC_64",       /* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
-+          true),               /* PC relative offset?  */
-+
-+   /* A 64 bit GOT relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GOT_64,  /* Type.  */
-+         0,                    /* Rightshift.  */
-+         2,                    /* Size (0 = byte, 1 = short, 2 = long).  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_GOT_64",/* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+    /* A 64 bit TEXTREL relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_TEXTREL_64,  /* Type.  */
-+         0,                    /* Rightshift.  */
-+         2,                    /* Size (0 = byte, 1 = short, 2 = long).  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_TEXTREL_64",/* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* A 64 bit PLT relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_PLT_64,  /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_PLT_64",/* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /*  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_REL,    /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_REL",   /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /*  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_JUMP_SLOT,/* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_JUMP_SLOT",     /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /*  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GLOB_DAT,/* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         true,                 /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_GLOB_DAT",      /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         true),                /* PC relative offset?  */
-+
-+   /* A 64 bit GOT relative relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GOTOFF_64,      /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_GOTOFF_64",     /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* A 32 bit GOT relative relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GOTOFF_32,      /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,        /* Special Function.  */
-+         "R_MICROBLAZE_GOTOFF_32",     /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* COPY relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_COPY,   /* Type.  */
-+         0,                    /* Rightshift.  */
-+         4,                    /* Size.  */
-+         16,                   /* Bitsize.  */
-+         false,                /* PC_relative.  */
-+         0,                    /* Bitpos.  */
-+         complain_overflow_dont, /* Complain on overflow.  */
-+         bfd_elf_generic_reloc,/* Special Function.  */
-+         "R_MICROBLAZE_COPY",  /* Name.  */
-+         false,                /* Partial Inplace.  */
-+         0,                    /* Source Mask.  */
-+         0x0000ffff,           /* Dest Mask.  */
-+         false),               /* PC relative offset?  */
-+
-+   /* Marker relocs for TLS.  */
-+   HOWTO (R_MICROBLAZE_TLS,
-+        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLS",            /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,                    /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   HOWTO (R_MICROBLAZE_TLSGD,
-+        0,                     /* rightshift */
-+        4,                     /* size */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSGD",          /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,                    /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   HOWTO (R_MICROBLAZE_TLSLD,
-+        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSLD",          /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,            /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   /* Computes the load module index of the load module that contains the
-+      definition of its TLS sym.  */
-+   HOWTO (R_MICROBLAZE_TLSDTPMOD32,
-+        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSDTPMOD32",    /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,            /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   /* Computes a dtv-relative displacement, the difference between the value
-+      of sym+add and the base address of the thread-local storage block that
-+      contains the definition of sym, minus 0x8000.  Used for initializing GOT */
-+   HOWTO (R_MICROBLAZE_TLSDTPREL32,
-+        0,                     /* rightshift */
-+        4,                     /* size */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSDTPREL32",    /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,            /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   /* Computes a dtv-relative displacement, the difference between the value
-+      of sym+add and the base address of the thread-local storage block that
-+      contains the definition of sym, minus 0x8000.  */
-+   HOWTO (R_MICROBLAZE_TLSDTPREL64,
-+        0,                     /* rightshift */
-+        4,                     /* size */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSDTPREL64",    /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,            /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   /* Computes a tp-relative displacement, the difference between the value of
-+      sym+add and the value of the thread pointer (r13).  */
-+   HOWTO (R_MICROBLAZE_TLSGOTTPREL32,
-+        0,                     /* rightshift */
-+        4,                     /* size */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSGOTTPREL32",  /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,            /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+   /* Computes a tp-relative displacement, the difference between the value of
-+      sym+add and the value of the thread pointer (r13).  */
-+   HOWTO (R_MICROBLAZE_TLSTPREL32,
-+        0,                     /* rightshift */
-+        4,                     /* size */
-+        32,                    /* bitsize */
-+        false,                 /* pc_relative */
-+        0,                     /* bitpos */
-+        complain_overflow_dont, /* complain_on_overflow */
-+        bfd_elf_generic_reloc, /* special_function */
-+        "R_MICROBLAZE_TLSTPREL32",     /* name */
-+        false,                 /* partial_inplace */
-+        0,                     /* src_mask */
-+        0x0000ffff,            /* dst_mask */
-+        false),                /* pcrel_offset */
-+
-+};
-+
-+#ifndef NUM_ELEM
-+#define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0])
-+#endif
-+
-+/* Initialize the microblaze_elf_howto_table, so that linear accesses can be done.  */
-+
-+static void
-+microblaze_elf_howto_init (void)
-+{
-+  unsigned int i;
-+
-+  for (i = NUM_ELEM (microblaze_elf_howto_raw); i--;)
-+    {
-+      unsigned int type;
-+
-+      type = microblaze_elf_howto_raw[i].type;
-+
-+      BFD_ASSERT (type < NUM_ELEM (microblaze_elf_howto_table));
-+
-+      microblaze_elf_howto_table [type] = & microblaze_elf_howto_raw [i];
-+    }
-+}
-+
-+static reloc_howto_type *
-+microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
-+                                 bfd_reloc_code_real_type code)
-+{
-+  enum elf_microblaze_reloc_type microblaze_reloc = R_MICROBLAZE_NONE;
-+
-+  switch (code)
-+    {
-+    case BFD_RELOC_NONE:
-+      microblaze_reloc = R_MICROBLAZE_NONE;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_NONE:
-+      microblaze_reloc = R_MICROBLAZE_32_NONE;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_NONE:
-+      microblaze_reloc = R_MICROBLAZE_64_NONE;
-+      break;
-+    case BFD_RELOC_32:
-+      microblaze_reloc = R_MICROBLAZE_32;
-+      break;
-+      /* RVA is treated the same as 32 */
-+    case BFD_RELOC_RVA:
-+      microblaze_reloc = R_MICROBLAZE_32;
-+      break;
-+    case BFD_RELOC_32_PCREL:
-+      microblaze_reloc = R_MICROBLAZE_32_PCREL;
-+      break;
-+    case BFD_RELOC_64_PCREL:
-+      microblaze_reloc = R_MICROBLAZE_64_PCREL;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_LO_PCREL:
-+      microblaze_reloc = R_MICROBLAZE_32_PCREL_LO;
-+      break;
-+    case BFD_RELOC_64:
-+      microblaze_reloc = R_MICROBLAZE_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_LO:
-+      microblaze_reloc = R_MICROBLAZE_32_LO;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_ROSDA:
-+      microblaze_reloc = R_MICROBLAZE_SRO32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_RWSDA:
-+      microblaze_reloc = R_MICROBLAZE_SRW32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM:
-+      microblaze_reloc = R_MICROBLAZE_32_SYM_OP_SYM;
-+      break;
-+    case BFD_RELOC_VTABLE_INHERIT:
-+      microblaze_reloc = R_MICROBLAZE_GNU_VTINHERIT;
-+      break;
-+    case BFD_RELOC_VTABLE_ENTRY:
-+      microblaze_reloc = R_MICROBLAZE_GNU_VTENTRY;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64:
-+      microblaze_reloc = R_MICROBLAZE_IMML_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_GOTPC:
-+      microblaze_reloc = R_MICROBLAZE_GOTPC_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_GPC:
-+      microblaze_reloc = R_MICROBLAZE_GPC_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_GOT:
-+      microblaze_reloc = R_MICROBLAZE_GOT_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TEXTPCREL:
-+      microblaze_reloc = R_MICROBLAZE_TEXTPCREL_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TEXTREL:
-+      microblaze_reloc = R_MICROBLAZE_TEXTREL_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_PLT:
-+      microblaze_reloc = R_MICROBLAZE_PLT_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_GOTOFF:
-+      microblaze_reloc = R_MICROBLAZE_GOTOFF_64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_GOTOFF:
-+      microblaze_reloc = R_MICROBLAZE_GOTOFF_32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TLSGD:
-+      microblaze_reloc = R_MICROBLAZE_TLSGD;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TLSLD:
-+      microblaze_reloc = R_MICROBLAZE_TLSLD;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_TLSDTPREL:
-+      microblaze_reloc = R_MICROBLAZE_TLSDTPREL32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TLSDTPREL:
-+      microblaze_reloc = R_MICROBLAZE_TLSDTPREL64;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_32_TLSDTPMOD:
-+      microblaze_reloc = R_MICROBLAZE_TLSDTPMOD32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TLSGOTTPREL:
-+      microblaze_reloc = R_MICROBLAZE_TLSGOTTPREL32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_64_TLSTPREL:
-+      microblaze_reloc = R_MICROBLAZE_TLSTPREL32;
-+      break;
-+    case BFD_RELOC_MICROBLAZE_COPY:
-+      microblaze_reloc = R_MICROBLAZE_COPY;
-+      break;
-+    default:
-+      return (reloc_howto_type *) NULL;
-+    }
-+
-+  if (!microblaze_elf_howto_table [R_MICROBLAZE_32])
-+    /* Initialize howto table if needed.  */
-+    microblaze_elf_howto_init ();
-+
-+  return microblaze_elf_howto_table [(int) microblaze_reloc];
-+};
-+
-+static reloc_howto_type *
-+microblaze_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-+                                 const char *r_name)
-+{
-+  unsigned int i;
-+
-+  for (i = 0; i < NUM_ELEM (microblaze_elf_howto_raw); i++)
-+    if (microblaze_elf_howto_raw[i].name != NULL
-+       && strcasecmp (microblaze_elf_howto_raw[i].name, r_name) == 0)
-+      return &microblaze_elf_howto_raw[i];
-+
-+  return NULL;
-+}
-+
-+/* Set the howto pointer for a RCE ELF reloc.  */
-+
-+static bool
-+microblaze_elf_info_to_howto (bfd * abfd,
-+                             arelent * cache_ptr,
-+                             Elf_Internal_Rela * dst)
-+{
-+  unsigned int r_type;
-+
-+  if (!microblaze_elf_howto_table [R_MICROBLAZE_32])
-+    /* Initialize howto table if needed.  */
-+    microblaze_elf_howto_init ();
-+
-+  r_type = ELF64_R_TYPE (dst->r_info);
-+  if (r_type >= R_MICROBLAZE_max)
-+    {
-+      /* xgettext:c-format */
-+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
-+                         abfd, r_type);
-+      bfd_set_error (bfd_error_bad_value);
-+      return false;
-+    }
-+
-+  cache_ptr->howto = microblaze_elf_howto_table [r_type];
-+  return true;
-+}
-+
-+/* Relax table contains information about instructions which can
-+   be removed by relaxation -- replacing a long address with a
-+   short address.  */
-+struct relax_table
-+{
-+  /* Address where bytes may be deleted.  */
-+  bfd_vma addr;
-+
-+  /* Number of bytes to be deleted.  */
-+  size_t size;
-+};
-+
-+struct _microblaze_elf_section_data
-+{
-+  struct bfd_elf_section_data elf;
-+  /* Count of used relaxation table entries.  */
-+  size_t relax_count;
-+  /* Relaxation table.  */
-+  struct relax_table *relax;
-+};
-+
-+#define microblaze_elf_section_data(sec) \
-+  ((struct _microblaze_elf_section_data *) elf_section_data (sec))
-+
-+static bool
-+microblaze_elf_new_section_hook (bfd *abfd, asection *sec)
-+{
-+  if (!sec->used_by_bfd)
-+    {
-+      struct _microblaze_elf_section_data *sdata;
-+      size_t amt = sizeof (*sdata);
-+
-+      sdata = bfd_zalloc (abfd, amt);
-+      if (sdata == NULL)
-+       return false;
-+      sec->used_by_bfd = sdata;
-+    }
-+
-+  return _bfd_elf_new_section_hook (abfd, sec);
-+}
-+
-+/* Microblaze ELF local labels start with 'L.' or '$L', not '.L'.  */
-+
-+static bool
-+microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
-+{
-+  if (name[0] == 'L' && name[1] == '.')
-+    return true;
-+
-+  if (name[0] == '$' && name[1] == 'L')
-+    return true;
-+
-+  /* With gcc, the labels go back to starting with '.', so we accept
-+     the generic ELF local label syntax as well.  */
-+  return _bfd_elf_is_local_label_name (abfd, name);
-+}
-+
-+/* ELF linker hash entry.  */
-+
-+struct elf64_mb_link_hash_entry
-+{
-+  struct elf_link_hash_entry elf;
-+
-+  /* TLS Reference Types for the symbol; Updated by check_relocs */
-+#define TLS_GD     1  /* GD reloc. */
-+#define TLS_LD     2  /* LD reloc. */
-+#define TLS_TPREL  4  /* TPREL reloc, => IE. */
-+#define TLS_DTPREL 8  /* DTPREL reloc, => LD. */
-+#define TLS_TLS    16 /* Any TLS reloc.  */
-+  unsigned char tls_mask;
-+
-+};
-+
-+#define IS_TLS_GD(x)     (x == (TLS_TLS | TLS_GD))
-+#define IS_TLS_LD(x)     (x == (TLS_TLS | TLS_LD))
-+#define IS_TLS_DTPREL(x) (x == (TLS_TLS | TLS_DTPREL))
-+#define IS_TLS_NONE(x)   (x == 0)
-+
-+#define elf64_mb_hash_entry(ent) ((struct elf64_mb_link_hash_entry *)(ent))
-+
-+/* ELF linker hash table.  */
-+
-+struct elf64_mb_link_hash_table
-+{
-+  struct elf_link_hash_table elf;
-+
-+  /* TLS Local Dynamic GOT Entry */
-+  union {
-+    bfd_signed_vma refcount;
-+    bfd_vma offset;
-+  } tlsld_got;
-+};
-+
-+/* Nonzero if this section has TLS related relocations.  */
-+#define has_tls_reloc sec_flg0
-+
-+/* Get the ELF linker hash table from a link_info structure.  */
-+
-+#define elf64_mb_hash_table(p) \
-+  ((is_elf_hash_table ((p)->hash)                                      \
-+    && elf_hash_table_id (elf_hash_table (p)) == MICROBLAZE_ELF_DATA)  \
-+   ? (struct elf64_mb_link_hash_table *) (p)->hash : NULL)
-+
-+/* Create an entry in a microblaze ELF linker hash table.  */
-+
-+static struct bfd_hash_entry *
-+link_hash_newfunc (struct bfd_hash_entry *entry,
-+                  struct bfd_hash_table *table,
-+                  const char *string)
-+{
-+  /* Allocate the structure if it has not already been allocated by a
-+     subclass.  */
-+  if (entry == NULL)
-+    {
-+      entry = bfd_hash_allocate (table,
-+                                sizeof (struct elf64_mb_link_hash_entry));
-+      if (entry == NULL)
-+       return entry;
-+    }
-+
-+  /* Call the allocation method of the superclass.  */
-+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
-+  if (entry != NULL)
-+    {
-+      struct elf64_mb_link_hash_entry *eh;
-+
-+      eh = (struct elf64_mb_link_hash_entry *) entry;
-+      eh->tls_mask = 0;
-+    }
-+
-+  return entry;
-+}
-+
-+/* Create a mb ELF linker hash table.  */
-+
-+static struct bfd_link_hash_table *
-+microblaze_elf_link_hash_table_create (bfd *abfd)
-+{
-+  struct elf64_mb_link_hash_table *ret;
-+  size_t amt = sizeof (struct elf64_mb_link_hash_table);
-+
-+  ret = (struct elf64_mb_link_hash_table *) bfd_zmalloc (amt);
-+  if (ret == NULL)
-+    return NULL;
-+
-+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
-+                                     sizeof (struct elf64_mb_link_hash_entry),
-+                                     MICROBLAZE_ELF_DATA))
-+    {
-+      free (ret);
-+      return NULL;
-+    }
-+
-+  return &ret->elf.root;
-+}
-+
-+/* Set the values of the small data pointers.  */
-+
-+static void
-+microblaze_elf_final_sdp (struct bfd_link_info *info)
-+{
-+  struct bfd_link_hash_entry *h;
-+
-+  h = bfd_link_hash_lookup (info->hash, RO_SDA_ANCHOR_NAME, false, false, true);
-+  if (h != (struct bfd_link_hash_entry *) NULL
-+      && h->type == bfd_link_hash_defined)
-+    ro_small_data_pointer = (h->u.def.value
-+                            + h->u.def.section->output_section->vma
-+                            + h->u.def.section->output_offset);
-+
-+  h = bfd_link_hash_lookup (info->hash, RW_SDA_ANCHOR_NAME, false, false, true);
-+  if (h != (struct bfd_link_hash_entry *) NULL
-+      && h->type == bfd_link_hash_defined)
-+    rw_small_data_pointer = (h->u.def.value
-+                            + h->u.def.section->output_section->vma
-+                            + h->u.def.section->output_offset);
-+}
-+
-+static bfd_vma
-+dtprel_base (struct bfd_link_info *info)
-+{
-+  /* If tls_sec is NULL, we should have signalled an error already.  */
-+  if (elf_hash_table (info)->tls_sec == NULL)
-+    return 0;
-+  return elf_hash_table (info)->tls_sec->vma;
-+}
-+
-+/* The size of the thread control block.  */
-+#define TCB_SIZE       8
-+
-+/* Output a simple dynamic relocation into SRELOC.  */
-+
-+static void
-+microblaze_elf_output_dynamic_relocation (bfd *output_bfd,
-+                                         asection *sreloc,
-+                                         unsigned long reloc_index,
-+                                         unsigned long indx,
-+                                         int r_type,
-+                                         bfd_vma offset,
-+                                         bfd_vma addend)
-+{
-+
-+  Elf_Internal_Rela rel;
-+
-+  rel.r_info = ELF64_R_INFO (indx, r_type);
-+  rel.r_offset = offset;
-+  rel.r_addend = addend;
-+
-+  bfd_elf64_swap_reloca_out (output_bfd, &rel,
-+              (sreloc->contents + reloc_index * sizeof (Elf64_External_Rela)));
-+}
-+
-+/* This code is taken from elf64-m32r.c
-+   There is some attempt to make this function usable for many architectures,
-+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
-+   if only to serve as a learning tool.
-+
-+   The RELOCATE_SECTION function is called by the new ELF backend linker
-+   to handle the relocations for a section.
-+
-+   The relocs are always passed as Rela structures; if the section
-+   actually uses Rel structures, the r_addend field will always be
-+   zero.
-+
-+   This function is responsible for adjust the section contents as
-+   necessary, and (if using Rela relocs and generating a
-+   relocatable output file) adjusting the reloc addend as
-+   necessary.
-+
-+   This function does not have to worry about setting the reloc
-+   address or the reloc symbol index.
-+
-+   LOCAL_SYMS is a pointer to the swapped in local symbols.
-+
-+   LOCAL_SECTIONS is an array giving the section in the input file
-+   corresponding to the st_shndx field of each local symbol.
-+
-+   The global hash table entry for the global symbols can be found
-+   via elf_sym_hashes (input_bfd).
-+
-+   When generating relocatable output, this function must handle
-+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
-+   going to be the section symbol corresponding to the output
-+   section, which means that the addend must be adjusted
-+   accordingly.  */
-+
-+static int
-+microblaze_elf_relocate_section (bfd *output_bfd,
-+                                struct bfd_link_info *info,
-+                                bfd *input_bfd,
-+                                asection *input_section,
-+                                bfd_byte *contents,
-+                                Elf_Internal_Rela *relocs,
-+                                Elf_Internal_Sym *local_syms,
-+                                asection **local_sections)
-+{
-+  struct elf64_mb_link_hash_table *htab;
-+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-+  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
-+  Elf_Internal_Rela *rel, *relend;
-+  int endian = (bfd_little_endian (output_bfd)) ? 0 : 2;
-+  /* Assume success.  */
-+  bool ret = true;
-+  asection *sreloc;
-+  bfd_vma *local_got_offsets;
-+  unsigned int tls_type;
-+
-+  if (!microblaze_elf_howto_table[R_MICROBLAZE_max-1])
-+    microblaze_elf_howto_init ();
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  local_got_offsets = elf_local_got_offsets (input_bfd);
-+
-+  sreloc = elf_section_data (input_section)->sreloc;
-+
-+  rel = relocs;
-+  relend = relocs + input_section->reloc_count;
-+  for (; rel < relend; rel++)
-+    {
-+      int r_type;
-+      reloc_howto_type *howto;
-+      unsigned long r_symndx;
-+      bfd_vma addend = rel->r_addend;
-+      bfd_vma offset = rel->r_offset;
-+      struct elf_link_hash_entry *h;
-+      Elf_Internal_Sym *sym;
-+      asection *sec;
-+      const char *sym_name;
-+      bfd_reloc_status_type r = bfd_reloc_ok;
-+      const char *errmsg = NULL;
-+      bool unresolved_reloc = false;
-+
-+      h = NULL;
-+      r_type = ELF64_R_TYPE (rel->r_info);
-+      tls_type = 0;
-+
-+      if (r_type < 0 || r_type >= (int) R_MICROBLAZE_max)
-+       {
-+         /* xgettext:c-format */
-+         _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
-+                             input_bfd, (int) r_type);
-+         bfd_set_error (bfd_error_bad_value);
-+         ret = false;
-+         continue;
-+       }
-+
-+      howto = microblaze_elf_howto_table[r_type];
-+      r_symndx = ELF64_R_SYM (rel->r_info);
-+
-+      if (bfd_link_relocatable (info))
-+       {
-+         /* This is a relocatable link.  We don't have to change
-+            anything, unless the reloc is against a section symbol,
-+            in which case we have to adjust according to where the
-+            section symbol winds up in the output section.  */
-+         sec = NULL;
-+         if (r_symndx >= symtab_hdr->sh_info)
-+           /* External symbol.  */
-+           continue;
-+
-+         /* Local symbol.  */
-+         sym = local_syms + r_symndx;
-+         sym_name = "<local symbol>";
-+         /* STT_SECTION: symbol is associated with a section.  */
-+         if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
-+           /* Symbol isn't associated with a section.  Nothing to do.  */
-+           continue;
-+
-+         sec = local_sections[r_symndx];
-+         addend += sec->output_offset + sym->st_value;
-+#ifndef USE_REL
-+         /* This can't be done for USE_REL because it doesn't mean anything
-+            and elf_link_input_bfd asserts this stays zero.  */
-+         /* rel->r_addend = addend; */
-+#endif
-+
-+#ifndef USE_REL
-+         /* Addends are stored with relocs.  We're done.  */
-+         continue;
-+#else /* USE_REL */
-+         /* If partial_inplace, we need to store any additional addend
-+            back in the section.  */
-+         if (!howto->partial_inplace)
-+           continue;
-+         /* ??? Here is a nice place to call a special_function like handler.  */
-+         r = _bfd_relocate_contents (howto, input_bfd, addend,
-+                                     contents + offset);
-+#endif /* USE_REL */
-+       }
-+      else
-+       {
-+         bfd_vma relocation;
-+         bool resolved_to_zero;
-+
-+         /* This is a final link.  */
-+         sym = NULL;
-+         sec = NULL;
-+         unresolved_reloc = false;
-+
-+         if (r_symndx < symtab_hdr->sh_info)
-+           {
-+             /* Local symbol.  */
-+             sym = local_syms + r_symndx;
-+             sec = local_sections[r_symndx];
-+             if (sec == 0)
-+               continue;
-+             sym_name = "<local symbol>";
-+             relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
-+             /* r_addend may have changed if the reference section was
-+                a merge section.  */
-+             addend = rel->r_addend;
-+           }
-+         else
-+           {
-+             /* External symbol.  */
-+             bool warned ATTRIBUTE_UNUSED;
-+             bool ignored ATTRIBUTE_UNUSED;
-+
-+             RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
-+                                      r_symndx, symtab_hdr, sym_hashes,
-+                                      h, sec, relocation,
-+                                      unresolved_reloc, warned, ignored);
-+             sym_name = h->root.root.string;
-+           }
-+
-+         /* Sanity check the address.  */
-+         if (offset > bfd_get_section_limit (input_bfd, input_section))
-+           {
-+             r = bfd_reloc_outofrange;
-+             goto check_reloc;
-+           }
-+
-+         resolved_to_zero = (h != NULL
-+                             && UNDEFWEAK_NO_DYNAMIC_RELOC (info, h));
-+
-+         switch ((int) r_type)
-+           {
-+           case (int) R_MICROBLAZE_SRO32 :
-+             {
-+               const char *name;
-+
-+               /* Only relocate if the symbol is defined.  */
-+               if (sec)
-+                 {
-+                   name = bfd_section_name (sec);
-+
-+                   if (strcmp (name, ".sdata2") == 0
-+                       || strcmp (name, ".sbss2") == 0)
-+                     {
-+                       if (ro_small_data_pointer == 0)
-+                         microblaze_elf_final_sdp (info);
-+                       if (ro_small_data_pointer == 0)
-+                         {
-+                           ret = false;
-+                           r = bfd_reloc_undefined;
-+                           goto check_reloc;
-+                         }
-+
-+                       /* At this point `relocation' contains the object's
-+                          address.  */
-+                       relocation -= ro_small_data_pointer;
-+                       /* Now it contains the offset from _SDA2_BASE_.  */
-+                       r = _bfd_final_link_relocate (howto, input_bfd,
-+                                                     input_section,
-+                                                     contents, offset,
-+                                                     relocation, addend);
-+                     }
-+                   else
-+                     {
-+                       _bfd_error_handler
-+                         /* xgettext:c-format */
-+                         (_("%pB: the target (%s) of an %s relocation"
-+                            " is in the wrong section (%pA)"),
-+                          input_bfd,
-+                          sym_name,
-+                          microblaze_elf_howto_table[(int) r_type]->name,
-+                          sec);
-+                       /*bfd_set_error (bfd_error_bad_value); ??? why? */
-+                       ret = false;
-+                       continue;
-+                     }
-+                 }
-+             }
-+             break;
-+
-+           case (int) R_MICROBLAZE_SRW32 :
-+             {
-+               const char *name;
-+
-+               /* Only relocate if the symbol is defined.  */
-+               if (sec)
-+                 {
-+                   name = bfd_section_name (sec);
-+
-+                   if (strcmp (name, ".sdata") == 0
-+                       || strcmp (name, ".sbss") == 0)
-+                     {
-+                       if (rw_small_data_pointer == 0)
-+                         microblaze_elf_final_sdp (info);
-+                       if (rw_small_data_pointer == 0)
-+                         {
-+                           ret = false;
-+                           r = bfd_reloc_undefined;
-+                           goto check_reloc;
-+                         }
-+
-+                       /* At this point `relocation' contains the object's
-+                          address.  */
-+                       relocation -= rw_small_data_pointer;
-+                       /* Now it contains the offset from _SDA_BASE_.  */
-+                       r = _bfd_final_link_relocate (howto, input_bfd,
-+                                                     input_section,
-+                                                     contents, offset,
-+                                                     relocation, addend);
-+                     }
-+                   else
-+                     {
-+                       _bfd_error_handler
-+                         /* xgettext:c-format */
-+                         (_("%pB: the target (%s) of an %s relocation"
-+                            " is in the wrong section (%pA)"),
-+                          input_bfd,
-+                          sym_name,
-+                          microblaze_elf_howto_table[(int) r_type]->name,
-+                          sec);
-+                       /*bfd_set_error (bfd_error_bad_value); ??? why? */
-+                       ret = false;
-+                       continue;
-+                     }
-+                 }
-+             }
-+             break;
-+
-+           case (int) R_MICROBLAZE_32_SYM_OP_SYM:
-+             break; /* Do nothing.  */
-+
-+           case (int) R_MICROBLAZE_GOTPC_64:
-+             relocation = (htab->elf.sgotplt->output_section->vma
-+                           + htab->elf.sgotplt->output_offset);
-+             relocation -= (input_section->output_section->vma
-+                            + input_section->output_offset
-+                            + offset + INST_WORD_SIZE);
-+             relocation += addend;
-+             bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                         contents + offset + endian);
-+             bfd_put_16 (input_bfd, relocation & 0xffff,
-+                         contents + offset + endian + INST_WORD_SIZE);
-+             break;
-+
-+           case (int) R_MICROBLAZE_TEXTPCREL_64:
-+             relocation = input_section->output_section->vma;
-+             relocation -= (input_section->output_section->vma
-+                            + input_section->output_offset
-+                            + offset + INST_WORD_SIZE);
-+             relocation += addend;
-+             bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                         contents + offset + endian);
-+             bfd_put_16 (input_bfd, relocation & 0xffff,
-+                         contents + offset + endian + INST_WORD_SIZE);
-+             break;
-+
-+           case (int) R_MICROBLAZE_PLT_64:
-+             {
-+               bfd_vma immediate;
-+               if (htab->elf.splt != NULL && h != NULL
-+                   && h->plt.offset != (bfd_vma) -1)
-+                 {
-+                   relocation = (htab->elf.splt->output_section->vma
-+                                 + htab->elf.splt->output_offset
-+                                 + h->plt.offset);
-+                   unresolved_reloc = false;
-+                   immediate = relocation - (input_section->output_section->vma
-+                                             + input_section->output_offset
-+                                             + offset + INST_WORD_SIZE);
-+                   bfd_put_16 (input_bfd, (immediate >> 16) & 0xffff,
-+                               contents + offset + endian);
-+                   bfd_put_16 (input_bfd, immediate & 0xffff,
-+                               contents + offset + endian + INST_WORD_SIZE);
-+                 }
-+               else
-+                 {
-+                   relocation -= (input_section->output_section->vma
-+                                  + input_section->output_offset
-+                                  + offset + INST_WORD_SIZE);
-+                   immediate = relocation;
-+                   bfd_put_16 (input_bfd, (immediate >> 16) & 0xffff,
-+                               contents + offset + endian);
-+                   bfd_put_16 (input_bfd, immediate & 0xffff,
-+                               contents + offset + endian + INST_WORD_SIZE);
-+                 }
-+               break;
-+             }
-+
-+           case (int) R_MICROBLAZE_TLSGD:
-+             tls_type = (TLS_TLS | TLS_GD);
-+             goto dogot;
-+           case (int) R_MICROBLAZE_TLSLD:
-+             tls_type = (TLS_TLS | TLS_LD);
-+             /* Fall through.  */
-+           dogot:
-+           case (int) R_MICROBLAZE_GOT_64:
-+             {
-+               bfd_vma *offp;
-+               bfd_vma off, off2;
-+               unsigned long indx;
-+               bfd_vma static_value;
-+
-+               bool need_relocs = false;
-+               if (htab->elf.sgot == NULL)
-+                 abort ();
-+
-+               indx = 0;
-+               offp = NULL;
-+
-+               /* 1. Identify GOT Offset;
-+                  2. Compute Static Values
-+                  3. Process Module Id, Process Offset
-+                  4. Fixup Relocation with GOT offset value. */
-+
-+               /* 1. Determine GOT Offset to use : TLS_LD, global, local */
-+               if (IS_TLS_LD (tls_type))
-+                 offp = &htab->tlsld_got.offset;
-+               else if (h != NULL)
-+                 {
-+                   if (htab->elf.sgotplt != NULL
-+                       && h->got.offset != (bfd_vma) -1)
-+                     offp = &h->got.offset;
-+                   else
-+                     abort ();
-+                 }
-+               else
-+                 {
-+                   if (local_got_offsets == NULL)
-+                     abort ();
-+                   offp = &local_got_offsets[r_symndx];
-+                 }
-+
-+               if (!offp)
-+                 abort ();
-+
-+               off = (*offp) & ~1;
-+               off2 = off;
-+
-+               if (IS_TLS_LD(tls_type) || IS_TLS_GD(tls_type))
-+                 off2 = off + 4;
-+
-+               /* Symbol index to use for relocs */
-+               if (h != NULL)
-+                 {
-+                   bool dyn =
-+                       elf_hash_table (info)->dynamic_sections_created;
-+
-+                   if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
-+                                                        bfd_link_pic (info),
-+                                                        h)
-+                       && (!bfd_link_pic (info)
-+                           || !SYMBOL_REFERENCES_LOCAL (info, h)))
-+                     indx = h->dynindx;
-+                 }
-+
-+               /* Need to generate relocs ? */
-+               if ((bfd_link_pic (info) || indx != 0)
-+                   && (h == NULL
-+                   || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-+                       && !resolved_to_zero)
-+                   || h->root.type != bfd_link_hash_undefweak))
-+                 need_relocs = true;
-+
-+               /* 2. Compute/Emit Static value of r-expression */
-+               static_value = relocation + addend;
-+
-+               /* 3. Process module-id and offset */
-+               if (! ((*offp) & 1) )
-+                 {
-+                   bfd_vma got_offset;
-+
-+                   got_offset = (htab->elf.sgot->output_section->vma
-+                                 + htab->elf.sgot->output_offset
-+                                 + off);
-+
-+                   /* Process module-id */
-+                   if (IS_TLS_LD(tls_type))
-+                     {
-+                       if (! bfd_link_pic (info))
-+                         bfd_put_32 (output_bfd, 1,
-+                                     htab->elf.sgot->contents + off);
-+                       else
-+                         microblaze_elf_output_dynamic_relocation
-+                           (output_bfd,
-+                            htab->elf.srelgot,
-+                            htab->elf.srelgot->reloc_count++,
-+                            /* symindex= */ 0, R_MICROBLAZE_TLSDTPMOD32,
-+                            got_offset, 0);
-+                     }
-+                   else if (IS_TLS_GD(tls_type))
-+                     {
-+                       if (! need_relocs)
-+                         bfd_put_32 (output_bfd, 1,
-+                                     htab->elf.sgot->contents + off);
-+                       else
-+                         microblaze_elf_output_dynamic_relocation
-+                           (output_bfd,
-+                            htab->elf.srelgot,
-+                            htab->elf.srelgot->reloc_count++,
-+                            /* symindex= */ indx, R_MICROBLAZE_TLSDTPMOD32,
-+                            got_offset, indx ? 0 : static_value);
-+                     }
-+
-+                   /* Process Offset */
-+                   if (htab->elf.srelgot == NULL)
-+                     abort ();
-+
-+                   got_offset = (htab->elf.sgot->output_section->vma
-+                                 + htab->elf.sgot->output_offset
-+                                 + off2);
-+                   if (IS_TLS_LD(tls_type))
-+                     {
-+                       /* For LD, offset should be 0 */
-+                       *offp |= 1;
-+                       bfd_put_32 (output_bfd, 0,
-+                                   htab->elf.sgot->contents + off2);
-+                     }
-+                   else if (IS_TLS_GD(tls_type))
-+                     {
-+                       *offp |= 1;
-+                       static_value -= dtprel_base(info);
-+                       if (need_relocs)
-+                         microblaze_elf_output_dynamic_relocation
-+                           (output_bfd,
-+                            htab->elf.srelgot,
-+                            htab->elf.srelgot->reloc_count++,
-+                            /* symindex= */ indx, R_MICROBLAZE_TLSDTPREL32,
-+                            got_offset, indx ? 0 : static_value);
-+                       else
-+                         bfd_put_32 (output_bfd, static_value,
-+                                     htab->elf.sgot->contents + off2);
-+                     }
-+                   else
-+                     {
-+                       bfd_put_32 (output_bfd, static_value,
-+                                   htab->elf.sgot->contents + off2);
-+
-+                       /* Relocs for dyn symbols generated by
-+                          finish_dynamic_symbols */
-+                       if (bfd_link_pic (info) && h == NULL)
-+                         {
-+                           *offp |= 1;
-+                           microblaze_elf_output_dynamic_relocation
-+                             (output_bfd,
-+                              htab->elf.srelgot,
-+                              htab->elf.srelgot->reloc_count++,
-+                              /* symindex= */ indx, R_MICROBLAZE_REL,
-+                              got_offset, static_value);
-+                         }
-+                     }
-+                 }
-+
-+               /* 4. Fixup Relocation with GOT offset value
-+                     Compute relative address of GOT entry for applying
-+                     the current relocation */
-+               relocation = htab->elf.sgot->output_section->vma
-+                            + htab->elf.sgot->output_offset
-+                            + off
-+                            - htab->elf.sgotplt->output_section->vma
-+                            - htab->elf.sgotplt->output_offset;
-+
-+               /* Apply Current Relocation */
-+               bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                           contents + offset + endian);
-+               bfd_put_16 (input_bfd, relocation & 0xffff,
-+                           contents + offset + endian + INST_WORD_SIZE);
-+
-+               unresolved_reloc = false;
-+               break;
-+             }
-+
-+           case (int) R_MICROBLAZE_GOTOFF_64:
-+             {
-+               bfd_vma immediate;
-+               unsigned short lo, high;
-+               relocation += addend;
-+               relocation -= (htab->elf.sgotplt->output_section->vma
-+                              + htab->elf.sgotplt->output_offset);
-+               /* Write this value into correct location.  */
-+               immediate = relocation;
-+               lo = immediate & 0x0000ffff;
-+               high = (immediate >> 16) & 0x0000ffff;
-+               bfd_put_16 (input_bfd, high, contents + offset + endian);
-+               bfd_put_16 (input_bfd, lo,
-+                           contents + offset + INST_WORD_SIZE + endian);
-+               break;
-+             }
-+
-+           case (int) R_MICROBLAZE_GOTOFF_32:
-+             {
-+               relocation += addend;
-+               relocation -= (htab->elf.sgotplt->output_section->vma
-+                              + htab->elf.sgotplt->output_offset);
-+               /* Write this value into correct location.  */
-+               bfd_put_32 (input_bfd, relocation, contents + offset);
-+               break;
-+             }
-+
-+           case (int) R_MICROBLAZE_TLSDTPREL64:
-+             relocation += addend;
-+             relocation -= dtprel_base(info);
-+             bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                         contents + offset + endian);
-+             bfd_put_16 (input_bfd, relocation & 0xffff,
-+                         contents + offset + endian + INST_WORD_SIZE);
-+             break;
-+           case (int) R_MICROBLAZE_TEXTREL_64:
-+           case (int) R_MICROBLAZE_TEXTREL_32_LO:
-+           case (int) R_MICROBLAZE_64_PCREL :
-+           case (int) R_MICROBLAZE_64:
-+           case (int) R_MICROBLAZE_32:
-+             {
-+               /* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
-+                  from removed linkonce sections, or sections discarded by
-+                  a linker script.  */
-+               if (r_symndx == STN_UNDEF || (input_section->flags & SEC_ALLOC) == 0)
-+                 {
-+                   relocation += addend;
-+                   if (r_type == R_MICROBLAZE_32)// || r_type == R_MICROBLAZE_IMML_64)
-+                     bfd_put_32 (input_bfd, relocation, contents + offset);
-+                   else
-+                     {
-+                       if (r_type == R_MICROBLAZE_64_PCREL)
-+                         relocation -= (input_section->output_section->vma
-+                                        + input_section->output_offset
-+                                        + offset + INST_WORD_SIZE);
-+                       else if (r_type == R_MICROBLAZE_TEXTREL_64
-+                                || r_type == R_MICROBLAZE_TEXTREL_32_LO)
-+                         relocation -= input_section->output_section->vma;
-+
-+                       if (r_type == R_MICROBLAZE_TEXTREL_32_LO)
-+                         bfd_put_16 (input_bfd, relocation & 0xffff,
-+                                     contents + offset + endian);
-+
-+                       else
-+                         {
-+                           bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                                   contents + offset + endian);
-+                           bfd_put_16 (input_bfd, relocation & 0xffff,
-+                                   contents + offset + endian + INST_WORD_SIZE);
-+                     }
-+                   }
-+                   break;
-+                 }
-+
-+               if ((bfd_link_pic (info)
-+                    && (h == NULL
-+                        || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-+                            && !resolved_to_zero)
-+                        || h->root.type != bfd_link_hash_undefweak)
-+                    && (!howto->pc_relative
-+                        || (h != NULL
-+                            && h->dynindx != -1
-+                            && (!info->symbolic
-+                                || !h->def_regular))))
-+                   || (!bfd_link_pic (info)
-+                       && h != NULL
-+                       && h->dynindx != -1
-+                       && !h->non_got_ref
-+                       && ((h->def_dynamic
-+                            && !h->def_regular)
-+                           || h->root.type == bfd_link_hash_undefweak
-+                           || h->root.type == bfd_link_hash_undefined)))
-+                 {
-+                   Elf_Internal_Rela outrel;
-+                   bfd_byte *loc;
-+                   bool skip;
-+
-+                   /* When generating a shared object, these relocations
-+                      are copied into the output file to be resolved at run
-+                      time.  */
-+
-+                   BFD_ASSERT (sreloc != NULL);
-+
-+                   skip = false;
-+
-+                   outrel.r_offset =
-+                     _bfd_elf_section_offset (output_bfd, info, input_section,
-+                                              rel->r_offset);
-+                   if (outrel.r_offset == (bfd_vma) -1)
-+                     skip = true;
-+                   else if (outrel.r_offset == (bfd_vma) -2)
-+                     skip = true;
-+                   outrel.r_offset += (input_section->output_section->vma
-+                                       + input_section->output_offset);
-+
-+                   if (skip)
-+                     memset (&outrel, 0, sizeof outrel);
-+                   /* h->dynindx may be -1 if the symbol was marked to
-+                      become local.  */
-+                   else if (h != NULL
-+                            && ((! info->symbolic && h->dynindx != -1)
-+                                || !h->def_regular))
-+                     {
-+                       BFD_ASSERT (h->dynindx != -1);
-+                       outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
-+                       outrel.r_addend = addend;
-+                     }
-+                   else
-+                     {
-+                       if (r_type == R_MICROBLAZE_32)
-+                         {
-+                           outrel.r_info = ELF64_R_INFO (0, R_MICROBLAZE_REL);
-+                           outrel.r_addend = relocation + addend;
-+                         }
-+                       else
-+                         {
-+                           BFD_FAIL ();
-+                           _bfd_error_handler
-+                             (_("%pB: probably compiled without -fPIC?"),
-+                              input_bfd);
-+                           bfd_set_error (bfd_error_bad_value);
-+                           return false;
-+                         }
-+                     }
-+
-+                   loc = sreloc->contents;
-+                   loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
-+                   bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
-+                   break;
-+                 }
-+               else
-+                 {
-+                   relocation += addend;
-+                   if (r_type == R_MICROBLAZE_32)
-+                     bfd_put_32 (input_bfd, relocation, contents + offset);
-+                   else
-+                     {
-+                       if (r_type == R_MICROBLAZE_64_PCREL)
-+                         relocation -= (input_section->output_section->vma
-+                                        + input_section->output_offset
-+                                        + offset + INST_WORD_SIZE);
-+                       else if (r_type == R_MICROBLAZE_TEXTREL_64
-+                                || r_type == R_MICROBLAZE_TEXTREL_32_LO)
-+                         relocation -= input_section->output_section->vma;
-+
-+                       if (r_type == R_MICROBLAZE_TEXTREL_32_LO)
-+                         {
-+                            bfd_put_16 (input_bfd, relocation & 0xffff,
-+                                        contents + offset + endian);
-+                         }
-+                       else
-+                         {
-+                           bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                                       contents + offset + endian);
-+                           bfd_put_16 (input_bfd, relocation & 0xffff,
-+                                       contents + offset + endian
-+                                       + INST_WORD_SIZE);
-+                         }
-+                   }
-+                   break;
-+                 }
-+             }
-+
-+           default :
-+             r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-+                                           contents, offset,
-+                                           relocation, addend);
-+             break;
-+           }
-+       }
-+
-+    check_reloc:
-+
-+      if (r != bfd_reloc_ok)
-+       {
-+         /* FIXME: This should be generic enough to go in a utility.  */
-+         const char *name;
-+
-+         if (h != NULL)
-+           name = h->root.root.string;
-+         else
-+           {
-+             name = (bfd_elf_string_from_elf_section
-+                     (input_bfd, symtab_hdr->sh_link, sym->st_name));
-+             if (name == NULL || *name == '\0')
-+               name = bfd_section_name (sec);
-+           }
-+
-+         if (errmsg != NULL)
-+           goto common_error;
-+
-+         switch (r)
-+           {
-+           case bfd_reloc_overflow:
-+             (*info->callbacks->reloc_overflow)
-+               (info, (h ? &h->root : NULL), name, howto->name,
-+                (bfd_vma) 0, input_bfd, input_section, offset);
-+             break;
-+
-+           case bfd_reloc_undefined:
-+             (*info->callbacks->undefined_symbol)
-+               (info, name, input_bfd, input_section, offset, true);
-+             break;
-+
-+           case bfd_reloc_outofrange:
-+             errmsg = _("internal error: out of range error");
-+             goto common_error;
-+
-+           case bfd_reloc_notsupported:
-+             errmsg = _("internal error: unsupported relocation error");
-+             goto common_error;
-+
-+           case bfd_reloc_dangerous:
-+             errmsg = _("internal error: dangerous error");
-+             goto common_error;
-+
-+           default:
-+             errmsg = _("internal error: unknown error");
-+             /* Fall through.  */
-+           common_error:
-+             (*info->callbacks->warning) (info, errmsg, name, input_bfd,
-+                                          input_section, offset);
-+             break;
-+           }
-+       }
-+    }
-+
-+  return ret;
-+}
-+
-+/* Calculate fixup value for reference.  */
-+
-+static size_t
-+calc_fixup (bfd_vma start, bfd_vma size, asection *sec)
-+{
-+  bfd_vma end = start + size;
-+  size_t i, fixup = 0;
-+  struct _microblaze_elf_section_data *sdata;
-+
-+  if (sec == NULL || (sdata = microblaze_elf_section_data (sec)) == NULL)
-+    return 0;
-+
-+  /* Look for addr in relax table, total fixup value.  */
-+  for (i = 0; i < sdata->relax_count; i++)
-+    {
-+      if (end <= sdata->relax[i].addr)
-+       break;
-+      if (end != start && start > sdata->relax[i].addr)
-+       continue;
-+      fixup += sdata->relax[i].size;
-+    }
-+  return fixup;
-+}
-+
-+/* Read-modify-write into the bfd, an immediate value into appropriate fields of
-+   a 32-bit instruction.  */
-+static void
-+microblaze_bfd_write_imm_value_32 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
-+{
-+    unsigned long instr = bfd_get_32 (abfd, bfd_addr);
-+    instr &= ~0x0000ffff;
-+    instr |= (val & 0x0000ffff);
-+    bfd_put_32 (abfd, instr, bfd_addr);
-+}
-+
-+/* Read-modify-write into the bfd, an immediate value into appropriate fields of
-+   two consecutive 32-bit instructions.  */
-+static void
-+microblaze_bfd_write_imm_value_64 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
-+{
-+    unsigned long instr_hi;
-+    unsigned long instr_lo;
-+
-+    instr_hi = bfd_get_32 (abfd, bfd_addr);
-+    instr_hi &= ~0x0000ffff;
-+    instr_hi |= ((val >> 16) & 0x0000ffff);
-+    bfd_put_32 (abfd, instr_hi, bfd_addr);
-+
-+    instr_lo = bfd_get_32 (abfd, bfd_addr + INST_WORD_SIZE);
-+    instr_lo &= ~0x0000ffff;
-+    instr_lo |= (val & 0x0000ffff);
-+    bfd_put_32 (abfd, instr_lo, bfd_addr + INST_WORD_SIZE);
-+}
-+
-+static bool
-+microblaze_elf_relax_section (bfd *abfd,
-+                             asection *sec,
-+                             struct bfd_link_info *link_info,
-+                             bool *again)
-+{
-+  Elf_Internal_Shdr *symtab_hdr;
-+  Elf_Internal_Rela *internal_relocs;
-+  Elf_Internal_Rela *free_relocs = NULL;
-+  Elf_Internal_Rela *irel, *irelend;
-+  bfd_byte *contents = NULL;
-+  bfd_byte *free_contents = NULL;
-+  int rel_count;
-+  unsigned int shndx;
-+  size_t i, sym_index;
-+  asection *o;
-+  struct elf_link_hash_entry *sym_hash;
-+  Elf_Internal_Sym *isymbuf, *isymend;
-+  Elf_Internal_Sym *isym;
-+  size_t symcount;
-+  size_t offset;
-+  bfd_vma src, dest;
-+  struct _microblaze_elf_section_data *sdata;
-+
-+  /* We only do this once per section.  We may be able to delete some code
-+     by running multiple passes, but it is not worth it.  */
-+  *again = false;
-+
-+  /* Only do this for a text section.  */
-+  if (bfd_link_relocatable (link_info)
-+      || (sec->flags & SEC_RELOC) == 0
-+      || (sec->flags & SEC_CODE) == 0
-+      || sec->reloc_count == 0
-+      || (sdata = microblaze_elf_section_data (sec)) == NULL)
-+    return true;
-+
-+  BFD_ASSERT ((sec->size > 0) || (sec->rawsize > 0));
-+
-+  /* If this is the first time we have been called for this section,
-+     initialize the cooked size.  */
-+  if (sec->size == 0)
-+    sec->size = sec->rawsize;
-+
-+  /* Get symbols for this section.  */
-+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
-+  symcount =  symtab_hdr->sh_size / sizeof (Elf64_External_Sym);
-+  if (isymbuf == NULL)
-+    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr, symcount,
-+                                   0, NULL, NULL, NULL);
-+  BFD_ASSERT (isymbuf != NULL);
-+
-+  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
-+  if (internal_relocs == NULL)
-+    goto error_return;
-+  if (! link_info->keep_memory)
-+    free_relocs = internal_relocs;
-+
-+  sdata->relax_count = 0;
-+  sdata->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
-+                                                   * sizeof (*sdata->relax));
-+  if (sdata->relax == NULL)
-+    goto error_return;
-+
-+  irelend = internal_relocs + sec->reloc_count;
-+  rel_count = 0;
-+  for (irel = internal_relocs; irel < irelend; irel++, rel_count++)
-+    {
-+      bfd_vma symval;
-+      if ((ELF64_R_TYPE (irel->r_info) != (int) R_MICROBLAZE_64_PCREL)
-+         && (ELF64_R_TYPE (irel->r_info) != (int) R_MICROBLAZE_64 )
-+&& (ELF64_R_TYPE (irel->r_info) != (int) R_MICROBLAZE_TEXTREL_64))
-+       continue; /* Can't delete this reloc.  */
-+
-+      /* Get the section contents.  */
-+      if (contents == NULL)
-+       {
-+         if (elf_section_data (sec)->this_hdr.contents != NULL)
-+           contents = elf_section_data (sec)->this_hdr.contents;
-+         else
-+           {
-+             contents = (bfd_byte *) bfd_malloc (sec->size);
-+             if (contents == NULL)
-+               goto error_return;
-+             free_contents = contents;
-+
-+             if (!bfd_get_section_contents (abfd, sec, contents,
-+                                            (file_ptr) 0, sec->size))
-+               goto error_return;
-+              elf_section_data (sec)->this_hdr.contents = contents;
-+           }
-+       }
-+
-+      /* Get the value of the symbol referred to by the reloc.  */
-+      if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-+       {
-+         /* A local symbol.  */
-+         asection *sym_sec;
-+
-+         isym = isymbuf + ELF64_R_SYM (irel->r_info);
-+          if (isym->st_shndx == SHN_UNDEF)
-+           sym_sec = bfd_und_section_ptr;
-+         else if (isym->st_shndx == SHN_ABS)
-+           sym_sec = bfd_abs_section_ptr;
-+         else if (isym->st_shndx == SHN_COMMON)
-+           sym_sec = bfd_com_section_ptr;
-+         else
-+           sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
-+
-+         symval = _bfd_elf_rela_local_sym (abfd, isym, &sym_sec, irel);
-+       }
-+      else
-+       {
-+         unsigned long indx;
-+         struct elf_link_hash_entry *h;
-+
-+         indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info;
-+         h = elf_sym_hashes (abfd)[indx];
-+         BFD_ASSERT (h != NULL);
-+
-+          if (h->root.type != bfd_link_hash_defined
-+             && h->root.type != bfd_link_hash_defweak)
-+           /* This appears to be a reference to an undefined
-+              symbol.  Just ignore it--it will be caught by the
-+              regular reloc processing.  */
-+           continue;
-+
-+         symval = (h->root.u.def.value
-+                   + h->root.u.def.section->output_section->vma
-+                   + h->root.u.def.section->output_offset);
-+       }
-+
-+      /* If this is a PC-relative reloc, subtract the instr offset from
-+         the symbol value.  */
-+      if (ELF64_R_TYPE (irel->r_info) == (int) R_MICROBLAZE_64_PCREL)
-+       {
-+         symval = symval + irel->r_addend
-+           - (irel->r_offset
-+              + sec->output_section->vma
-+              + sec->output_offset);
-+        }
-+      else if (ELF64_R_TYPE (irel->r_info) == (int) R_MICROBLAZE_TEXTREL_64)
-+       {
-+         symval = symval + irel->r_addend - (sec->output_section->vma);
-+       }
-+      else
-+       symval += irel->r_addend;
-+
-+      if ((symval & 0xffff8000) == 0
-+         || (symval & 0xffff8000) == 0xffff8000)
-+       {
-+         /* We can delete this instruction.  */
-+         sdata->relax[sdata->relax_count].addr = irel->r_offset;
-+         sdata->relax[sdata->relax_count].size = INST_WORD_SIZE;
-+         sdata->relax_count++;
-+
-+         /* Rewrite relocation type.  */
-+          switch ((enum elf_microblaze_reloc_type) ELF64_R_TYPE (irel->r_info))
-+           {
-+           case R_MICROBLAZE_64_PCREL:
-+             irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-+                                           (int) R_MICROBLAZE_32_PCREL_LO);
-+             break;
-+           case R_MICROBLAZE_64:
-+              irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-+                                           (int) R_MICROBLAZE_32_LO);
-+             break;
-+           case R_MICROBLAZE_TEXTREL_64:
-+             irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-+                                          (int) R_MICROBLAZE_TEXTREL_32_LO);
-+             break;
-+           default:
-+             /* Cannot happen.  */
-+             BFD_ASSERT (false);
-+            }
-+        }
-+    } /* Loop through all relocations.  */
-+
-+  /* Loop through the relocs again, and see if anything needs to change.  */
-+  if (sdata->relax_count > 0)
-+    {
-+      shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-+      rel_count = 0;
-+      sdata->relax[sdata->relax_count].addr = sec->size;
-+
-+      for (irel = internal_relocs; irel < irelend; irel++, rel_count++)
-+        {
-+         bfd_vma nraddr;
-+
-+          /* Get the new reloc address.  */
-+         nraddr = irel->r_offset - calc_fixup (irel->r_offset, 0, sec);
-+          switch ((enum elf_microblaze_reloc_type) ELF64_R_TYPE (irel->r_info))
-+           {
-+           default:
-+             break;
-+           case R_MICROBLAZE_64_PCREL:
-+             break;
-+           case R_MICROBLAZE_64:
-+           case R_MICROBLAZE_32_LO:
-+             /* If this reloc is against a symbol defined in this
-+                section, we must check the addend to see it will put the value in
-+                range to be adjusted, and hence must be changed.  */
-+             if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-+               {
-+                 isym = isymbuf + ELF64_R_SYM (irel->r_info);
-+                 /* Only handle relocs against .text.  */
-+                 if (isym->st_shndx == shndx
-+                     && ELF64_ST_TYPE (isym->st_info) == STT_SECTION)
-+                   irel->r_addend -= calc_fixup (irel->r_addend, 0, sec);
-+               }
-+             break;
-+           case R_MICROBLAZE_IMML_64:
-+             {
-+               /* This was a PC-relative instruction that was
-+                  completely resolved.  */
-+               int sfix, efix;
-+            unsigned int val;
-+               bfd_vma target_address;
-+               target_address = irel->r_addend + irel->r_offset;
-+               sfix = calc_fixup (irel->r_offset, 0, sec);
-+               efix = calc_fixup (target_address, 0, sec);
-+
-+            /* Validate the in-band val.  */
-+            val = bfd_get_32 (abfd, contents + irel->r_offset);
-+            if (val != irel->r_addend && ELF64_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
-+               fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
-+            }
-+               irel->r_addend -= (efix - sfix);
-+               /* Should use HOWTO.  */
-+               microblaze_bfd_write_imm_value_64 (abfd, contents + irel->r_offset,
-+                                                  irel->r_addend);
-+             }
-+             break;
-+           case R_MICROBLAZE_NONE:
-+           case R_MICROBLAZE_32_NONE:
-+             {
-+               /* This was a PC-relative instruction that was
-+                  completely resolved.  */
-+               size_t sfix, efix;
-+                unsigned int val;
-+               bfd_vma target_address;
-+               target_address = irel->r_addend + irel->r_offset;
-+               sfix = calc_fixup (irel->r_offset, 0, sec);
-+               efix = calc_fixup (target_address, 0, sec);
-+
-+            /* Validate the in-band val.  */
-+            val = bfd_get_32 (abfd, contents + irel->r_offset);
-+            if (val != irel->r_addend && ELF64_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
-+               fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
-+            }
-+               irel->r_addend -= (efix - sfix);
-+               /* Should use HOWTO.  */
-+               microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset,
-+                                                  irel->r_addend);
-+             }
-+             break;
-+           case R_MICROBLAZE_64_NONE:
-+             {
-+               /* This was a PC-relative 64-bit instruction that was
-+                  completely resolved.  */
-+               size_t sfix, efix;
-+               bfd_vma target_address;
-+               target_address = irel->r_addend + irel->r_offset + INST_WORD_SIZE;
-+               sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, 0, sec);
-+               efix = calc_fixup (target_address, 0, sec);
-+               irel->r_addend -= (efix - sfix);
-+    microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset
-+                                      + INST_WORD_SIZE, irel->r_addend);
-+             }
-+             break;
-+           }
-+          irel->r_offset = nraddr;
-+        } /* Change all relocs in this section.  */
-+
-+      /* Look through all other sections.  */
-+      for (o = abfd->sections; o != NULL; o = o->next)
-+        {
-+          Elf_Internal_Rela *irelocs;
-+          Elf_Internal_Rela *irelscan, *irelscanend;
-+          bfd_byte *ocontents;
-+
-+          if (o == sec
-+              || (o->flags & SEC_RELOC) == 0
-+              || o->reloc_count == 0)
-+            continue;
-+
-+          /* We always cache the relocs.  Perhaps, if info->keep_memory is
-+             false, we should free them, if we are permitted to.  */
-+
-+          irelocs = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL, true);
-+          if (irelocs == NULL)
-+            goto error_return;
-+
-+          ocontents = NULL;
-+          irelscanend = irelocs + o->reloc_count;
-+          for (irelscan = irelocs; irelscan < irelscanend; irelscan++)
-+            {
-+              if (1 && ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_NONE)
-+                {
-+                  unsigned int val;
-+
-+                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
-+
-+                  /* hax: We only do the following fixup for debug location lists.  */
-+                  if (strcmp(".debug_loc", o->name))
-+                    continue;
-+
-+                  /* This was a PC-relative instruction that was completely resolved.  */
-+                  if (ocontents == NULL)
-+                    {
-+                     if (elf_section_data (o)->this_hdr.contents != NULL)
-+                         ocontents = elf_section_data (o)->this_hdr.contents;
-+                     else
-+                       {
-+                         /* We always cache the section contents.
-+                            Perhaps, if info->keep_memory is false, we
-+                            should free them, if we are permitted to.  */
-+
-+                         if (o->rawsize == 0)
-+                             o->rawsize = o->size;
-+                         ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                         if (ocontents == NULL)
-+                             goto error_return;
-+                         if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                         (file_ptr) 0,
-+                                                         o->rawsize))
-+                              goto error_return;
-+                         elf_section_data (o)->this_hdr.contents = ocontents;
-+                       }
-+                   }
-+
-+                  val = bfd_get_32 (abfd, ocontents + irelscan->r_offset);
-+                  if (val != irelscan->r_addend) {
-+                    fprintf(stderr, "%d: CORRUPT relax reloc! %x %lx\n", __LINE__, val, irelscan->r_addend);
-+                  }
-+                  irelscan->r_addend -= calc_fixup (irelscan->r_addend, 0, sec);
-+                  microblaze_bfd_write_imm_value_32 (abfd, ocontents + irelscan->r_offset,
-+                                                     irelscan->r_addend);
-+              }
-+              if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
-+                {
-+                 isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
-+
-+                  /* Look at the reloc only if the value has been resolved.  */
-+                  if (isym->st_shndx == shndx
-+                      && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
-+                    {
-+                      if (ocontents == NULL)
-+                        {
-+                          if (elf_section_data (o)->this_hdr.contents != NULL)
-+                            ocontents = elf_section_data (o)->this_hdr.contents;
-+                          else
-+                            {
-+                              /* We always cache the section contents.
-+                                 Perhaps, if info->keep_memory is false, we
-+                                 should free them, if we are permitted to.  */
-+                             if (o->rawsize == 0)
-+                               o->rawsize = o->size;
-+                              ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                              if (ocontents == NULL)
-+                                goto error_return;
-+                              if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                             (file_ptr) 0,
-+                                                            o->rawsize))
-+                                goto error_return;
-+                              elf_section_data (o)->this_hdr.contents = ocontents;
-+                            }
-+
-+                        }
-+                     irelscan->r_addend -= calc_fixup (irelscan->r_addend, 0, sec);
-+                    }
-+                 else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_SYM_OP_SYM)
-+                   {
-+                     isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
-+
-+                     /* Look at the reloc only if the value has been resolved.  */
-+                     if (ocontents == NULL)
-+                       {
-+                         if (elf_section_data (o)->this_hdr.contents != NULL)
-+                           ocontents = elf_section_data (o)->this_hdr.contents;
-+                         else
-+                           {
-+                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is false, we
-+                                should free them, if we are permitted to.  */
-+
-+                             if (o->rawsize == 0)
-+                               o->rawsize = o->size;
-+                             ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                             if (ocontents == NULL)
-+                               goto error_return;
-+                             if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                            (file_ptr) 0,
-+                                                            o->rawsize))
-+                               goto error_return;
-+                             elf_section_data (o)->this_hdr.contents = ocontents;
-+                           }
-+                       }
-+              irelscan->r_addend -= calc_fixup (irelscan->r_addend
-+                                                       + isym->st_value,
-+                                                       0,
-+                                                       sec);
-+                   }
-+               }
-+             else if ((ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_PCREL_LO)
-+                      || (ELF32_R_TYPE (irelscan->r_info)
-+                                  == (int) R_MICROBLAZE_32_LO)
-+                      || (ELF32_R_TYPE (irelscan->r_info)
-+                                  == (int) R_MICROBLAZE_TEXTREL_32_LO))
-+               {
-+                 isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
-+
-+                 /* Look at the reloc only if the value has been resolved.  */
-+                 if (isym->st_shndx == shndx
-+                     && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
-+                   {
-+                     bfd_vma immediate;
-+                     bfd_vma target_address;
-+
-+                     if (ocontents == NULL)
-+                       {
-+                         if (elf_section_data (o)->this_hdr.contents != NULL)
-+                           ocontents = elf_section_data (o)->this_hdr.contents;
-+                         else
-+                           {
-+                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is false, we
-+                                should free them, if we are permitted to.  */
-+                             if (o->rawsize == 0)
-+                               o->rawsize = o->size;
-+                             ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                             if (ocontents == NULL)
-+                               goto error_return;
-+                             if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                            (file_ptr) 0,
-+                                                            o->rawsize))
-+                               goto error_return;
-+                             elf_section_data (o)->this_hdr.contents = ocontents;
-+                           }
-+                       }
-+
-+                     unsigned long instr = bfd_get_32 (abfd, ocontents + irelscan->r_offset);
-+                     immediate = instr & 0x0000ffff;
-+                     target_address = immediate;
-+                     offset = calc_fixup (target_address, 0, sec);
-+                     immediate -= offset;
-+                     irelscan->r_addend -= offset;
-+          microblaze_bfd_write_imm_value_32 (abfd, ocontents + irelscan->r_offset,
-+                                             irelscan->r_addend);
-+                   }
-+               }
-+
-+             if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64
-+          || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_TEXTREL_64))
-+               {
-+                 isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
-+
-+                 /* Look at the reloc only if the value has been resolved.  */
-+                 if (isym->st_shndx == shndx
-+                     && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
-+                   {
-+                     if (ocontents == NULL)
-+                       {
-+                         if (elf_section_data (o)->this_hdr.contents != NULL)
-+                           ocontents = elf_section_data (o)->this_hdr.contents;
-+                         else
-+                           {
-+                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is false, we
-+                                should free them, if we are permitted to.  */
-+
-+                             if (o->rawsize == 0)
-+                               o->rawsize = o->size;
-+                             ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                             if (ocontents == NULL)
-+                               goto error_return;
-+                             if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                            (file_ptr) 0,
-+                                                            o->rawsize))
-+                               goto error_return;
-+                             elf_section_data (o)->this_hdr.contents = ocontents;
-+                           }
-+                       }
-+                     offset = calc_fixup (irelscan->r_addend, 0, sec);
-+                     irelscan->r_addend -= offset;
-+                   }
-+               }
-+             else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
-+               {
-+                 isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
-+
-+                 /* Look at the reloc only if the value has been resolved.  */
-+                 if (isym->st_shndx == shndx
-+                     && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
-+                   {
-+                     bfd_vma immediate;
-+                     bfd_vma target_address;
-+
-+                     if (ocontents == NULL)
-+                       {
-+                         if (elf_section_data (o)->this_hdr.contents != NULL)
-+                           ocontents = elf_section_data (o)->this_hdr.contents;
-+                         else
-+                           {
-+                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is false, we
-+                                should free them, if we are permitted to.  */
-+                             if (o->rawsize == 0)
-+                               o->rawsize = o->size;
-+                             ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
-+                             if (ocontents == NULL)
-+                               goto error_return;
-+                             if (!bfd_get_section_contents (abfd, o, ocontents,
-+                                                            (file_ptr) 0,
-+                                                            o->rawsize))
-+                               goto error_return;
-+                             elf_section_data (o)->this_hdr.contents = ocontents;
-+                           }
-+                       }
-+          unsigned long instr_hi =  bfd_get_32 (abfd, ocontents
-+                                                + irelscan->r_offset);
-+          unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
-+                                                + irelscan->r_offset
-+                                                + INST_WORD_SIZE);
-+          immediate = (instr_hi & 0x0000ffff) << 16;
-+          immediate |= (instr_lo & 0x0000ffff);
-+                     target_address = immediate;
-+                     offset = calc_fixup (target_address, 0, sec);
-+                     immediate -= offset;
-+                     irelscan->r_addend -= offset;
-+          microblaze_bfd_write_imm_value_64 (abfd, ocontents
-+                                             + irelscan->r_offset, immediate);
-+                   }
-+               }
-+            }
-+        }
-+
-+      /* Adjust the local symbols defined in this section.  */
-+      isymend = isymbuf + symtab_hdr->sh_info;
-+      for (isym = isymbuf; isym < isymend; isym++)
-+        {
-+          if (isym->st_shndx == shndx)
-+            {
-+              isym->st_value -= calc_fixup (isym->st_value, 0, sec);
-+              if (isym->st_size)
-+                isym->st_size -= calc_fixup (isym->st_value, isym->st_size, sec);
-+            }
-+        }
-+
-+      /* Now adjust the global symbols defined in this section.  */
-+      isym = isymbuf + symtab_hdr->sh_info;
-+      symcount =  (symtab_hdr->sh_size / sizeof (Elf64_External_Sym)) - symtab_hdr->sh_info;
-+      for (sym_index = 0; sym_index < symcount; sym_index++)
-+        {
-+          sym_hash = elf_sym_hashes (abfd)[sym_index];
-+          if ((sym_hash->root.type == bfd_link_hash_defined
-+                  || sym_hash->root.type == bfd_link_hash_defweak)
-+              && sym_hash->root.u.def.section == sec)
-+            {
-+              sym_hash->root.u.def.value -= calc_fixup (sym_hash->root.u.def.value,
-+                                                        0, sec);
-+              if (sym_hash->size)
-+                sym_hash->size -= calc_fixup (sym_hash->root.u.def.value,
-+                                              sym_hash->size, sec);
-+            }
-+        }
-+
-+      /* Physically move the code and change the cooked size.  */
-+      dest = sdata->relax[0].addr;
-+      for (i = 0; i < sdata->relax_count; i++)
-+       {
-+         size_t len;
-+         src = sdata->relax[i].addr + sdata->relax[i].size;
-+         len = (sdata->relax[i+1].addr - sdata->relax[i].addr
-+                - sdata->relax[i].size);
-+
-+         memmove (contents + dest, contents + src, len);
-+         sec->size -= sdata->relax[i].size;
-+         dest += len;
-+       }
-+
-+      elf_section_data (sec)->relocs = internal_relocs;
-+      free_relocs = NULL;
-+
-+      elf_section_data (sec)->this_hdr.contents = contents;
-+      free_contents = NULL;
-+
-+      symtab_hdr->contents = (bfd_byte *) isymbuf;
-+    }
-+
-+  free (free_relocs);
-+  free_relocs = NULL;
-+
-+  if (free_contents != NULL)
-+    {
-+      if (!link_info->keep_memory)
-+       free (free_contents);
-+      else
-+       /* Cache the section contents for elf_link_input_bfd.  */
-+       elf_section_data (sec)->this_hdr.contents = contents;
-+      free_contents = NULL;
-+    }
-+
-+  if (sdata->relax_count == 0)
-+    {
-+      *again = false;
-+      free (sdata->relax);
-+      sdata->relax = NULL;
-+    }
-+  else
-+    *again = true;
-+  return true;
-+
-+ error_return:
-+  free (free_relocs);
-+  free (free_contents);
-+  free (sdata->relax);
-+  sdata->relax = NULL;
-+  sdata->relax_count = 0;
-+  return false;
-+}
-+
-+/* Return the section that should be marked against GC for a given
-+   relocation.  */
-+
-+static asection *
-+microblaze_elf_gc_mark_hook (asection *sec,
-+                            struct bfd_link_info * info,
-+                            Elf_Internal_Rela * rel,
-+                            struct elf_link_hash_entry * h,
-+                            Elf_Internal_Sym * sym)
-+{
-+  if (h != NULL)
-+    switch (ELF64_R_TYPE (rel->r_info))
-+      {
-+      case R_MICROBLAZE_GNU_VTINHERIT:
-+      case R_MICROBLAZE_GNU_VTENTRY:
-+       return NULL;
-+      }
-+
-+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
-+}
-+
-+/* PIC support.  */
-+
-+#define PLT_ENTRY_SIZE 16
-+
-+#define PLT_ENTRY_WORD_0  0xb0000000          /* "imm 0".  */
-+#define PLT_ENTRY_WORD_1  0xe9940000          /* "lwi r12,r20,0" - relocated to lwi r12,r20,func@GOT.  */
-+#define PLT_ENTRY_WORD_1_NOPIC  0xe9800000    /* "lwi r12,r0,0" - non-PIC object.  */
-+#define PLT_ENTRY_WORD_2  0x98186000          /* "brad r12".  */
-+#define PLT_ENTRY_WORD_3  0x80000000          /* "nop".  */
-+
-+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
-+   shortcuts to them in our hash table.  */
-+
-+static bool
-+update_local_sym_info (bfd *abfd,
-+                      Elf_Internal_Shdr *symtab_hdr,
-+                      unsigned long r_symndx,
-+                      unsigned int tls_type)
-+{
-+  bfd_signed_vma *local_got_refcounts = elf_local_got_refcounts (abfd);
-+  unsigned char *local_got_tls_masks;
-+
-+  if (local_got_refcounts == NULL)
-+    {
-+      bfd_size_type size = symtab_hdr->sh_info;
-+
-+      size *= (sizeof (*local_got_refcounts) + sizeof (*local_got_tls_masks));
-+      local_got_refcounts = bfd_zalloc (abfd, size);
-+      if (local_got_refcounts == NULL)
-+        return false;
-+      elf_local_got_refcounts (abfd) = local_got_refcounts;
-+    }
-+
-+  local_got_tls_masks =
-+         (unsigned char *) (local_got_refcounts + symtab_hdr->sh_info);
-+  local_got_tls_masks[r_symndx] |= tls_type;
-+  local_got_refcounts[r_symndx] += 1;
-+
-+  return true;
-+}
-+/* Look through the relocs for a section during the first phase.  */
-+
-+static bool
-+microblaze_elf_check_relocs (bfd * abfd,
-+                            struct bfd_link_info * info,
-+                            asection * sec,
-+                            const Elf_Internal_Rela * relocs)
-+{
-+  Elf_Internal_Shdr *           symtab_hdr;
-+  struct elf_link_hash_entry ** sym_hashes;
-+  struct elf_link_hash_entry ** sym_hashes_end;
-+  const Elf_Internal_Rela *     rel;
-+  const Elf_Internal_Rela *     rel_end;
-+  struct elf64_mb_link_hash_table *htab;
-+  asection *sreloc = NULL;
-+
-+  if (bfd_link_relocatable (info))
-+    return true;
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
-+  sym_hashes = elf_sym_hashes (abfd);
-+  sym_hashes_end = sym_hashes + symtab_hdr->sh_size / sizeof (Elf64_External_Sym);
-+  if (!elf_bad_symtab (abfd))
-+    sym_hashes_end -= symtab_hdr->sh_info;
-+
-+  rel_end = relocs + sec->reloc_count;
-+
-+  for (rel = relocs; rel < rel_end; rel++)
-+    {
-+      unsigned int r_type;
-+      struct elf_link_hash_entry * h;
-+      unsigned long r_symndx;
-+      unsigned char tls_type = 0;
-+
-+      r_symndx = ELF64_R_SYM (rel->r_info);
-+      r_type = ELF64_R_TYPE (rel->r_info);
-+
-+      if (r_symndx < symtab_hdr->sh_info)
-+        h = NULL;
-+      else
-+       {
-+         h = sym_hashes [r_symndx - symtab_hdr->sh_info];
-+         while (h->root.type == bfd_link_hash_indirect
-+                || h->root.type == bfd_link_hash_warning)
-+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
-+       }
-+
-+      switch (r_type)
-+        {
-+         /* This relocation describes the C++ object vtable hierarchy.
-+            Reconstruct it for later use during GC.  */
-+        case R_MICROBLAZE_GNU_VTINHERIT:
-+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-+            return false;
-+          break;
-+
-+         /* This relocation describes which C++ vtable entries are actually
-+            used.  Record for later use during GC.  */
-+        case R_MICROBLAZE_GNU_VTENTRY:
-+          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-+            return false;
-+          break;
-+
-+         /* This relocation requires .plt entry.  */
-+        case R_MICROBLAZE_PLT_64:
-+          if (h != NULL)
-+           {
-+             h->needs_plt = 1;
-+             h->plt.refcount += 1;
-+           }
-+          break;
-+
-+         /* This relocation requires .got entry.  */
-+       case R_MICROBLAZE_TLSGD:
-+         tls_type |= (TLS_TLS | TLS_GD);
-+         goto dogottls;
-+       case R_MICROBLAZE_TLSLD:
-+         tls_type |= (TLS_TLS | TLS_LD);
-+         /* Fall through.  */
-+       dogottls:
-+         sec->has_tls_reloc = 1;
-+         /* Fall through.  */
-+       case R_MICROBLAZE_GOT_64:
-+         if (htab->elf.sgot == NULL)
-+           {
-+             if (htab->elf.dynobj == NULL)
-+               htab->elf.dynobj = abfd;
-+             if (!_bfd_elf_create_got_section (htab->elf.dynobj, info))
-+               return false;
-+           }
-+         if (h != NULL)
-+           {
-+             h->got.refcount += 1;
-+             elf64_mb_hash_entry (h)->tls_mask |= tls_type;
-+           }
-+          else
-+           {
-+             if (! update_local_sym_info(abfd, symtab_hdr, r_symndx, tls_type) )
-+               return false;
-+           }
-+         break;
-+
-+       case R_MICROBLAZE_GOTOFF_64:
-+       case R_MICROBLAZE_GOTOFF_32:
-+         if (htab->elf.sgot == NULL)
-+           {
-+             if (htab->elf.dynobj == NULL)
-+               htab->elf.dynobj = abfd;
-+             if (!_bfd_elf_create_got_section (htab->elf.dynobj, info))
-+               return false;
-+           }
-+          break;
-+
-+        case R_MICROBLAZE_64:
-+        case R_MICROBLAZE_64_PCREL:
-+        case R_MICROBLAZE_32:
-+          {
-+            if (h != NULL && !bfd_link_pic (info))
-+             {
-+               /* we may need a copy reloc.  */
-+               h->non_got_ref = 1;
-+
-+               /* we may also need a .plt entry.  */
-+               h->plt.refcount += 1;
-+               if (ELF64_R_TYPE (rel->r_info) != R_MICROBLAZE_64_PCREL)
-+                 h->pointer_equality_needed = 1;
-+             }
-+
-+
-+           /* If we are creating a shared library, and this is a reloc
-+              against a global symbol, or a non PC relative reloc
-+              against a local symbol, then we need to copy the reloc
-+              into the shared library.  However, if we are linking with
-+              -Bsymbolic, we do not need to copy a reloc against a
-+              global symbol which is defined in an object we are
-+              including in the link (i.e., DEF_REGULAR is set).  At
-+              this point we have not seen all the input files, so it is
-+              possible that DEF_REGULAR is not set now but will be set
-+              later (it is never cleared).  In case of a weak definition,
-+              DEF_REGULAR may be cleared later by a strong definition in
-+              a shared library.  We account for that possibility below by
-+              storing information in the relocs_copied field of the hash
-+              table entry.  A similar situation occurs when creating
-+              shared libraries and symbol visibility changes render the
-+              symbol local.
-+
-+              If on the other hand, we are creating an executable, we
-+              may need to keep relocations for symbols satisfied by a
-+              dynamic library if we manage to avoid copy relocs for the
-+              symbol.  */
-+
-+            if ((bfd_link_pic (info)
-+                 && (sec->flags & SEC_ALLOC) != 0
-+                 && (r_type != R_MICROBLAZE_64_PCREL
-+                     || (h != NULL
-+                        && (! info->symbolic
-+                            || h->root.type == bfd_link_hash_defweak
-+                            || !h->def_regular))))
-+               || (!bfd_link_pic (info)
-+                   && (sec->flags & SEC_ALLOC) != 0
-+                   && h != NULL
-+                   && (h->root.type == bfd_link_hash_defweak
-+                       || !h->def_regular)))
-+             {
-+               struct elf_dyn_relocs *p;
-+               struct elf_dyn_relocs **head;
-+
-+                /* When creating a shared object, we must copy these
-+                   relocs into the output file.  We create a reloc
-+                   section in dynobj and make room for the reloc.  */
-+
-+               if (sreloc == NULL)
-+                 {
-+                   bfd *dynobj;
-+
-+                   if (htab->elf.dynobj == NULL)
-+                     htab->elf.dynobj = abfd;
-+                   dynobj = htab->elf.dynobj;
-+
-+                   sreloc = _bfd_elf_make_dynamic_reloc_section (sec, dynobj,
-+                                                                 2, abfd, 1);
-+                   if (sreloc == NULL)
-+                     return false;
-+                 }
-+
-+               /* If this is a global symbol, we count the number of
-+                  relocations we need for this symbol.  */
-+               if (h != NULL)
-+                 head = &h->dyn_relocs;
-+               else
-+                 {
-+                   /* Track dynamic relocs needed for local syms too.
-+                      We really need local syms available to do this
-+                      easily.  Oh well.  */
-+
-+                   asection *s;
-+                   Elf_Internal_Sym *isym;
-+                   void *vpp;
-+
-+                   isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,
-+                                                 abfd, r_symndx);
-+                   if (isym == NULL)
-+                     return false;
-+
-+                   s = bfd_section_from_elf_index (abfd, isym->st_shndx);
-+                   if (s == NULL)
-+                     return false;
-+
-+                   vpp = &elf_section_data (s)->local_dynrel;
-+                   head = (struct elf_dyn_relocs **) vpp;
-+                 }
-+
-+               p = *head;
-+               if (p == NULL || p->sec != sec)
-+                 {
-+                   size_t amt = sizeof *p;
-+                   p = ((struct elf_dyn_relocs *)
-+                        bfd_alloc (htab->elf.dynobj, amt));
-+                   if (p == NULL)
-+                     return false;
-+                   p->next = *head;
-+                   *head = p;
-+                   p->sec = sec;
-+                   p->count = 0;
-+                   p->pc_count = 0;
-+                 }
-+
-+               p->count += 1;
-+               if (r_type == R_MICROBLAZE_64_PCREL)
-+                 p->pc_count += 1;
-+             }
-+          }
-+          break;
-+        }
-+    }
-+
-+  return true;
-+}
-+
-+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
-+
-+static void
-+microblaze_elf_copy_indirect_symbol (struct bfd_link_info *info,
-+                                    struct elf_link_hash_entry *dir,
-+                                    struct elf_link_hash_entry *ind)
-+{
-+  struct elf64_mb_link_hash_entry *edir, *eind;
-+
-+  edir = (struct elf64_mb_link_hash_entry *) dir;
-+  eind = (struct elf64_mb_link_hash_entry *) ind;
-+
-+  edir->tls_mask |= eind->tls_mask;
-+
-+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-+}
-+
-+static bool
-+microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
-+                                     struct elf_link_hash_entry *h)
-+{
-+  struct elf64_mb_link_hash_table *htab;
-+  asection *s, *srel;
-+  unsigned int power_of_two;
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  /* If this is a function, put it in the procedure linkage table.  We
-+     will fill in the contents of the procedure linkage table later,
-+     when we know the address of the .got section.  */
-+  if (h->type == STT_FUNC
-+      || h->needs_plt)
-+    {
-+      if (h->plt.refcount <= 0
-+         || SYMBOL_CALLS_LOCAL (info, h)
-+         || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
-+             && h->root.type == bfd_link_hash_undefweak))
-+       {
-+         /* This case can occur if we saw a PLT reloc in an input
-+            file, but the symbol was never referred to by a dynamic
-+            object, or if all references were garbage collected.  In
-+            such a case, we don't actually need to build a procedure
-+            linkage table, and we can just do a PC32 reloc instead.  */
-+         h->plt.offset = (bfd_vma) -1;
-+         h->needs_plt = 0;
-+       }
-+
-+      return true;
-+    }
-+  else
-+    /* It's possible that we incorrectly decided a .plt reloc was
-+       needed for an R_MICROBLAZE_64_PCREL reloc to a non-function sym in
-+       check_relocs.  We can't decide accurately between function and
-+       non-function syms in check-relocs;  Objects loaded later in
-+       the link may change h->type.  So fix it now.  */
-+    h->plt.offset = (bfd_vma) -1;
-+
-+  /* If this is a weak symbol, and there is a real definition, the
-+     processor independent code will have arranged for us to see the
-+     real definition first, and we can just use the same value.  */
-+  if (h->is_weakalias)
-+    {
-+      struct elf_link_hash_entry *def = weakdef (h);
-+      BFD_ASSERT (def->root.type == bfd_link_hash_defined);
-+      h->root.u.def.section = def->root.u.def.section;
-+      h->root.u.def.value = def->root.u.def.value;
-+      return true;
-+    }
-+
-+  /* This is a reference to a symbol defined by a dynamic object which
-+     is not a function.  */
-+
-+  /* If we are creating a shared library, we must presume that the
-+     only references to the symbol are via the global offset table.
-+     For such cases we need not do anything here; the relocations will
-+     be handled correctly by relocate_section.  */
-+  if (bfd_link_pic (info))
-+    return true;
-+
-+  /* If there are no references to this symbol that do not use the
-+     GOT, we don't need to generate a copy reloc.  */
-+  if (!h->non_got_ref)
-+    return true;
-+
-+  /* If -z nocopyreloc was given, we won't generate them either.  */
-+  if (info->nocopyreloc)
-+    {
-+      h->non_got_ref = 0;
-+      return true;
-+    }
-+
-+  /* If we don't find any dynamic relocs in read-only sections, then
-+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
-+  if (!_bfd_elf_readonly_dynrelocs (h))
-+    {
-+      h->non_got_ref = 0;
-+      return true;
-+    }
-+
-+  /* We must allocate the symbol in our .dynbss section, which will
-+     become part of the .bss section of the executable.  There will be
-+     an entry for this symbol in the .dynsym section.  The dynamic
-+     object will contain position independent code, so all references
-+     from the dynamic object to this symbol will go through the global
-+     offset table.  The dynamic linker will use the .dynsym entry to
-+     determine the address it must put in the global offset table, so
-+     both the dynamic object and the regular object will refer to the
-+     same memory location for the variable.  */
-+
-+  /* We must generate a R_MICROBLAZE_COPY reloc to tell the dynamic linker
-+     to copy the initial value out of the dynamic object and into the
-+     runtime process image.  */
-+  if ((h->root.u.def.section->flags & SEC_READONLY) != 0)
-+    {
-+      s = htab->elf.sdynrelro;
-+      srel = htab->elf.sreldynrelro;
-+    }
-+  else
-+    {
-+      s = htab->elf.sdynbss;
-+      srel = htab->elf.srelbss;
-+    }
-+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-+    {
-+      srel->size += sizeof (Elf64_External_Rela);
-+      h->needs_copy = 1;
-+    }
-+
-+  /* We need to figure out the alignment required for this symbol.  I
-+     have no idea how ELF linkers handle this.  */
-+  power_of_two = bfd_log2 (h->size);
-+  if (power_of_two > 3)
-+    power_of_two = 3;
-+
-+  /* Apply the required alignment.  */
-+  s->size = BFD_ALIGN (s->size, (bfd_size_type) (1 << power_of_two));
-+  if (power_of_two > s->alignment_power)
-+    {
-+      if (!bfd_set_section_alignment (s, power_of_two))
-+       return false;
-+    }
-+
-+  /* Define the symbol as being at this point in the section.  */
-+  h->root.u.def.section = s;
-+  h->root.u.def.value = s->size;
-+
-+  /* Increment the section size to make room for the symbol.  */
-+  s->size += h->size;
-+  return true;
-+}
-+
-+/* Allocate space in .plt, .got and associated reloc sections for
-+   dynamic relocs.  */
-+
-+static bool
-+allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-+{
-+  struct bfd_link_info *info;
-+  struct elf64_mb_link_hash_table *htab;
-+  struct elf64_mb_link_hash_entry *eh;
-+  struct elf_dyn_relocs *p;
-+
-+  if (h->root.type == bfd_link_hash_indirect)
-+    return true;
-+
-+  info = (struct bfd_link_info *) dat;
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  if (htab->elf.dynamic_sections_created
-+      && h->plt.refcount > 0)
-+    {
-+      /* Make sure this symbol is output as a dynamic symbol.
-+        Undefined weak syms won't yet be marked as dynamic.  */
-+      if (h->dynindx == -1
-+          && !h->forced_local)
-+        {
-+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+            return false;
-+        }
-+
-+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h))
-+       {
-+         asection *s = htab->elf.splt;
-+
-+          /* The first entry in .plt is reserved.  */
-+          if (s->size == 0)
-+            s->size = PLT_ENTRY_SIZE;
-+
-+          h->plt.offset = s->size;
-+
-+          /* If this symbol is not defined in a regular file, and we are
-+             not generating a shared library, then set the symbol to this
-+             location in the .plt.  This is required to make function
-+             pointers compare as equal between the normal executable and
-+             the shared library.  */
-+          if (! bfd_link_pic (info)
-+              && !h->def_regular)
-+            {
-+              h->root.u.def.section = s;
-+              h->root.u.def.value = h->plt.offset;
-+            }
-+
-+          /* Make room for this entry.  */
-+          s->size += PLT_ENTRY_SIZE;
-+
-+         /* We also need to make an entry in the .got.plt section, which
-+            will be placed in the .got section by the linker script.  */
-+         htab->elf.sgotplt->size += 4;
-+
-+         /* We also need to make an entry in the .rel.plt section.  */
-+         htab->elf.srelplt->size += sizeof (Elf32_External_Rela);
-+       }
-+      else
-+        {
-+          h->plt.offset = (bfd_vma) -1;
-+          h->needs_plt = 0;
-+        }
-+    }
-+  else
-+    {
-+      h->plt.offset = (bfd_vma) -1;
-+      h->needs_plt = 0;
-+    }
-+
-+  eh = (struct elf64_mb_link_hash_entry *) h;
-+  if (h->got.refcount > 0)
-+    {
-+      unsigned int need;
-+      asection *s;
-+
-+      /* Make sure this symbol is output as a dynamic symbol.
-+         Undefined weak syms won't yet be marked as dynamic.  */
-+      if (h->dynindx == -1
-+          && !h->forced_local)
-+        {
-+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+            return false;
-+        }
-+
-+      need = 0;
-+      if ((eh->tls_mask & TLS_TLS) != 0)
-+        {
-+          /* Handle TLS Symbol */
-+          if ((eh->tls_mask & TLS_LD) != 0)
-+            {
-+              if (!eh->elf.def_dynamic)
-+                /* We'll just use htab->tlsld_got.offset.  This should
-+                   always be the case.  It's a little odd if we have
-+                   a local dynamic reloc against a non-local symbol.  */
-+                htab->tlsld_got.refcount += 1;
-+              else
-+                need += 8;
-+            }
-+          if ((eh->tls_mask & TLS_GD) != 0)
-+            need += 8;
-+        }
-+      else
-+        {
-+          /* Regular (non-TLS) symbol */
-+          need += 4;
-+        }
-+      if (need == 0)
-+        {
-+          h->got.offset = (bfd_vma) -1;
-+        }
-+      else
-+       {
-+         s = htab->elf.sgot;
-+         h->got.offset = s->size;
-+         s->size += need;
-+         htab->elf.srelgot->size += need * (sizeof (Elf64_External_Rela) / 4);
-+       }
-+    }
-+  else
-+    h->got.offset = (bfd_vma) -1;
-+
-+  if (h->dyn_relocs == NULL)
-+    return true;
-+
-+  /* In the shared -Bsymbolic case, discard space allocated for
-+     dynamic pc-relative relocs against symbols which turn out to be
-+     defined in regular objects.  For the normal shared case, discard
-+     space for pc-relative relocs that have become local due to symbol
-+     visibility changes.  */
-+
-+  if (bfd_link_pic (info))
-+    {
-+      if (h->def_regular
-+         && (h->forced_local
-+             || info->symbolic))
-+       {
-+         struct elf_dyn_relocs **pp;
-+
-+         for (pp = &h->dyn_relocs; (p = *pp) != NULL; )
-+           {
-+             p->count -= p->pc_count;
-+             p->pc_count = 0;
-+             if (p->count == 0)
-+               *pp = p->next;
-+             else
-+               pp = &p->next;
-+           }
-+       }
-+      else if (UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
-+       h->dyn_relocs = NULL;
-+    }
-+  else
-+    {
-+      /* For the non-shared case, discard space for relocs against
-+        symbols which turn out to need copy relocs or are not
-+        dynamic.  */
-+
-+      if (!h->non_got_ref
-+         && ((h->def_dynamic
-+              && !h->def_regular)
-+             || (htab->elf.dynamic_sections_created
-+                 && (h->root.type == bfd_link_hash_undefweak
-+                     || h->root.type == bfd_link_hash_undefined))))
-+       {
-+         /* Make sure this symbol is output as a dynamic symbol.
-+            Undefined weak syms won't yet be marked as dynamic.  */
-+         if (h->dynindx == -1
-+             && !h->forced_local)
-+           {
-+             if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+               return false;
-+           }
-+
-+         /* If that succeeded, we know we'll be keeping all the
-+            relocs.  */
-+         if (h->dynindx != -1)
-+           goto keep;
-+       }
-+
-+      h->dyn_relocs = NULL;
-+
-+    keep: ;
-+    }
-+
-+  /* Finally, allocate space.  */
-+  for (p = h->dyn_relocs; p != NULL; p = p->next)
-+    {
-+      asection *sreloc = elf_section_data (p->sec)->sreloc;
-+      sreloc->size += p->count * sizeof (Elf64_External_Rela);
-+    }
-+
-+  return true;
-+}
-+
-+/* Set the sizes of the dynamic sections.  */
-+
-+static bool
-+microblaze_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-+                                     struct bfd_link_info *info)
-+{
-+  struct elf64_mb_link_hash_table *htab;
-+  bfd *dynobj;
-+  asection *s;
-+  bfd *ibfd;
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  dynobj = htab->elf.dynobj;
-+  BFD_ASSERT (dynobj != NULL);
-+
-+  /* Set up .got offsets for local syms, and space for local dynamic
-+     relocs.  */
-+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
-+    {
-+      bfd_signed_vma *local_got;
-+      bfd_signed_vma *end_local_got;
-+      bfd_size_type locsymcount;
-+      Elf_Internal_Shdr *symtab_hdr;
-+      unsigned char *lgot_masks;
-+      asection *srel;
-+
-+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
-+        continue;
-+
-+      for (s = ibfd->sections; s != NULL; s = s->next)
-+       {
-+         struct elf_dyn_relocs *p;
-+
-+         for (p = ((struct elf_dyn_relocs *)
-+                   elf_section_data (s)->local_dynrel);
-+              p != NULL;
-+              p = p->next)
-+           {
-+             if (!bfd_is_abs_section (p->sec)
-+                 && bfd_is_abs_section (p->sec->output_section))
-+               {
-+                 /* Input section has been discarded, either because
-+                    it is a copy of a linkonce section or due to
-+                    linker script /DISCARD/, so we'll be discarding
-+                    the relocs too.  */
-+               }
-+             else if (p->count != 0)
-+               {
-+                 srel = elf_section_data (p->sec)->sreloc;
-+                 srel->size += p->count * sizeof (Elf64_External_Rela);
-+                 if ((p->sec->output_section->flags & SEC_READONLY) != 0)
-+                   info->flags |= DF_TEXTREL;
-+               }
-+           }
-+       }
-+
-+      local_got = elf_local_got_refcounts (ibfd);
-+      if (!local_got)
-+        continue;
-+
-+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
-+      locsymcount = symtab_hdr->sh_info;
-+      end_local_got = local_got + locsymcount;
-+      lgot_masks = (unsigned char *) end_local_got;
-+      s = htab->elf.sgot;
-+      srel = htab->elf.srelgot;
-+
-+      for (; local_got < end_local_got; ++local_got, ++lgot_masks)
-+       {
-+         if (*local_got > 0)
-+           {
-+             unsigned int need = 0;
-+             if ((*lgot_masks & TLS_TLS) != 0)
-+               {
-+                 if ((*lgot_masks & TLS_GD) != 0)
-+                   need += 8;
-+                 if ((*lgot_masks & TLS_LD) != 0)
-+                   htab->tlsld_got.refcount += 1;
-+               }
-+             else
-+               need += 4;
-+
-+             if (need == 0)
-+               {
-+                 *local_got = (bfd_vma) -1;
-+               }
-+             else
-+               {
-+                 *local_got = s->size;
-+                 s->size += need;
-+                 if (bfd_link_pic (info))
-+                   srel->size += need * (sizeof (Elf64_External_Rela) / 4);
-+               }
-+            }
-+          else
-+            *local_got = (bfd_vma) -1;
-+        }
-+    }
-+
-+  /* Allocate global sym .plt and .got entries, and space for global
-+     sym dynamic relocs.  */
-+  elf_link_hash_traverse (elf_hash_table (info), allocate_dynrelocs, info);
-+
-+  if (htab->tlsld_got.refcount > 0)
-+    {
-+      htab->tlsld_got.offset = htab->elf.sgot->size;
-+      htab->elf.sgot->size += 8;
-+      if (bfd_link_pic (info))
-+       htab->elf.srelgot->size += sizeof (Elf64_External_Rela);
-+    }
-+  else
-+    htab->tlsld_got.offset = (bfd_vma) -1;
-+
-+  if (elf_hash_table (info)->dynamic_sections_created)
-+    {
-+      /* Make space for the trailing nop in .plt.  */
-+      if (htab->elf.splt->size > 0)
-+       htab->elf.splt->size += 4;
-+    }
-+
-+  /* The check_relocs and adjust_dynamic_symbol entry points have
-+     determined the sizes of the various dynamic sections.  Allocate
-+     memory for them.  */
-+  for (s = dynobj->sections; s != NULL; s = s->next)
-+    {
-+      const char *name;
-+      bool strip = false;
-+
-+      if ((s->flags & SEC_LINKER_CREATED) == 0)
-+        continue;
-+
-+      /* It's OK to base decisions on the section name, because none
-+        of the dynobj section names depend upon the input files.  */
-+      name = bfd_section_name (s);
-+
-+      if (startswith (name, ".rela"))
-+       {
-+         if (s->size == 0)
-+           {
-+             /* If we don't need this section, strip it from the
-+                output file.  This is to handle .rela.bss and
-+                .rela.plt.  We must create it in
-+                create_dynamic_sections, because it must be created
-+                before the linker maps input sections to output
-+                sections.  The linker does that before
-+                adjust_dynamic_symbol is called, and it is that
-+                function which decides whether anything needs to go
-+                into these sections.  */
-+             strip = true;
-+           }
-+         else
-+           {
-+             /* We use the reloc_count field as a counter if we need
-+                to copy relocs into the output file.  */
-+             s->reloc_count = 0;
-+           }
-+       }
-+      else if (s != htab->elf.splt
-+              && s != htab->elf.sgot
-+              && s != htab->elf.sgotplt
-+              && s != htab->elf.sdynbss
-+              && s != htab->elf.sdynrelro)
-+       {
-+         /* It's not one of our sections, so don't allocate space.  */
-+         continue;
-+       }
-+
-+      if (strip)
-+       {
-+         s->flags |= SEC_EXCLUDE;
-+         continue;
-+       }
-+
-+      /* Allocate memory for the section contents.  */
-+      /* FIXME: This should be a call to bfd_alloc not bfd_zalloc.
-+        Unused entries should be reclaimed before the section's contents
-+        are written out, but at the moment this does not happen.  Thus in
-+        order to prevent writing out garbage, we initialise the section's
-+        contents to zero.  */
-+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
-+      if (s->contents == NULL && s->size != 0)
-+       return false;
-+    }
-+
-+  /* ??? Force DF_BIND_NOW?  */
-+  info->flags |= DF_BIND_NOW;
-+  return _bfd_elf_add_dynamic_tags (output_bfd, info, true);
-+}
-+
-+/* Finish up dynamic symbol handling.  We set the contents of various
-+   dynamic sections here.  */
-+
-+static bool
-+microblaze_elf_finish_dynamic_symbol (bfd *output_bfd,
-+                                     struct bfd_link_info *info,
-+                                     struct elf_link_hash_entry *h,
-+                                     Elf_Internal_Sym *sym)
-+{
-+  struct elf64_mb_link_hash_table *htab;
-+  struct elf64_mb_link_hash_entry *eh = elf64_mb_hash_entry(h);
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  if (h->plt.offset != (bfd_vma) -1)
-+    {
-+      asection *splt;
-+      asection *srela;
-+      asection *sgotplt;
-+      Elf_Internal_Rela rela;
-+      bfd_byte *loc;
-+      bfd_vma plt_index;
-+      bfd_vma got_offset;
-+      bfd_vma got_addr;
-+
-+      /* This symbol has an entry in the procedure linkage table.  Set
-+         it up.  */
-+      BFD_ASSERT (h->dynindx != -1);
-+
-+      splt = htab->elf.splt;
-+      srela = htab->elf.srelplt;
-+      sgotplt = htab->elf.sgotplt;
-+      BFD_ASSERT (splt != NULL && srela != NULL && sgotplt != NULL);
-+
-+      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; /* first entry reserved.  */
-+      got_offset = (plt_index + 3) * 4; /* 3 reserved ???  */
-+      got_addr = got_offset;
-+
-+      /* For non-PIC objects we need absolute address of the GOT entry.  */
-+      if (!bfd_link_pic (info))
-+       got_addr += sgotplt->output_section->vma + sgotplt->output_offset;
-+
-+      /* Fill in the entry in the procedure linkage table.  */
-+      bfd_put_32 (output_bfd, PLT_ENTRY_WORD_0 + ((got_addr >> 16) & 0xffff),
-+                  splt->contents + h->plt.offset);
-+      if (bfd_link_pic (info))
-+        bfd_put_32 (output_bfd, PLT_ENTRY_WORD_1 + (got_addr & 0xffff),
-+                    splt->contents + h->plt.offset + 4);
-+      else
-+        bfd_put_32 (output_bfd, PLT_ENTRY_WORD_1_NOPIC + (got_addr & 0xffff),
-+                    splt->contents + h->plt.offset + 4);
-+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD_2,
-+                  splt->contents + h->plt.offset + 8);
-+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD_3,
-+                  splt->contents + h->plt.offset + 12);
-+
-+      /* Any additions to the .got section??? */
-+      /*      bfd_put_32 (output_bfd,
-+             splt->output_section->vma + splt->output_offset + h->plt.offset + 4,
-+             sgotplt->contents + got_offset); */
-+
-+      /* Fill in the entry in the .rela.plt section.  */
-+      rela.r_offset = (sgotplt->output_section->vma
-+                       + sgotplt->output_offset
-+                       + got_offset);
-+      rela.r_info = ELF64_R_INFO (h->dynindx, R_MICROBLAZE_JUMP_SLOT);
-+      rela.r_addend = 0;
-+      loc = srela->contents;
-+      loc += plt_index * sizeof (Elf64_External_Rela);
-+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
-+
-+      if (!h->def_regular)
-+        {
-+          /* Mark the symbol as undefined, rather than as defined in
-+             the .plt section.  Zero the value.  */
-+          sym->st_shndx = SHN_UNDEF;
-+          sym->st_value = 0;
-+        }
-+    }
-+
-+  /* h->got.refcount to be checked ? */
-+  if (h->got.offset != (bfd_vma) -1 &&
-+      ! ((h->got.offset & 1) ||
-+          IS_TLS_LD(eh->tls_mask) || IS_TLS_GD(eh->tls_mask)))
-+    {
-+      asection *sgot;
-+      asection *srela;
-+      bfd_vma offset;
-+
-+      /* This symbol has an entry in the global offset table.  Set it
-+         up.  */
-+
-+      sgot = htab->elf.sgot;
-+      srela = htab->elf.srelgot;
-+      BFD_ASSERT (sgot != NULL && srela != NULL);
-+
-+      offset = (sgot->output_section->vma + sgot->output_offset
-+               + (h->got.offset &~ (bfd_vma) 1));
-+
-+      /* If this is a -Bsymbolic link, and the symbol is defined
-+         locally, we just want to emit a RELATIVE reloc.  Likewise if
-+         the symbol was forced to be local because of a version file.
-+         The entry in the global offset table will already have been
-+         initialized in the relocate_section function.  */
-+      if (bfd_link_pic (info)
-+          && ((info->symbolic && h->def_regular)
-+             || h->dynindx == -1))
-+       {
-+         asection *sec = h->root.u.def.section;
-+         bfd_vma value;
-+
-+         value = h->root.u.def.value;
-+         if (sec->output_section != NULL)
-+           /* PR 21180: If the output section is NULL, then the symbol is no
-+              longer needed, and in theory the GOT entry is redundant.  But
-+              it is too late to change our minds now...  */
-+           value += sec->output_section->vma + sec->output_offset;
-+
-+         microblaze_elf_output_dynamic_relocation (output_bfd,
-+                                                   srela, srela->reloc_count++,
-+                                                   /* symindex= */ 0,
-+                                                   R_MICROBLAZE_REL, offset,
-+                                                   value);
-+       }
-+      else
-+        {
-+          microblaze_elf_output_dynamic_relocation (output_bfd,
-+                                                    srela, srela->reloc_count++,
-+                                                    h->dynindx,
-+                                                    R_MICROBLAZE_GLOB_DAT,
-+                                                    offset, 0);
-+        }
-+
-+      bfd_put_32 (output_bfd, (bfd_vma) 0,
-+                  sgot->contents + (h->got.offset &~ (bfd_vma) 1));
-+    }
-+
-+  if (h->needs_copy)
-+    {
-+      asection *s;
-+      Elf_Internal_Rela rela;
-+      bfd_byte *loc;
-+
-+      /* This symbols needs a copy reloc.  Set it up.  */
-+
-+      BFD_ASSERT (h->dynindx != -1);
-+
-+      rela.r_offset = (h->root.u.def.value
-+                       + h->root.u.def.section->output_section->vma
-+                       + h->root.u.def.section->output_offset);
-+      rela.r_info = ELF64_R_INFO (h->dynindx, R_MICROBLAZE_COPY);
-+      rela.r_addend = 0;
-+      if (h->root.u.def.section == htab->elf.sdynrelro)
-+       s = htab->elf.sreldynrelro;
-+      else
-+       s = htab->elf.srelbss;
-+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
-+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
-+    }
-+
-+  /* Mark some specially defined symbols as absolute.  */
-+  if (h == htab->elf.hdynamic
-+      || h == htab->elf.hgot
-+      || h == htab->elf.hplt)
-+    sym->st_shndx = SHN_ABS;
-+
-+  return true;
-+}
-+
-+
-+/* Finish up the dynamic sections.  */
-+
-+static bool
-+microblaze_elf_finish_dynamic_sections (bfd *output_bfd,
-+                                       struct bfd_link_info *info)
-+{
-+  bfd *dynobj;
-+  asection *sdyn, *sgot;
-+  struct elf64_mb_link_hash_table *htab;
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  dynobj = htab->elf.dynobj;
-+
-+  sdyn = bfd_get_linker_section (dynobj, ".dynamic");
-+
-+  if (htab->elf.dynamic_sections_created)
-+    {
-+      asection *splt;
-+      Elf64_External_Dyn *dyncon, *dynconend;
-+
-+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
-+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
-+      for (; dyncon < dynconend; dyncon++)
-+       {
-+         Elf_Internal_Dyn dyn;
-+         asection *s;
-+         bool size;
-+
-+          bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
-+
-+         switch (dyn.d_tag)
-+           {
-+           case DT_PLTGOT:
-+             s = htab->elf.sgotplt;
-+             size = false;
-+             break;
-+
-+           case DT_PLTRELSZ:
-+             s = htab->elf.srelplt;
-+             size = true;
-+             break;
-+
-+           case DT_JMPREL:
-+             s = htab->elf.srelplt;
-+             size = false;
-+             break;
-+
-+           default:
-+             continue;
-+           }
-+
-+         if (s == NULL)
-+           dyn.d_un.d_val = 0;
-+         else
-+           {
-+             if (!size)
-+               dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
-+             else
-+               dyn.d_un.d_val = s->size;
-+           }
-+         bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
-+       }
-+
-+      splt = htab->elf.splt;
-+      BFD_ASSERT (splt != NULL && sdyn != NULL);
-+
-+      /* Clear the first entry in the procedure linkage table,
-+        and put a nop in the last four bytes.  */
-+      if (splt->size > 0)
-+       {
-+         memset (splt->contents, 0, PLT_ENTRY_SIZE);
-+         bfd_put_32 (output_bfd, (bfd_vma) 0x80000000 /* nop.  */,
-+                     splt->contents + splt->size - 4);
-+
-+         if (splt->output_section != bfd_abs_section_ptr)
-+           elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
-+       }
-+    }
-+
-+  /* Set the first entry in the global offset table to the address of
-+     the dynamic section.  */
-+  sgot = htab->elf.sgotplt;
-+  if (sgot && sgot->size > 0)
-+    {
-+      if (sdyn == NULL)
-+        bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-+      else
-+        bfd_put_32 (output_bfd,
-+                    sdyn->output_section->vma + sdyn->output_offset,
-+                    sgot->contents);
-+      elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-+    }
-+
-+  if (htab->elf.sgot && htab->elf.sgot->size > 0)
-+    elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize = 4;
-+
-+  return true;
-+}
-+
-+/* Hook called by the linker routine which adds symbols from an object
-+   file.  We use it to put .comm items in .sbss, and not .bss.  */
-+
-+static bool
-+microblaze_elf_add_symbol_hook (bfd *abfd,
-+                               struct bfd_link_info *info,
-+                               Elf_Internal_Sym *sym,
-+                               const char **namep ATTRIBUTE_UNUSED,
-+                               flagword *flagsp ATTRIBUTE_UNUSED,
-+                               asection **secp,
-+                               bfd_vma *valp)
-+{
-+  if (sym->st_shndx == SHN_COMMON
-+      && !bfd_link_relocatable (info)
-+      && sym->st_size <= elf_gp_size (abfd))
-+    {
-+      /* Common symbols less than or equal to -G nn bytes are automatically
-+        put into .sbss.  */
-+      *secp = bfd_make_section_old_way (abfd, ".sbss");
-+      if (*secp == NULL
-+         || !bfd_set_section_flags (*secp, SEC_IS_COMMON | SEC_SMALL_DATA))
-+       return false;
-+
-+      *valp = sym->st_size;
-+    }
-+
-+  return true;
-+}
-+
-+#define TARGET_LITTLE_SYM      microblaze_elf64_le_vec
-+#define TARGET_LITTLE_NAME     "elf64-microblazeel"
-+
-+#define TARGET_BIG_SYM          microblaze_elf64_vec
-+#define TARGET_BIG_NAME                "elf64-microblaze"
-+
-+#define ELF_ARCH               bfd_arch_microblaze
-+#define ELF_TARGET_ID          MICROBLAZE_ELF_DATA
-+#define ELF_MACHINE_CODE       EM_MICROBLAZE
-+#define ELF_MACHINE_ALT1       EM_MICROBLAZE_OLD
-+#define ELF_MAXPAGESIZE                0x1000
-+#define elf_info_to_howto      microblaze_elf_info_to_howto
-+#define elf_info_to_howto_rel  NULL
-+
-+#define bfd_elf64_bfd_reloc_type_lookup                microblaze_elf_reloc_type_lookup
-+#define bfd_elf64_bfd_is_local_label_name       microblaze_elf_is_local_label_name
-+#define bfd_elf64_new_section_hook             microblaze_elf_new_section_hook
-+#define elf_backend_relocate_section           microblaze_elf_relocate_section
-+#define bfd_elf64_bfd_relax_section             microblaze_elf_relax_section
-+#define bfd_elf64_bfd_merge_private_bfd_data    _bfd_generic_verify_endian_match
-+#define bfd_elf64_bfd_reloc_name_lookup                microblaze_elf_reloc_name_lookup
-+
-+#define elf_backend_gc_mark_hook               microblaze_elf_gc_mark_hook
-+#define elf_backend_check_relocs               microblaze_elf_check_relocs
-+#define elf_backend_copy_indirect_symbol       microblaze_elf_copy_indirect_symbol
-+#define bfd_elf64_bfd_link_hash_table_create   microblaze_elf_link_hash_table_create
-+#define elf_backend_can_gc_sections            1
-+#define elf_backend_can_refcount               1
-+#define elf_backend_want_got_plt               1
-+#define elf_backend_plt_readonly               1
-+#define elf_backend_got_header_size            12
-+#define elf_backend_want_dynrelro              1
-+#define elf_backend_rela_normal                        1
-+#define elf_backend_dtrel_excludes_plt         1
-+
-+#define elf_backend_adjust_dynamic_symbol      microblaze_elf_adjust_dynamic_symbol
-+#define elf_backend_create_dynamic_sections    _bfd_elf_create_dynamic_sections
-+#define elf_backend_finish_dynamic_sections    microblaze_elf_finish_dynamic_sections
-+#define elf_backend_finish_dynamic_symbol      microblaze_elf_finish_dynamic_symbol
-+#define elf_backend_size_dynamic_sections      microblaze_elf_size_dynamic_sections
-+#define elf_backend_add_symbol_hook            microblaze_elf_add_symbol_hook
-+
-+#include "elf64-target.h"
-diff --git a/bfd/libbfd.h b/bfd/libbfd.h
-index ea2507d1879..e74c051e781 100644
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -2991,7 +2991,9 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
-   "BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM",
-   "BFD_RELOC_MICROBLAZE_32_NONE",
-   "BFD_RELOC_MICROBLAZE_64_NONE",
-+  "BFD_RELOC_MICROBLAZE_64",
-   "BFD_RELOC_MICROBLAZE_64_GOTPC",
-+  "BFD_RELOC_MICROBLAZE_64_GPC",
-   "BFD_RELOC_MICROBLAZE_64_GOT",
-   "BFD_RELOC_MICROBLAZE_64_PLT",
-   "BFD_RELOC_MICROBLAZE_64_GOTOFF",
-diff --git a/bfd/reloc.c b/bfd/reloc.c
-index 5ac8a8536a7..0f99df91299 100644
---- a/bfd/reloc.c
-+++ b/bfd/reloc.c
-@@ -6875,12 +6875,24 @@ ENUMDOC
-   done here - only used for relaxing
- ENUM
-   BFD_RELOC_MICROBLAZE_64_NONE
-+ENUMDOC
-+  This is a 32 bit reloc that stores the 32 bit pc relative
-+  value in two words (with an imml instruction).  No relocation is
-+  done here - only used for relaxing
-+ENUM
-+  BFD_RELOC_MICROBLAZE_64
- ENUMDOC
-   This is a 64 bit reloc that stores the 32 bit pc relative
-   value in two words (with an imm instruction).  No relocation is
-   done here - only used for relaxing
- ENUM
-   BFD_RELOC_MICROBLAZE_64_GOTPC
-+ENUMDOC
-+  This is a 64 bit reloc that stores the 32 bit pc relative
-+  value in two words (with an imml instruction).  No relocation is
-+  done here - only used for relaxing
-+ENUM
-+  BFD_RELOC_MICROBLAZE_64_GPC
- ENUMDOC
-   This is a 64 bit reloc that stores the 32 bit pc relative
-   value in two words (with an imm instruction).  The relocation is
-diff --git a/bfd/targets.c b/bfd/targets.c
-index 3284bb88aa8..6e93cb2f995 100644
---- a/bfd/targets.c
-+++ b/bfd/targets.c
-@@ -791,6 +791,8 @@ extern const bfd_target mep_elf32_le_vec;
- extern const bfd_target metag_elf32_vec;
- extern const bfd_target microblaze_elf32_vec;
- extern const bfd_target microblaze_elf32_le_vec;
-+extern const bfd_target microblaze_elf64_vec;
-+extern const bfd_target microblaze_elf64_le_vec;
- extern const bfd_target mips_ecoff_be_vec;
- extern const bfd_target mips_ecoff_le_vec;
- extern const bfd_target mips_ecoff_bele_vec;
-@@ -1153,6 +1155,10 @@ static const bfd_target * const _bfd_target_vector[] =
- 
-        &metag_elf32_vec,
- 
-+#ifdef BFD64
-+       &microblaze_elf64_vec,
-+       &microblaze_elf64_le_vec,
-+#endif
-        &microblaze_elf32_vec,
- 
-        &mips_ecoff_be_vec,
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 086f8704156..a6f12dda54a 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -35,10 +35,13 @@
- #define streq(a,b) (strcmp (a, b) == 0)
- #endif
- 
-+static int microblaze_arch_size = 0;
-+
- #define OPTION_EB (OPTION_MD_BASE + 0)
- #define OPTION_EL (OPTION_MD_BASE + 1)
- #define OPTION_LITTLE (OPTION_MD_BASE + 2)
- #define OPTION_BIG (OPTION_MD_BASE + 3)
-+#define OPTION_M64 (OPTION_MD_BASE + 4)
- 
- void microblaze_generate_symbol (char *sym);
- static bool check_spl_reg (unsigned *);
-@@ -91,6 +94,7 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP";
- #define TLSTPREL_OFFSET      16
- #define TEXT_OFFSET         17
- #define TEXT_PC_OFFSET       18
-+#define DEFINED_64_OFFSET   19
- 
- /* Initialize the relax table.  */
- const relax_typeS md_relax_table[] =
-@@ -113,7 +117,9 @@ const relax_typeS md_relax_table[] =
-   { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 },  /* 15: TLSGOTTPREL_OFFSET.  */
-   { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 },  /* 16: TLSTPREL_OFFSET.  */
-   { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 },  /* 17: TEXT_OFFSET.  */
--  { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }   /* 18: TEXT_PC_OFFSET.  */
-+  { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 },   /* 18: TEXT_PC_OFFSET.  */
-+//  { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }   /* 16: TLSTPREL_OFFSET.  */
-+  { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE, 0 }   /* 17: DEFINED_64_OFFSET.  */
- };
- 
- static htab_t  opcode_hash_control;    /* Opcode mnemonics.  */
-@@ -393,7 +399,8 @@ const pseudo_typeS md_pseudo_table[] =
-   {"data32", cons, 4},     /* Same as word.  */
-   {"ent", s_func, 0}, /* Treat ent as function entry point.  */
-   {"end", microblaze_s_func, 1}, /* Treat end as function end point.  */
--  {"gpword", s_rva, 4}, /* gpword label => store resolved label address in data section.  */
-+  {"gpword", s_rva, 8}, /* gpword label => store resolved label address in data section.  */
-+  {"gpdword", s_rva, 8}, /* gpword label => store resolved label address in data section.  */
-   {"weakext", microblaze_s_weakext, 0},
-   {"rodata", microblaze_s_rdata, 0},
-   {"sdata2", microblaze_s_rdata, 1},
-@@ -402,6 +409,7 @@ const pseudo_typeS md_pseudo_table[] =
-   {"sbss", microblaze_s_bss, 1},
-   {"text", microblaze_s_text, 0},
-   {"word", cons, 4},
-+  {"dword", cons, 8},
-   {"frame", s_ignore, 0},
-   {"mask", s_ignore, 0}, /* Emitted by gcc.  */
-   {NULL, NULL, 0}
-@@ -773,6 +781,74 @@ parse_imm (char * s, expressionS * e, offsetT min, offsetT max)
-   return new_pointer;
- }
- 
-+ static char *
-+parse_imml (char * s, expressionS * e, long min, long max)
-+{
-+  char *new_pointer;
-+  char *atp;
-+  int itype, ilen;
-+
-+  ilen = 0;
-+
-+  /* Find the start of "@GOT" or "@PLT" suffix (if any) */
-+  for (atp = s; *atp != '@'; atp++)
-+    if (is_end_of_line[(unsigned char) *atp])
-+      break;
-+
-+  if (*atp == '@')
-+    {
-+      itype = match_imm (atp + 1, &ilen);
-+      if (itype != 0)
-+        {
-+          *atp = 0;
-+          e->X_md = itype;
-+        }
-+      else
-+        {
-+          atp = NULL;
-+          e->X_md = 0;
-+          ilen = 0;
-+        }
-+      *atp = 0;
-+    }
-+  else
-+    {
-+      atp = NULL;
-+      e->X_md = 0;
-+    }
-+
-+  if (atp && !GOT_symbol)
-+    {
-+      GOT_symbol = symbol_find_or_make (GOT_SYMBOL_NAME);
-+    }
-+
-+  new_pointer = parse_exp (s, e);
-+
-+  if (!GOT_symbol && ! strncmp (s, GOT_SYMBOL_NAME, 20))
-+    {
-+      GOT_symbol = symbol_find_or_make (GOT_SYMBOL_NAME);
-+    }
-+
-+  if (e->X_op == O_absent)
-+    ; /* An error message has already been emitted.  */
-+  else if ((e->X_op != O_constant && e->X_op != O_symbol) )
-+    as_fatal (_("operand must be a constant or a label"));
-+  else if ((e->X_op == O_constant) && ((long) e->X_add_number < min
-+                                      || (long) e->X_add_number > max))
-+    {
-+      as_fatal (_("operand must be absolute in range %ld..%ld, not %ld"),
-+                min, max, (long) e->X_add_number);
-+    }
-+
-+  if (atp)
-+    {
-+      *atp = '@'; /* restore back (needed?)  */
-+      if (new_pointer >= atp)
-+        new_pointer += ilen + 1; /* sizeof (imm_suffix) + 1 for '@' */
-+    }
-+  return new_pointer;
-+}
-+
- static char *
- check_got (int * got_type, int * got_len)
- {
-@@ -827,7 +903,7 @@ check_got (int * got_type, int * got_len)
- extern bfd_reloc_code_real_type
- parse_cons_expression_microblaze (expressionS *exp, int size)
- {
--  if (size == 4)
-+  if (size == 4 || (microblaze_arch_size == 64 && size == 8))
-     {
-       /* Handle @GOTOFF et.al.  */
-       char *save, *gotfree_copy;
-@@ -859,6 +935,7 @@ parse_cons_expression_microblaze (expressionS *exp, int size)
- 
- static const char * str_microblaze_ro_anchor = "RO";
- static const char * str_microblaze_rw_anchor = "RW";
-+static const char * str_microblaze_64 = "64";
- 
- static bool
- check_spl_reg (unsigned * reg)
-@@ -920,6 +997,7 @@ md_assemble (char * str)
-   unsigned int immed = 0, immed2 = 0, temp;
-   expressionS exp;
-   char name[20];
-+  long immedl;
- 
-   /* Drop leading whitespace.  */
-   while (ISSPACE (* str))
-@@ -1106,6 +1184,33 @@ md_assemble (char * str)
-               inst |= (immed << IMM_LOW) & IMM_MASK;
-             }
-        }
-+#if 0 //revisit
-+      else if (streq (name, "lli") || streq (name, "sli"))
-+       {
-+          temp = immed & 0xFFFFFFFFFFFF8000;
-+          if ((temp != 0) && (temp != 0xFFFFFFFFFFFF8000))
-+           {
-+              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+
-+              inst1 = opcode1->bit_sequence;
-+             inst1 |= ((immedl & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+           }
-+         inst |= (reg1 << RD_LOW) & RD_MASK;
-+         inst |= (reg2 << RA_LOW) & RA_MASK;
-+         inst |= (immed << IMM_LOW) & IMM_MASK;
-+        }
-+#endif
-       else
-        {
-           temp = immed & 0xFFFF8000;
-@@ -1135,7 +1240,7 @@ md_assemble (char * str)
-        }
-       break;
- 
--    case INST_TYPE_RD_R1_IMM5:
-+    case INST_TYPE_RD_R1_IMMS:
-       if (strcmp (op_end, ""))
-         op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
-       else
-@@ -1169,16 +1274,22 @@ md_assemble (char * str)
-           immed = exp.X_add_number;
-         }
- 
--      if (immed != (immed % 32))
-+      if ((immed != (immed % 32)) &&
-+          (opcode->instr == bslli || opcode->instr == bsrai || opcode->instr == bsrli))
-        {
-           as_warn (_("Shift value > 32. using <value %% 32>"));
-           immed = immed % 32;
-         }
-+      else if (immed != (immed % 64))
-+       {
-+          as_warn (_("Shift value > 64. using <value %% 64>"));
-+          immed = immed % 64;
-+        }
-       inst |= (reg1 << RD_LOW) & RD_MASK;
-       inst |= (reg2 << RA_LOW) & RA_MASK;
--      inst |= (immed << IMM_LOW) & IMM5_MASK;
-+      inst |= (immed << IMM_LOW) & IMM6_MASK;
-       break;
-- case INST_TYPE_RD_R1_IMM5_IMM5:
-+ case INST_TYPE_RD_R1_IMMW_IMMS:
-       if (strcmp (op_end, ""))
-         op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
-       else
-@@ -1202,7 +1313,7 @@ md_assemble (char * str)
- 
-       /* Width immediate value.  */
-       if (strcmp (op_end, ""))
--        op_end = parse_imm (op_end + 1, &exp, MIN_IMM_WIDTH, MAX_IMM_WIDTH);
-+        op_end = parse_imm (op_end + 1, &exp, MIN_IMM, MAX_IMM);
-       else
-         as_fatal (_("Error in statement syntax"));
-       if (exp.X_op != O_constant)
-@@ -1214,6 +1325,8 @@ md_assemble (char * str)
-         immed = exp.X_add_number;
-       if (opcode->instr == bsefi && immed > 31)
-         as_fatal (_("Width value must be less than 32"));
-+      else if (opcode->instr == bslefi && immed > 63)
-+        as_fatal (_("Width value must be less than 64"));
- 
-       /* Shift immediate value.  */
-       if (strcmp (op_end, ""))
-@@ -1221,32 +1334,40 @@ md_assemble (char * str)
-       else
-         as_fatal (_("Error in statement syntax"));
-       if (exp.X_op != O_constant)
--           {
-+       {
-           as_warn (_("Symbol used as immediate shift value for bit field instruction"));
-           immed2 = 0;
-         }
-       else
--           {
-+        {
-           output = frag_more (isize);
-           immed2 = exp.X_add_number;
--           }
--      if (immed2 != (immed2 % 32))
--           {
--          as_warn (_("Shift value greater than 32. using <value %% 32>"));
-+       }
-+      if ((immed2 != (immed2 % 32)) && (opcode->instr == bsefi || opcode->instr == bsifi))
-+       {
-+          
-+         as_warn (_("Shift value greater than 32. using <value %% 32>"));
-           immed2 = immed2 % 32;
-         }
-+      else if (immed2 != (immed2 % 64))
-+       {
-+          as_warn (_("Shift value greater than 64. using <value %% 64>"));
-+          immed2 = immed2 % 64;
-+        }
- 
-       /* Check combined value.  */
--      if (immed + immed2 > 32)
-+      if ((immed + immed2 > 32) && (opcode->instr == bsefi || opcode->instr == bsifi))
-         as_fatal (_("Width value + shift value must not be greater than 32"));
- 
-+      else if (immed + immed2 > 64)
-+        as_fatal (_("Width value + shift value must not be greater than 64"));
-       inst |= (reg1 << RD_LOW) & RD_MASK;
-       inst |= (reg2 << RA_LOW) & RA_MASK;
--      if (opcode->instr == bsefi)
--        inst |= (immed & IMM5_MASK) << IMM_WIDTH_LOW; /* bsefi */
-+      if (opcode->instr == bsefi || opcode->instr == bslefi)
-+        inst |= (immed & IMM6_MASK) << IMM_WIDTH_LOW; /* bsefi or bslefi */
-       else
--        inst |= ((immed + immed2 - 1) & IMM5_MASK) << IMM_WIDTH_LOW; /* bsifi */
--      inst |= (immed2 << IMM_LOW) & IMM5_MASK;
-+        inst |= ((immed + immed2 - 1) & IMM6_MASK) << IMM_WIDTH_LOW; /* bsifi or bslifi */
-+      inst |= (immed2 << IMM_LOW) & IMM6_MASK;
-       break;
-     case INST_TYPE_R1_R2:
-       if (strcmp (op_end, ""))
-@@ -1820,6 +1941,143 @@ md_assemble (char * str)
-       }
-       inst |= (immed << IMM_MBAR);
-       break;
-+    /* For 64-bit instructions */
-+    case INST_TYPE_RD_R1_IMML:
-+      if (strcmp (op_end, ""))
-+       op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
-+      else
-+       {
-+          as_fatal (_("Error in statement syntax"));
-+          reg1 = 0;
-+        }
-+      if (strcmp (op_end, ""))
-+       op_end = parse_reg (op_end + 1, &reg2);  /* Get r1.  */
-+      else
-+       {
-+          as_fatal (_("Error in statement syntax"));
-+          reg2 = 0;
-+        }
-+      if (strcmp (op_end, ""))
-+       op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-+      else
-+       as_fatal (_("Error in statement syntax"));
-+
-+      /* Check for spl registers.  */
-+      if (check_spl_reg (& reg1))
-+       as_fatal (_("Cannot use special register with this instruction"));
-+      if (check_spl_reg (& reg2))
-+       as_fatal (_("Cannot use special register with this instruction"));
-+
-+      if (exp.X_op != O_constant)
-+       {
-+         char *opc = NULL;
-+         //char *opc = str_microblaze_64;
-+         relax_substateT subtype;
-+
-+         if (exp.X_md != 0)
-+           subtype = get_imm_otype(exp.X_md);
-+         else
-+           subtype = opcode->inst_offset_type;
-+
-+         output = frag_var (rs_machine_dependent,
-+                            isize * 2, /* maxm of 2 words.  */
-+                            isize * 2, /* minm of 2 words.  */
-+                            subtype,   /* PC-relative or not.  */
-+                            exp.X_add_symbol,
-+                            exp.X_add_number,
-+                            (char *) opc);
-+         immedl = 0L;
-+        }
-+      else
-+       {
-+         output = frag_more (isize);
-+         immedl = exp.X_add_number;
-+
-+         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+         if (opcode1 == NULL)
-+           {
-+             as_bad (_("unknown opcode \"%s\""), "imml");
-+             return;
-+           }
-+
-+         inst1 = opcode1->bit_sequence;
-+         inst1 |= ((immedl & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+         output[0] = INST_BYTE0 (inst1);
-+         output[1] = INST_BYTE1 (inst1);
-+         output[2] = INST_BYTE2 (inst1);
-+         output[3] = INST_BYTE3 (inst1);
-+         output = frag_more (isize);
-+        }
-+
-+      inst |= (reg1 << RD_LOW) & RD_MASK;
-+      inst |= (reg2 << RA_LOW) & RA_MASK;
-+      inst |= (immedl << IMM_LOW) & IMM_MASK;
-+      break;
-+
-+    case INST_TYPE_R1_IMML:
-+      if (strcmp (op_end, ""))
-+        op_end = parse_reg (op_end + 1, &reg1);  /* Get r1.  */
-+      else
-+       {
-+          as_fatal (_("Error in statement syntax"));
-+          reg1 = 0;
-+        }
-+      if (strcmp (op_end, ""))
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-+      else
-+        as_fatal (_("Error in statement syntax"));
-+
-+      /* Check for spl registers.  */
-+      if (check_spl_reg (&reg1))
-+        as_fatal (_("Cannot use special register with this instruction"));
-+
-+      if (exp.X_op != O_constant)
-+       {
-+         //char *opc = NULL;
-+          char *opc = str_microblaze_64;
-+          relax_substateT subtype;
-+
-+         if (exp.X_md != 0)
-+           subtype = get_imm_otype(exp.X_md);
-+         else
-+           subtype = opcode->inst_offset_type;
-+
-+         output = frag_var (rs_machine_dependent,
-+                            isize * 2, /* maxm of 2 words.  */
-+                            isize * 2, /* minm of 2 words.  */
-+                            subtype,   /* PC-relative or not.  */
-+                            exp.X_add_symbol,
-+                            exp.X_add_number,
-+                            (char *) opc);
-+         immedl = 0L;
-+       }
-+      else
-+       {
-+          output = frag_more (isize);
-+          immedl = exp.X_add_number;
-+         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+         if (opcode1 == NULL)
-+           {
-+             as_bad (_("unknown opcode \"%s\""), "imml");
-+             return;
-+           }
-+
-+          inst1 = opcode1->bit_sequence;
-+         inst1 |= ((immedl & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+          output[0] = INST_BYTE0 (inst1);
-+          output[1] = INST_BYTE1 (inst1);
-+          output[2] = INST_BYTE2 (inst1);
-+          output[3] = INST_BYTE3 (inst1);
-+          output = frag_more (isize);
-+        }
-+
-+      inst |= (reg1 << RA_LOW) & RA_MASK;
-+      inst |= (immedl << IMM_LOW) & IMM_MASK;
-+      break;
-+
-+    case INST_TYPE_IMML:
-+      as_fatal (_("An IMML instruction should not be present in the .s file"));
-+      break;
- 
-     default:
-       as_fatal (_("unimplemented opcode \"%s\""), name);
-@@ -1927,6 +2185,7 @@ struct option md_longopts[] =
-   {"EL", no_argument, NULL, OPTION_EL},
-   {"mlittle-endian", no_argument, NULL, OPTION_LITTLE},
-   {"mbig-endian", no_argument, NULL, OPTION_BIG},
-+  {"m64", no_argument, NULL, OPTION_M64},
-   { NULL,          no_argument, NULL, 0}
- };
- 
-@@ -1971,13 +2230,23 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
-       fragP->fr_fix += INST_WORD_SIZE * 2;
-       fragP->fr_var = 0;
-       break;
-+    case DEFINED_64_OFFSET:
-+      if (fragP->fr_symbol == GOT_symbol)
-+        fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE, fragP->fr_symbol,
-+                fragP->fr_offset, true, BFD_RELOC_MICROBLAZE_64_GPC);
-+      else
-+        fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE, fragP->fr_symbol,
-+                fragP->fr_offset, true, BFD_RELOC_MICROBLAZE_64);
-+      fragP->fr_fix += INST_WORD_SIZE * 2;
-+      fragP->fr_var = 0;
-+      break;
-     case DEFINED_ABS_SEGMENT:
-       if (fragP->fr_symbol == GOT_symbol)
-         fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE * 2, fragP->fr_symbol,
-                 fragP->fr_offset, true, BFD_RELOC_MICROBLAZE_64_GOTPC);
-       else
-         fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE * 2, fragP->fr_symbol,
--                fragP->fr_offset, false, BFD_RELOC_64);
-+                fragP->fr_offset, true, BFD_RELOC_64);
-       fragP->fr_fix += INST_WORD_SIZE * 2;
-       fragP->fr_var = 0;
-       break;
-@@ -2198,23 +2467,38 @@ md_apply_fix (fixS *   fixP,
-     case BFD_RELOC_64_PCREL:
-     case BFD_RELOC_64:
-     case BFD_RELOC_MICROBLAZE_64_TEXTREL:
-+    case BFD_RELOC_MICROBLAZE_64:
-       /* Add an imm instruction.  First save the current instruction.  */
-       for (i = 0; i < INST_WORD_SIZE; i++)
-        buf[i + INST_WORD_SIZE] = buf[i];
-+      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+        {
-+          /* Generate the imm instruction.  */
-+          opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+          if (opcode1 == NULL)
-+           {
-+             as_bad (_("unknown opcode \"%s\""), "imml");
-+             return;
-+           }
- 
--      /* Generate the imm instruction.  */
--      opcode1
--       = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
--      if (opcode1 == NULL)
--       {
--         as_bad (_("unknown opcode \"%s\""), "imm");
--         return;
--       }
--
--      inst1 = opcode1->bit_sequence;
--      if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
--       inst1 |= ((val & 0xFFFF0000) >> 16) & IMM_MASK;
--
-+           inst1 = opcode1->bit_sequence;
-+           if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-+            inst1 |= ((val & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+         }
-+      else
-+        {
-+          /* Generate the imm instruction.  */
-+          opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-+          if (opcode1 == NULL)
-+           {
-+             as_bad (_("unknown opcode \"%s\""), "imm");
-+             return;
-+           }
-+     
-+          inst1 = opcode1->bit_sequence;
-+          if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-+           inst1 |= ((val & 0xFFFF0000) >> 16) & IMM_MASK;
-+         }
-       buf[0] = INST_BYTE0 (inst1);
-       buf[1] = INST_BYTE1 (inst1);
-       buf[2] = INST_BYTE2 (inst1);
-@@ -2243,6 +2527,7 @@ md_apply_fix (fixS *   fixP,
-       /* Fall through.  */
- 
-     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-+    case BFD_RELOC_MICROBLAZE_64_GPC:
-     case BFD_RELOC_MICROBLAZE_64_GOT:
-     case BFD_RELOC_MICROBLAZE_64_PLT:
-     case BFD_RELOC_MICROBLAZE_64_GOTOFF:
-@@ -2250,13 +2535,17 @@ md_apply_fix (fixS *   fixP,
-       /* Add an imm instruction.  First save the current instruction.  */
-       for (i = 0; i < INST_WORD_SIZE; i++)
-        buf[i + INST_WORD_SIZE] = buf[i];
--
-       /* Generate the imm instruction.  */
--      opcode1
--       = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-+      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
-+        opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+      else
-+        opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-       if (opcode1 == NULL)
-        {
--         as_bad (_("unknown opcode \"%s\""), "imm");
-+         if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
-+           as_bad (_("unknown opcode \"%s\""), "imml");
-+          else
-+           as_bad (_("unknown opcode \"%s\""), "imm");
-          return;
-        }
- 
-@@ -2280,6 +2569,8 @@ md_apply_fix (fixS *   fixP,
-         moves code around due to relaxing.  */
-       if (fixP->fx_r_type == BFD_RELOC_64_PCREL)
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
-+      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+           fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
-       else if (fixP->fx_r_type == BFD_RELOC_32)
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE;
-       else
-@@ -2323,6 +2614,32 @@ md_estimate_size_before_relax (fragS * fragP,
-           as_bad (_("Absolute PC-relative value in relaxation code.  Assembler error....."));
-           abort ();
-         }
-+      else if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type
-+               && !S_IS_WEAK (fragP->fr_symbol))
-+        {
-+           if (fragP->fr_opcode != NULL) {
-+            if(streq (fragP->fr_opcode, str_microblaze_64)) 
-+             {
-+               /* Used as an absolute value.  */
-+              fragP->fr_subtype = DEFINED_64_OFFSET;
-+               /* Variable part does not change.  */
-+              fragP->fr_var = INST_WORD_SIZE;
-+            }
-+          else
-+            {
-+               fragP->fr_subtype = DEFINED_PC_OFFSET;
-+              /* Don't know now whether we need an imm instruction.  */
-+               fragP->fr_var = INST_WORD_SIZE;
-+            }
-+          }  
-+          else
-+            {
-+               fragP->fr_subtype = DEFINED_PC_OFFSET;
-+              /* Don't know now whether we need an imm instruction.  */
-+               fragP->fr_var = INST_WORD_SIZE;
-+            }
-+        }
-+    #if 0
-       else if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type &&
-                !S_IS_WEAK (fragP->fr_symbol))
-         {
-@@ -2330,6 +2647,7 @@ md_estimate_size_before_relax (fragS * fragP,
-           /* Don't know now whether we need an imm instruction.  */
-           fragP->fr_var = INST_WORD_SIZE;
-         }
-+#endif
-       else if (S_IS_DEFINED (fragP->fr_symbol)
-               && (((S_GET_SEGMENT (fragP->fr_symbol))->flags & SEC_CODE) == 0))
-         {
-@@ -2432,6 +2750,7 @@ md_estimate_size_before_relax (fragS * fragP,
-     case TLSLD_OFFSET:
-     case TLSTPREL_OFFSET:
-     case TLSDTPREL_OFFSET:
-+    case DEFINED_64_OFFSET:
-       fragP->fr_var = INST_WORD_SIZE*2;
-       break;
-     case DEFINED_RO_SEGMENT:
-@@ -2485,7 +2804,7 @@ md_pcrel_from_section (fixS * fixp, segT sec ATTRIBUTE_UNUSED)
-   else
-     {
-       /* The case where we are going to resolve things... */
--      if (fixp->fx_r_type == BFD_RELOC_64_PCREL)
-+      if (fixp->fx_r_type == BFD_RELOC_64_PCREL ||fixp->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-         return  fixp->fx_where + fixp->fx_frag->fr_address + INST_WORD_SIZE;
-       else
-         return  fixp->fx_where + fixp->fx_frag->fr_address;
-@@ -2518,6 +2837,8 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
-     case BFD_RELOC_MICROBLAZE_32_RWSDA:
-     case BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM:
-     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-+    case BFD_RELOC_MICROBLAZE_64_GPC:
-+    case BFD_RELOC_MICROBLAZE_64:
-     case BFD_RELOC_MICROBLAZE_64_GOT:
-     case BFD_RELOC_MICROBLAZE_64_PLT:
-     case BFD_RELOC_MICROBLAZE_64_GOTOFF:
-@@ -2578,6 +2899,18 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
-   return rel;
- }
- 
-+/* Called by TARGET_FORMAT.  */
-+const char *
-+microblaze_target_format (void)
-+{
-+
-+  if (microblaze_arch_size == 64)
-+    return "elf64-microblazeel";
-+  else 
-+      return target_big_endian ? "elf32-microblaze" : "elf32-microblazeel";
-+}
-+
-+
- int
- md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
- {
-@@ -2591,6 +2924,10 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
-     case OPTION_LITTLE:
-       target_big_endian = 0;
-       break;
-+    case OPTION_M64:
-+      //if (arg != NULL && strcmp (arg, "64") == 0)
-+      microblaze_arch_size = 64;
-+      break;
-     default:
-       return 0;
-     }
-@@ -2606,6 +2943,7 @@ md_show_usage (FILE * stream ATTRIBUTE_UNUSED)
-   fprintf (stream, _(" MicroBlaze specific assembler options:\n"));
-   fprintf (stream, "  -%-23s%s\n", "mbig-endian", N_("assemble for a big endian cpu"));
-   fprintf (stream, "  -%-23s%s\n", "mlittle-endian", N_("assemble for a little endian cpu"));
-+  fprintf (stream, "  -%-23s%s\n", "m64", N_("generate 64-bit elf"));
- }
- 
- 
-@@ -2643,7 +2981,10 @@ cons_fix_new_microblaze (fragS * frag,
-           r = BFD_RELOC_32;
-           break;
-         case 8:
--          r = BFD_RELOC_64;
-+          if (microblaze_arch_size == 64)
-+            r = BFD_RELOC_32;
-+          else
-+            r = BFD_RELOC_64;
-           break;
-         default:
-           as_bad (_("unsupported BFD relocation size %u"), size);
-diff --git a/gas/config/tc-microblaze.h b/gas/config/tc-microblaze.h
-index 36f56725c46..5a97b460212 100644
---- a/gas/config/tc-microblaze.h
-+++ b/gas/config/tc-microblaze.h
-@@ -81,7 +81,9 @@ extern const struct relax_type md_relax_table[];
- 
- #ifdef OBJ_ELF
- 
--#define TARGET_FORMAT (target_big_endian ? "elf32-microblaze" : "elf32-microblazeel")
-+#define TARGET_FORMAT microblaze_target_format()
-+extern const char *microblaze_target_format (void);
-+//#define TARGET_FORMAT (target_big_endian ? "elf32-microblaze" : "elf32-microblazeel")
- 
- #define ELF_TC_SPECIAL_SECTIONS \
-   { ".sdata",          SHT_PROGBITS,   SHF_ALLOC + SHF_WRITE }, \
-diff --git a/include/elf/common.h b/include/elf/common.h
-index e4bc53e35b4..1ad565adf7a 100644
---- a/include/elf/common.h
-+++ b/include/elf/common.h
-@@ -360,6 +360,7 @@
- #define EM_U16_U8CORE  260     /* LAPIS nX-U16/U8 */
- #define EM_TACHYUM     261     /* Tachyum */
- #define EM_56800EF     262     /* NXP 56800EF Digital Signal Controller (DSC) */
-+#define EM_MB_64       263     /* Xilinx MicroBlaze 32-bit RISC soft processor core */
- 
- /* If it is necessary to assign new unofficial EM_* values, please pick large
-    random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision
-diff --git a/include/elf/microblaze.h b/include/elf/microblaze.h
-index a2e1ce4580f..79799b86a49 100644
---- a/include/elf/microblaze.h
-+++ b/include/elf/microblaze.h
-@@ -62,6 +62,8 @@ START_RELOC_NUMBERS (elf_microblaze_reloc_type)
-   RELOC_NUMBER (R_MICROBLAZE_TEXTREL_64, 31)    /* TEXT Entry offset 64-bit.  */
-   RELOC_NUMBER (R_MICROBLAZE_TEXTREL_32_LO, 32) /* TEXT Entry offset 32-bit.  */
-   RELOC_NUMBER (R_MICROBLAZE_32_NONE, 33)
-+  RELOC_NUMBER (R_MICROBLAZE_IMML_64, 34)
-+  RELOC_NUMBER (R_MICROBLAZE_GPC_64, 35)    /* GOT entry offset.  */
-    
- END_RELOC_NUMBERS (R_MICROBLAZE_max)
- 
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index d31021c13e2..bd1a2e5a625 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -418,6 +418,8 @@ ALL_64_EMULATION_SOURCES = \
-        eelf32ltsmipn32.c \
-        eelf32ltsmipn32_fbsd.c \
-        eelf32mipswindiss.c \
-+        eelf64microblazeel.c \
-+        eelf64microblaze.c \
-        eelf64_aix.c \
-        eelf64_ia64.c \
-        eelf64_ia64_fbsd.c \
-@@ -906,6 +908,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32_fbsd.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32mipswindiss.Pc@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64microblazeel.Pc@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64microblaze.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_aix.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64_fbsd.Pc@am__quote@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index ee0c98f65b0..f4b7ee0623e 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -914,6 +914,8 @@ ALL_64_EMULATION_SOURCES = \
-        eelf32ltsmipn32.c \
-        eelf32ltsmipn32_fbsd.c \
-        eelf32mipswindiss.c \
-+       eelf64microblazeel.c \
-+       eelf64microblaze.c \
-        eelf64_aix.c \
-        eelf64_ia64.c \
-        eelf64_ia64_fbsd.c \
-@@ -1407,6 +1409,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64microblazeel.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64microblaze.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_aix.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64_fbsd.Po@am__quote@
-@@ -2572,6 +2576,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32_fbsd.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32mipswindiss.Pc@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64microblazeel.Pc@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64microblaze.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_aix.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64.Pc@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64_fbsd.Pc@am__quote@
-diff --git a/ld/configure.tgt b/ld/configure.tgt
-index 2bae9099b6a..80ffbcf23b3 100644
---- a/ld/configure.tgt
-+++ b/ld/configure.tgt
-@@ -515,6 +515,9 @@ microblaze*-linux*) targ_emul="elf32mb_linux"
- microblazeel*)         targ_emul=elf32microblazeel
-                        targ_extra_emuls=elf32microblaze
-                        ;;
-+microblazeel64*)       targ_emul=elf64microblazeel
-+                       targ_extra_emuls=elf64microblaze
-+                       ;;
- microblaze*)           targ_emul=elf32microblaze
-                        targ_extra_emuls=elf32microblazeel
-                        ;;
-diff --git a/ld/emulparams/elf64microblaze.sh b/ld/emulparams/elf64microblaze.sh
-new file mode 100644
-index 00000000000..9c7b0eb7080
---- /dev/null
-+++ b/ld/emulparams/elf64microblaze.sh
-@@ -0,0 +1,23 @@
-+SCRIPT_NAME=elfmicroblaze
-+OUTPUT_FORMAT="elf64-microblazeel"
-+#BIG_OUTPUT_FORMAT="elf64-microblaze"
-+LITTLE_OUTPUT_FORMAT="elf64-microblazeel"
-+#TEXT_START_ADDR=0
-+NONPAGED_TEXT_START_ADDR=0x28
-+ALIGNMENT=4
-+MAXPAGESIZE=4
-+ARCH=microblaze
-+EMBEDDED=yes
-+
-+NOP=0x80000000
-+
-+# Hmmm, there's got to be a better way.  This sets the stack to the
-+# top of the simulator memory (2^19 bytes).
-+#PAGE_SIZE=0x1000
-+#DATA_ADDR=0x10000
-+#OTHER_RELOCATING_SECTIONS='.stack 0x7000 : { _stack = .; *(.stack) }'
-+#$@{RELOCATING+ PROVIDE (__stack = 0x7000);@}
-+#OTHER_RELOCATING_SECTIONS='PROVIDE (_stack = _end + 0x1000);'
-+
-+TEMPLATE_NAME=elf32
-+#GENERATE_SHLIB_SCRIPT=yes
-diff --git a/ld/emulparams/elf64microblazeel.sh b/ld/emulparams/elf64microblazeel.sh
-new file mode 100644
-index 00000000000..9c7b0eb7080
---- /dev/null
-+++ b/ld/emulparams/elf64microblazeel.sh
-@@ -0,0 +1,23 @@
-+SCRIPT_NAME=elfmicroblaze
-+OUTPUT_FORMAT="elf64-microblazeel"
-+#BIG_OUTPUT_FORMAT="elf64-microblaze"
-+LITTLE_OUTPUT_FORMAT="elf64-microblazeel"
-+#TEXT_START_ADDR=0
-+NONPAGED_TEXT_START_ADDR=0x28
-+ALIGNMENT=4
-+MAXPAGESIZE=4
-+ARCH=microblaze
-+EMBEDDED=yes
-+
-+NOP=0x80000000
-+
-+# Hmmm, there's got to be a better way.  This sets the stack to the
-+# top of the simulator memory (2^19 bytes).
-+#PAGE_SIZE=0x1000
-+#DATA_ADDR=0x10000
-+#OTHER_RELOCATING_SECTIONS='.stack 0x7000 : { _stack = .; *(.stack) }'
-+#$@{RELOCATING+ PROVIDE (__stack = 0x7000);@}
-+#OTHER_RELOCATING_SECTIONS='PROVIDE (_stack = _end + 0x1000);'
-+
-+TEMPLATE_NAME=elf32
-+#GENERATE_SHLIB_SCRIPT=yes
-diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index f57b98fc9f7..921adce04ea 100644
---- a/opcodes/microblaze-dis.c
-+++ b/opcodes/microblaze-dis.c
-@@ -33,6 +33,7 @@
- #define get_field_r1(buf, instr)   get_field (buf, instr, RA_MASK, RA_LOW)
- #define get_field_r2(buf, instr)   get_field (buf, instr, RB_MASK, RB_LOW)
- #define get_int_field_imm(instr)   ((instr & IMM_MASK) >> IMM_LOW)
-+#define get_int_field_imml(instr)  ((instr & IMML_MASK) >> IMM_LOW)
- #define get_int_field_r1(instr)    ((instr & RA_MASK) >> RA_LOW)
- 
- #define NUM_STRBUFS 3
-@@ -73,11 +74,19 @@ get_field_imm (struct string_buf *buf, long instr)
- }
- 
- static char *
--get_field_imm5 (struct string_buf *buf, long instr)
-+get_field_imml (struct string_buf *buf, long instr)
-+{
-+  char *p = strbuf (buf);
-+  sprintf (p, "%d", (short)((instr & IMML_MASK) >> IMM_LOW));
-+  return p;
-+}
-+
-+static char *
-+get_field_imms (struct string_buf *buf, long instr)
- {
-   char *p = strbuf (buf);
- 
--  sprintf (p, "%d", (short)((instr & IMM5_MASK) >> IMM_LOW));
-+  sprintf (p, "%d", (short)((instr & IMM6_MASK) >> IMM_LOW));
-   return p;
- }
- 
-@@ -91,14 +100,14 @@ get_field_imm5_mbar (struct string_buf *buf, long instr)
- }
- 
- static char *
--get_field_imm5width (struct string_buf *buf, long instr)
-+get_field_immw (struct string_buf *buf, long instr)
- {
-   char *p = strbuf (buf);
- 
-   if (instr & 0x00004000)
--    sprintf (p, "%d", (short)(((instr & IMM5_WIDTH_MASK) >> IMM_WIDTH_LOW))); /* bsefi */
-+    sprintf (p, "%d", (short)(((instr & IMM6_WIDTH_MASK) >> IMM_WIDTH_LOW))); /* bsefi */
-  else
--    sprintf (p, "%d", (short)(((instr & IMM5_WIDTH_MASK) >> IMM_WIDTH_LOW) - ((instr & IMM5_MASK) >> IMM_LOW) + 1)); /* bsifi */
-+    sprintf (p, "%d", (short)(((instr & IMM6_WIDTH_MASK) >> IMM_WIDTH_LOW) - ((instr & IMM6_MASK) >> IMM_LOW) + 1)); /* bsifi */
-   return p;
- }
- 
-@@ -308,9 +317,14 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-                }
-            }
-          break;
--       case INST_TYPE_RD_R1_IMM5:
-+       case INST_TYPE_RD_R1_IMML:
-          print_func (stream, "\t%s, %s, %s", get_field_rd (&buf, inst),
--                     get_field_r1 (&buf, inst), get_field_imm5 (&buf, inst));
-+                     get_field_r1 (&buf, inst), get_field_imm (&buf, inst));
-+          /* TODO: Also print symbol */
-+         break;
-+       case INST_TYPE_RD_R1_IMMS:
-+         print_func (stream, "\t%s, %s, %s", get_field_rd (&buf, inst),
-+                  get_field_r1(&buf, inst), get_field_imms (&buf, inst));
-          break;
-        case INST_TYPE_RD_RFSL:
-          print_func (stream, "\t%s, %s", get_field_rd (&buf, inst),
-@@ -417,6 +431,10 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-        case INST_TYPE_RD_R2:
-          print_func (stream, "\t%s, %s", get_field_rd (&buf, inst),
-                      get_field_r2 (&buf, inst));
-+          break;
-+        case INST_TYPE_IMML:
-+         print_func (stream, "\t%s", get_field_imml (&buf, inst));
-+          /* TODO: Also print symbol */
-          break;
-        case INST_TYPE_R2:
-          print_func (stream, "\t%s", get_field_r2 (&buf, inst));
-@@ -440,8 +458,8 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-        case INST_TYPE_NONE:
-          break;
-         /* For bit field insns.  */
--       case INST_TYPE_RD_R1_IMM5_IMM5:
--          print_func (stream, "\t%s, %s, %s, %s", get_field_rd (&buf, inst),get_field_r1(&buf, inst),get_field_imm5width (&buf, inst), get_field_imm5 (&buf, inst));
-+       case INST_TYPE_RD_R1_IMMW_IMMS:
-+          print_func (stream, "\t%s, %s, %s, %s", get_field_rd (&buf, inst),get_field_r1(&buf, inst),get_field_immw (&buf, inst), get_field_imms (&buf, inst));
-             break;
-        /* For tuqula instruction */
-        case INST_TYPE_RD:
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 825c639a41e..ab90240d88a 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -40,7 +40,7 @@
- #define INST_TYPE_RD_SPECIAL 11
- #define INST_TYPE_R1 12
- /* New instn type for barrel shift imms.  */
--#define INST_TYPE_RD_R1_IMM5  13
-+#define INST_TYPE_RD_R1_IMMS  13
- #define INST_TYPE_RD_RFSL    14
- #define INST_TYPE_R1_RFSL    15
- 
-@@ -60,7 +60,13 @@
- #define INST_TYPE_IMM5 20
- 
- /* For bsefi and bsifi */
--#define INST_TYPE_RD_R1_IMM5_IMM5  21
-+#define INST_TYPE_RD_R1_IMMW_IMMS  21
-+
-+/* For 64-bit instructions */
-+#define INST_TYPE_IMML 22
-+#define INST_TYPE_RD_R1_IMML 23
-+#define INST_TYPE_R1_IMML 24
-+#define INST_TYPE_RD_R1_IMMW_IMMS  21
- 
- #define INST_TYPE_NONE 25
- 
-@@ -91,13 +97,14 @@
- #define OPCODE_MASK_H24 0xFC1F07FF  /* High 6, bits 20-16 and low 11 bits.  */
- #define OPCODE_MASK_H124  0xFFFF07FF /* High 16, and low 11 bits.  */
- #define OPCODE_MASK_H1234 0xFFFFFFFF /* All 32 bits.  */
--#define OPCODE_MASK_H3  0xFC000600  /* High 6 bits and bits 21, 22.  */
--#define OPCODE_MASK_H3B 0xFC00C600  /* High 6 bits and bits 16, 17, 21, 22.  */
-+#define OPCODE_MASK_H3  0xFC000700  /* High 6 bits and bits 21, 22, 23.  */
-+#define OPCODE_MASK_H3B 0xFC00E600  /* High 6 bits and bits 16, 17, 18, 21, 22.  */
- #define OPCODE_MASK_H32 0xFC00FC00  /* High 6 bits and bit 16-21.  */
--#define OPCODE_MASK_H32B 0xFC00C000  /* High 6 bits and bit 16, 17.  */
-+#define OPCODE_MASK_H32B 0xFC00E000  /* High 6 bits and bit 16, 17, 18.  */
- #define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits.  */
- #define OPCODE_MASK_H35B 0xFC0004FF /* High 6 bits and low 9 bits.  */
- #define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26.  */
-+#define OPCODE_MASK_H8  0xFF000000  /* High 8 bits only.  */
- 
- /* New Mask for msrset, msrclr insns.  */
- #define OPCODE_MASK_H23N  0xFC1F8000 /* High 6 and bits 11 - 16.  */
-@@ -107,7 +114,7 @@
- #define DELAY_SLOT 1
- #define NO_DELAY_SLOT 0
- 
--#define MAX_OPCODES 301
-+#define MAX_OPCODES 412
- 
- const struct op_code_struct
- {
-@@ -125,6 +132,7 @@ const struct op_code_struct
-   /* More info about output format here.  */
- } microblaze_opcodes[MAX_OPCODES] =
- {
-+  /* 32-bit instructions */
-   {"add",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x00000000, OPCODE_MASK_H4, add, arithmetic_inst },
-   {"rsub",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x04000000, OPCODE_MASK_H4, rsub, arithmetic_inst },
-   {"addc",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x08000000, OPCODE_MASK_H4, addc, arithmetic_inst },
-@@ -161,11 +169,11 @@ const struct op_code_struct
-   {"ncget", INST_TYPE_RD_RFSL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x6C006000, OPCODE_MASK_H32, ncget, anyware_inst },
-   {"ncput", INST_TYPE_R1_RFSL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x6C00E000, OPCODE_MASK_H32, ncput, anyware_inst },
-   {"muli",  INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x60000000, OPCODE_MASK_H, muli, mult_inst },
--  {"bslli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000400, OPCODE_MASK_H3, bslli, barrel_shift_inst },
--  {"bsrai", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000200, OPCODE_MASK_H3, bsrai, barrel_shift_inst },
--  {"bsrli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000000, OPCODE_MASK_H3, bsrli, barrel_shift_inst },
--  {"bsefi", INST_TYPE_RD_R1_IMM5_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64004000, OPCODE_MASK_H32B, bsefi, barrel_shift_inst },
--  {"bsifi", INST_TYPE_RD_R1_IMM5_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64008000, OPCODE_MASK_H32B, bsifi, barrel_shift_inst },
-+  {"bslli", INST_TYPE_RD_R1_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000400, OPCODE_MASK_H3B, bslli, barrel_shift_inst },
-+  {"bsrai", INST_TYPE_RD_R1_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000200, OPCODE_MASK_H3B, bsrai, barrel_shift_inst },
-+  {"bsrli", INST_TYPE_RD_R1_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000000, OPCODE_MASK_H3B, bsrli, barrel_shift_inst },
-+  {"bsefi", INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64004000, OPCODE_MASK_H32B, bsefi, barrel_shift_inst },
-+  {"bsifi", INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64008000, OPCODE_MASK_H32B, bsifi, barrel_shift_inst },
-   {"or",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x80000000, OPCODE_MASK_H4, microblaze_or, logical_inst },
-   {"and",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x84000000, OPCODE_MASK_H4, microblaze_and, logical_inst },
-   {"xor",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x88000000, OPCODE_MASK_H4, microblaze_xor, logical_inst },
-@@ -425,6 +433,129 @@ const struct op_code_struct
-   {"suspend",   INST_TYPE_NONE,  INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBB020004, OPCODE_MASK_HN,   invalid_inst, special_inst }, /* translates to mbar 24.  */
-   {"swapb",     INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E0, OPCODE_MASK_H4,   swapb,     arithmetic_inst },
-   {"swaph",     INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E2, OPCODE_MASK_H4,   swaph,     arithmetic_inst },
-+
-+  /* 64-bit instructions */
-+  {"addl",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x00000100, OPCODE_MASK_H4, addl, arithmetic_inst },
-+  {"rsubl",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x04000100, OPCODE_MASK_H4, rsubl, arithmetic_inst },
-+  {"addlc",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x08000100, OPCODE_MASK_H4, addlc, arithmetic_inst },
-+  {"rsublc",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x0C000100, OPCODE_MASK_H4, rsublc, arithmetic_inst },
-+  {"addlk",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x10000100, OPCODE_MASK_H4, addlk, arithmetic_inst },
-+  {"rsublk",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x14000100, OPCODE_MASK_H4, rsublk, arithmetic_inst },
-+  {"addlkc",  INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x18000100, OPCODE_MASK_H4, addlkc, arithmetic_inst },
-+  {"rsublkc", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x1C000100, OPCODE_MASK_H4, rsublkc, arithmetic_inst },
-+  {"cmpl",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x14000101, OPCODE_MASK_H4, cmpl, arithmetic_inst },
-+  {"cmplu",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x14000103, OPCODE_MASK_H4, cmplu, arithmetic_inst },
-+  {"addli",   INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x20000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"rsubli",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x24000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addlic",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x28000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"rsublic", INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x2C000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addlik",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x30000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"rsublik", INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x34000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addlikc", INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x38000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"rsublikc",INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x3C000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },  /* Identical to 32-bit */
-+  {"mull",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x40000100, OPCODE_MASK_H4, mull, mult_inst },
-+  {"bslll",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x44000500, OPCODE_MASK_H3, bslll, barrel_shift_inst },
-+  {"bslra",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x44000300, OPCODE_MASK_H3, bslra, barrel_shift_inst },
-+  {"bslrl",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x44000100, OPCODE_MASK_H3, bslrl, barrel_shift_inst },
-+  {"bsllli",  INST_TYPE_RD_R1_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64002400, OPCODE_MASK_H3B, bsllli, barrel_shift_inst },
-+  {"bslrai",  INST_TYPE_RD_R1_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64002200, OPCODE_MASK_H3B, bslrai, barrel_shift_inst },
-+  {"bslrli",  INST_TYPE_RD_R1_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64002000, OPCODE_MASK_H3B, bslrli, barrel_shift_inst },
-+  {"bslefi",  INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64006000, OPCODE_MASK_H32B, bslefi, barrel_shift_inst },
-+  {"bslifi",  INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x6400a000, OPCODE_MASK_H32B, bslifi, barrel_shift_inst },
-+  {"orl",     INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x80000100, OPCODE_MASK_H4, orl, logical_inst },
-+  {"andl",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x84000100, OPCODE_MASK_H4, andl, logical_inst },
-+  {"xorl",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x88000100, OPCODE_MASK_H4, xorl, logical_inst },
-+  {"andnl",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x8C000100, OPCODE_MASK_H4, andnl, logical_inst },
-+  {"pcmplbf", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x80000500, OPCODE_MASK_H4, pcmplbf, logical_inst },
-+  {"pcmpleq", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x88000500, OPCODE_MASK_H4, pcmpleq, logical_inst },
-+  {"pcmplne", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x8C000500, OPCODE_MASK_H4, pcmplne, logical_inst },
-+  {"srla",    INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000101, OPCODE_MASK_H34, srla, logical_inst },
-+  {"srlc",    INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000121, OPCODE_MASK_H34, srlc, logical_inst },
-+  {"srll",    INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000141, OPCODE_MASK_H34, srll, logical_inst },
-+  {"sextl8",  INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000160, OPCODE_MASK_H34, sextl8, logical_inst },
-+  {"sextl16", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000161, OPCODE_MASK_H34, sextl16, logical_inst },
-+  {"sextl32", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000162, OPCODE_MASK_H34, sextl32, logical_inst },
-+  {"brea",    INST_TYPE_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98010000, OPCODE_MASK_H124, brea, branch_inst },
-+  {"bread",   INST_TYPE_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98110000, OPCODE_MASK_H124, bread, branch_inst },
-+  {"breald",  INST_TYPE_RD_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98150000, OPCODE_MASK_H24, breald, branch_inst },
-+  {"beaeq",   INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D000000, OPCODE_MASK_H14, beaeq, branch_inst },
-+  {"bealeq",  INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D000100, OPCODE_MASK_H14, bealeq, branch_inst },
-+  {"beaeqd",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F000000, OPCODE_MASK_H14, beaeqd, branch_inst },
-+  {"bealeqd", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F000100, OPCODE_MASK_H14, bealeqd, branch_inst },
-+  {"beane",   INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D200000, OPCODE_MASK_H14, beane, branch_inst },
-+  {"bealne",  INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D200100, OPCODE_MASK_H14, bealne, branch_inst },
-+  {"beaned",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F200000, OPCODE_MASK_H14, beaned, branch_inst },
-+  {"bealned", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F200100, OPCODE_MASK_H14, bealned, branch_inst },
-+  {"bealt",   INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D400000, OPCODE_MASK_H14, bealt, branch_inst },
-+  {"beallt",  INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D400100, OPCODE_MASK_H14, beallt, branch_inst },
-+  {"bealtd",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F400000, OPCODE_MASK_H14, bealtd, branch_inst },
-+  {"bealltd", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F400100, OPCODE_MASK_H14, bealltd, branch_inst },
-+  {"beale",   INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D600000, OPCODE_MASK_H14, beale, branch_inst },
-+  {"bealle",  INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D600100, OPCODE_MASK_H14, bealle, branch_inst },
-+  {"bealed",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F600000, OPCODE_MASK_H14, bealed, branch_inst },
-+  {"bealled", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F600100, OPCODE_MASK_H14, bealled, branch_inst },
-+  {"beagt",   INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D800000, OPCODE_MASK_H14, beagt, branch_inst },
-+  {"bealgt",  INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9D800100, OPCODE_MASK_H14, bealgt, branch_inst },
-+  {"beagtd",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F800000, OPCODE_MASK_H14, beagtd, branch_inst },
-+  {"bealgtd", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9F800100, OPCODE_MASK_H14, bealgtd, branch_inst },
-+  {"beage",   INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9DA00000, OPCODE_MASK_H14, beage, branch_inst },
-+  {"bealge",  INST_TYPE_R1_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9DA00100, OPCODE_MASK_H14, bealge, branch_inst },
-+  {"beaged",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9FA00000, OPCODE_MASK_H14, beaged, branch_inst },
-+  {"bealged", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9FA00100, OPCODE_MASK_H14, bealged, branch_inst },
-+  {"orli",    INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA0000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"andli",   INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA4000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"xorli",   INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA8000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"andnli",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xAC000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"imml",    INST_TYPE_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB2000000, OPCODE_MASK_H8, imml, immediate_inst },
-+  {"breai",   INST_TYPE_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8010000, OPCODE_MASK_H12, breai, branch_inst },
-+  {"breaid",  INST_TYPE_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8110000, OPCODE_MASK_H12, breaid, branch_inst },
-+  {"brealid", INST_TYPE_RD_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8150000, OPCODE_MASK_H2, brealid, branch_inst },
-+  {"beaeqi",  INST_TYPE_R1_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD000000, OPCODE_MASK_H1, beaeqi, branch_inst },
-+  {"bealeqi", INST_TYPE_R1_IMML, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD000000, OPCODE_MASK_H1, invalid_inst, branch_inst }, /* Identical to beaeqi */
-+  {"beaeqid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF000000, OPCODE_MASK_H1, beaeqid, branch_inst },
-+  {"bealeqid",INST_TYPE_R1_IMML, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF000000, OPCODE_MASK_H1, invalid_inst, branch_inst },    /* Identical to beaeqid */
-+  {"beanei",  INST_TYPE_R1_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD200000, OPCODE_MASK_H1, beanei, branch_inst },
-+  {"bealnei", INST_TYPE_R1_IMML, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD200000, OPCODE_MASK_H1, invalid_inst, branch_inst }, /* Identical to beanei */
-+  {"beaneid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF200000, OPCODE_MASK_H1, beaneid, branch_inst },
-+  {"bealneid",INST_TYPE_R1_IMML, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF200000, OPCODE_MASK_H1, invalid_inst, branch_inst },    /* Identical to beaneid */
-+  {"bealti",  INST_TYPE_R1_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD400000, OPCODE_MASK_H1, bealti, branch_inst },
-+  {"beallti", INST_TYPE_R1_IMML, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD400000, OPCODE_MASK_H1, invalid_inst, branch_inst }, /* Identical to bealti */
-+  {"bealtid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF400000, OPCODE_MASK_H1, bealtid, branch_inst },
-+  {"bealltid",INST_TYPE_R1_IMML, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF400000, OPCODE_MASK_H1, invalid_inst, branch_inst },    /* Identical to bealtid */
-+  {"bealei",  INST_TYPE_R1_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD600000, OPCODE_MASK_H1, bealei, branch_inst },
-+  {"beallei", INST_TYPE_R1_IMML, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD600000, OPCODE_MASK_H1, invalid_inst, branch_inst }, /* Identical to bealei */
-+  {"bealeid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF600000, OPCODE_MASK_H1, bealeid, branch_inst },
-+  {"bealleid",INST_TYPE_R1_IMML, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF600000, OPCODE_MASK_H1, invalid_inst, branch_inst },    /* Identical to bealeid */
-+  {"beagti",  INST_TYPE_R1_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD800000, OPCODE_MASK_H1, beagti, branch_inst },
-+  {"bealgti", INST_TYPE_R1_IMML, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBD800000, OPCODE_MASK_H1, invalid_inst, branch_inst }, /* Identical to beagti */
-+  {"beagtid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF800000, OPCODE_MASK_H1, beagtid, branch_inst },
-+  {"bealgtid",INST_TYPE_R1_IMML, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBF800000, OPCODE_MASK_H1, invalid_inst, branch_inst },    /* Identical to beagtid */
-+  {"beagei",  INST_TYPE_R1_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBDA00000, OPCODE_MASK_H1, beagei, branch_inst },
-+  {"bealgei", INST_TYPE_R1_IMML, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBDA00000, OPCODE_MASK_H1, invalid_inst, branch_inst }, /* Identical to beagei */
-+  {"beageid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBFA00000, OPCODE_MASK_H1, beageid, branch_inst },
-+  {"bealgeid",INST_TYPE_R1_IMML, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBFA00000, OPCODE_MASK_H1, invalid_inst, branch_inst },    /* Identical to beageid */
-+  {"ll",      INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000100, OPCODE_MASK_H4, ll, memory_load_inst },
-+  {"llr",     INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000300, OPCODE_MASK_H4, llr, memory_load_inst },
-+  {"sl",      INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000100, OPCODE_MASK_H4, sl, memory_store_inst },
-+  {"slr",     INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000300, OPCODE_MASK_H4, slr, memory_store_inst },
-+  {"lli",     INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xEC000000, OPCODE_MASK_H, invalid_inst, memory_load_inst },  /* Identical to 32-bit */
-+  {"sli",     INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xFC000000, OPCODE_MASK_H, invalid_inst, memory_store_inst }, /* Identical to 32-bit */
-+  {"lla",     INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x30000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* lla translates to addlik */
-+  {"dadd",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000400, OPCODE_MASK_H4, dadd, arithmetic_inst },
-+  {"drsub",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000480, OPCODE_MASK_H4, drsub, arithmetic_inst },
-+  {"dmul",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000500, OPCODE_MASK_H4, dmul, arithmetic_inst },
-+  {"ddiv",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000580, OPCODE_MASK_H4, ddiv, arithmetic_inst },
-+  {"dcmp.lt", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000610, OPCODE_MASK_H4, dcmp_lt, arithmetic_inst },
-+  {"dcmp.eq", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000620, OPCODE_MASK_H4, dcmp_eq, arithmetic_inst },
-+  {"dcmp.le", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000630, OPCODE_MASK_H4, dcmp_le, arithmetic_inst },
-+  {"dcmp.gt", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000640, OPCODE_MASK_H4, dcmp_gt, arithmetic_inst },
-+  {"dcmp.ne", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000650, OPCODE_MASK_H4, dcmp_ne, arithmetic_inst },
-+  {"dcmp.ge", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000660, OPCODE_MASK_H4, dcmp_ge, arithmetic_inst },
-+  {"dcmp.un", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000600, OPCODE_MASK_H4, dcmp_un, arithmetic_inst },
-+  {"dbl",     INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000680, OPCODE_MASK_H4, dbl,   arithmetic_inst },
-+  {"dlong",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000700, OPCODE_MASK_H4, dlong, arithmetic_inst },
-+  {"dsqrt",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000780, OPCODE_MASK_H4, dsqrt, arithmetic_inst },
-+
-   {"", 0, 0, 0, 0, 0, 0, 0, 0},
- };
- 
-@@ -445,8 +576,17 @@ char pvr_register_prefix[] = "rpvr";
- #define MIN_IMM5  ((int) 0x00000000)
- #define MAX_IMM5  ((int) 0x0000001f)
- 
-+#define MIN_IMM6  ((int) 0x00000000)
-+#define MAX_IMM6  ((int) 0x0000003f)
-+
- #define MIN_IMM_WIDTH  ((int) 0x00000001)
- #define MAX_IMM_WIDTH  ((int) 0x00000020)
- 
-+#define MIN_IMM6_WIDTH  ((int) 0x00000001)
-+#define MAX_IMM6_WIDTH  ((int) 0x00000040)
-+
-+#define MIN_IMML  ((long) 0xffffff8000000000L)
-+#define MAX_IMML  ((long) 0x0000007fffffffffL)
-+
- #endif /* MICROBLAZE_OPC */
- 
-diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index aa3401610d9..b242ea73c7b 100644
---- a/opcodes/microblaze-opcm.h
-+++ b/opcodes/microblaze-opcm.h
-@@ -25,6 +25,7 @@
- 
- enum microblaze_instr
- {
-+  /* 32-bit instructions */
-   add, rsub, addc, rsubc, addk, rsubk, addkc, rsubkc, clz, cmp, cmpu,
-   addi, rsubi, addic, rsubic, addik, rsubik, addikc, rsubikc, mul,
-   mulh, mulhu, mulhsu,swapb,swaph,
-@@ -39,8 +40,8 @@ enum microblaze_instr
-   imm, rtsd, rtid, rtbd, rted, bri, brid, brlid, brai, braid, bralid,
-   brki, beqi, beqid, bnei, bneid, blti, bltid, blei, bleid, bgti,
-   bgtid, bgei, bgeid, lbu, lbuea, lbur, lhu, lhuea, lhur, lw, lwea, lwr, lwx,
--  sb, sbea, sbr, sh, shea, shr, sw, swea, swr, swx, lbui, lhui, lwi,
--  sbi, shi, swi, msrset, msrclr, tuqula, mbi_fadd, frsub, mbi_fmul, mbi_fdiv,
-+  sb, sbea, sbr, sh, shea, shr, sw, swea, swr, swx, lbui, lhui, lwi, lli,
-+  sbi, shi, swi, sli, msrset, msrclr, tuqula, mbi_fadd, frsub, mbi_fmul, mbi_fdiv,
-   fcmp_lt, fcmp_eq, fcmp_le, fcmp_gt, fcmp_ne, fcmp_ge, fcmp_un, flt,
-   /* 'fsqrt' is a glibc:math.h symbol.  */
-   fint, microblaze_fsqrt,
-@@ -59,6 +60,18 @@ enum microblaze_instr
-   aputd, taputd, caputd, tcaputd, naputd, tnaputd, ncaputd, tncaputd,
-   eagetd, teagetd, ecagetd, tecagetd, neagetd, tneagetd, necagetd, tnecagetd,
-   eaputd, teaputd, ecaputd, tecaputd, neaputd, tneaputd, necaputd, tnecaputd,
-+
-+  /* 64-bit instructions */
-+  addl, rsubl, addlc, rsublc, addlk, rsublk, addlkc, rsublkc, cmpl, cmplu, mull,
-+  bslll, bslra, bslrl, bsllli, bslrai, bslrli, bslefi, bslifi, orl, andl, xorl,
-+  andnl, pcmplbf, pcmpleq, pcmplne, srla, srlc, srll, sextl8, sextl16, sextl32,
-+  brea, bread, breald, beaeq, bealeq, beaeqd, bealeqd, beane, bealne, beaned,
-+  bealned, bealt, beallt, bealtd, bealltd, beale, bealle, bealed, bealled, beagt,
-+  bealgt, beagtd, bealgtd, beage, bealge, beaged, bealged, breai, breaid, brealid,
-+  beaeqi, beaeqid, beanei, beaneid, bealti, bealtid, bealei, bealeid, beagti,
-+  beagtid, beagei, beageid, imml, ll, llr, sl, slr,
-+  dadd, drsub, dmul, ddiv, dcmp_lt, dcmp_eq, dcmp_le, dcmp_gt, dcmp_ne, dcmp_ge,
-+  dcmp_un, dbl, dlong, dsqrt,
-   invalid_inst
- };
- 
-@@ -136,15 +149,18 @@ enum microblaze_instr_type
- #define RA_MASK 0x001F0000
- #define RB_MASK 0x0000F800
- #define IMM_MASK 0x0000FFFF
-+#define IMML_MASK 0x00FFFFFF
- 
--/* Imm mask for barrel shifts.  */
-+/* Imm masks for barrel shifts.  */
- #define IMM5_MASK 0x0000001F
-+#define IMM6_MASK 0x0000003F
- 
- /* Imm mask for mbar.  */
- #define IMM5_MBAR_MASK 0x03E00000
- 
--/* Imm mask for extract/insert width. */
-+/* Imm masks for extract/insert width. */
- #define IMM5_WIDTH_MASK 0x000007C0
-+#define IMM6_WIDTH_MASK 0x00000FC0
- 
- /* FSL imm mask for get, put instructions.  */
- #define  RFSL_MASK 0x000000F
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
deleted file mode 100644
index 01aff144..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 667611ec2dfb22bf13d5c6af65ea62e9c13a68de Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Tue, 11 Sep 2018 13:48:33 +0530
-Subject: [PATCH 13/34] [Patch,Microblaze] : negl instruction is overriding
- rsubl,fixed it by changing the instruction order...
-
----
- opcodes/microblaze-opc.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index ab90240d88a..5e45df995de 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -275,9 +275,7 @@ const struct op_code_struct
-   {"la",    INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x30000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst }, /* la translates to addik.  */
-   {"tuqula",INST_TYPE_RD, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x3000002A, OPCODE_MASK_H, invalid_inst, arithmetic_inst }, /* tuqula rd translates to addik rd, r0, 42.  */
-   {"not",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA800FFFF, OPCODE_MASK_H34, invalid_inst, logical_inst }, /* not translates to xori rd,ra,-1.  */
--  {"neg",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x04000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst }, /* neg translates to rsub rd, ra, r0.  */
-   {"rtb",   INST_TYPE_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB6000004, OPCODE_MASK_H1, invalid_inst, return_inst }, /* rtb translates to rts rd, 4.  */
--  {"sub",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x04000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst }, /* sub translates to rsub rd, rb, ra.  */
-   {"lmi",   INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE8000000, OPCODE_MASK_H, invalid_inst, memory_load_inst },
-   {"smi",   INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xF8000000, OPCODE_MASK_H, invalid_inst, memory_store_inst },
-   {"msrset",INST_TYPE_RD_IMM15, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x94100000, OPCODE_MASK_H23N, msrset, special_inst },
-@@ -555,6 +553,8 @@ const struct op_code_struct
-   {"dbl",     INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000680, OPCODE_MASK_H4, dbl,   arithmetic_inst },
-   {"dlong",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000700, OPCODE_MASK_H4, dlong, arithmetic_inst },
-   {"dsqrt",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x58000780, OPCODE_MASK_H4, dsqrt, arithmetic_inst },
-+  {"neg",   INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x04000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst }, /* neg translates to rsub rd, ra, r0.  */
-+  {"sub",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x04000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst }, /* sub translates to rsub rd, rb, ra.  */
- 
-   {"", 0, 0, 0, 0, 0, 0, 0, 0},
- };
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0014-Added-relocations-for-MB-X.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Added-relocations-for-MB-X.patch
deleted file mode 100644
index 404081e0..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0014-Added-relocations-for-MB-X.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-From 4e94c1683a806ac46f3a0d54bfe8f7247d5f0cbd Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Tue, 11 Sep 2018 17:30:17 +0530
-Subject: [PATCH 14/34] Added relocations for MB-X
-
-Conflicts:
-        bfd/bfd-in2.h
-        gas/config/tc-microblaze.c
-
-Conflicts:
-        gas/config/tc-microblaze.c
----
- bfd/bfd-in2.h              |  9 +++-
- bfd/libbfd.h               |  4 +-
- bfd/reloc.c                | 26 ++++++-----
- gas/config/tc-microblaze.c | 90 ++++++++++++++++----------------------
- 4 files changed, 61 insertions(+), 68 deletions(-)
-
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 6cf701abf10..14e228c9c0e 100644
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -5387,13 +5387,18 @@ done here - only used for relaxing  */
- /* This is a 64 bit reloc that stores the 32 bit pc relative
- value in two words (with an imm instruction).  No relocation is
- done here - only used for relaxing  */
--  BFD_RELOC_MICROBLAZE_64_NONE,
-+  BFD_RELOC_MICROBLAZE_64_PCREL,
- 
--/* This is a 64 bit reloc that stores the 32 bit pc relative
-+/* This is a 64 bit reloc that stores the 32 bit relative
-  *  +value in two words (with an imml instruction).  No relocation is
-  *   +done here - only used for relaxing  */
-     BFD_RELOC_MICROBLAZE_64,
- 
-+/* This is a 64 bit reloc that stores the 32 bit pc relative
-+ *  +value in two words (with an imm instruction).  No relocation is
-+ *   +done here - only used for relaxing  */
-+    BFD_RELOC_MICROBLAZE_64_NONE,
-+
- /* This is a 64 bit reloc that stores the 32 bit pc relative
- value in two words (with an imm instruction).  The relocation is
- PC-relative GOT offset  */
-diff --git a/bfd/libbfd.h b/bfd/libbfd.h
-index e74c051e781..20086ba608b 100644
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -2991,14 +2991,14 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
-   "BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM",
-   "BFD_RELOC_MICROBLAZE_32_NONE",
-   "BFD_RELOC_MICROBLAZE_64_NONE",
--  "BFD_RELOC_MICROBLAZE_64",
-   "BFD_RELOC_MICROBLAZE_64_GOTPC",
--  "BFD_RELOC_MICROBLAZE_64_GPC",
-   "BFD_RELOC_MICROBLAZE_64_GOT",
-   "BFD_RELOC_MICROBLAZE_64_PLT",
-   "BFD_RELOC_MICROBLAZE_64_GOTOFF",
-   "BFD_RELOC_MICROBLAZE_32_GOTOFF",
-   "BFD_RELOC_MICROBLAZE_COPY",
-+  "BFD_RELOC_MICROBLAZE_64",
-+  "BFD_RELOC_MICROBLAZE_64_PCREL",
-   "BFD_RELOC_MICROBLAZE_64_TLS",
-   "BFD_RELOC_MICROBLAZE_64_TLSGD",
-   "BFD_RELOC_MICROBLAZE_64_TLSLD",
-diff --git a/bfd/reloc.c b/bfd/reloc.c
-index 0f99df91299..6165ff3adf1 100644
---- a/bfd/reloc.c
-+++ b/bfd/reloc.c
-@@ -6875,24 +6875,12 @@ ENUMDOC
-   done here - only used for relaxing
- ENUM
-   BFD_RELOC_MICROBLAZE_64_NONE
--ENUMDOC
--  This is a 32 bit reloc that stores the 32 bit pc relative
--  value in two words (with an imml instruction).  No relocation is
--  done here - only used for relaxing
--ENUM
--  BFD_RELOC_MICROBLAZE_64
- ENUMDOC
-   This is a 64 bit reloc that stores the 32 bit pc relative
-   value in two words (with an imm instruction).  No relocation is
-   done here - only used for relaxing
- ENUM
-   BFD_RELOC_MICROBLAZE_64_GOTPC
--ENUMDOC
--  This is a 64 bit reloc that stores the 32 bit pc relative
--  value in two words (with an imml instruction).  No relocation is
--  done here - only used for relaxing
--ENUM
--  BFD_RELOC_MICROBLAZE_64_GPC
- ENUMDOC
-   This is a 64 bit reloc that stores the 32 bit pc relative
-   value in two words (with an imm instruction).  The relocation is
-@@ -6978,6 +6966,20 @@ ENUMDOC
-   value in two words (with an imm instruction).  The relocation is
-   relative offset from start of TEXT.
- 
-+  This is a 64 bit reloc that stores 64-bit thread pointer relative offset
-+  to two words (uses imml instruction).
-+ENUM
-+BFD_RELOC_MICROBLAZE_64,
-+ENUMDOC
-+ This is a 64 bit reloc that stores the 64 bit pc relative
-+ value in two words (with an imml instruction).  No relocation is
-+ done here - only used for relaxing
-+ENUM
-+BFD_RELOC_MICROBLAZE_64_PCREL,
-+ENUMDOC
-+ This is a 32 bit reloc that stores the 32 bit pc relative
-+ value in two words (with an imml instruction).  No relocation is
-+ done here - only used for relaxing
- ENUM
-   BFD_RELOC_AARCH64_RELOC_START
- ENUMDOC
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index a6f12dda54a..9d4dbc12ab3 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -95,6 +95,7 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP";
- #define TEXT_OFFSET         17
- #define TEXT_PC_OFFSET       18
- #define DEFINED_64_OFFSET   19
-+#define DEFINED_64_PC_OFFSET 20 
- 
- /* Initialize the relax table.  */
- const relax_typeS md_relax_table[] =
-@@ -119,7 +120,8 @@ const relax_typeS md_relax_table[] =
-   { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 },  /* 17: TEXT_OFFSET.  */
-   { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 },   /* 18: TEXT_PC_OFFSET.  */
- //  { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }   /* 16: TLSTPREL_OFFSET.  */
--  { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE, 0 }   /* 17: DEFINED_64_OFFSET.  */
-+  { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE, 0 },   /* 19: DEFINED_64_OFFSET.  */
-+  { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE*2, 0 }   /* 20: DEFINED_64_PC_OFFSET.  */
- };
- 
- static htab_t  opcode_hash_control;    /* Opcode mnemonics.  */
-@@ -1184,33 +1186,6 @@ md_assemble (char * str)
-               inst |= (immed << IMM_LOW) & IMM_MASK;
-             }
-        }
--#if 0 //revisit
--      else if (streq (name, "lli") || streq (name, "sli"))
--       {
--          temp = immed & 0xFFFFFFFFFFFF8000;
--          if ((temp != 0) && (temp != 0xFFFFFFFFFFFF8000))
--           {
--              /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
--              if (opcode1 == NULL)
--                {
--                  as_bad (_("unknown opcode \"%s\""), "imml");
--                  return;
--                }
--
--              inst1 = opcode1->bit_sequence;
--             inst1 |= ((immedl & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
--              output[0] = INST_BYTE0 (inst1);
--              output[1] = INST_BYTE1 (inst1);
--              output[2] = INST_BYTE2 (inst1);
--              output[3] = INST_BYTE3 (inst1);
--              output = frag_more (isize);
--           }
--         inst |= (reg1 << RD_LOW) & RD_MASK;
--         inst |= (reg2 << RA_LOW) & RA_MASK;
--         inst |= (immed << IMM_LOW) & IMM_MASK;
--        }
--#endif
-       else
-        {
-           temp = immed & 0xFFFF8000;
-@@ -1970,8 +1945,8 @@ md_assemble (char * str)
- 
-       if (exp.X_op != O_constant)
-        {
--         char *opc = NULL;
--         //char *opc = str_microblaze_64;
-+         //char *opc = NULL;
-+         char *opc = str_microblaze_64;
-          relax_substateT subtype;
- 
-          if (exp.X_md != 0)
-@@ -2230,13 +2205,19 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
-       fragP->fr_fix += INST_WORD_SIZE * 2;
-       fragP->fr_var = 0;
-       break;
-+    case DEFINED_64_PC_OFFSET:
-+      fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE, fragP->fr_symbol,
-+                fragP->fr_offset, TRUE, BFD_RELOC_MICROBLAZE_64_PCREL);
-+      fragP->fr_fix += INST_WORD_SIZE * 2;
-+      fragP->fr_var = 0;
-+      break;
-     case DEFINED_64_OFFSET:
-       if (fragP->fr_symbol == GOT_symbol)
-         fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE, fragP->fr_symbol,
--                fragP->fr_offset, true, BFD_RELOC_MICROBLAZE_64_GPC);
-+                fragP->fr_offset, false, BFD_RELOC_MICROBLAZE_64_GPC);
-       else
-         fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE, fragP->fr_symbol,
--                fragP->fr_offset, true, BFD_RELOC_MICROBLAZE_64);
-+                fragP->fr_offset, false, BFD_RELOC_MICROBLAZE_64);
-       fragP->fr_fix += INST_WORD_SIZE * 2;
-       fragP->fr_var = 0;
-       break;
-@@ -2246,7 +2227,7 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
-                 fragP->fr_offset, true, BFD_RELOC_MICROBLAZE_64_GOTPC);
-       else
-         fix_new (fragP, fragP->fr_fix, INST_WORD_SIZE * 2, fragP->fr_symbol,
--                fragP->fr_offset, true, BFD_RELOC_64);
-+                fragP->fr_offset, false, BFD_RELOC_64);
-       fragP->fr_fix += INST_WORD_SIZE * 2;
-       fragP->fr_var = 0;
-       break;
-@@ -2464,14 +2445,17 @@ md_apply_fix (fixS *   fixP,
-            }
-        }
-       break;
-+
-     case BFD_RELOC_64_PCREL:
-     case BFD_RELOC_64:
-     case BFD_RELOC_MICROBLAZE_64_TEXTREL:
-     case BFD_RELOC_MICROBLAZE_64:
-+    case BFD_RELOC_MICROBLAZE_64_PCREL:
-       /* Add an imm instruction.  First save the current instruction.  */
-       for (i = 0; i < INST_WORD_SIZE; i++)
-        buf[i + INST_WORD_SIZE] = buf[i];
--      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64
-+            || fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-         {
-           /* Generate the imm instruction.  */
-           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-@@ -2484,6 +2468,10 @@ md_apply_fix (fixS *   fixP,
-            inst1 = opcode1->bit_sequence;
-            if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-             inst1 |= ((val & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+             fixP->fx_r_type = BFD_RELOC_64; 
-+           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-+             fixP->fx_r_type = BFD_RELOC_64_PCREL; 
-          }
-       else
-         {
-@@ -2494,7 +2482,7 @@ md_apply_fix (fixS *   fixP,
-              as_bad (_("unknown opcode \"%s\""), "imm");
-              return;
-            }
--     
-+
-           inst1 = opcode1->bit_sequence;
-           if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-            inst1 |= ((val & 0xFFFF0000) >> 16) & IMM_MASK;
-@@ -2542,7 +2530,7 @@ md_apply_fix (fixS *   fixP,
-         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-       if (opcode1 == NULL)
-        {
--         if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
-+          if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
-            as_bad (_("unknown opcode \"%s\""), "imml");
-           else
-            as_bad (_("unknown opcode \"%s\""), "imm");
-@@ -2569,8 +2557,6 @@ md_apply_fix (fixS *   fixP,
-         moves code around due to relaxing.  */
-       if (fixP->fx_r_type == BFD_RELOC_64_PCREL)
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
--      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
--           fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
-       else if (fixP->fx_r_type == BFD_RELOC_32)
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE;
-       else
-@@ -2621,33 +2607,24 @@ md_estimate_size_before_relax (fragS * fragP,
-             if(streq (fragP->fr_opcode, str_microblaze_64)) 
-              {
-                /* Used as an absolute value.  */
--              fragP->fr_subtype = DEFINED_64_OFFSET;
-+              fragP->fr_subtype = DEFINED_64_PC_OFFSET;
-                /* Variable part does not change.  */
--              fragP->fr_var = INST_WORD_SIZE;
-+              fragP->fr_var = INST_WORD_SIZE*2;
-             }
-           else
-             {
-                fragP->fr_subtype = DEFINED_PC_OFFSET;
--              /* Don't know now whether we need an imm instruction.  */
-+               /* Don't know now whether we need an imm instruction.  */
-                fragP->fr_var = INST_WORD_SIZE;
-             }
-           }  
-           else
-             {
-                fragP->fr_subtype = DEFINED_PC_OFFSET;
--              /* Don't know now whether we need an imm instruction.  */
-+               /* Don't know now whether we need an imm instruction.  */
-                fragP->fr_var = INST_WORD_SIZE;
-             }
-         }
--    #if 0
--      else if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type &&
--               !S_IS_WEAK (fragP->fr_symbol))
--        {
--          fragP->fr_subtype = DEFINED_PC_OFFSET;
--          /* Don't know now whether we need an imm instruction.  */
--          fragP->fr_var = INST_WORD_SIZE;
--        }
--#endif
-       else if (S_IS_DEFINED (fragP->fr_symbol)
-               && (((S_GET_SEGMENT (fragP->fr_symbol))->flags & SEC_CODE) == 0))
-         {
-@@ -2677,6 +2654,13 @@ md_estimate_size_before_relax (fragS * fragP,
-              /* Variable part does not change.  */
-              fragP->fr_var = INST_WORD_SIZE*2;
-            }
-+         else if (streq (fragP->fr_opcode, str_microblaze_64))
-+           {
-+              /* Used as an absolute value.  */
-+              fragP->fr_subtype = DEFINED_64_OFFSET;
-+              /* Variable part does not change.  */
-+              fragP->fr_var = INST_WORD_SIZE;
-+            }
-          else if (streq (fragP->fr_opcode, str_microblaze_ro_anchor))
-            {
-               /* It is accessed using the small data read only anchor.  */
-@@ -2751,6 +2735,7 @@ md_estimate_size_before_relax (fragS * fragP,
-     case TLSTPREL_OFFSET:
-     case TLSDTPREL_OFFSET:
-     case DEFINED_64_OFFSET:
-+    case DEFINED_64_PC_OFFSET:
-       fragP->fr_var = INST_WORD_SIZE*2;
-       break;
-     case DEFINED_RO_SEGMENT:
-@@ -2804,7 +2789,7 @@ md_pcrel_from_section (fixS * fixp, segT sec ATTRIBUTE_UNUSED)
-   else
-     {
-       /* The case where we are going to resolve things... */
--      if (fixp->fx_r_type == BFD_RELOC_64_PCREL ||fixp->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+      if (fixp->fx_r_type == BFD_RELOC_64_PCREL ||fixp->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-         return  fixp->fx_where + fixp->fx_frag->fr_address + INST_WORD_SIZE;
-       else
-         return  fixp->fx_where + fixp->fx_frag->fr_address;
-@@ -2839,6 +2824,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
-     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-     case BFD_RELOC_MICROBLAZE_64_GPC:
-     case BFD_RELOC_MICROBLAZE_64:
-+    case BFD_RELOC_MICROBLAZE_64_PCREL:
-     case BFD_RELOC_MICROBLAZE_64_GOT:
-     case BFD_RELOC_MICROBLAZE_64_PLT:
-     case BFD_RELOC_MICROBLAZE_64_GOTOFF:
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0015-Fixed-MB-x-relocation-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0015-Fixed-MB-x-relocation-issues.patch
deleted file mode 100644
index e93e3476..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0015-Fixed-MB-x-relocation-issues.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From da36307dff05dff1eebd44aec56f9bdc196ad632 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Fri, 28 Sep 2018 12:04:55 +0530
-Subject: [PATCH 15/34] -Fixed MB-x relocation issues -Added imml for required
- MB-x instructions
-
-Conflicts:
-        bfd/elf64-microblaze.c
-        gas/config/tc-microblaze.c
-
-Conflicts:
-        gas/config/tc-microblaze.c
----
- bfd/elf64-microblaze.c     |  48 ++++++++++--
- gas/config/tc-microblaze.c | 155 ++++++++++++++++++++++++++-----------
- gas/tc.h                   |   2 +-
- 3 files changed, 152 insertions(+), 53 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 0faa8de73c8..951bb36506d 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1552,6 +1552,14 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                          bfd_put_16 (input_bfd, relocation & 0xffff,
-                                      contents + offset + endian);
- 
-+                        unsigned long insn = bfd_get_32 (input_bfd, contents + offset +endian);
-+                        if (insn == 0xb2000000 || insn == 0xb2ffffff)
-+                          {
-+                            insn &= ~0x00ffffff;
-+                            insn |= (relocation >> 16) & 0xffffff;
-+                            bfd_put_32 (input_bfd, insn,
-+                                    contents + offset + endian);
-+                          }
-                        else
-                          {
-                            bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-@@ -1659,6 +1667,14 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                             bfd_put_16 (input_bfd, relocation & 0xffff,
-                                         contents + offset + endian);
-                          }
-+                       unsigned long insn = bfd_get_32 (input_bfd, contents + offset +endian);
-+                        if (insn == 0xb2000000 || insn == 0xb2ffffff)
-+                          {
-+                            insn &= ~0x00ffffff;
-+                            insn |= (relocation >> 16) & 0xffffff;
-+                            bfd_put_32 (input_bfd, insn,
-+                                    contents + offset + endian);
-+                          }
-                        else
-                          {
-                            bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-@@ -1769,9 +1785,19 @@ static void
- microblaze_bfd_write_imm_value_32 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
- {
-     unsigned long instr = bfd_get_32 (abfd, bfd_addr);
--    instr &= ~0x0000ffff;
--    instr |= (val & 0x0000ffff);
--    bfd_put_32 (abfd, instr, bfd_addr);
-+
-+    if (instr == 0xb2000000 || instr == 0xb2ffffff)
-+      {
-+        instr &= ~0x00ffffff;
-+        instr |= (val & 0xffffff);
-+        bfd_put_32 (abfd, instr, bfd_addr);
-+      }
-+    else
-+      {
-+        instr &= ~0x0000ffff;
-+        instr |= (val & 0x0000ffff);
-+        bfd_put_32 (abfd, instr, bfd_addr);
-+      }
- }
- 
- /* Read-modify-write into the bfd, an immediate value into appropriate fields of
-@@ -1783,10 +1809,18 @@ microblaze_bfd_write_imm_value_64 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
-     unsigned long instr_lo;
- 
-     instr_hi = bfd_get_32 (abfd, bfd_addr);
--    instr_hi &= ~0x0000ffff;
--    instr_hi |= ((val >> 16) & 0x0000ffff);
--    bfd_put_32 (abfd, instr_hi, bfd_addr);
--
-+    if (instr_hi == 0xb2000000 || instr_hi == 0xb2ffffff)
-+      {
-+        instr_hi &= ~0x00ffffff;
-+        instr_hi |= (val >> 16) & 0xffffff;
-+        bfd_put_32 (abfd, instr_hi,bfd_addr);
-+      }
-+    else
-+      {
-+        instr_hi &= ~0x0000ffff;
-+        instr_hi |= ((val >> 16) & 0x0000ffff);
-+        bfd_put_32 (abfd, instr_hi, bfd_addr);
-+      }
-     instr_lo = bfd_get_32 (abfd, bfd_addr + INST_WORD_SIZE);
-     instr_lo &= ~0x0000ffff;
-     instr_lo |= (val & 0x0000ffff);
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 9d4dbc12ab3..a0e97231a41 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -392,7 +392,7 @@ microblaze_s_weakext (int ignore ATTRIBUTE_UNUSED)
-    Integer arg to pass to the function.  */
- /* If the pseudo-op is not found in this table, it searches in the obj-elf.c,
-    and then in the read.c table.  */
--const pseudo_typeS md_pseudo_table[] =
-+pseudo_typeS md_pseudo_table[] =
- {
-   {"lcomm", microblaze_s_lcomm, 1},
-   {"data", microblaze_s_data, 0},
-@@ -401,7 +401,7 @@ const pseudo_typeS md_pseudo_table[] =
-   {"data32", cons, 4},     /* Same as word.  */
-   {"ent", s_func, 0}, /* Treat ent as function entry point.  */
-   {"end", microblaze_s_func, 1}, /* Treat end as function end point.  */
--  {"gpword", s_rva, 8}, /* gpword label => store resolved label address in data section.  */
-+  {"gpword", s_rva, 4}, /* gpword label => store resolved label address in data section.  */
-   {"gpdword", s_rva, 8}, /* gpword label => store resolved label address in data section.  */
-   {"weakext", microblaze_s_weakext, 0},
-   {"rodata", microblaze_s_rdata, 0},
-@@ -996,7 +996,7 @@ md_assemble (char * str)
-   unsigned reg2;
-   unsigned reg3;
-   unsigned isize;
--  unsigned int immed = 0, immed2 = 0, temp;
-+  unsigned long immed = 0, immed2 = 0, temp;
-   expressionS exp;
-   char name[20];
-   long immedl;
-@@ -1118,8 +1118,9 @@ md_assemble (char * str)
-            as_fatal (_("lmi pseudo instruction should not use a label in imm field"));
-          else if (streq (name, "smi"))
-            as_fatal (_("smi pseudo instruction should not use a label in imm field"));
--
--         if (reg2 == REG_ROSDP)
-+          if(streq (name, "lli") || streq (name, "sli"))
-+            opc = str_microblaze_64;
-+         else if (reg2 == REG_ROSDP)
-            opc = str_microblaze_ro_anchor;
-          else if (reg2 == REG_RWSDP)
-            opc = str_microblaze_rw_anchor;
-@@ -1186,33 +1187,57 @@ md_assemble (char * str)
-               inst |= (immed << IMM_LOW) & IMM_MASK;
-             }
-        }
--      else
--       {
--          temp = immed & 0xFFFF8000;
--          if ((temp != 0) && (temp != 0xFFFF8000))
--           {
-+      else if (streq (name, "lli") || streq (name, "sli"))
-+        {
-+          temp = immed & 0xFFFFFF8000;
-+          if (temp != 0 && temp != 0xFFFFFF8000)
-+            {
-               /* Needs an immediate inst.  */
-              opcode1
-                = (struct op_code_struct *) str_hash_find (opcode_hash_control,
--                                                          "imm");
-+                                                          "imml");
-               if (opcode1 == NULL)
-                 {
--                  as_bad (_("unknown opcode \"%s\""), "imm");
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-                   return;
-                 }
--
-               inst1 = opcode1->bit_sequence;
--              inst1 |= ((immed & 0xFFFF0000) >> 16) & IMM_MASK;
-+             inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-               output[0] = INST_BYTE0 (inst1);
-               output[1] = INST_BYTE1 (inst1);
-               output[2] = INST_BYTE2 (inst1);
-               output[3] = INST_BYTE3 (inst1);
-               output = frag_more (isize);
--           }
--         inst |= (reg1 << RD_LOW) & RD_MASK;
--         inst |= (reg2 << RA_LOW) & RA_MASK;
--         inst |= (immed << IMM_LOW) & IMM_MASK;
--       }
-+            }
-+          inst |= (reg1 << RD_LOW) & RD_MASK;
-+          inst |= (reg2 << RA_LOW) & RA_MASK;
-+          inst |= (immed << IMM_LOW) & IMM_MASK;
-+         }
-+       else 
-+        {
-+           temp = immed & 0xFFFF8000;
-+           if ((temp != 0) && (temp != 0xFFFF8000))
-+            {
-+               /* Needs an immediate inst.  */
-+               opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-+               if (opcode1 == NULL)
-+                 {
-+                   as_bad (_("unknown opcode \"%s\""), "imm");
-+                   return;
-+                 }
-+
-+               inst1 = opcode1->bit_sequence;
-+               inst1 |= ((immed & 0xFFFF0000) >> 16) & IMM_MASK;
-+               output[0] = INST_BYTE0 (inst1);
-+               output[1] = INST_BYTE1 (inst1);
-+               output[2] = INST_BYTE2 (inst1);
-+               output[3] = INST_BYTE3 (inst1);
-+               output = frag_more (isize);
-+            }
-+          inst |= (reg1 << RD_LOW) & RD_MASK;
-+          inst |= (reg2 << RA_LOW) & RA_MASK;
-+          inst |= (immed << IMM_LOW) & IMM_MASK;
-+        }
-       break;
- 
-     case INST_TYPE_RD_R1_IMMS:
-@@ -1842,12 +1867,20 @@ md_assemble (char * str)
-     case INST_TYPE_IMM:
-       if (streq (name, "imm"))
-         as_fatal (_("An IMM instruction should not be present in the .s file"));
--
--      op_end = parse_imm (op_end + 1, & exp, MIN_IMM, MAX_IMM);
-+      if (microblaze_arch_size == 64)
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-+      else
-+        op_end = parse_imm (op_end + 1, & exp, MIN_IMM, MAX_IMM);
- 
-       if (exp.X_op != O_constant)
-        {
--          char *opc = NULL;
-+         char *opc;
-+          if (microblaze_arch_size == 64 && (streq (name, "breai") || 
-+                streq (name, "breaid") || 
-+                streq (name, "brai") || streq (name, "braid")))
-+            opc = str_microblaze_64;
-+         else
-+            opc = NULL;
-           relax_substateT subtype;
- 
-          if (exp.X_md != 0)
-@@ -1870,29 +1903,53 @@ md_assemble (char * str)
-           immed = exp.X_add_number;
-         }
- 
--
--      temp = immed & 0xFFFF8000;
--      if ((temp != 0) && (temp != 0xFFFF8000))
--       {
--          /* Needs an immediate inst.  */
--          opcode1
--           = (struct op_code_struct *) str_hash_find (opcode_hash_control,
--                                                      "imm");
--          if (opcode1 == NULL)
--            {
--              as_bad (_("unknown opcode \"%s\""), "imm");
--              return;
-+      if (microblaze_arch_size == 64 && (streq (name, "breai") || 
-+            streq (name, "breaid") || 
-+           streq (name, "brai") || streq (name, "braid")))
-+        {
-+          temp = immed & 0xFFFFFF8000;
-+          if (temp != 0)
-+           {
-+              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-             }
-+          inst |= (immed << IMM_LOW) & IMM_MASK;
-+       }
-+      else
-+       {
-+          temp = immed & 0xFFFF8000;
-+          if ((temp != 0) && (temp != 0xFFFF8000))
-+           {
-+              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-+              if (opcode1 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imm");
-+                  return;
-+                }
- 
--          inst1 = opcode1->bit_sequence;
--          inst1 |= ((immed & 0xFFFF0000) >> 16) & IMM_MASK;
--          output[0] = INST_BYTE0 (inst1);
--          output[1] = INST_BYTE1 (inst1);
--          output[2] = INST_BYTE2 (inst1);
--          output[3] = INST_BYTE3 (inst1);
--          output = frag_more (isize);
--        }
--      inst |= (immed << IMM_LOW) & IMM_MASK;
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0xFFFF0000) >> 16) & IMM_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+            }
-+          inst |= (immed << IMM_LOW) & IMM_MASK;
-+       }
-       break;
- 
-     case INST_TYPE_NONE:
-@@ -2467,7 +2524,7 @@ md_apply_fix (fixS *   fixP,
- 
-            inst1 = opcode1->bit_sequence;
-            if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
--            inst1 |= ((val & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+            inst1 |= ((val & 0xFFFFFF0000L) >> 16) & IMML_MASK;
-            if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-              fixP->fx_r_type = BFD_RELOC_64; 
-            if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-@@ -2636,7 +2693,14 @@ md_estimate_size_before_relax (fragS * fragP,
-         }
-       else
-        {
--         fragP->fr_subtype = UNDEFINED_PC_OFFSET;
-+         if (fragP->fr_opcode != NULL) {
-+           if (streq (fragP->fr_opcode, str_microblaze_64)) 
-+              fragP->fr_subtype = DEFINED_64_PC_OFFSET;
-+           else
-+             fragP->fr_subtype = UNDEFINED_PC_OFFSET;
-+           }
-+         else
-+           fragP->fr_subtype = UNDEFINED_PC_OFFSET;
-          fragP->fr_var = INST_WORD_SIZE*2;
-        }
-       break;
-@@ -2913,6 +2977,7 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
-     case OPTION_M64:
-       //if (arg != NULL && strcmp (arg, "64") == 0)
-       microblaze_arch_size = 64;
-+      md_pseudo_table[7].poc_val = 8;
-       break;
-     default:
-       return 0;
-diff --git a/gas/tc.h b/gas/tc.h
-index 4a740f9bdd9..bb9a935a353 100644
---- a/gas/tc.h
-+++ b/gas/tc.h
-@@ -22,7 +22,7 @@
- /* In theory (mine, at least!) the machine dependent part of the assembler
-    should only have to include one file.  This one.  -- JF */
- 
--extern const pseudo_typeS md_pseudo_table[];
-+extern pseudo_typeS md_pseudo_table[];
- 
- const char * md_atof (int, char *, int *);
- int    md_parse_option (int, const char *);
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Fixing-the-branch-related-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Fixing-the-branch-related-issues.patch
deleted file mode 100644
index f3a7267d..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Fixing-the-branch-related-issues.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3a46bc21f52c7b5ccbd408eeecd7145b856f6b1d Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Sun, 30 Sep 2018 17:06:58 +0530
-Subject: [PATCH 16/34] Fixing the branch related issues
-
-Conflicts:
-        bfd/elf64-microblaze.c
----
- bfd/elf64-microblaze.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 951bb36506d..6d698383404 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -2559,6 +2559,9 @@ microblaze_elf_check_relocs (bfd * abfd,
-          while (h->root.type == bfd_link_hash_indirect
-                 || h->root.type == bfd_link_hash_warning)
-            h = (struct elf_link_hash_entry *) h->root.u.i.link;
-+         /* PR15323, ref flags aren't set for references in the same
-+            object.  */
-+         h->root.non_ir_ref_regular = 1;
-        }
- 
-       switch (r_type)
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-address-computation-issues-with-64bit-address.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-address-computation-issues-with-64bit-address.patch
deleted file mode 100644
index 4c0496c3..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-address-computation-issues-with-64bit-address.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From a6003437722a8f04c1e31435eb7f9101c50cc292 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Tue, 9 Oct 2018 10:14:22 +0530
-Subject: [PATCH 17/34] - Fixed address computation issues with 64bit address -
- Fixed imml dissassamble issue
-
-Conflicts:
-        gas/config/tc-microblaze.c
-        opcodes/microblaze-dis.c
-
-Conflicts:
-        bfd/elf64-microblaze.c
-
-Conflicts:
-        bfd/elf64-microblaze.c
----
- bfd/bfd-in2.h              |  5 +++
- bfd/elf64-microblaze.c     | 12 +++----
- gas/config/tc-microblaze.c | 74 +++++++++++++++++++++++++++++++++-----
- opcodes/microblaze-dis.c   |  2 +-
- 4 files changed, 78 insertions(+), 15 deletions(-)
-
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 14e228c9c0e..d4b5006902c 100644
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -5394,6 +5394,11 @@ done here - only used for relaxing  */
-  *   +done here - only used for relaxing  */
-     BFD_RELOC_MICROBLAZE_64,
- 
-+/* This is a 64 bit reloc that stores the 32 bit relative
-+ *  +value in two words (with an imml instruction).  No relocation is
-+ *   +done here - only used for relaxing  */
-+    BFD_RELOC_MICROBLAZE_EA64,
-+
- /* This is a 64 bit reloc that stores the 32 bit pc relative
-  *  +value in two words (with an imm instruction).  No relocation is
-  *   +done here - only used for relaxing  */
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 6d698383404..f16b544b1fc 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -118,14 +118,14 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
-           0,                   /* Rightshift.  */
-           4,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-           64,                  /* Bitsize.  */
--          true,                /* PC_relative.  */
-+          false,               /* PC_relative.  */
-           0,                   /* Bitpos.  */
-           complain_overflow_dont, /* Complain on overflow.  */
-           bfd_elf_generic_reloc,/* Special Function.  */
-           "R_MICROBLAZE_IMML_64",      /* Name.  */
-           false,               /* Partial Inplace.  */
-           0,                   /* Source Mask.  */
--          0x0000ffff,          /* Dest Mask.  */
-+          0xffffffffffffff,            /* Dest Mask.  */
-           false),              /* PC relative offset?  */
- 
-    /* A 64 bit relocation.  Table entry not really used.  */
-@@ -613,9 +613,9 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
-     case BFD_RELOC_32:
-       microblaze_reloc = R_MICROBLAZE_32;
-       break;
--      /* RVA is treated the same as 32 */
-+      /* RVA is treated the same as 64 */
-     case BFD_RELOC_RVA:
--      microblaze_reloc = R_MICROBLAZE_32;
-+      microblaze_reloc = R_MICROBLAZE_IMML_64;
-       break;
-     case BFD_RELOC_32_PCREL:
-       microblaze_reloc = R_MICROBLAZE_32_PCREL;
-@@ -647,7 +647,7 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
-     case BFD_RELOC_VTABLE_ENTRY:
-       microblaze_reloc = R_MICROBLAZE_GNU_VTENTRY;
-       break;
--    case BFD_RELOC_MICROBLAZE_64:
-+    case BFD_RELOC_MICROBLAZE_EA64:
-       microblaze_reloc = R_MICROBLAZE_IMML_64;
-       break;
-     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-@@ -2050,7 +2050,7 @@ microblaze_elf_relax_section (bfd *abfd,
-                efix = calc_fixup (target_address, 0, sec);
- 
-             /* Validate the in-band val.  */
--            val = bfd_get_32 (abfd, contents + irel->r_offset);
-+            val = bfd_get_64 (abfd, contents + irel->r_offset);
-             if (val != irel->r_addend && ELF64_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
-                fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
-             }
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index a0e97231a41..d3de049e9c0 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -402,7 +402,6 @@ pseudo_typeS md_pseudo_table[] =
-   {"ent", s_func, 0}, /* Treat ent as function entry point.  */
-   {"end", microblaze_s_func, 1}, /* Treat end as function end point.  */
-   {"gpword", s_rva, 4}, /* gpword label => store resolved label address in data section.  */
--  {"gpdword", s_rva, 8}, /* gpword label => store resolved label address in data section.  */
-   {"weakext", microblaze_s_weakext, 0},
-   {"rodata", microblaze_s_rdata, 0},
-   {"sdata2", microblaze_s_rdata, 1},
-@@ -2483,18 +2482,74 @@ md_apply_fix (fixS *   fixP,
-     case BFD_RELOC_RVA:
-     case BFD_RELOC_32_PCREL:
-     case BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM:
-+      /* Don't do anything if the symbol is not defined.  */
-+      if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-+       {
-+         if ((fixP->fx_r_type == BFD_RELOC_RVA) && (microblaze_arch_size == 64))
-+            {
-+             if (target_big_endian)
-+               {
-+                 buf[0] |= ((val >> 56) & 0xff);
-+                 buf[1] |= ((val >> 48) & 0xff);
-+                 buf[2] |= ((val >> 40) & 0xff);
-+                 buf[3] |= ((val >> 32) & 0xff);
-+                 buf[4] |= ((val >> 24) & 0xff);
-+                 buf[5] |= ((val >> 16) & 0xff);
-+                 buf[6] |= ((val >> 8) & 0xff);
-+                 buf[7] |= (val & 0xff);
-+               }
-+             else
-+               {
-+                 buf[7] |= ((val >> 56) & 0xff);
-+                 buf[6] |= ((val >> 48) & 0xff);
-+                 buf[5] |= ((val >> 40) & 0xff);
-+                 buf[4] |= ((val >> 32) & 0xff);
-+                 buf[3] |= ((val >> 24) & 0xff);
-+                 buf[2] |= ((val >> 16) & 0xff);
-+                 buf[1] |= ((val >> 8) & 0xff);
-+                 buf[0] |= (val & 0xff);
-+               }
-+           }
-+         else {
-+           if (target_big_endian)
-+             {
-+               buf[0] |= ((val >> 24) & 0xff);
-+               buf[1] |= ((val >> 16) & 0xff);
-+               buf[2] |= ((val >> 8) & 0xff);
-+               buf[3] |= (val & 0xff);
-+             }
-+           else
-+             {
-+               buf[3] |= ((val >> 24) & 0xff);
-+               buf[2] |= ((val >> 16) & 0xff);
-+               buf[1] |= ((val >> 8) & 0xff);
-+               buf[0] |= (val & 0xff);
-+             }
-+         }
-+       }
-+      break;
-+    
-+    case BFD_RELOC_MICROBLAZE_EA64:
-       /* Don't do anything if the symbol is not defined.  */
-       if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-        {
-          if (target_big_endian)
-            {
--             buf[0] |= ((val >> 24) & 0xff);
--             buf[1] |= ((val >> 16) & 0xff);
--             buf[2] |= ((val >> 8) & 0xff);
--             buf[3] |= (val & 0xff);
-+             buf[0] |= ((val >> 56) & 0xff);
-+             buf[1] |= ((val >> 48) & 0xff);
-+             buf[2] |= ((val >> 40) & 0xff);
-+             buf[3] |= ((val >> 32) & 0xff);
-+             buf[4] |= ((val >> 24) & 0xff);
-+             buf[5] |= ((val >> 16) & 0xff);
-+             buf[6] |= ((val >> 8) & 0xff);
-+             buf[7] |= (val & 0xff);
-            }
-          else
-            {
-+             buf[7] |= ((val >> 56) & 0xff);
-+             buf[6] |= ((val >> 48) & 0xff);
-+             buf[5] |= ((val >> 40) & 0xff);
-+             buf[4] |= ((val >> 32) & 0xff);
-              buf[3] |= ((val >> 24) & 0xff);
-              buf[2] |= ((val >> 16) & 0xff);
-              buf[1] |= ((val >> 8) & 0xff);
-@@ -2616,6 +2671,8 @@ md_apply_fix (fixS *   fixP,
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
-       else if (fixP->fx_r_type == BFD_RELOC_32)
-        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE;
-+      else if(fixP->fx_r_type == BFD_RELOC_MICROBLAZE_EA64)
-+        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_EA64;
-       else
-        fixP->fx_r_type = BFD_RELOC_NONE;
-       fixP->fx_addsy = section_symbol (absolute_section);
-@@ -2887,6 +2944,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
-     case BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM:
-     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-     case BFD_RELOC_MICROBLAZE_64_GPC:
-+    case BFD_RELOC_MICROBLAZE_EA64:
-     case BFD_RELOC_MICROBLAZE_64:
-     case BFD_RELOC_MICROBLAZE_64_PCREL:
-     case BFD_RELOC_MICROBLAZE_64_GOT:
-@@ -3032,10 +3090,10 @@ cons_fix_new_microblaze (fragS * frag,
-           r = BFD_RELOC_32;
-           break;
-         case 8:
--          if (microblaze_arch_size == 64)
-+          /*if (microblaze_arch_size == 64)
-             r = BFD_RELOC_32;
--          else
--            r = BFD_RELOC_64;
-+          else*/
-+            r = BFD_RELOC_MICROBLAZE_EA64;
-           break;
-         default:
-           as_bad (_("unsupported BFD relocation size %u"), size);
-diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index 921adce04ea..d837ebb38e2 100644
---- a/opcodes/microblaze-dis.c
-+++ b/opcodes/microblaze-dis.c
-@@ -77,7 +77,7 @@ static char *
- get_field_imml (struct string_buf *buf, long instr)
- {
-   char *p = strbuf (buf);
--  sprintf (p, "%d", (short)((instr & IMML_MASK) >> IMM_LOW));
-+  sprintf (p, "%d", (int)((instr & IMML_MASK) >> IMM_LOW));
-   return p;
- }
- 
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
deleted file mode 100644
index 6a70dbfb..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 6209a572f4ec70608564fa7aa0270d640aa421f0 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Tue, 2 Nov 2021 17:28:24 +0530
-Subject: [PATCH 18/34] [Patch,MicroBlaze : Adding new relocation to support
- 64bit rodata.
-
----
- bfd/elf64-microblaze.c     | 11 +++++++--
- gas/config/tc-microblaze.c | 49 ++++++++++++++++++++++++++++++++++----
- 2 files changed, 54 insertions(+), 6 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index f16b544b1fc..355e9131987 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1529,6 +1529,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-            case (int) R_MICROBLAZE_64_PCREL :
-            case (int) R_MICROBLAZE_64:
-            case (int) R_MICROBLAZE_32:
-+           case (int) R_MICROBLAZE_IMML_64:
-              {
-                /* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
-                   from removed linkonce sections, or sections discarded by
-@@ -1538,6 +1539,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                    relocation += addend;
-                    if (r_type == R_MICROBLAZE_32)// || r_type == R_MICROBLAZE_IMML_64)
-                      bfd_put_32 (input_bfd, relocation, contents + offset);
-+                   else if (r_type == R_MICROBLAZE_IMML_64)
-+                     bfd_put_64 (input_bfd, relocation, contents + offset);
-                    else
-                      {
-                        if (r_type == R_MICROBLAZE_64_PCREL)
-@@ -1626,7 +1629,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                      }
-                    else
-                      {
--                       if (r_type == R_MICROBLAZE_32)
-+                       if (r_type == R_MICROBLAZE_32 || r_type == R_MICROBLAZE_IMML_64)
-                          {
-                            outrel.r_info = ELF64_R_INFO (0, R_MICROBLAZE_REL);
-                            outrel.r_addend = relocation + addend;
-@@ -1652,6 +1655,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                    relocation += addend;
-                    if (r_type == R_MICROBLAZE_32)
-                      bfd_put_32 (input_bfd, relocation, contents + offset);
-+                   else if (r_type == R_MICROBLAZE_IMML_64)
-+                     bfd_put_64 (input_bfd, relocation, contents + offset + endian);
-                    else
-                      {
-                        if (r_type == R_MICROBLAZE_64_PCREL)
-@@ -2166,7 +2171,8 @@ microblaze_elf_relax_section (bfd *abfd,
-                   microblaze_bfd_write_imm_value_32 (abfd, ocontents + irelscan->r_offset,
-                                                      irelscan->r_addend);
-               }
--              if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
-+              if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32 
-+                  || ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_IMML_64)
-                 {
-                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-@@ -2633,6 +2639,7 @@ microblaze_elf_check_relocs (bfd * abfd,
-         case R_MICROBLAZE_64:
-         case R_MICROBLAZE_64_PCREL:
-         case R_MICROBLAZE_32:
-+        case R_MICROBLAZE_IMML_64:
-           {
-             if (h != NULL && !bfd_link_pic (info))
-              {
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index d3de049e9c0..76ce516d8aa 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -1119,6 +1119,13 @@ md_assemble (char * str)
-            as_fatal (_("smi pseudo instruction should not use a label in imm field"));
-           if(streq (name, "lli") || streq (name, "sli"))
-             opc = str_microblaze_64;
-+          else if ((microblaze_arch_size == 64) && ((streq (name, "lbui")
-+                       || streq (name, "lhui") || streq (name, "lwi") || streq (name, "sbi")
-+                       || streq (name, "shi") || streq (name, "swi"))))
-+           {
-+              opc = str_microblaze_64;
-+             subtype = opcode->inst_offset_type;
-+           }
-          else if (reg2 == REG_ROSDP)
-            opc = str_microblaze_ro_anchor;
-          else if (reg2 == REG_RWSDP)
-@@ -1186,7 +1193,10 @@ md_assemble (char * str)
-               inst |= (immed << IMM_LOW) & IMM_MASK;
-             }
-        }
--      else if (streq (name, "lli") || streq (name, "sli"))
-+      else if (streq (name, "lli") || streq (name, "sli") || ((microblaze_arch_size == 64)
-+               && ((streq (name, "lbui")) || streq (name, "lhui")
-+               || streq (name, "lwi") || streq (name, "sbi")
-+                || streq (name, "shi") || streq (name, "swi"))))
-         {
-           temp = immed & 0xFFFFFF8000;
-           if (temp != 0 && temp != 0xFFFFFF8000)
-@@ -1802,6 +1812,11 @@ md_assemble (char * str)
- 
-          if (exp.X_md != 0)
-            subtype = get_imm_otype(exp.X_md);
-+          else if (streq (name, "brealid") || streq (name, "breaid") || streq (name, "breai"))
-+            {
-+              opc = str_microblaze_64;
-+             subtype = opcode->inst_offset_type;
-+           }
-          else
-            subtype = opcode->inst_offset_type;
- 
-@@ -1819,6 +1834,31 @@ md_assemble (char * str)
-           output = frag_more (isize);
-           immed = exp.X_add_number;
-         }
-+      if (streq (name, "brealid") || streq (name, "breaid") || streq (name, "breai"))
-+        {
-+          temp = immed & 0xFFFFFF8000;
-+          if (temp != 0 && temp != 0xFFFFFF8000)
-+            {
-+              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode1->bit_sequence;
-+             inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+            }
-+         inst |= (reg1 << RD_LOW) & RD_MASK;
-+          inst |= (immed << IMM_LOW) & IMM_MASK;
-+         }
-+       else 
-+        {
- 
-       temp = immed & 0xFFFF8000;
-       if ((temp != 0) && (temp != 0xFFFF8000))
-@@ -1844,6 +1884,7 @@ md_assemble (char * str)
- 
-       inst |= (reg1 << RD_LOW) & RD_MASK;
-       inst |= (immed << IMM_LOW) & IMM_MASK;
-+        }
-       break;
- 
-     case INST_TYPE_R2:
-@@ -3090,10 +3131,10 @@ cons_fix_new_microblaze (fragS * frag,
-           r = BFD_RELOC_32;
-           break;
-         case 8:
--          /*if (microblaze_arch_size == 64)
--            r = BFD_RELOC_32;
--          else*/
-+          if (microblaze_arch_size == 64)
-             r = BFD_RELOC_MICROBLAZE_EA64;
-+          else
-+            r = BFD_RELOC_64;
-           break;
-         default:
-           as_bad (_("unsupported BFD relocation size %u"), size);
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0019-fixing-the-.bss-relocation-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0019-fixing-the-.bss-relocation-issue.patch
deleted file mode 100644
index 5826f0a3..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0019-fixing-the-.bss-relocation-issue.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 35e89c09636e2ce2f5eafcf62941d15ece79a172 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Wed, 24 Oct 2018 12:34:37 +0530
-Subject: [PATCH 19/34] fixing the .bss relocation issue
-
-Conflicts:
-        bfd/elf64-microblaze.c
-
-Conflicts:
-        bfd/elf64-microblaze.c
----
- bfd/elf64-microblaze.c | 41 +++++++++++++++++++++++++++++------------
- 1 file changed, 29 insertions(+), 12 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 355e9131987..eb7f9138884 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1555,14 +1555,14 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                          bfd_put_16 (input_bfd, relocation & 0xffff,
-                                      contents + offset + endian);
- 
--                        unsigned long insn = bfd_get_32 (input_bfd, contents + offset +endian);
--                        if (insn == 0xb2000000 || insn == 0xb2ffffff)
--                          {
--                            insn &= ~0x00ffffff;
--                            insn |= (relocation >> 16) & 0xffffff;
--                            bfd_put_32 (input_bfd, insn,
--                                    contents + offset + endian);
--                          }
-+                       unsigned long insn = bfd_get_32 (input_bfd, contents + offset +endian);
-+                       if ((insn & 0xff000000) == 0xb2000000)
-+                         {
-+                           insn &= ~0x00ffffff;
-+                           insn |= (relocation >> 16) & 0xffffff;
-+                           bfd_put_32 (input_bfd, insn,
-+                                   contents + offset + endian);
-+                         }
-                        else
-                          {
-                            bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-@@ -1673,7 +1673,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                                         contents + offset + endian);
-                          }
-                        unsigned long insn = bfd_get_32 (input_bfd, contents + offset +endian);
--                        if (insn == 0xb2000000 || insn == 0xb2ffffff)
-+                       if ((insn & 0xff000000) == 0xb2000000)
-                           {
-                             insn &= ~0x00ffffff;
-                             insn |= (relocation >> 16) & 0xffffff;
-@@ -1791,7 +1791,7 @@ microblaze_bfd_write_imm_value_32 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
- {
-     unsigned long instr = bfd_get_32 (abfd, bfd_addr);
- 
--    if (instr == 0xb2000000 || instr == 0xb2ffffff)
-+    if ((instr & 0xff000000) == 0xb2000000)
-       {
-         instr &= ~0x00ffffff;
-         instr |= (val & 0xffffff);
-@@ -1814,7 +1814,7 @@ microblaze_bfd_write_imm_value_64 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
-     unsigned long instr_lo;
- 
-     instr_hi = bfd_get_32 (abfd, bfd_addr);
--    if (instr_hi == 0xb2000000 || instr_hi == 0xb2ffffff)
-+    if ((instr_hi & 0xff000000) == 0xb2000000)
-       {
-         instr_hi &= ~0x00ffffff;
-         instr_hi |= (val >> 16) & 0xffffff;
-@@ -2294,6 +2294,8 @@ microblaze_elf_relax_section (bfd *abfd,
-                  if (isym->st_shndx == shndx
-                      && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
-                    {
-+                     bfd_vma immediate;
-+
-                      if (ocontents == NULL)
-                        {
-                          if (elf_section_data (o)->this_hdr.contents != NULL)
-@@ -2316,8 +2318,20 @@ microblaze_elf_relax_section (bfd *abfd,
-                              elf_section_data (o)->this_hdr.contents = ocontents;
-                            }
-                        }
-+              unsigned long instr_hi =  bfd_get_32 (abfd, ocontents
-+                                                + irelscan->r_offset);
-+              unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
-+                                                + irelscan->r_offset
-+                                                + INST_WORD_SIZE);
-+              if ((instr_hi & 0xff000000) == 0xb2000000)
-+                immediate = (instr_hi & 0x00ffffff) << 24;
-+             else
-+                immediate = (instr_hi & 0x0000ffff) << 16;
-+              immediate |= (instr_lo & 0x0000ffff);
-                      offset = calc_fixup (irelscan->r_addend, 0, sec);
-+                     immediate -= offset;
-                      irelscan->r_addend -= offset;
-+                         
-                    }
-                }
-              else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
-@@ -2357,7 +2371,10 @@ microblaze_elf_relax_section (bfd *abfd,
-           unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
-                                                 + irelscan->r_offset
-                                                 + INST_WORD_SIZE);
--          immediate = (instr_hi & 0x0000ffff) << 16;
-+          if ((instr_hi & 0xff000000) == 0xb2000000)
-+            immediate = (instr_hi & 0x00ffffff) << 24;
-+         else
-+            immediate = (instr_hi & 0x0000ffff) << 16;
-           immediate |= (instr_lo & 0x0000ffff);
-                      target_address = immediate;
-                      offset = calc_fixup (target_address, 0, sec);
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
deleted file mode 100644
index 21fab2de..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6c6490ed5a5c5c00d1b18a1f446280689bb572d1 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Wed, 28 Nov 2018 14:00:29 +0530
-Subject: [PATCH 20/34] Fixed the bug in the R_MICROBLAZE_64_NONE relocation.
- It was adjusting only lower 16bits.
-
-Conflicts:
-        bfd/elf64-microblaze.c
----
- bfd/elf32-microblaze.c | 4 ++--
- bfd/elf64-microblaze.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index f20adb6fd73..88ac730582b 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -2060,8 +2060,8 @@ microblaze_elf_relax_section (bfd *abfd,
-                sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, 0, sec);
-                efix = calc_fixup (target_address, 0, sec);
-                irel->r_addend -= (efix - sfix);
--    microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset
--                                      + INST_WORD_SIZE, irel->r_addend);
-+    microblaze_bfd_write_imm_value_64 (abfd, contents + irel->r_offset,
-+                                       irel->r_addend);
-              }
-              break;
-            }
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index eb7f9138884..03fe9eba53a 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -2098,8 +2098,8 @@ microblaze_elf_relax_section (bfd *abfd,
-                sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, 0, sec);
-                efix = calc_fixup (target_address, 0, sec);
-                irel->r_addend -= (efix - sfix);
--    microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset
--                                      + INST_WORD_SIZE, irel->r_addend);
-+    microblaze_bfd_write_imm_value_64 (abfd, contents + irel->r_offset,
-+                                       irel->r_addend);
-              }
-              break;
-            }
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0021-Revert-ld-Remove-unused-expression-state.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0021-Revert-ld-Remove-unused-expression-state.patch
deleted file mode 100644
index ab7f2077..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0021-Revert-ld-Remove-unused-expression-state.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 6238123cdc680941f3b3a253cca5be06d5c81492 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Wed, 27 Feb 2019 15:12:32 +0530
-Subject: [PATCH 21/34] Revert "ld: Remove unused expression state" --defsym
- symbol=expression Create a global symbol in the output file, containing the
- absolute address given by expression.
-
-This reverts commit 65f14869fd3fbee8ed4c4ca49de8aaa86dbc66cb.
-
-Conflicts:
-        ld/ChangeLog
-
-Conflicts:
-        ld/ldexp.c
-        ld/ldexp.h
----
- ld/ldexp.c | 8 +++++---
- ld/ldexp.h | 1 +
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/ld/ldexp.c b/ld/ldexp.c
-index d4d8706968d..b7f4361129f 100644
---- a/ld/ldexp.c
-+++ b/ld/ldexp.c
-@@ -1380,6 +1380,7 @@ static etree_type *
- exp_assop (const char *dst,
-           etree_type *src,
-           enum node_tree_enum class,
-+          bool defsym,
-           bool hidden)
- {
-   etree_type *n;
-@@ -1391,6 +1392,7 @@ exp_assop (const char *dst,
-   n->assign.type.node_class = class;
-   n->assign.src = src;
-   n->assign.dst = dst;
-+  n->assign.defsym = defsym;
-   n->assign.hidden = hidden;
-   return n;
- }
-@@ -1400,7 +1402,7 @@ exp_assop (const char *dst,
- etree_type *
- exp_assign (const char *dst, etree_type *src, bool hidden)
- {
--  return exp_assop (dst, src, etree_assign, hidden);
-+  return exp_assop (dst, src, etree_assign, false, hidden);
- }
- 
- /* Handle --defsym command-line option.  */
-@@ -1408,7 +1410,7 @@ exp_assign (const char *dst, etree_type *src, bool hidden)
- etree_type *
- exp_defsym (const char *dst, etree_type *src)
- {
--  return exp_assop (dst, src, etree_assign, false);
-+  return exp_assop (dst, src, etree_assign, true, false);
- }
- 
- /* Handle PROVIDE.  */
-@@ -1416,7 +1418,7 @@ exp_defsym (const char *dst, etree_type *src)
- etree_type *
- exp_provide (const char *dst, etree_type *src, bool hidden)
- {
--  return exp_assop (dst, src, etree_provide, hidden);
-+  return exp_assop (dst, src, etree_provide, false, hidden);
- }
- 
- /* Handle ASSERT.  */
-diff --git a/ld/ldexp.h b/ld/ldexp.h
-index ed6fb8be715..e838b736306 100644
---- a/ld/ldexp.h
-+++ b/ld/ldexp.h
-@@ -66,6 +66,7 @@ typedef union etree_union {
-     node_type type;
-     const char *dst;
-     union etree_union *src;
-+    bool defsym;
-     bool hidden;
-   } assign;
-   struct {
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-long-long-long-mingw-toolchain-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-long-long-long-mingw-toolchain-issue.patch
deleted file mode 100644
index bfb68360..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-long-long-long-mingw-toolchain-issue.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 24269bd086efcd37f702b92fd25dfe45faa7dfb6 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Thu, 29 Nov 2018 17:59:25 +0530
-Subject: [PATCH 22/34] fixing the long & long long mingw toolchain issue
-
----
- gas/config/tc-microblaze.c | 10 +++++-----
- opcodes/microblaze-opc.h   |  4 ++--
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 76ce516d8aa..a1fb6ccbd44 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -783,7 +783,7 @@ parse_imm (char * s, expressionS * e, offsetT min, offsetT max)
- }
- 
-  static char *
--parse_imml (char * s, expressionS * e, long min, long max)
-+parse_imml (char * s, expressionS * e, long long min, long long max)
- {
-   char *new_pointer;
-   char *atp;
-@@ -834,11 +834,11 @@ parse_imml (char * s, expressionS * e, long min, long max)
-     ; /* An error message has already been emitted.  */
-   else if ((e->X_op != O_constant && e->X_op != O_symbol) )
-     as_fatal (_("operand must be a constant or a label"));
--  else if ((e->X_op == O_constant) && ((long) e->X_add_number < min
--                                      || (long) e->X_add_number > max))
-+  else if ((e->X_op == O_constant) && ((long long) e->X_add_number < min
-+                                      || (long long) e->X_add_number > max))
-     {
--      as_fatal (_("operand must be absolute in range %ld..%ld, not %ld"),
--                min, max, (long) e->X_add_number);
-+      as_fatal (_("operand must be absolute in range %lld..%lld, not %lld"),
-+                min, max, (long long) e->X_add_number);
-     }
- 
-   if (atp)
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 5e45df995de..6b25d12dace 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -585,8 +585,8 @@ char pvr_register_prefix[] = "rpvr";
- #define MIN_IMM6_WIDTH  ((int) 0x00000001)
- #define MAX_IMM6_WIDTH  ((int) 0x00000040)
- 
--#define MIN_IMML  ((long) 0xffffff8000000000L)
--#define MAX_IMML  ((long) 0x0000007fffffffffL)
-+#define MIN_IMML  ((long long) 0xffffff8000000000L)
-+#define MAX_IMML  ((long long) 0x0000007fffffffffL)
- 
- #endif /* MICROBLAZE_OPC */
- 
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0023-Added-support-to-new-arithmetic-single-register-inst.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0023-Added-support-to-new-arithmetic-single-register-inst.patch
deleted file mode 100644
index 0b8c83cd..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0023-Added-support-to-new-arithmetic-single-register-inst.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-From 3c197b12c4b680a230e8350ecd9a523be804fe3c Mon Sep 17 00:00:00 2001
-From: Nagaraju <nmekala@xilinx.com>
-Date: Fri, 23 Aug 2019 16:18:43 +0530
-Subject: [PATCH 23/34] Added support to new arithmetic single register
- instructions
-
-Conflicts:
-        opcodes/microblaze-dis.c
-
-Conflicts:
-        gas/config/tc-microblaze.c
-        opcodes/microblaze-dis.c
-
-Conflicts:
-        gas/config/tc-microblaze.c
-signed-off-by:Nagaraju <nmekala@xilinx.com>
-              Mahesh <mbodapat@xilinx.com>
----
- gas/config/tc-microblaze.c | 147 ++++++++++++++++++++++++++++++++++++-
- opcodes/microblaze-dis.c   |  11 +++
- opcodes/microblaze-opc.h   |  43 ++++++++++-
- opcodes/microblaze-opcm.h  |   5 +-
- 4 files changed, 200 insertions(+), 6 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index a1fb6ccbd44..27544b60ea3 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -423,12 +423,33 @@ void
- md_begin (void)
- {
-   const struct op_code_struct * opcode;
-+  const char *prev_name = "";
- 
-   opcode_hash_control = str_htab_create ();
- 
-   /* Insert unique names into hash table.  */
--  for (opcode = microblaze_opcodes; opcode->name; opcode ++)
--    str_hash_insert (opcode_hash_control, opcode->name, opcode, 0);
-+  for (opcode = (struct microblaze_opcodes *)microblaze_opcodes; opcode->name; opcode ++)
-+    {
-+      if (strcmp (prev_name, opcode->name))
-+       {
-+         prev_name = (char *) opcode->name;
-+          str_hash_insert (opcode_hash_control, opcode->name, opcode, 0);
-+        }
-+    }
-+}
-+
-+static int
-+is_reg (char * s)
-+{
-+  int is_reg = 0; 
-+  /* Strip leading whitespace.  */
-+  while (ISSPACE (* s))
-+    ++ s;
-+  if (TOLOWER (s[0]) == 'r')
-+    {
-+        is_reg =1;
-+    }
-+  return is_reg;
- }
- 
- /* Try to parse a reg name.  */
-@@ -986,6 +1007,7 @@ md_assemble (char * str)
- {
-   char * op_start;
-   char * op_end;
-+  char * temp_op_end;
-   struct op_code_struct * opcode, *opcode1;
-   char * output = NULL;
-   int nlen = 0;
-@@ -996,9 +1018,10 @@ md_assemble (char * str)
-   unsigned reg3;
-   unsigned isize;
-   unsigned long immed = 0, immed2 = 0, temp;
--  expressionS exp;
-+  expressionS exp,exp1;
-   char name[20];
-   long immedl;
-+  int reg=0;
- 
-   /* Drop leading whitespace.  */
-   while (ISSPACE (* str))
-@@ -1029,7 +1052,78 @@ md_assemble (char * str)
-       as_bad (_("unknown opcode \"%s\""), name);
-       return;
-     }
--
-+   
-+  if ((microblaze_arch_size == 64) && (streq (name, "addli") || streq (name, "addlic") ||
-+        streq (name, "addlik") || streq (name, "addlikc") || streq (name, "rsubli") 
-+       || streq (name, "rsublic") || streq (name, "rsublik") || streq (name, "rsublikc") 
-+       || streq (name, "andli") || streq (name, "andnli") || streq (name, "orli") 
-+       || streq (name, "xorli")))
-+    {
-+      temp_op_end = op_end;
-+      if (strcmp (temp_op_end, ""))
-+        temp_op_end = parse_reg (temp_op_end + 1, &reg1);  /* Get rd.  */
-+      if (strcmp (temp_op_end, ""))
-+        reg  = is_reg (temp_op_end + 1);
-+      if (reg) 
-+       {
-+          
-+         opcode->inst_type=INST_TYPE_RD_R1_IMML;
-+          opcode->inst_offset_type = OPCODE_MASK_H;
-+          if (streq (name, "addli"))
-+           opcode->bit_sequence = ADDLI_MASK;
-+          else if (streq (name, "addlic"))
-+           opcode->bit_sequence = ADDLIC_MASK;
-+          else if (streq (name, "addlik"))
-+           opcode->bit_sequence = ADDLIK_MASK;
-+          else if (streq (name, "addlikc"))
-+           opcode->bit_sequence = ADDLIKC_MASK;
-+          else if (streq (name, "rsubli"))
-+           opcode->bit_sequence = RSUBLI_MASK;
-+          else if (streq (name, "rsublic"))
-+           opcode->bit_sequence = RSUBLIC_MASK;
-+          else if (streq (name, "rsublik"))
-+           opcode->bit_sequence = RSUBLIK_MASK;
-+          else if (streq (name, "rsublikc"))
-+           opcode->bit_sequence = RSUBLIKC_MASK;
-+          else if (streq (name, "andli"))
-+           opcode->bit_sequence = ANDLI_MASK;
-+          else if (streq (name, "andnli"))
-+           opcode->bit_sequence = ANDLNI_MASK;
-+          else if (streq (name, "orli"))
-+           opcode->bit_sequence = ORLI_MASK;
-+          else if (streq (name, "xorli"))
-+           opcode->bit_sequence = XORLI_MASK;
-+       }
-+      else
-+        {
-+         opcode->inst_type=INST_TYPE_RD_IMML;
-+          opcode->inst_offset_type = OPCODE_MASK_LIMM;
-+          if (streq (name, "addli"))
-+           opcode->bit_sequence = ADDLI_ONE_REG_MASK;
-+          else if (streq (name, "addlic"))
-+           opcode->bit_sequence = ADDLIC_ONE_REG_MASK;
-+          else if (streq (name, "addlik"))
-+           opcode->bit_sequence = ADDLIK_ONE_REG_MASK;
-+          else if (streq (name, "addlikc"))
-+           opcode->bit_sequence = ADDLIKC_ONE_REG_MASK;
-+          else if (streq (name, "rsubli"))
-+           opcode->bit_sequence = RSUBLI_ONE_REG_MASK;
-+          else if (streq (name, "rsublic"))
-+           opcode->bit_sequence = RSUBLIC_ONE_REG_MASK;
-+          else if (streq (name, "rsublik"))
-+           opcode->bit_sequence = RSUBLIK_ONE_REG_MASK;
-+          else if (streq (name, "rsublikc"))
-+           opcode->bit_sequence = RSUBLIKC_ONE_REG_MASK;
-+          else if (streq (name, "andli"))
-+           opcode->bit_sequence = ANDLI_ONE_REG_MASK;
-+          else if (streq (name, "andnli"))
-+           opcode->bit_sequence = ANDLNI_ONE_REG_MASK;
-+          else if (streq (name, "orli"))
-+           opcode->bit_sequence = ORLI_ONE_REG_MASK;
-+          else if (streq (name, "xorli"))
-+           opcode->bit_sequence = XORLI_ONE_REG_MASK;
-+        }
-+    }
-   inst = opcode->bit_sequence;
-   isize = 4;
- 
-@@ -1486,6 +1580,51 @@ md_assemble (char * str)
-       inst |= (immed << IMM_LOW) & IMM15_MASK;
-       break;
- 
-+    case INST_TYPE_RD_IMML:
-+      if (strcmp (op_end, ""))
-+        op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
-+      else
-+        {
-+          as_fatal (_("Error in statement syntax"));
-+          reg1 = 0;
-+        }
-+
-+      if (strcmp (op_end, ""))
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-+      else
-+        as_fatal (_("Error in statement syntax"));
-+
-+      /* Check for spl registers. */
-+      if (check_spl_reg (&reg1))
-+        as_fatal (_("Cannot use special register with this instruction"));
-+      if (exp.X_op != O_constant)
-+       {
-+          char *opc = NULL;
-+          relax_substateT subtype;
-+
-+          if (exp.X_md != 0)
-+            subtype = get_imm_otype(exp.X_md);
-+          else
-+            subtype = opcode->inst_offset_type;
-+
-+          output = frag_var (rs_machine_dependent,
-+                             isize * 2, 
-+                             isize * 2,
-+                             subtype,   
-+                             exp.X_add_symbol,
-+                             exp.X_add_number,
-+                             (char *) opc);
-+          immedl = 0L;
-+       }               
-+      else
-+        {
-+          output = frag_more (isize);
-+          immed = exp.X_add_number;
-+        }
-+      inst |= (reg1 << RD_LOW) & RD_MASK;
-+      inst |= (immed << IMM_LOW) & IMM16_MASK;
-+      break;
-+       
-     case INST_TYPE_R1_RFSL:
-       if (strcmp (op_end, ""))
-         op_end = parse_reg (op_end + 1, &reg1);  /* Get r1.  */
-diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index d837ebb38e2..b5a78dcfe09 100644
---- a/opcodes/microblaze-dis.c
-+++ b/opcodes/microblaze-dis.c
-@@ -130,6 +130,14 @@ get_field_imm15 (struct string_buf *buf, long instr)
-   return p;
- }
- 
-+get_field_imm16 (struct string_buf *buf, long instr)
-+{
-+  char *p = strbuf (buf);
-+
-+  sprintf (p, "%d", (short)((instr & IMM16_MASK) >> IMM_LOW));
-+  return p;
-+}
-+
- static char *
- get_field_special (struct string_buf *buf, long instr,
-                   const struct op_code_struct *op)
-@@ -457,6 +465,9 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-          /* For mbar 16 or sleep insn.  */
-        case INST_TYPE_NONE:
-          break;
-+       case INST_TYPE_RD_IMML:
-+         print_func (stream, "\t%s, %s", get_field_rd (&buf, inst), get_field_imm16 (&buf, inst));
-+          break;
-         /* For bit field insns.  */
-        case INST_TYPE_RD_R1_IMMW_IMMS:
-           print_func (stream, "\t%s, %s, %s, %s", get_field_rd (&buf, inst),get_field_r1(&buf, inst),get_field_immw (&buf, inst), get_field_imms (&buf, inst));
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 6b25d12dace..82da7f1179a 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -69,6 +69,7 @@
- #define INST_TYPE_RD_R1_IMMW_IMMS  21
- 
- #define INST_TYPE_NONE 25
-+#define INST_TYPE_RD_IMML 26
- 
- 
- 
-@@ -84,6 +85,7 @@
- #define IMMVAL_MASK_MFS 0x0000
- 
- #define OPCODE_MASK_H   0xFC000000  /* High 6 bits only.  */
-+#define OPCODE_MASK_LIMM 0xFC1F0000 /* High 6 bits and 12-16 bits */
- #define OPCODE_MASK_H1  0xFFE00000  /* High 11 bits.  */
- #define OPCODE_MASK_H2  0xFC1F0000  /* High 6 and bits 20-16.  */
- #define OPCODE_MASK_H12 0xFFFF0000  /* High 16.  */
-@@ -106,6 +108,33 @@
- #define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26.  */
- #define OPCODE_MASK_H8  0xFF000000  /* High 8 bits only.  */
- 
-+/*Defines to identify 64-bit single reg instructions */
-+#define ADDLI_ONE_REG_MASK 0x68000000
-+#define ADDLIC_ONE_REG_MASK 0x68020000
-+#define ADDLIK_ONE_REG_MASK 0x68040000
-+#define ADDLIKC_ONE_REG_MASK 0x68060000
-+#define RSUBLI_ONE_REG_MASK 0x68010000
-+#define RSUBLIC_ONE_REG_MASK 0x68030000
-+#define RSUBLIK_ONE_REG_MASK 0x68050000
-+#define RSUBLIKC_ONE_REG_MASK 0x68070000
-+#define ORLI_ONE_REG_MASK 0x68100000
-+#define ANDLI_ONE_REG_MASK 0x68110000
-+#define XORLI_ONE_REG_MASK 0x68120000
-+#define ANDLNI_ONE_REG_MASK 0x68130000
-+#define ADDLI_MASK 0x20000000
-+#define ADDLIC_MASK 0x28000000
-+#define ADDLIK_MASK 0x30000000
-+#define ADDLIKC_MASK 0x38000000
-+#define RSUBLI_MASK 0x24000000
-+#define RSUBLIC_MASK 0x2C000000
-+#define RSUBLIK_MASK 0x34000000
-+#define RSUBLIKC_MASK 0x3C000000
-+#define ANDLI_MASK 0xA4000000
-+#define ANDLNI_MASK 0xAC000000
-+#define ORLI_MASK 0xA0000000
-+#define XORLI_MASK 0xA8000000
-+
-+
- /* New Mask for msrset, msrclr insns.  */
- #define OPCODE_MASK_H23N  0xFC1F8000 /* High 6 and bits 11 - 16.  */
- /* Mask for mbar insn.  */
-@@ -114,7 +143,7 @@
- #define DELAY_SLOT 1
- #define NO_DELAY_SLOT 0
- 
--#define MAX_OPCODES 412
-+#define MAX_OPCODES 424
- 
- const struct op_code_struct
- {
-@@ -444,13 +473,21 @@ const struct op_code_struct
-   {"cmpl",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x14000101, OPCODE_MASK_H4, cmpl, arithmetic_inst },
-   {"cmplu",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x14000103, OPCODE_MASK_H4, cmplu, arithmetic_inst },
-   {"addli",   INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x20000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addli", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68000000, OPCODE_MASK_LIMM, addli, arithmetic_inst },
-   {"rsubli",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x24000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"rsubli", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68010000, OPCODE_MASK_LIMM, rsubli, arithmetic_inst },
-   {"addlic",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x28000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addlic", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68020000, OPCODE_MASK_LIMM, addlic, arithmetic_inst },
-   {"rsublic", INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x2C000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+    {"rsublic", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68030000, OPCODE_MASK_LIMM, rsublic, arithmetic_inst },
-   {"addlik",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x30000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addlik", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68040000, OPCODE_MASK_LIMM, addlik, arithmetic_inst },
-   {"rsublik", INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x34000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"rsublik", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68050000, OPCODE_MASK_LIMM, rsublik, arithmetic_inst },
-   {"addlikc", INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x38000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },   /* Identical to 32-bit */
-+  {"addlikc", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68060000, OPCODE_MASK_LIMM, addlikc, arithmetic_inst },
-   {"rsublikc",INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x3C000000, OPCODE_MASK_H, invalid_inst, arithmetic_inst },  /* Identical to 32-bit */
-+  {"rsublikc", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68070000, OPCODE_MASK_LIMM, rsublikc, arithmetic_inst },
-   {"mull",    INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x40000100, OPCODE_MASK_H4, mull, mult_inst },
-   {"bslll",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x44000500, OPCODE_MASK_H3, bslll, barrel_shift_inst },
-   {"bslra",   INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x44000300, OPCODE_MASK_H3, bslra, barrel_shift_inst },
-@@ -501,9 +538,13 @@ const struct op_code_struct
-   {"beaged",  INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9FA00000, OPCODE_MASK_H14, beaged, branch_inst },
-   {"bealged", INST_TYPE_R1_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x9FA00100, OPCODE_MASK_H14, bealged, branch_inst },
-   {"orli",    INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA0000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"orli", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68100000, OPCODE_MASK_LIMM, orli, arithmetic_inst },
-   {"andli",   INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA4000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"andli", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68110000, OPCODE_MASK_LIMM, andli, arithmetic_inst },
-   {"xorli",   INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xA8000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"xorli", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68120000, OPCODE_MASK_LIMM, xorli, arithmetic_inst },
-   {"andnli",  INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xAC000000, OPCODE_MASK_H, invalid_inst, logical_inst },      /* Identical to 32-bit */
-+  {"andnli", INST_TYPE_RD_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL,0x68130000, OPCODE_MASK_LIMM, andnli, arithmetic_inst },
-   {"imml",    INST_TYPE_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB2000000, OPCODE_MASK_H8, imml, immediate_inst },
-   {"breai",   INST_TYPE_IMM, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8010000, OPCODE_MASK_H12, breai, branch_inst },
-   {"breaid",  INST_TYPE_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8110000, OPCODE_MASK_H12, breaid, branch_inst },
-diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index b242ea73c7b..5c44a5ff0ac 100644
---- a/opcodes/microblaze-opcm.h
-+++ b/opcodes/microblaze-opcm.h
-@@ -62,7 +62,9 @@ enum microblaze_instr
-   eaputd, teaputd, ecaputd, tecaputd, neaputd, tneaputd, necaputd, tnecaputd,
- 
-   /* 64-bit instructions */
--  addl, rsubl, addlc, rsublc, addlk, rsublk, addlkc, rsublkc, cmpl, cmplu, mull,
-+  addl, addli, addlic, addlik, addlikc, rsubl, rsubli, rsublic, rsublik, rsublikc,
-+  addlc, rsublc, addlk, rsublk, addlkc, rsublkc, cmpl, cmplu, mull,
-+  andli, andnli, orli, xorli,
-   bslll, bslra, bslrl, bsllli, bslrai, bslrli, bslefi, bslifi, orl, andl, xorl,
-   andnl, pcmplbf, pcmpleq, pcmplne, srla, srlc, srll, sextl8, sextl16, sextl32,
-   brea, bread, breald, beaeq, bealeq, beaeqd, bealeqd, beane, bealne, beaned,
-@@ -167,5 +169,6 @@ enum microblaze_instr_type
- 
- /* Imm mask for msrset, msrclr instructions.  */
- #define  IMM15_MASK 0x00007FFF
-+#define IMM16_MASK 0x0000FFFF
- 
- #endif /* MICROBLAZE-OPCM */
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
deleted file mode 100644
index 6d0df558..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
+++ /dev/null
@@ -1,545 +0,0 @@
-From ec5bfe546213b2cb7fe2a51f9f9571597b2c5aa9 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 26 Aug 2019 15:29:42 +0530
-Subject: [PATCH 24/34] [Patch,MicroBlaze] : double imml generation for 64 bit
- values.
-
-Conflicts:
-        gas/config/tc-microblaze.c
----
- gas/config/tc-microblaze.c | 321 ++++++++++++++++++++++++++++++-------
- opcodes/microblaze-opc.h   |   4 +-
- 2 files changed, 262 insertions(+), 63 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 27544b60ea3..4c455ff02b8 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -1008,7 +1008,7 @@ md_assemble (char * str)
-   char * op_start;
-   char * op_end;
-   char * temp_op_end;
--  struct op_code_struct * opcode, *opcode1;
-+  struct op_code_struct * opcode, *opcode1, *opcode2;
-   char * output = NULL;
-   int nlen = 0;
-   int i;
-@@ -1192,7 +1192,12 @@ md_assemble (char * str)
-           reg2 = 0;
-         }
-       if (strcmp (op_end, ""))
-+        {
-+        if(microblaze_arch_size == 64)
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-+       else
-        op_end = parse_imm (op_end + 1, & exp, MIN_IMM, MAX_IMM);
-+       }
-       else
-        as_fatal (_("Error in statement syntax"));
- 
-@@ -1292,26 +1297,51 @@ md_assemble (char * str)
-                || streq (name, "lwi") || streq (name, "sbi")
-                 || streq (name, "shi") || streq (name, "swi"))))
-         {
--          temp = immed & 0xFFFFFF8000;
--          if (temp != 0 && temp != 0xFFFFFF8000)
-+          temp = ((long long)immed) & 0xFFFFFFFFFFFF8000;
-+          if (temp != 0 && temp != 0xFFFFFFFFFFFF8000)
-             {
-               /* Needs an immediate inst.  */
--             opcode1
--               = (struct op_code_struct *) str_hash_find (opcode_hash_control,
--                                                          "imml");
--              if (opcode1 == NULL)
-+          if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
-+            {
-+             opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+             if (opcode1 == NULL)
-                 {
-                   as_bad (_("unknown opcode \"%s\""), "imml");
-                   return;
-                 }
-               inst1 = opcode1->bit_sequence;
--             inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-               output[0] = INST_BYTE0 (inst1);
-               output[1] = INST_BYTE1 (inst1);
-               output[2] = INST_BYTE2 (inst1);
-               output[3] = INST_BYTE3 (inst1);
-               output = frag_more (isize);
-             }
-+         else 
-+           {
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL || opcode2 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode2->bit_sequence;
-+              inst1 |= ((immed & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+            }
-+         }
-           inst |= (reg1 << RD_LOW) & RD_MASK;
-           inst |= (reg2 << RA_LOW) & RA_MASK;
-           inst |= (immed << IMM_LOW) & IMM_MASK;
-@@ -1328,8 +1358,7 @@ md_assemble (char * str)
-                    as_bad (_("unknown opcode \"%s\""), "imm");
-                    return;
-                  }
--
--               inst1 = opcode1->bit_sequence;
-+              inst1 = opcode1->bit_sequence;
-                inst1 |= ((immed & 0xFFFF0000) >> 16) & IMM_MASK;
-                output[0] = INST_BYTE0 (inst1);
-                output[1] = INST_BYTE1 (inst1);
-@@ -1570,7 +1599,7 @@ md_assemble (char * str)
-         as_fatal (_("Cannot use special register with this instruction"));
- 
-       if (exp.X_op != O_constant)
--        as_fatal (_("Symbol used as immediate value for msrset/msrclr instructions"));
-+        as_fatal (_("Symbol used as immediate value for arithmetic long instructions"));
-       else
-        {
-           output = frag_more (isize);
-@@ -1904,6 +1933,7 @@ md_assemble (char * str)
-       temp = immed & 0xFFFF8000;
-       if ((temp != 0) && (temp != 0xFFFF8000))
-        {
-+
-           /* Needs an immediate inst.  */
-          opcode1
-            = (struct op_code_struct *) str_hash_find (opcode_hash_control,
-@@ -1936,7 +1966,12 @@ md_assemble (char * str)
-           reg1 = 0;
-         }
-       if (strcmp (op_end, ""))
-+      {
-+        if(microblaze_arch_size == 64)
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-+        else
-         op_end = parse_imm (op_end + 1, & exp, MIN_IMM, MAX_IMM);
-+      }
-       else
-         as_fatal (_("Error in statement syntax"));
- 
-@@ -1975,30 +2010,55 @@ md_assemble (char * str)
-         }
-       if (streq (name, "brealid") || streq (name, "breaid") || streq (name, "breai"))
-         {
--          temp = immed & 0xFFFFFF8000;
--          if (temp != 0 && temp != 0xFFFFFF8000)
-+          temp = ((long long)immed) & 0xFFFFFFFFFFFF8000;
-+          if (temp != 0 && temp != 0xFFFFFFFFFFFF8000)
-             {
-               /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
-+           {
-+            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-               if (opcode1 == NULL)
-                 {
-                   as_bad (_("unknown opcode \"%s\""), "imml");
-                   return;
-                 }
-               inst1 = opcode1->bit_sequence;
--             inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-               output[0] = INST_BYTE0 (inst1);
-               output[1] = INST_BYTE1 (inst1);
-               output[2] = INST_BYTE2 (inst1);
-               output[3] = INST_BYTE3 (inst1);
-               output = frag_more (isize);
-             }
-+          else {
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL || opcode2 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode2->bit_sequence;
-+              inst1 |= ((immed & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+          }
-+         }
-          inst |= (reg1 << RD_LOW) & RD_MASK;
-           inst |= (immed << IMM_LOW) & IMM_MASK;
-          }
-        else 
-         {
--
-       temp = immed & 0xFFFF8000;
-       if ((temp != 0) && (temp != 0xFFFF8000))
-        {
-@@ -2086,24 +2146,50 @@ md_assemble (char * str)
-             streq (name, "breaid") || 
-            streq (name, "brai") || streq (name, "braid")))
-         {
--          temp = immed & 0xFFFFFF8000;
-+          temp = immed & 0xFFFFFFFFFFFF8000;
-           if (temp != 0)
-            {
-               /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+         if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
-+          {
-+            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-               if (opcode1 == NULL)
-                 {
-                   as_bad (_("unknown opcode \"%s\""), "imml");
-                   return;
-                 }
-               inst1 = opcode1->bit_sequence;
--              inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-               output[0] = INST_BYTE0 (inst1);
-               output[1] = INST_BYTE1 (inst1);
-               output[2] = INST_BYTE2 (inst1);
-               output[3] = INST_BYTE3 (inst1);
-               output = frag_more (isize);
-             }
-+           else {
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL || opcode2 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode2->bit_sequence;
-+              inst1 |= ((immed & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+            }
-+            }
-           inst |= (immed << IMM_LOW) & IMM_MASK;
-        }
-       else
-@@ -2203,21 +2289,45 @@ md_assemble (char * str)
-        {
-          output = frag_more (isize);
-          immedl = exp.X_add_number;
--
--         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
--         if (opcode1 == NULL)
--           {
--             as_bad (_("unknown opcode \"%s\""), "imml");
--             return;
--           }
--
--         inst1 = opcode1->bit_sequence;
--         inst1 |= ((immedl & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
--         output[0] = INST_BYTE0 (inst1);
--         output[1] = INST_BYTE1 (inst1);
--         output[2] = INST_BYTE2 (inst1);
--         output[3] = INST_BYTE3 (inst1);
--         output = frag_more (isize);
-+         if (((long long)immedl) > (long long)-549755813888 && ((long long)immedl) < (long long)549755813887)
-+            {
-+             opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+             if (opcode1 == NULL)
-+             {
-+              as_bad (_("unknown opcode \"%s\""), "imml");
-+              return;
-+             }
-+          inst1 = opcode1->bit_sequence;
-+          inst1 |= ((immedl & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+          output[0] = INST_BYTE0 (inst1);
-+          output[1] = INST_BYTE1 (inst1);
-+          output[2] = INST_BYTE2 (inst1);
-+          output[3] = INST_BYTE3 (inst1);
-+          output = frag_more (isize);
-+        }
-+           else {
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+       if (opcode2 == NULL || opcode1 == NULL)
-+            {
-+              as_bad (_("unknown opcode \"%s\""), "imml");
-+              return;
-+            }
-+          inst1 = opcode2->bit_sequence;
-+          inst1 |= ((immedl & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
-+          output[0] = INST_BYTE0 (inst1);
-+          output[1] = INST_BYTE1 (inst1);
-+          output[2] = INST_BYTE2 (inst1);
-+          output[3] = INST_BYTE3 (inst1);
-+          output = frag_more (isize);
-+          inst1 = opcode1->bit_sequence;
-+          inst1 |= ((immedl & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+          output[0] = INST_BYTE0 (inst1);
-+          output[1] = INST_BYTE1 (inst1);
-+          output[2] = INST_BYTE2 (inst1);
-+          output[3] = INST_BYTE3 (inst1);
-+          output = frag_more (isize);
-+        }
-         }
- 
-       inst |= (reg1 << RD_LOW) & RD_MASK;
-@@ -2266,21 +2376,46 @@ md_assemble (char * str)
-        {
-           output = frag_more (isize);
-           immedl = exp.X_add_number;
--         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
--         if (opcode1 == NULL)
--           {
--             as_bad (_("unknown opcode \"%s\""), "imml");
--             return;
--           }
--
-+          if (((long long)immedl) > (long long)-549755813888 && ((long long)immedl) < (long long)549755813887)
-+             {
-+            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           if (opcode1 == NULL)
-+            {
-+              as_bad (_("unknown opcode \"%s\""), "imml");
-+              return;
-+            }
-+          inst1 = opcode1->bit_sequence;
-+          inst1 |= ((immedl & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+          output[0] = INST_BYTE0 (inst1);
-+          output[1] = INST_BYTE1 (inst1);
-+          output[2] = INST_BYTE2 (inst1);
-+          output[3] = INST_BYTE3 (inst1);
-+          output = frag_more (isize);
-+          }
-+           else {
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+       if (opcode2 == NULL || opcode1 == NULL)
-+            {
-+              as_bad (_("unknown opcode \"%s\""), "imml");
-+              return;
-+            }
-+          inst1 = opcode2->bit_sequence;
-+          inst1 |= ((immedl & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
-+          output[0] = INST_BYTE0 (inst1);
-+          output[1] = INST_BYTE1 (inst1);
-+          output[2] = INST_BYTE2 (inst1);
-+          output[3] = INST_BYTE3 (inst1);
-+          output = frag_more (isize);
-           inst1 = opcode1->bit_sequence;
--         inst1 |= ((immedl & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
-+          inst1 |= ((immedl & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-           output[0] = INST_BYTE0 (inst1);
-           output[1] = INST_BYTE1 (inst1);
-           output[2] = INST_BYTE2 (inst1);
-           output[3] = INST_BYTE3 (inst1);
-           output = frag_more (isize);
-         }
-+        }
- 
-       inst |= (reg1 << RA_LOW) & RA_MASK;
-       inst |= (immedl << IMM_LOW) & IMM_MASK;
-@@ -2560,8 +2695,8 @@ md_apply_fix (fixS *   fixP,
-   /* Note: use offsetT because it is signed, valueT is unsigned.  */
-   offsetT      val  = (offsetT) * valp;
-   int          i;
--  struct op_code_struct * opcode1;
--  unsigned long inst1;
-+  struct op_code_struct * opcode1, * opcode2;
-+  unsigned long inst1,inst2;
- 
-   symname = fixP->fx_addsy ? S_GET_NAME (fixP->fx_addsy) : _("<unknown>");
- 
-@@ -2743,30 +2878,75 @@ md_apply_fix (fixS *   fixP,
-     case BFD_RELOC_MICROBLAZE_64_TEXTREL:
-     case BFD_RELOC_MICROBLAZE_64:
-     case BFD_RELOC_MICROBLAZE_64_PCREL:
--      /* Add an imm instruction.  First save the current instruction.  */
--      for (i = 0; i < INST_WORD_SIZE; i++)
--       buf[i + INST_WORD_SIZE] = buf[i];
-       if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64
-             || fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-         {
-           /* Generate the imm instruction.  */
--          opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           if (((long long)val) > (long long)-549755813888 && ((long long)val) < (long long)549755813887)
-+          {
-+        /* Add an imm instruction.  First save the current instruction.  */
-+        for (i = 0; i < INST_WORD_SIZE; i++)
-+        buf[i + INST_WORD_SIZE] = buf[i];
-+        opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-           if (opcode1 == NULL)
--           {
--             as_bad (_("unknown opcode \"%s\""), "imml");
--             return;
--           }
-+            {
-+              as_bad (_("unknown opcode \"%s\""), "imml");
-+              return;
-+            }
- 
-            inst1 = opcode1->bit_sequence;
-            if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
--            inst1 |= ((val & 0xFFFFFF0000L) >> 16) & IMML_MASK;
-+             inst1 |= ((val & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-            if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
--             fixP->fx_r_type = BFD_RELOC_64; 
-+             fixP->fx_r_type = BFD_RELOC_64;
-            if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
--             fixP->fx_r_type = BFD_RELOC_64_PCREL; 
-+             fixP->fx_r_type = BFD_RELOC_64_PCREL;
-+      buf[0] = INST_BYTE0 (inst1);
-+      buf[1] = INST_BYTE1 (inst1);
-+      buf[2] = INST_BYTE2 (inst1);
-+      buf[3] = INST_BYTE3 (inst1);
-+        }
-+           else {
-+      /* Add an imm instruction.  First save the current instruction.  */
-+        for (i = 0; i < INST_WORD_SIZE; i++)
-+        buf[i + INST_WORD_SIZE + 4] = buf[i];
-+
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+          if (opcode1 == NULL || opcode2 ==NULL)
-+              {
-+             as_bad (_("unknown opcode \"%s\""), "imml");
-+              return;
-+             }
-+           inst1 = opcode2->bit_sequence;
-+           if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-+             inst1 |= ((val & 0x000000FFFFFF0000L) >> 40) & IMML_MASK;
-+           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+             fixP->fx_r_type = BFD_RELOC_64;
-+           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-+             fixP->fx_r_type = BFD_RELOC_64_PCREL;
-+           inst2 = opcode1->bit_sequence;
-+           if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-+             inst1 |= ((val & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64)
-+             fixP->fx_r_type = BFD_RELOC_64;
-+           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-+             fixP->fx_r_type = BFD_RELOC_64_PCREL;
-+       buf[0] = INST_BYTE0 (inst1);
-+       buf[1] = INST_BYTE1 (inst1);
-+       buf[2] = INST_BYTE2 (inst1);
-+       buf[3] = INST_BYTE3 (inst1);
-+       buf[4] = INST_BYTE0 (inst2);
-+       buf[5] = INST_BYTE1 (inst2);
-+       buf[6] = INST_BYTE2 (inst2);
-+       buf[7] = INST_BYTE3 (inst2);
-+           }
-          }
-       else
-         {
-+      /* Add an imm instruction.  First save the current instruction.  */
-+        for (i = 0; i < INST_WORD_SIZE; i++)
-+        buf[i + INST_WORD_SIZE] = buf[i];
-           /* Generate the imm instruction.  */
-           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-           if (opcode1 == NULL)
-@@ -2778,12 +2958,11 @@ md_apply_fix (fixS *   fixP,
-           inst1 = opcode1->bit_sequence;
-           if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-            inst1 |= ((val & 0xFFFF0000) >> 16) & IMM_MASK;
--         }
-       buf[0] = INST_BYTE0 (inst1);
-       buf[1] = INST_BYTE1 (inst1);
-       buf[2] = INST_BYTE2 (inst1);
-       buf[3] = INST_BYTE3 (inst1);
--
-+         }
-       /* Add the value only if the symbol is defined.  */
-       if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
-        {
-@@ -2816,21 +2995,41 @@ md_apply_fix (fixS *   fixP,
-       for (i = 0; i < INST_WORD_SIZE; i++)
-        buf[i + INST_WORD_SIZE] = buf[i];
-       /* Generate the imm instruction.  */
--      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
--        opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC) {
-+           if (((long long)val) > (long long)-549755813888 && ((long long)val) < (long long)549755813887)
-+           {
-+           for (i = 0; i < INST_WORD_SIZE; i++)
-+           buf[i + INST_WORD_SIZE] = buf[i];
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+          }
-+           else {
-+       for (i = 0; i < INST_WORD_SIZE; i++)
-+        buf[i + INST_WORD_SIZE + 4] = buf[i]; 
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+      inst2 = opcode2->bit_sequence;
-+
-+      /* We can fixup call to a defined non-global address
-+ *          within the same section only.  */
-+      buf[4] = INST_BYTE0 (inst2);
-+      buf[5] = INST_BYTE1 (inst2);
-+      buf[6] = INST_BYTE2 (inst2);
-+      buf[7] = INST_BYTE3 (inst2);
-+           }
-+       }
-       else
-         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
-       if (opcode1 == NULL)
-        {
-+      for (i = 0; i < INST_WORD_SIZE; i++)
-+        buf[i + INST_WORD_SIZE] = buf[i];
-           if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
-            as_bad (_("unknown opcode \"%s\""), "imml");
-           else
-            as_bad (_("unknown opcode \"%s\""), "imm");
-          return;
-        }
--
-       inst1 = opcode1->bit_sequence;
--
-       /* We can fixup call to a defined non-global address
-         within the same section only.  */
-       buf[0] = INST_BYTE0 (inst1);
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 82da7f1179a..e65f4b58233 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -626,8 +626,8 @@ char pvr_register_prefix[] = "rpvr";
- #define MIN_IMM6_WIDTH  ((int) 0x00000001)
- #define MAX_IMM6_WIDTH  ((int) 0x00000040)
- 
--#define MIN_IMML  ((long long) 0xffffff8000000000L)
--#define MAX_IMML  ((long long) 0x0000007fffffffffL)
-+#define MIN_IMML  ((long long) -9223372036854775808)
-+#define MAX_IMML  ((long long) 9223372036854775807)
- 
- #endif /* MICROBLAZE_OPC */
- 
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
deleted file mode 100644
index 74fcea81..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0ba14f999b266406e7e86fc0e7311ebb275e7b97 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Wed, 3 Nov 2021 12:13:32 +0530
-Subject: [PATCH 25/34] Fixed bug in generation of IMML instruction for the
-
-new MB-64 instructions with single register.
----
- gas/config/tc-microblaze.c | 50 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 47 insertions(+), 3 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 4c455ff02b8..bccaafe296c 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -1643,12 +1643,56 @@ md_assemble (char * str)
-                              exp.X_add_symbol,
-                              exp.X_add_number,
-                              (char *) opc);
--          immedl = 0L;
-+          immed = 0L;
-        }               
-       else
-         {
-           output = frag_more (isize);
-           immed = exp.X_add_number;
-+          temp = ((long long)immed) & 0xFFFFFFFFFFFF8000;
-+          if (temp != 0 && temp != 0xFFFFFFFFFFFF8000 && temp != 0x8000)
-+            {
-+              /* Needs an immediate inst.  */
-+           if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
-+           {
-+            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+            }
-+          else {
-+           opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
-+              if (opcode1 == NULL || opcode2 == NULL)
-+                {
-+                  as_bad (_("unknown opcode \"%s\""), "imml");
-+                  return;
-+                }
-+              inst1 = opcode2->bit_sequence;
-+              inst1 |= ((immed & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+              inst1 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
-+              output[0] = INST_BYTE0 (inst1);
-+              output[1] = INST_BYTE1 (inst1);
-+              output[2] = INST_BYTE2 (inst1);
-+              output[3] = INST_BYTE3 (inst1);
-+              output = frag_more (isize);
-+          }
-+         }
-         }
-       inst |= (reg1 << RD_LOW) & RD_MASK;
-       inst |= (immed << IMM_LOW) & IMM16_MASK;
-@@ -2146,8 +2190,8 @@ md_assemble (char * str)
-             streq (name, "breaid") || 
-            streq (name, "brai") || streq (name, "braid")))
-         {
--          temp = immed & 0xFFFFFFFFFFFF8000;
--          if (temp != 0)
-+          temp = ((long long)immed) & 0xFFFFFFFFFFFF8000;
-+          if (temp != 0 && temp != 0xFFFFFFFFFFFF8000 && temp != 0x8000)
-            {
-               /* Needs an immediate inst.  */
-          if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
deleted file mode 100644
index 8058c6a6..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6e92cc2429ec37ced6cc70596ad7c6217d25e806 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Thu, 16 Apr 2020 18:08:58 +0530
-Subject: [PATCH 26/34]  [Patch,MicroBlaze m64] : This patch will remove imml 0
- and imml -1 instructions when the offset is less than 16 bit for Type A
- branch EA instructions.
-
----
- gas/config/tc-microblaze.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index bccaafe296c..85509011f8c 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -2158,9 +2158,7 @@ md_assemble (char * str)
-       if (exp.X_op != O_constant)
-        {
-          char *opc;
--          if (microblaze_arch_size == 64 && (streq (name, "breai") || 
--                streq (name, "breaid") || 
--                streq (name, "brai") || streq (name, "braid")))
-+          if (microblaze_arch_size == 64 && (streq (name, "brai") || streq (name, "braid")))
-             opc = str_microblaze_64;
-          else
-             opc = NULL;
-@@ -2923,7 +2921,7 @@ md_apply_fix (fixS *   fixP,
-     case BFD_RELOC_MICROBLAZE_64:
-     case BFD_RELOC_MICROBLAZE_64_PCREL:
-       if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64
--            || fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
-+            || fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL || (fixP->fx_r_type == BFD_RELOC_64_PCREL && microblaze_arch_size == 64))
-         {
-           /* Generate the imm instruction.  */
-            if (((long long)val) > (long long)-549755813888 && ((long long)val) < (long long)549755813887)
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
deleted file mode 100644
index 50819300..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7f4c17e26065d8194a2512f2982c245afa0e7e40 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Wed, 17 Jun 2020 21:20:26 +0530
-Subject: [PATCH 27/34] [Patch,MicroBlaze] : improper address mapping of
- PROVIDE directive symbols[DTOR_END] are causing runtime loops and we don't
- need to override PROVIDE symbols if symbols are defined in libraries and
- linker so I am disabling override for PROVIDE symbols.
-
----
- ld/ldlang.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index f12c09633a7..4a71abc7cbc 100644
---- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -3692,10 +3692,16 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
-            plugin_insert = NULL;
- #endif
-          break;
-+         /* This is from a --defsym on the command line.  */
-        case lang_assignment_statement_enum:
--         if (s->assignment_statement.exp->type.node_class != etree_assert)
--           exp_fold_tree_no_dot (s->assignment_statement.exp);
--         break;
-+          if (s->assignment_statement.exp->type.node_class != etree_assert)
-+          {
-+          if(!(s->assignment_statement.exp->assign.defsym) && (s->assignment_statement.exp->type.node_class == etree_provide))
-+          ;
-+          else
-+          exp_fold_tree_no_dot (s->assignment_statement.exp);
-+          }
-+          break;
-        default:
-          break;
-        }
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
deleted file mode 100644
index c7c4f1d1..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3e308d91912ade69f914383fd9c13f934da37be4 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilinx.com>
-Date: Tue, 20 Apr 2021 21:22:06 +0530
-Subject: [PATCH 28/34] [Patch, microblaze]:Changing the long to long long as
- in Windows long is 32-bit but we need the variable to be 64-bit
-
-Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
-
-Conflicts:
-        gas/config/tc-microblaze.c
----
- gas/config/tc-microblaze.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 85509011f8c..31677446114 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -1017,7 +1017,7 @@ md_assemble (char * str)
-   unsigned reg2;
-   unsigned reg3;
-   unsigned isize;
--  unsigned long immed = 0, immed2 = 0, temp;
-+  unsigned long long immed = 0, immed2 = 0, temp;
-   expressionS exp,exp1;
-   char name[20];
-   long immedl;
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0029-gas-revert-moving-of-md_pseudo_table-from-const.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0029-gas-revert-moving-of-md_pseudo_table-from-const.patch
deleted file mode 100644
index 205f04fe..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0029-gas-revert-moving-of-md_pseudo_table-from-const.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 24d43f5ce8746c653de7de3fad46915755ba789d Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 8 Nov 2021 21:57:13 +0530
-Subject: [PATCH 29/34] gas: revert moving of md_pseudo_table from const
-
-The base system expect md_pseudo_table to be constant, Changing the
-definition will break other architectures when compiled with a
-unified source code.
-
-Patch reverts the change away from const, and implements a newer
-dynamic handler that passes the correct argument value based on word
-size.
-
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
----
- gas/config/tc-microblaze.c | 16 +++++++++++++---
- gas/tc.h                   |  2 +-
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 31677446114..6b398ab5605 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -385,6 +385,17 @@ microblaze_s_weakext (int ignore ATTRIBUTE_UNUSED)
-   demand_empty_rest_of_line ();
- }
- 
-+/* Handle the .gpword pseudo-op, Pass to s_rva */
-+
-+static void
-+microblaze_s_gpword (int ignore ATTRIBUTE_UNUSED)
-+{
-+  int size = 4;
-+  if (microblaze_arch_size == 64)
-+    size = 8;
-+  s_rva(size);
-+}
-+
- /* This table describes all the machine specific pseudo-ops the assembler
-    has to support.  The fields are:
-    Pseudo-op name without dot
-@@ -392,7 +403,7 @@ microblaze_s_weakext (int ignore ATTRIBUTE_UNUSED)
-    Integer arg to pass to the function.  */
- /* If the pseudo-op is not found in this table, it searches in the obj-elf.c,
-    and then in the read.c table.  */
--pseudo_typeS md_pseudo_table[] =
-+const pseudo_typeS md_pseudo_table[] =
- {
-   {"lcomm", microblaze_s_lcomm, 1},
-   {"data", microblaze_s_data, 0},
-@@ -401,7 +412,7 @@ pseudo_typeS md_pseudo_table[] =
-   {"data32", cons, 4},     /* Same as word.  */
-   {"ent", s_func, 0}, /* Treat ent as function entry point.  */
-   {"end", microblaze_s_func, 1}, /* Treat end as function end point.  */
--  {"gpword", s_rva, 4}, /* gpword label => store resolved label address in data section.  */
-+  {"gpword", microblaze_s_gpword, 0}, /* gpword label => store resolved label address in data section.  */
-   {"weakext", microblaze_s_weakext, 0},
-   {"rodata", microblaze_s_rdata, 0},
-   {"sdata2", microblaze_s_rdata, 1},
-@@ -3456,7 +3467,6 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
-     case OPTION_M64:
-       //if (arg != NULL && strcmp (arg, "64") == 0)
-       microblaze_arch_size = 64;
--      md_pseudo_table[7].poc_val = 8;
-       break;
-     default:
-       return 0;
-diff --git a/gas/tc.h b/gas/tc.h
-index bb9a935a353..4a740f9bdd9 100644
---- a/gas/tc.h
-+++ b/gas/tc.h
-@@ -22,7 +22,7 @@
- /* In theory (mine, at least!) the machine dependent part of the assembler
-    should only have to include one file.  This one.  -- JF */
- 
--extern pseudo_typeS md_pseudo_table[];
-+extern const pseudo_typeS md_pseudo_table[];
- 
- const char * md_atof (int, char *, int *);
- int    md_parse_option (int, const char *);
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
deleted file mode 100644
index bfb65224..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 62107ba949fe70e5ae0573147d82cbb52bd1fc08 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 8 Nov 2021 22:01:23 +0530
-Subject: [PATCH 30/34] ld/emulparams/elf64microblaze: Fix emulation generation
-
-Compilation fails when building ld-new with:
-
-ldemul.o:(.data.rel+0x820): undefined reference to `ld_elf64microblazeel_emulation'
-ldemul.o:(.data.rel+0x828): undefined reference to `ld_elf64microblaze_emulation'
-
-The error appears to be that the elf64 files were referencing the elf32 emulation.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- ld/emulparams/elf64microblaze.sh   | 2 +-
- ld/emulparams/elf64microblazeel.sh | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ld/emulparams/elf64microblaze.sh b/ld/emulparams/elf64microblaze.sh
-index 9c7b0eb7080..7b4c7c411bd 100644
---- a/ld/emulparams/elf64microblaze.sh
-+++ b/ld/emulparams/elf64microblaze.sh
-@@ -19,5 +19,5 @@ NOP=0x80000000
- #$@{RELOCATING+ PROVIDE (__stack = 0x7000);@}
- #OTHER_RELOCATING_SECTIONS='PROVIDE (_stack = _end + 0x1000);'
- 
--TEMPLATE_NAME=elf32
-+TEMPLATE_NAME=elf
- #GENERATE_SHLIB_SCRIPT=yes
-diff --git a/ld/emulparams/elf64microblazeel.sh b/ld/emulparams/elf64microblazeel.sh
-index 9c7b0eb7080..7b4c7c411bd 100644
---- a/ld/emulparams/elf64microblazeel.sh
-+++ b/ld/emulparams/elf64microblazeel.sh
-@@ -19,5 +19,5 @@ NOP=0x80000000
- #$@{RELOCATING+ PROVIDE (__stack = 0x7000);@}
- #OTHER_RELOCATING_SECTIONS='PROVIDE (_stack = _end + 0x1000);'
- 
--TEMPLATE_NAME=elf32
-+TEMPLATE_NAME=elf
- #GENERATE_SHLIB_SCRIPT=yes
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch
deleted file mode 100644
index cb31c0d7..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 7bddfaf3ad574aa738ab903f63a345ebde134f9e Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 24 Jan 2022 16:04:07 +0530
-Subject: [PATCH 31/34] [Patch,MicroBlaze] : Invalid data offsets (pointer)
- after relaxation. Proposed patch from community member (dednev@rambler.ru)
- against 2021.1 [CR-1115232]
-
----
- bfd/elf32-microblaze.c | 18 ++++++++++++++++++
- bfd/elf64-microblaze.c | 17 +++++++++++++++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 88ac730582b..588367ebcbb 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -2095,6 +2095,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                 {
-                   unsigned int val;
- 
-+                 if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
-+
-                   isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
- 
-                   /* hax: We only do the following fixup for debug location lists.  */
-@@ -2136,6 +2139,9 @@ microblaze_elf_relax_section (bfd *abfd,
-               }
-               if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
-                 {
-+                 if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
-+
-                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
- 
-                   /* Look at the reloc only if the value has been resolved.  */
-@@ -2168,6 +2174,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                    }
-                  else if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_SYM_OP_SYM)
-                    {
-+                     if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                       continue;
-+
-                      isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
- 
-                      /* Look at the reloc only if the value has been resolved.  */
-@@ -2205,6 +2214,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                       || (ELF32_R_TYPE (irelscan->r_info)
-                                   == (int) R_MICROBLAZE_TEXTREL_32_LO))
-                {
-+                 if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
-+
-                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
- 
-                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2251,6 +2263,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                  || (ELF32_R_TYPE (irelscan->r_info)
-                              == (int) R_MICROBLAZE_TEXTREL_64))
-                {
-+                 if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
-+
-                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
- 
-                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2285,6 +2300,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                }
-              else if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
-                {
-+                 if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
-+
-                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
- 
-                  /* Look at the reloc only if the value has been resolved.  */
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 03fe9eba53a..76aec43ec7a 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -2132,6 +2132,8 @@ microblaze_elf_relax_section (bfd *abfd,
-               if (1 && ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_NONE)
-                 {
-                   unsigned int val;
-+                 if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
- 
-                   isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-@@ -2174,6 +2176,9 @@ microblaze_elf_relax_section (bfd *abfd,
-               if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32 
-                   || ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_IMML_64)
-                 {
-+                 if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                   continue;
-+
-                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-                   /* Look at the reloc only if the value has been resolved.  */
-@@ -2206,6 +2211,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                     }
-                  else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_SYM_OP_SYM)
-                    {
-+                      if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                        continue;
-+
-                      isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-                      /* Look at the reloc only if the value has been resolved.  */
-@@ -2243,6 +2251,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                       || (ELF32_R_TYPE (irelscan->r_info)
-                                   == (int) R_MICROBLAZE_TEXTREL_32_LO))
-                {
-+                  if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                    continue;
-+
-                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2288,6 +2299,9 @@ microblaze_elf_relax_section (bfd *abfd,
-              if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64
-           || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_TEXTREL_64))
-                {
-+                  if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                    continue;
-+
-                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2336,6 +2350,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                }
-              else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
-                {
-+                  if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-+                    continue;
-+
-                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
- 
-                  /* Look at the reloc only if the value has been resolved.  */
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch
deleted file mode 100644
index e9556bf5..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 70268d8d38851d06bd66f9c7cc85865f2f3c0e48 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 24 Jan 2022 16:59:19 +0530
-Subject: [PATCH 32/34] [Patch,MicroBlaze] : Double free with ld
- --no-keep-memory. Proposed patches from the community member
- (dednev@rambler.ru) for 2021.1. [CR-1115233]
-
-Conflicts:
-        bfd/elf32-microblaze.c
-        bfd/elf64-microblaze.c
----
- bfd/elf32-microblaze.c | 40 ++++++++++++++++++++++------------------
- bfd/elf64-microblaze.c | 38 ++++++++++++++++++++------------------
- 2 files changed, 42 insertions(+), 36 deletions(-)
-
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 588367ebcbb..28589db662f 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -1800,10 +1800,8 @@ microblaze_elf_relax_section (bfd *abfd,
- {
-   Elf_Internal_Shdr *symtab_hdr;
-   Elf_Internal_Rela *internal_relocs;
--  Elf_Internal_Rela *free_relocs = NULL;
-   Elf_Internal_Rela *irel, *irelend;
-   bfd_byte *contents = NULL;
--  bfd_byte *free_contents = NULL;
-   int rel_count;
-   unsigned int shndx;
-   size_t i, sym_index;
-@@ -1847,8 +1845,6 @@ microblaze_elf_relax_section (bfd *abfd,
-   internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
-   if (internal_relocs == NULL)
-     goto error_return;
--  if (! link_info->keep_memory)
--    free_relocs = internal_relocs;
- 
-   sdata->relax_count = 0;
-   sdata->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
-@@ -1876,7 +1872,6 @@ microblaze_elf_relax_section (bfd *abfd,
-              contents = (bfd_byte *) bfd_malloc (sec->size);
-              if (contents == NULL)
-                goto error_return;
--             free_contents = contents;
- 
-              if (!bfd_get_section_contents (abfd, sec, contents,
-                                             (file_ptr) 0, sec->size))
-@@ -2396,25 +2391,26 @@ microblaze_elf_relax_section (bfd *abfd,
-        }
- 
-       elf_section_data (sec)->relocs = internal_relocs;
--      free_relocs = NULL;
- 
-       elf_section_data (sec)->this_hdr.contents = contents;
--      free_contents = NULL;
- 
-       symtab_hdr->contents = (bfd_byte *) isymbuf;
-     }
- 
--  free (free_relocs);
--  free_relocs = NULL;
-+  if (internal_relocs != NULL
-+      && elf_section_data (sec)->relocs != internal_relocs)
-+    free (internal_relocs);
- 
--  if (free_contents != NULL)
--    {
--      if (!link_info->keep_memory)
--       free (free_contents);
-+  if (contents != NULL
-+      && elf_section_data (sec)->this_hdr.contents != contents)
-+   {
-+      if (! link_info->keep_memory)
-+       free (contents);
-       else
--       /* Cache the section contents for elf_link_input_bfd.  */
--       elf_section_data (sec)->this_hdr.contents = contents;
--      free_contents = NULL;
-+       {
-+         /* Cache the section contents for elf_link_input_bfd.  */
-+         elf_section_data (sec)->this_hdr.contents = contents;
-+       }
-     }
- 
-   if (sdata->relax_count == 0)
-@@ -2428,8 +2424,16 @@ microblaze_elf_relax_section (bfd *abfd,
-   return true;
- 
-  error_return:
--  free (free_relocs);
--  free (free_contents);
-+ 
-+  if (isymbuf != NULL
-+      && symtab_hdr->contents != (unsigned char *) isymbuf)
-+    free (isymbuf);
-+  if (internal_relocs != NULL
-+      && elf_section_data (sec)->relocs != internal_relocs)
-+    free (internal_relocs);
-+  if (contents != NULL
-+      && elf_section_data (sec)->this_hdr.contents != contents)
-+    free (contents);
-   free (sdata->relax);
-   sdata->relax = NULL;
-   sdata->relax_count = 0;
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 76aec43ec7a..77872cef1ab 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1840,10 +1840,8 @@ microblaze_elf_relax_section (bfd *abfd,
- {
-   Elf_Internal_Shdr *symtab_hdr;
-   Elf_Internal_Rela *internal_relocs;
--  Elf_Internal_Rela *free_relocs = NULL;
-   Elf_Internal_Rela *irel, *irelend;
-   bfd_byte *contents = NULL;
--  bfd_byte *free_contents = NULL;
-   int rel_count;
-   unsigned int shndx;
-   size_t i, sym_index;
-@@ -1887,8 +1885,6 @@ microblaze_elf_relax_section (bfd *abfd,
-   internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
-   if (internal_relocs == NULL)
-     goto error_return;
--  if (! link_info->keep_memory)
--    free_relocs = internal_relocs;
- 
-   sdata->relax_count = 0;
-   sdata->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
-@@ -1916,8 +1912,6 @@ microblaze_elf_relax_section (bfd *abfd,
-              contents = (bfd_byte *) bfd_malloc (sec->size);
-              if (contents == NULL)
-                goto error_return;
--             free_contents = contents;
--
-              if (!bfd_get_section_contents (abfd, sec, contents,
-                                             (file_ptr) 0, sec->size))
-                goto error_return;
-@@ -2449,25 +2443,26 @@ microblaze_elf_relax_section (bfd *abfd,
-        }
- 
-       elf_section_data (sec)->relocs = internal_relocs;
--      free_relocs = NULL;
- 
-       elf_section_data (sec)->this_hdr.contents = contents;
--      free_contents = NULL;
- 
-       symtab_hdr->contents = (bfd_byte *) isymbuf;
-     }
- 
--  free (free_relocs);
--  free_relocs = NULL;
-+  if (internal_relocs != NULL
-+      && elf_section_data (sec)->relocs != internal_relocs)
-+    free (internal_relocs);
- 
--  if (free_contents != NULL)
-+  if (contents != NULL
-+      && elf_section_data (sec)->this_hdr.contents != contents)
-     {
--      if (!link_info->keep_memory)
--       free (free_contents);
-+      if (! link_info->keep_memory)
-+       free (contents);
-       else
--       /* Cache the section contents for elf_link_input_bfd.  */
--       elf_section_data (sec)->this_hdr.contents = contents;
--      free_contents = NULL;
-+       {
-+         /* Cache the section contents for elf_link_input_bfd.  */
-+         elf_section_data (sec)->this_hdr.contents = contents;
-+       }
-     }
- 
-   if (sdata->relax_count == 0)
-@@ -2481,8 +2476,15 @@ microblaze_elf_relax_section (bfd *abfd,
-   return true;
- 
-  error_return:
--  free (free_relocs);
--  free (free_contents);
-+  if (isymbuf != NULL
-+      && symtab_hdr->contents != (unsigned char *) isymbuf)
-+    free (isymbuf);
-+  if (internal_relocs != NULL
-+      && elf_section_data (sec)->relocs != internal_relocs)
-+    free (internal_relocs);
-+  if (contents != NULL
-+      && elf_section_data (sec)->this_hdr.contents != contents)
-+    free (contents);
-   free (sdata->relax);
-   sdata->relax = NULL;
-   sdata->relax_count = 0;
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0033-Patch-MB-MB-binutils-Upstream-port-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0033-Patch-MB-MB-binutils-Upstream-port-issues.patch
deleted file mode 100644
index f70ca3f2..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0033-Patch-MB-MB-binutils-Upstream-port-issues.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 5b79b9fe7da091664680b86e3b09bc4b926e2e61 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Sun, 28 Nov 2021 17:17:15 +0530
-Subject: [PATCH 33/34] [Patch,MB]: MB binutils Upstream port issues.
-
-It's resolving the seg faults with ADDLIK
-Conflicts:
-        bfd/elf64-microblaze.c
----
- bfd/elf64-microblaze.c     | 248 ++++++++++++++++++++++++++++---------
- gas/config/tc-microblaze.c |   2 +-
- opcodes/microblaze-dis.c   |  12 +-
- opcodes/microblaze-opc.h   |   2 +-
- 4 files changed, 197 insertions(+), 67 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 77872cef1ab..119d266f95a 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -807,12 +807,35 @@ microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
-   return _bfd_elf_is_local_label_name (abfd, name);
- }
- 
-+/* The microblaze linker (like many others) needs to keep track of
-+   the number of relocs that it decides to copy as dynamic relocs in
-+   check_relocs for each symbol. This is so that it can later discard
-+   them if they are found to be unnecessary.  We store the information
-+   in a field extending the regular ELF linker hash table.  */
-+
-+struct elf64_mb_dyn_relocs
-+{
-+  struct elf64_mb_dyn_relocs *next;
-+
-+  /* The input section of the reloc.  */
-+  asection *sec;
-+
-+  /* Total number of relocs copied for the input section.  */
-+  bfd_size_type count;
-+
-+  /* Number of pc-relative relocs copied for the input section.  */
-+  bfd_size_type pc_count;
-+};
-+
- /* ELF linker hash entry.  */
- 
- struct elf64_mb_link_hash_entry
- {
-   struct elf_link_hash_entry elf;
- 
-+  /* Track dynamic relocs copied for this symbol.  */
-+  struct elf64_mb_dyn_relocs *dyn_relocs;
-+
-   /* TLS Reference Types for the symbol; Updated by check_relocs */
- #define TLS_GD     1  /* GD reloc. */
- #define TLS_LD     2  /* LD reloc. */
-@@ -836,6 +859,18 @@ struct elf64_mb_link_hash_table
- {
-   struct elf_link_hash_table elf;
- 
-+  /* Short-cuts to get to dynamic linker sections.  */
-+  asection *sgot;
-+  asection *sgotplt;
-+  asection *srelgot;
-+  asection *splt;
-+  asection *srelplt;
-+  asection *sdynbss;
-+  asection *srelbss;
-+
-+  /* Small local sym to section mapping cache.  */
-+  struct sym_cache sym_sec;
-+
-   /* TLS Local Dynamic GOT Entry */
-   union {
-     bfd_signed_vma refcount;
-@@ -1376,8 +1411,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                /* Need to generate relocs ? */
-                if ((bfd_link_pic (info) || indx != 0)
-                    && (h == NULL
--                   || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
--                       && !resolved_to_zero)
-+                   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-                    || h->root.type != bfd_link_hash_undefweak))
-                  need_relocs = true;
- 
-@@ -1564,13 +1598,11 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                                    contents + offset + endian);
-                          }
-                        else
--                         {
--                           bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
--                                   contents + offset + endian);
--                           bfd_put_16 (input_bfd, relocation & 0xffff,
--                                   contents + offset + endian + INST_WORD_SIZE);
-+                         bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                                     contents + offset + endian);
-+                       bfd_put_16 (input_bfd, relocation & 0xffff,
-+                                   contents + offset + endian + INST_WORD_SIZE);
-                      }
--                   }
-                    break;
-                  }
- 
-@@ -1660,9 +1692,16 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                    else
-                      {
-                        if (r_type == R_MICROBLAZE_64_PCREL)
-+                       {       
-+                       if (!input_section->output_section->vma &&
-+                                !input_section->output_offset && !offset)      
-+                             relocation -= (input_section->output_section->vma
-+                                            + input_section->output_offset
-+                                            + offset);
-+                           else
-                          relocation -= (input_section->output_section->vma
--                                        + input_section->output_offset
--                                        + offset + INST_WORD_SIZE);
-+                                        + input_section->output_offset + offset + INST_WORD_SIZE);
-+                       }
-                        else if (r_type == R_MICROBLAZE_TEXTREL_64
-                                 || r_type == R_MICROBLAZE_TEXTREL_32_LO)
-                          relocation -= input_section->output_section->vma;
-@@ -1681,14 +1720,11 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                                     contents + offset + endian);
-                           }
-                        else
--                         {
--                           bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
--                                       contents + offset + endian);
--                           bfd_put_16 (input_bfd, relocation & 0xffff,
--                                       contents + offset + endian
--                                       + INST_WORD_SIZE);
--                         }
--                   }
-+                         bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                                     contents + offset + endian);
-+                       bfd_put_16 (input_bfd, relocation & 0xffff,
-+                                   contents + offset + endian + INST_WORD_SIZE);
-+                     }
-                    break;
-                  }
-              }
-@@ -1759,6 +1795,21 @@ microblaze_elf_relocate_section (bfd *output_bfd,
- 
-   return ret;
- }
-+
-+/* Merge backend specific data from an object file to the output
-+   object file when linking.
-+
-+   Note: We only use this hook to catch endian mismatches.  */
-+static bool
-+microblaze_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
-+{
-+  /* Check if we have the same endianess.  */
-+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
-+    return false;
-+
-+  return true;
-+}
-+
- 
- /* Calculate fixup value for reference.  */
- 
-@@ -2512,6 +2563,17 @@ microblaze_elf_gc_mark_hook (asection *sec,
-   return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
- }
- 
-+/* Update the got entry reference counts for the section being removed.  */
-+
-+static bool
-+microblaze_elf_gc_sweep_hook (bfd * abfd ATTRIBUTE_UNUSED,
-+                             struct bfd_link_info * info ATTRIBUTE_UNUSED,
-+                             asection * sec ATTRIBUTE_UNUSED,
-+                             const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED)
-+{
-+  return true;
-+}
-+
- /* PIC support.  */
- 
- #define PLT_ENTRY_SIZE 16
-@@ -2718,14 +2780,14 @@ microblaze_elf_check_relocs (bfd * abfd,
-                         && (! info->symbolic
-                             || h->root.type == bfd_link_hash_defweak
-                             || !h->def_regular))))
--               || (!bfd_link_pic (info)
--                   && (sec->flags & SEC_ALLOC) != 0
--                   && h != NULL
--                   && (h->root.type == bfd_link_hash_defweak
--                       || !h->def_regular)))
--             {
--               struct elf_dyn_relocs *p;
--               struct elf_dyn_relocs **head;
-+                || (!bfd_link_pic (info)
-+                    && (sec->flags & SEC_ALLOC) != 0
-+                    && h != NULL
-+                    && (h->root.type == bfd_link_hash_defweak
-+                        || !h->def_regular)))
-+              {
-+                struct elf64_mb_dyn_relocs *p;
-+                struct elf64_mb_dyn_relocs **head;
- 
-                 /* When creating a shared object, we must copy these
-                    relocs into the output file.  We create a reloc
-@@ -2769,14 +2831,14 @@ microblaze_elf_check_relocs (bfd * abfd,
-                      return false;
- 
-                    vpp = &elf_section_data (s)->local_dynrel;
--                   head = (struct elf_dyn_relocs **) vpp;
-+                   head = (struct elf64_mb_dyn_relocs **) vpp;
-                  }
- 
-                p = *head;
-                if (p == NULL || p->sec != sec)
-                  {
-                    size_t amt = sizeof *p;
--                   p = ((struct elf_dyn_relocs *)
-+                   p = ((struct elf64_mb_dyn_relocs *)
-                         bfd_alloc (htab->elf.dynobj, amt));
-                    if (p == NULL)
-                      return false;
-@@ -2799,6 +2861,34 @@ microblaze_elf_check_relocs (bfd * abfd,
-   return true;
- }
- 
-+static bool
-+microblaze_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
-+{
-+  struct elf64_mb_link_hash_table *htab;
-+
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return false;
-+
-+  if (!htab->sgot && !_bfd_elf_create_got_section (dynobj, info))
-+    return false;
-+
-+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-+    return false;
-+
-+  htab->splt = bfd_get_linker_section (dynobj, ".plt");
-+  htab->srelplt = bfd_get_linker_section (dynobj, ".rela.plt");
-+  htab->sdynbss = bfd_get_linker_section (dynobj, ".dynbss");
-+  if (!bfd_link_pic (info))
-+    htab->srelbss = bfd_get_linker_section (dynobj, ".rela.bss");
-+
-+  if (!htab->splt || !htab->srelplt || !htab->sdynbss
-+      || (!bfd_link_pic (info) && !htab->srelbss))
-+    abort ();
-+
-+  return true;
-+}
-+
- /* Copy the extra info we tack onto an elf_link_hash_entry.  */
- 
- static void
-@@ -2811,6 +2901,40 @@ microblaze_elf_copy_indirect_symbol (struct bfd_link_info *info,
-   edir = (struct elf64_mb_link_hash_entry *) dir;
-   eind = (struct elf64_mb_link_hash_entry *) ind;
- 
-+  if (eind->dyn_relocs != NULL)
-+    {
-+      if (edir->dyn_relocs != NULL)
-+       {
-+         struct elf64_mb_dyn_relocs **pp;
-+         struct elf64_mb_dyn_relocs *p;
-+
-+         if (ind->root.type == bfd_link_hash_indirect)
-+           abort ();
-+
-+         /* Add reloc counts against the weak sym to the strong sym
-+            list.  Merge any entries against the same section.  */
-+         for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
-+           {
-+             struct elf64_mb_dyn_relocs *q;
-+
-+             for (q = edir->dyn_relocs; q != NULL; q = q->next)
-+               if (q->sec == p->sec)
-+                 {
-+                   q->pc_count += p->pc_count;
-+                   q->count += p->count;
-+                   *pp = p->next;
-+                   break;
-+                 }
-+             if (q == NULL)
-+               pp = &p->next;
-+           }
-+         *pp = edir->dyn_relocs;
-+       }
-+
-+      edir->dyn_relocs = eind->dyn_relocs;
-+      eind->dyn_relocs = NULL;
-+    }
-+
-   edir->tls_mask |= eind->tls_mask;
- 
-   _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-@@ -2821,8 +2945,12 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
-                                      struct elf_link_hash_entry *h)
- {
-   struct elf64_mb_link_hash_table *htab;
-+  struct elf64_mb_link_hash_entry * eh;
-+  struct elf64_mb_dyn_relocs *p;
-+  asection *sdynbss;
-   asection *s, *srel;
-   unsigned int power_of_two;
-+  bfd *dynobj;
- 
-   htab = elf64_mb_hash_table (info);
-   if (htab == NULL)
-@@ -2892,9 +3020,17 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
-       return true;
-     }
- 
--  /* If we don't find any dynamic relocs in read-only sections, then
-+  eh = (struct elf64_mb_link_hash_entry *) h;
-+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
-+    {
-+      s = p->sec->output_section;
-+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-+       break;
-+    }
-+
-+  /* If we didn't find any dynamic relocs in read-only sections, then
-      we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
--  if (!_bfd_elf_readonly_dynrelocs (h))
-+  if (p == NULL)
-     {
-       h->non_got_ref = 0;
-       return true;
-@@ -2913,19 +3049,11 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
-   /* We must generate a R_MICROBLAZE_COPY reloc to tell the dynamic linker
-      to copy the initial value out of the dynamic object and into the
-      runtime process image.  */
--  if ((h->root.u.def.section->flags & SEC_READONLY) != 0)
--    {
--      s = htab->elf.sdynrelro;
--      srel = htab->elf.sreldynrelro;
--    }
--  else
--    {
--      s = htab->elf.sdynbss;
--      srel = htab->elf.srelbss;
--    }
-+  dynobj = elf_hash_table (info)->dynobj;
-+  BFD_ASSERT (dynobj != NULL);
-   if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-     {
--      srel->size += sizeof (Elf64_External_Rela);
-+      htab->srelbss->size += sizeof (Elf64_External_Rela);
-       h->needs_copy = 1;
-     }
- 
-@@ -2935,11 +3063,12 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
-   if (power_of_two > 3)
-     power_of_two = 3;
- 
-+  sdynbss = htab->sdynbss;
-   /* Apply the required alignment.  */
--  s->size = BFD_ALIGN (s->size, (bfd_size_type) (1 << power_of_two));
--  if (power_of_two > s->alignment_power)
-+  sdynbss->size = BFD_ALIGN (sdynbss->size, (bfd_size_type) (1 << power_of_two));
-+  if (power_of_two > sdynbss->alignment_power)
-     {
--      if (!bfd_set_section_alignment (s, power_of_two))
-+      if (! bfd_set_section_alignment (sdynbss, power_of_two))
-        return false;
-     }
- 
-@@ -2961,7 +3090,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-   struct bfd_link_info *info;
-   struct elf64_mb_link_hash_table *htab;
-   struct elf64_mb_link_hash_entry *eh;
--  struct elf_dyn_relocs *p;
-+  struct elf64_mb_dyn_relocs *p;
- 
-   if (h->root.type == bfd_link_hash_indirect)
-     return true;
-@@ -3013,7 +3142,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-          htab->elf.sgotplt->size += 4;
- 
-          /* We also need to make an entry in the .rel.plt section.  */
--         htab->elf.srelplt->size += sizeof (Elf32_External_Rela);
-+         htab->elf.srelplt->size += sizeof (Elf64_External_Rela);
-        }
-       else
-         {
-@@ -3079,7 +3208,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-   else
-     h->got.offset = (bfd_vma) -1;
- 
--  if (h->dyn_relocs == NULL)
-+  if (eh->dyn_relocs == NULL)
-     return true;
- 
-   /* In the shared -Bsymbolic case, discard space allocated for
-@@ -3094,9 +3223,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-          && (h->forced_local
-              || info->symbolic))
-        {
--         struct elf_dyn_relocs **pp;
-+         struct elf64_mb_dyn_relocs **pp;
- 
--         for (pp = &h->dyn_relocs; (p = *pp) != NULL; )
-+         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
-            {
-              p->count -= p->pc_count;
-              p->pc_count = 0;
-@@ -3188,7 +3317,7 @@ microblaze_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-        {
-          struct elf_dyn_relocs *p;
- 
--         for (p = ((struct elf_dyn_relocs *)
-+         for (p = ((struct elf64_mb_dyn_relocs *)
-                    elf_section_data (s)->local_dynrel);
-               p != NULL;
-               p = p->next)
-@@ -3666,13 +3795,14 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
- #define bfd_elf64_new_section_hook             microblaze_elf_new_section_hook
- #define elf_backend_relocate_section           microblaze_elf_relocate_section
- #define bfd_elf64_bfd_relax_section             microblaze_elf_relax_section
--#define bfd_elf64_bfd_merge_private_bfd_data    _bfd_generic_verify_endian_match
-+#define bfd_elf64_bfd_merge_private_bfd_data    microblaze_elf_merge_private_bfd_data
- #define bfd_elf64_bfd_reloc_name_lookup                microblaze_elf_reloc_name_lookup
- 
- #define elf_backend_gc_mark_hook               microblaze_elf_gc_mark_hook
--#define elf_backend_check_relocs               microblaze_elf_check_relocs
--#define elf_backend_copy_indirect_symbol       microblaze_elf_copy_indirect_symbol
--#define bfd_elf64_bfd_link_hash_table_create   microblaze_elf_link_hash_table_create
-+#define elf_backend_gc_sweep_hook              microblaze_elf_gc_sweep_hook
-+#define elf_backend_check_relocs                microblaze_elf_check_relocs
-+#define elf_backend_copy_indirect_symbol        microblaze_elf_copy_indirect_symbol
-+#define bfd_elf64_bfd_link_hash_table_create    microblaze_elf_link_hash_table_create
- #define elf_backend_can_gc_sections            1
- #define elf_backend_can_refcount               1
- #define elf_backend_want_got_plt               1
-@@ -3682,11 +3812,11 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
- #define elf_backend_rela_normal                        1
- #define elf_backend_dtrel_excludes_plt         1
- 
--#define elf_backend_adjust_dynamic_symbol      microblaze_elf_adjust_dynamic_symbol
--#define elf_backend_create_dynamic_sections    _bfd_elf_create_dynamic_sections
--#define elf_backend_finish_dynamic_sections    microblaze_elf_finish_dynamic_sections
--#define elf_backend_finish_dynamic_symbol      microblaze_elf_finish_dynamic_symbol
--#define elf_backend_size_dynamic_sections      microblaze_elf_size_dynamic_sections
-+#define elf_backend_adjust_dynamic_symbol       microblaze_elf_adjust_dynamic_symbol
-+#define elf_backend_create_dynamic_sections     microblaze_elf_create_dynamic_sections
-+#define elf_backend_finish_dynamic_sections     microblaze_elf_finish_dynamic_sections
-+#define elf_backend_finish_dynamic_symbol       microblaze_elf_finish_dynamic_symbol
-+#define elf_backend_size_dynamic_sections       microblaze_elf_size_dynamic_sections
- #define elf_backend_add_symbol_hook            microblaze_elf_add_symbol_hook
- 
- #include "elf64-target.h"
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 6b398ab5605..c4a3817bf19 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -433,7 +433,7 @@ const pseudo_typeS md_pseudo_table[] =
- void
- md_begin (void)
- {
--  const struct op_code_struct * opcode;
-+  struct op_code_struct * opcode;
-   const char *prev_name = "";
- 
-   opcode_hash_control = str_htab_create ();
-diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index b5a78dcfe09..b76a5935a34 100644
---- a/opcodes/microblaze-dis.c
-+++ b/opcodes/microblaze-dis.c
-@@ -140,7 +140,7 @@ get_field_imm16 (struct string_buf *buf, long instr)
- 
- static char *
- get_field_special (struct string_buf *buf, long instr,
--                  const struct op_code_struct *op)
-+                  struct op_code_struct *op)
- {
-   char *p = strbuf (buf);
-   char *spr;
-@@ -213,11 +213,11 @@ get_field_special (struct string_buf *buf, long instr,
- static unsigned long
- read_insn_microblaze (bfd_vma memaddr,
-                      struct disassemble_info *info,
--                     const struct op_code_struct **opr)
-+                     struct op_code_struct **opr)
- {
-   unsigned char       ibytes[4];
-   int                 status;
--  const struct op_code_struct *op;
-+  struct op_code_struct *op;
-   unsigned long inst;
- 
-   status = info->read_memory_func (memaddr, ibytes, 4, info);
-@@ -253,7 +253,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-   fprintf_ftype print_func = info->fprintf_func;
-   void *stream = info->stream;
-   unsigned long inst, prev_inst;
--  const struct op_code_struct *op, *pop;
-+  struct op_code_struct *op, *pop;
-   int immval = 0;
-   bool immfound = false;
-   static bfd_vma prev_insn_addr = -1;  /* Init the prev insn addr.  */
-@@ -497,7 +497,7 @@ get_insn_microblaze (long inst,
-                     enum microblaze_instr_type *insn_type,
-                     short *delay_slots)
- {
--  const struct op_code_struct *op;
-+  struct op_code_struct *op;
-   *isunsignedimm = false;
- 
-   /* Just a linear search of the table.  */
-@@ -539,7 +539,7 @@ microblaze_get_target_address (long inst, bool immfound, int immval,
-                               bool *targetvalid,
-                               bool *unconditionalbranch)
- {
--  const struct op_code_struct *op;
-+  struct op_code_struct *op;
-   long targetaddr = 0;
- 
-   *unconditionalbranch = false;
-diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index e65f4b58233..4a415495113 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -145,7 +145,7 @@
- 
- #define MAX_OPCODES 424
- 
--const struct op_code_struct
-+struct op_code_struct
- {
-   const char * name;
-   short inst_type;            /* Registers and immediate values involved.  */
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch
deleted file mode 100644
index 4428823f..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 652c69cca5a9da92369378674707cdc59988bcc3 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Fri, 28 Oct 2022 13:57:48 +0530
-Subject: [PATCH 34/34] [Patch,MicroBlaze] : By default the linker will
- generate warnings if it is creating an  executable stack or a segment with
- all three of read, write and  execute permissions.  These settings are not
- appropriate for all  targets
-
----
- ld/configure.tgt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ld/configure.tgt b/ld/configure.tgt
-index 80ffbcf23b3..198cd0f71e4 100644
---- a/ld/configure.tgt
-+++ b/ld/configure.tgt
-@@ -55,6 +55,7 @@ if test "${ac_default_ld_warn_rwx_segments}" = unset; then
-     cris-*-* | crisv32-*-* | \
-     hppa*-*-* | \
-     mips*-*-* | \
-+    microblaze*-*-* | \
-     sparc*-*-*)
-       ac_default_ld_warn_rwx_segments=0
-       ;;
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12.2.inc b/meta-microblaze/recipes-devtools/gcc/gcc-12.2.inc
new file mode 100644
index 00000000..0dbbecad
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12.2.inc
@@ -0,0 +1,114 @@
+require gcc-common.inc
+
+# Third digit in PV should be incremented after a minor release
+
+PV = "12.2.0"
+
+# BINV should be incremented to a revision after a minor gcc release
+
+BINV = "12.2.0"
+
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
+
+DEPENDS =+ "mpfr gmp libmpc zlib flex-native"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native zstd-native"
+
+LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
+
+LIC_FILES_CHKSUM = "\
+    file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \
+"
+# from git
+#RELEASE ?= "7092b7aea122a91824d048aeb23834cf1d19b1a1"
+#BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz"
+#SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}"
+
+# from snapshot
+#RELEASE ?= "12.1.0-RC-20220429"
+#SOURCEDIR ?= "gcc-${RELEASE}"
+#BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz"
+
+# official release
+RELEASE ?= "${PV}"
+BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz"
+SOURCEDIR ?= "gcc-${PV}"
+
+SRC_URI = "${BASEURI} \
+           file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+           file://0002-gcc-poison-system-directories.patch \
+           file://0003-64-bit-multilib-hack.patch \
+           file://0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch \
+           file://0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
+           file://0006-cpp-honor-sysroot.patch \
+           file://0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
+           file://0008-libtool.patch \
+           file://0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
+           file://0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
+           file://0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \
+           file://0013-Ensure-target-gcc-headers-can-be-included.patch \
+           file://0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
+           file://0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
+           file://0016-handle-sysroot-support-for-nativesdk-gcc.patch \
+           file://0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
+           file://0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \
+           file://0019-Re-introduce-spe-commandline-options.patch \
+           file://0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \
+           file://0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
+           file://0023-libatomic-Do-not-enforce-march-on-aarch64.patch \
+           file://0024-Fix-install-path-of-linux64.h.patch \
+           file://0026-rust-recursion-limit.patch \
+           file://prefix-map-realpath.patch \
+           file://hardcoded-paths.patch \
+"
+SRC_URI[sha256sum] = "e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff"
+
+S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
+B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
+
+# Language Overrides
+FORTRAN = ""
+JAVA = ""
+
+SSP ?= "--disable-libssp"
+SSP:mingw32 = "--enable-libssp"
+
+EXTRA_OECONF_BASE = "\
+    ${SSP} \
+    --enable-libitm \
+    --enable-lto \
+    --disable-bootstrap \
+    --with-system-zlib \
+    ${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \
+    --enable-linker-build-id \
+    --with-ppl=no \
+    --with-cloog=no \
+    --enable-checking=release \
+    --enable-cheaders=c_global \
+    --without-isl \
+"
+
+EXTRA_OECONF_INITIAL = "\
+    --disable-libgomp \
+    --disable-libitm \
+    --disable-libquadmath \
+    --with-system-zlib \
+    --disable-lto \
+    --disable-plugin \
+    --enable-linker-build-id \
+    --enable-decimal-float=no \
+    --without-isl \
+    --disable-libssp \
+"
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+# Is a binutils 2.26 issue, not gcc
+CVE_CHECK_IGNORE += "CVE-2021-37322"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch
index 1099a0e8..f8985752 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch
@@ -2,6 +2,8 @@ From 376b0ee790231a99fe50b50e20070c104bbba0d8 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 11 Jan 2017 13:13:57 +0530
 Subject: [PATCH 01/53] LOCAL]: Testsuite - builtins tests require fpic
+Upstream-Status: Pending
+
  Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 
 Conflicts:
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch
index 061dfc86..5302b942 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 02/53] [LOCAL]: Quick fail g++.dg/opt/memcpy1.C This
  for microblaze. This speeds up the testsuite without removing it from the
  FAIL reports.
 
+Upstream-Status: Pending
+
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 ---
  gcc/testsuite/g++.dg/opt/memcpy1.C | 4 ++++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch
index 1b5d428e..89fe0ff6 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 03/53] [LOCAL]: For dejagnu static testing on qemu, suppress
  with method used by powerpc. Dynamic linking and using a qemu binary which
  understands sysroot resolves all test failures with builtins
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
  gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp | 4 ----
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0004-Patch-testsuite-Add-MicroBlaze-to-target-supports-fo.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0004-Patch-testsuite-Add-MicroBlaze-to-target-supports-fo.patch
index 8db33100..39c9c17e 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0004-Patch-testsuite-Add-MicroBlaze-to-target-supports-fo.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0004-Patch-testsuite-Add-MicroBlaze-to-target-supports-fo.patch
@@ -13,6 +13,8 @@ Changelog/testsuite
  * gcc/testsuite/lib/target-supports.exp: Add microblaze to
    check_effective_target_sync_int_long.
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
  gcc/testsuite/lib/target-supports.exp | 1 +
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0005-Patch-testsuite-Update-MicroBlaze-strings-test.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0005-Patch-testsuite-Update-MicroBlaze-strings-test.patch
index 0fb32850..d127a03e 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0005-Patch-testsuite-Update-MicroBlaze-strings-test.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0005-Patch-testsuite-Update-MicroBlaze-strings-test.patch
@@ -11,6 +11,8 @@ ChangeLog/testsuite
  * gcc/testsuite/gcc.target/microblaze/others/strings1.c: Update
    to include $LC label.
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
  gcc/testsuite/gcc.target/microblaze/others/strings1.c | 4 ++++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0006-Patch-testsuite-Allow-MicroBlaze-.weakext-pattern-in.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0006-Patch-testsuite-Allow-MicroBlaze-.weakext-pattern-in.patch
index a82f11cc..3c412471 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0006-Patch-testsuite-Allow-MicroBlaze-.weakext-pattern-in.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0006-Patch-testsuite-Allow-MicroBlaze-.weakext-pattern-in.patch
@@ -13,6 +13,8 @@ ChangeLog/testsuite
    pattern to take optional ext after .weak.
  * gcc/testsuite/g++.dg/abi/thunk4.C: Likewise.
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 
 Conflicts:
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0007-Patch-testsuite-Add-MicroBlaze-to-check_profiling_av.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0007-Patch-testsuite-Add-MicroBlaze-to-check_profiling_av.patch
index 736f5cd1..89d3b75a 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0007-Patch-testsuite-Add-MicroBlaze-to-check_profiling_av.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0007-Patch-testsuite-Add-MicroBlaze-to-check_profiling_av.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 07/53] [Patch, testsuite]: Add MicroBlaze to
  check_profiling_available inline with other archs setting
  profiling_available_saved to 0
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
  gcc/testsuite/lib/target-supports.exp | 1 +
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0008-Patch-microblaze-Fix-atomic-side-effects.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0008-Patch-microblaze-Fix-atomic-side-effects.patch
index 451070c0..21747726 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0008-Patch-microblaze-Fix-atomic-side-effects.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0008-Patch-microblaze-Fix-atomic-side-effects.patch
@@ -7,6 +7,8 @@ Subject: [PATCH 08/53] [Patch, microblaze]: Fix atomic side effects. In
  generated assembly code with undefined side effects after invocation of the
  atomic.
 
+Upstream-Status: Pending
+
 Signed-off-by: Kirk Meyer <kirk.meyer@sencore.com>
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0009-Patch-microblaze-Fix-atomic-boolean-return-value.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0009-Patch-microblaze-Fix-atomic-boolean-return-value.patch
index c7efbb07..97f35569 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0009-Patch-microblaze-Fix-atomic-boolean-return-value.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0009-Patch-microblaze-Fix-atomic-boolean-return-value.patch
@@ -5,6 +5,8 @@ Subject: [PATCH 09/53] [Patch, microblaze]: Fix atomic boolean return value.
  In atomic_compare_and_swapsi, fix boolean return value. Previously, it
  contained zero if successful and non-zero if unsuccessful.
 
+Upstream-Status: Pending
+
 Signed-off-by: Kirk Meyer <kirk.meyer@sencore.com>
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0010-Patch-microblaze-Fix-the-Microblaze-crash-with-msmal.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0010-Patch-microblaze-Fix-the-Microblaze-crash-with-msmal.patch
index 1bffafa9..62bb02a9 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0010-Patch-microblaze-Fix-the-Microblaze-crash-with-msmal.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0010-Patch-microblaze-Fix-the-Microblaze-crash-with-msmal.patch
@@ -9,6 +9,8 @@ Subject: [PATCH 10/53] [Patch, microblaze]: Fix the Microblaze crash with
  have subreg register due to this compiler was crashing. Changed the logic to
  avoid sub_reg call
 
+Upstream-Status: Pending
+
 Signed-off-by:Nagaraju Mekala <nmekala@xilix.com>
 
 Conflicts:
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0011-Patch-microblaze-Added-ashrsi3_with_size_opt.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0011-Patch-microblaze-Added-ashrsi3_with_size_opt.patch
index 1bd73b8a..09ebfca6 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0011-Patch-microblaze-Added-ashrsi3_with_size_opt.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0011-Patch-microblaze-Added-ashrsi3_with_size_opt.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 11/53] [Patch, microblaze]: Added ashrsi3_with_size_opt Added
  optimization is used. lshrsi3_with_size_opt is being removed as it has
  conflicts with unsigned int variables
 
+Upstream-Status: Pending
+
 Signed-off-by:Nagaraju Mekala <nmekala@xilix.com>
 ---
  gcc/config/microblaze/microblaze.md | 21 +++++++++++++++++++++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0012-Patch-microblaze-Use-bralid-for-profiler-calls.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0012-Patch-microblaze-Use-bralid-for-profiler-calls.patch
index f40fff9a..c26d46d4 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0012-Patch-microblaze-Use-bralid-for-profiler-calls.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0012-Patch-microblaze-Use-bralid-for-profiler-calls.patch
@@ -2,6 +2,8 @@ From 12d7e086376916ef61e2c48639671fd0f7c8fbbf Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 17 Jan 2017 10:57:19 +0530
 Subject: [PATCH 12/53] [Patch, microblaze]: Use bralid for profiler calls
+Upstream-Status: Pending
+
  Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 
 ---
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0013-Patch-microblaze-Removed-moddi3-routinue.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0013-Patch-microblaze-Removed-moddi3-routinue.patch
index 5c927264..8739e6ea 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0013-Patch-microblaze-Removed-moddi3-routinue.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0013-Patch-microblaze-Removed-moddi3-routinue.patch
@@ -4,6 +4,8 @@ Date: Thu, 12 Jan 2017 17:36:16 +0530
 Subject: [PATCH 13/53] [Patch, microblaze]: Removed moddi3 routinue Using the
  default moddi3 function as the existing implementation has many bugs
 
+Upstream-Status: Pending
+
 Signed-off-by:Nagaraju <nmekala@xilix.com>
 
 Conflicts:
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0014-Patch-microblaze-Add-INIT_PRIORITY-support-Added.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0014-Patch-microblaze-Add-INIT_PRIORITY-support-Added.patch
index f8bcabe3..472c543c 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0014-Patch-microblaze-Add-INIT_PRIORITY-support-Added.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0014-Patch-microblaze-Add-INIT_PRIORITY-support-Added.patch
@@ -10,6 +10,10 @@ attribute by specifying a relative priority, a constant integral
 expression currently bounded between 101 and 65535 inclusive.
 
 Lower numbers indicate a higher priority.
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 53 +++++++++++++++++++++++++++++
  1 file changed, 53 insertions(+)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0015-Patch-microblaze-Add-optimized-lshrsi3.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0015-Patch-microblaze-Add-optimized-lshrsi3.patch
index 0f7d356f..7ce5ebc0 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0015-Patch-microblaze-Add-optimized-lshrsi3.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0015-Patch-microblaze-Add-optimized-lshrsi3.patch
@@ -17,6 +17,8 @@ ChangeLog/testsuite
 
  * gcc/testsuite/gcc.target/microblaze/others/lshrsi_Os_1.c: New test.
 
+Upstream-Status: Pending
+
 Signed-off-by:Nagaraju <nmekala@xilix.com>
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 ---
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0016-Patch-microblaze-Add-cbranchsi4_reg.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0016-Patch-microblaze-Add-cbranchsi4_reg.patch
index 19ae324d..dc645c30 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0016-Patch-microblaze-Add-cbranchsi4_reg.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0016-Patch-microblaze-Add-cbranchsi4_reg.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 16/53] [Patch, microblaze]: Add cbranchsi4_reg This patch
  instruction has no immediate values.For the immediate values the xor
  instruction is generated
 
+Upstream-Status: Pending
+
 Signed-off-by: Nagaraju Mekala <nmekala@xilix.com>
 Signed-off-by: Ajit Agarwal  <ajitkum@xilinx.com>
 
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0017-Patch-microblaze-Inline-Expansion-of-fsqrt-builtin.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0017-Patch-microblaze-Inline-Expansion-of-fsqrt-builtin.patch
index e3a98a08..b0d33516 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0017-Patch-microblaze-Inline-Expansion-of-fsqrt-builtin.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0017-Patch-microblaze-Inline-Expansion-of-fsqrt-builtin.patch
@@ -22,6 +22,8 @@ ChangeLog:
         * config/microblaze/microblaze.md (sqrtdf2): New
         pattern.
 
+Upstream-Status: Pending
+
 Signed-off-by:Ajit Agarwal ajitkum@xilinx.com
               Nagaraju Mekala nmekala@xilinx.com
 ---
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0018-PATCH-microblaze.md-Improve-adddi3-and-subdi3-insn-d.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0018-PATCH-microblaze.md-Improve-adddi3-and-subdi3-insn-d.patch
index 831b8f22..94235be6 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0018-PATCH-microblaze.md-Improve-adddi3-and-subdi3-insn-d.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0018-PATCH-microblaze.md-Improve-adddi3-and-subdi3-insn-d.patch
@@ -17,6 +17,8 @@ implement purely with instructions as microblaze does not provide an
 instruction to perform a forward arithmetic subtraction (it only
 provides reverse 'rD = IMM - rA').
 
+Upstream-Status: Pending
+
 Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
 ---
  gcc/config/microblaze/microblaze.md | 13 ++++++-------
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0019-Patch-microblaze-Update-ashlsi3-movsf-patterns.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0019-Patch-microblaze-Update-ashlsi3-movsf-patterns.patch
index ab3fa535..e955938e 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0019-Patch-microblaze-Update-ashlsi3-movsf-patterns.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0019-Patch-microblaze-Update-ashlsi3-movsf-patterns.patch
@@ -24,6 +24,10 @@ ChangeLog:
 
 Conflicts:
         gcc/config/microblaze/microblaze.c
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc |  2 +-
  gcc/config/microblaze/microblaze.md | 10 ++++++++--
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0020-Patch-microblaze-8-stage-pipeline-for-microblaze.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0020-Patch-microblaze-8-stage-pipeline-for-microblaze.patch
index 67eb0893..2d384b78 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0020-Patch-microblaze-8-stage-pipeline-for-microblaze.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0020-Patch-microblaze-8-stage-pipeline-for-microblaze.patch
@@ -6,6 +6,10 @@ Subject: [PATCH 20/53] [Patch, microblaze]: 8-stage pipeline for microblaze
  pipeline reduces the latencies of float & integer division drastically
 
 Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc  | 11 ++++
  gcc/config/microblaze/microblaze.h   |  3 +-
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0021-PATCH-21-53-Patch-microblaze-Correct-the-const-high-.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0021-PATCH-21-53-Patch-microblaze-Correct-the-const-high-.patch
index 96fe4f73..1b8d924c 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0021-PATCH-21-53-Patch-microblaze-Correct-the-const-high-.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0021-PATCH-21-53-Patch-microblaze-Correct-the-const-high-.patch
@@ -9,6 +9,10 @@ Subject: [PATCH 21/53] [PATCH 21/53] [Patch, microblaze]: Correct the const
 
 Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
                Ajit Agarwal  <ajitkum@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc               | 6 ++++--
  gcc/testsuite/gcc.target/microblaze/others/long.c | 9 +++++++++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0022-Fix-microblaze-Fix-internal-compiler-error-with-msma.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0022-Fix-microblaze-Fix-internal-compiler-error-with-msma.patch
index 332db5d3..a5917947 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0022-Fix-microblaze-Fix-internal-compiler-error-with-msma.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0022-Fix-microblaze-Fix-internal-compiler-error-with-msma.patch
@@ -9,6 +9,10 @@ Subject: [PATCH 22/53] [Fix, microblaze]: Fix internal compiler error with
 
     Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
                    Ajit Agarwal  <ajitkum@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0023-patch-microblaze-Fix-the-calculation-of-high-word-in.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0023-patch-microblaze-Fix-the-calculation-of-high-word-in.patch
index 47e13fa6..ae05e791 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0023-patch-microblaze-Fix-the-calculation-of-high-word-in.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0023-patch-microblaze-Fix-the-calculation-of-high-word-in.patch
@@ -14,6 +14,10 @@ Subject: [PATCH 23/53] [patch,microblaze]: Fix the calculation of high word in
 
     Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
                    Ajit Agarwal  <ajitkum@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 3 ---
  1 file changed, 3 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0024-Patch-MicroBlaze-this-patch-has-1.Fixed-the-bug-in.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0024-Patch-MicroBlaze-this-patch-has-1.Fixed-the-bug-in.patch
index 8ed5ae83..444c9397 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0024-Patch-MicroBlaze-this-patch-has-1.Fixed-the-bug-in.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0024-Patch-MicroBlaze-this-patch-has-1.Fixed-the-bug-in.patch
@@ -5,6 +5,10 @@ Subject: [PATCH 24/53] [Patch,MicroBlaze] : this patch has 1.Fixed the bug in
  version calculation. 2.Add new bitfield instructions.
 
 Signed-off-by :Mahesh Bodapati <mbodapat@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 154 ++++++++++++++--------------
  gcc/config/microblaze/microblaze.h  |   2 +
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0025-Fixing-the-issue-with-the-builtin_alloc.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0025-Fixing-the-issue-with-the-builtin_alloc.patch
index 109e0686..2800dee7 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0025-Fixing-the-issue-with-the-builtin_alloc.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0025-Fixing-the-issue-with-the-builtin_alloc.patch
@@ -6,6 +6,10 @@ Subject: [PATCH 25/53] Fixing the issue with the builtin_alloc. register r18
  available register
 
 signed-off-by:nagaraju mekala <nmekala@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0026-Patch-Microblaze-Removed-fsqrt-generation-for-double.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0026-Patch-Microblaze-Removed-fsqrt-generation-for-double.patch
index 4f101b96..a1e4fb36 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0026-Patch-Microblaze-Removed-fsqrt-generation-for-double.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0026-Patch-Microblaze-Removed-fsqrt-generation-for-double.patch
@@ -4,6 +4,10 @@ Date: Mon, 4 Jun 2018 10:10:18 +0530
 Subject: [PATCH 26/53] [Patch,Microblaze] : Removed fsqrt generation for
  double values.
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 14 --------------
  1 file changed, 14 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0027-Patch-MicroBlaze-Intial-commit-of-64-bit-Microblaze.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0027-Patch-MicroBlaze-Intial-commit-of-64-bit-Microblaze.patch
index 2e7106d6..a9222e54 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0027-Patch-MicroBlaze-Intial-commit-of-64-bit-Microblaze.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0027-Patch-MicroBlaze-Intial-commit-of-64-bit-Microblaze.patch
@@ -5,6 +5,10 @@ Subject: [PATCH 27/53]  [Patch,MicroBlaze]: Intial commit of 64-bit Microblaze
 
     Conflicts:
         gcc/config/microblaze/microblaze.md
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/constraints.md      |   6 +
  gcc/config/microblaze/microblaze-protos.h |   1 +
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0028-Intial-commit-for-64bit-MB-sources.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0028-Intial-commit-for-64bit-MB-sources.patch
index 1ffa79cb..c36e246a 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0028-Intial-commit-for-64bit-MB-sources.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0028-Intial-commit-for-64bit-MB-sources.patch
@@ -4,6 +4,10 @@ Date: Tue, 13 Sep 2022 14:38:48 +0530
 Subject: [PATCH 28/53]  Intial commit for 64bit-MB sources.  Need to cleanup
  the code later.
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/constraints.md    |   2 +-
  gcc/config/microblaze/microblaze-c.cc   |   6 +
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0029-Patch-MicroBlaze-re-arrangement-of-the-compare-branc.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0029-Patch-MicroBlaze-re-arrangement-of-the-compare-branc.patch
index 26cdfca2..0a275c0b 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0029-Patch-MicroBlaze-re-arrangement-of-the-compare-branc.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0029-Patch-MicroBlaze-re-arrangement-of-the-compare-branc.patch
@@ -4,6 +4,10 @@ Date: Tue, 13 Sep 2022 14:45:15 +0530
 Subject: [PATCH 29/53] [Patch,MicroBlaze] : re-arrangement of the compare
  branches
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc |  28 ++----
  gcc/config/microblaze/microblaze.md | 141 +++++++++++++---------------
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0030-Patch-Microblaze-previous-commit-broke-the-handling-.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0030-Patch-Microblaze-previous-commit-broke-the-handling-.patch
index 83d047cb..bda4e7da 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0030-Patch-Microblaze-previous-commit-broke-the-handling-.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0030-Patch-Microblaze-previous-commit-broke-the-handling-.patch
@@ -4,6 +4,10 @@ Date: Wed, 8 Aug 2018 17:37:26 +0530
 Subject: [PATCH 30/53] [Patch,Microblaze] :  previous commit broke the
  handling of SI Branch compare for Microblaze 32-bit..
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0031-Patch-Microblaze-Support-of-multilibs-with-m64.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0031-Patch-Microblaze-Support-of-multilibs-with-m64.patch
index c230049c..a9a7a03d 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0031-Patch-Microblaze-Support-of-multilibs-with-m64.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0031-Patch-Microblaze-Support-of-multilibs-with-m64.patch
@@ -7,6 +7,10 @@ Conflicts:
         gcc/config/microblaze/microblaze-c.c
 
 signed-off-by : Mahesh Bodapati <mbodapat@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze-c.cc |  1 +
  gcc/config/microblaze/t-microblaze    | 15 ++++++---------
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0032-Patch-MicroBlaze-Fixed-issues-like.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0032-Patch-MicroBlaze-Fixed-issues-like.patch
index 36a20450..cb62c5a7 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0032-Patch-MicroBlaze-Fixed-issues-like.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0032-Patch-MicroBlaze-Fixed-issues-like.patch
@@ -4,6 +4,10 @@ Date: Tue, 13 Sep 2022 15:24:25 +0530
 Subject: [PATCH 32/53] [Patch,MicroBlaze]: Fixed issues like:     1 Interrupt
  alignment issue     2 Sign extension issue
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 16 ++++++++++------
  gcc/config/microblaze/microblaze.md |  2 +-
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0033-Patch-MicroBlaze.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0033-Patch-MicroBlaze.patch
index 9c9e4dd2..9760695c 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0033-Patch-MicroBlaze.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0033-Patch-MicroBlaze.patch
@@ -7,6 +7,10 @@ Subject: [PATCH 33/53] [Patch,MicroBlaze]: fixed below issues:     - Floating
 
     Conflicts:
         gcc/config/microblaze/microblaze.md
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 12 +++-
  gcc/config/microblaze/microblaze.h  |  7 +++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0034-Added-double-arith-instructions.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0034-Added-double-arith-instructions.patch
index 7bd3001d..3f07dfa1 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0034-Added-double-arith-instructions.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0034-Added-double-arith-instructions.patch
@@ -4,6 +4,10 @@ Date: Tue, 9 Oct 2018 10:07:08 +0530
 Subject: [PATCH 34/53] -Added double arith instructions -Fixed prologue stack
  pointer decrement issue
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 78 +++++++++++++++++++++++++----
  gcc/config/microblaze/t-microblaze  |  7 +++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0035-Fixed-the-issue-in-the-delay-slot-with-swap-instruct.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0035-Fixed-the-issue-in-the-delay-slot-with-swap-instruct.patch
index 89018aae..3ff6a2d0 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0035-Fixed-the-issue-in-the-delay-slot-with-swap-instruct.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0035-Fixed-the-issue-in-the-delay-slot-with-swap-instruct.patch
@@ -4,6 +4,10 @@ Date: Fri, 12 Oct 2018 16:07:36 +0530
 Subject: [PATCH 35/53] Fixed the issue in the delay slot with swap
  instructions
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 6 ++++++
  1 file changed, 6 insertions(+)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0036-Fixed-the-load-store-issue-with-the-32bit-arith-libr.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0036-Fixed-the-load-store-issue-with-the-32bit-arith-libr.patch
index 0c27d69f..90ddf3eb 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0036-Fixed-the-load-store-issue-with-the-32bit-arith-libr.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0036-Fixed-the-load-store-issue-with-the-32bit-arith-libr.patch
@@ -4,6 +4,10 @@ Date: Sat, 13 Oct 2018 21:12:43 +0530
 Subject: [PATCH 36/53] Fixed the load store issue with the 32bit arith
  libraries
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  libgcc/config/microblaze/divsi3.S  | 25 ++++++++++++++++++++++++-
  libgcc/config/microblaze/modsi3.S  | 26 +++++++++++++++++++++++++-
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0037-extending-the-Dwarf-support-to-64bit-Microblaze.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0037-extending-the-Dwarf-support-to-64bit-Microblaze.patch
index 2eab03ec..191c7627 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0037-extending-the-Dwarf-support-to-64bit-Microblaze.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0037-extending-the-Dwarf-support-to-64bit-Microblaze.patch
@@ -3,6 +3,10 @@ From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 15 Oct 2018 12:00:10 +0530
 Subject: [PATCH 37/53] extending the Dwarf support to 64bit Microblaze
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0038-fixing-the-typo-errors-in-umodsi3-file.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0038-fixing-the-typo-errors-in-umodsi3-file.patch
index 4d6be758..8697be58 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0038-fixing-the-typo-errors-in-umodsi3-file.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0038-fixing-the-typo-errors-in-umodsi3-file.patch
@@ -3,6 +3,10 @@ From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Tue, 16 Oct 2018 07:55:46 +0530
 Subject: [PATCH 38/53] fixing the typo errors in umodsi3 file
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  libgcc/config/microblaze/umodsi3.S | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0039-fixing-the-32bit-LTO-related-issue9-1014024.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0039-fixing-the-32bit-LTO-related-issue9-1014024.patch
index 1a5a0ef7..032cab4d 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0039-fixing-the-32bit-LTO-related-issue9-1014024.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0039-fixing-the-32bit-LTO-related-issue9-1014024.patch
@@ -3,6 +3,10 @@ From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Wed, 17 Oct 2018 16:56:14 +0530
 Subject: [PATCH 39/53] fixing the 32bit LTO related issue9(1014024)
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.h | 24 ++++++++++++++----------
  1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0040-Fixed-the-missing-stack-adjustment-in-prologue-of-mo.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0040-Fixed-the-missing-stack-adjustment-in-prologue-of-mo.patch
index 7c6f9008..1ed53957 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0040-Fixed-the-missing-stack-adjustment-in-prologue-of-mo.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0040-Fixed-the-missing-stack-adjustment-in-prologue-of-mo.patch
@@ -4,6 +4,10 @@ Date: Fri, 19 Oct 2018 14:26:25 +0530
 Subject: [PATCH 40/53] Fixed the missing stack adjustment in prologue of
  modsi3 function
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  libgcc/config/microblaze/modsi3.S | 1 +
  1 file changed, 1 insertion(+)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0041-Patch-Microblaze-corrected-SPN-for-dlong-instruction.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0041-Patch-Microblaze-corrected-SPN-for-dlong-instruction.patch
index 9cec7be9..e6335e8e 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0041-Patch-Microblaze-corrected-SPN-for-dlong-instruction.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0041-Patch-Microblaze-corrected-SPN-for-dlong-instruction.patch
@@ -4,6 +4,10 @@ Date: Wed, 24 Oct 2018 18:31:04 +0530
 Subject: [PATCH 41/53] [Patch,Microblaze] : corrected SPN for dlong
  instruction mapping.
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0042-fixing-the-long-long-long-mingw-toolchain-issue.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0042-fixing-the-long-long-long-mingw-toolchain-issue.patch
index 8836d0e7..f4013b9e 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0042-fixing-the-long-long-long-mingw-toolchain-issue.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0042-fixing-the-long-long-long-mingw-toolchain-issue.patch
@@ -3,6 +3,10 @@ From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Thu, 29 Nov 2018 17:55:08 +0530
 Subject: [PATCH 42/53] fixing the long & long long mingw toolchain issue
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/constraints.md | 2 +-
  gcc/config/microblaze/microblaze.md  | 8 ++++----
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0043-Fix-the-MB-64-bug-of-handling-QI-objects.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0043-Fix-the-MB-64-bug-of-handling-QI-objects.patch
index c8caff29..7f3c8373 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0043-Fix-the-MB-64-bug-of-handling-QI-objects.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0043-Fix-the-MB-64-bug-of-handling-QI-objects.patch
@@ -3,6 +3,10 @@ From: Nagaraju <nmekala@xilinx.com>
 Date: Thu, 14 Mar 2019 18:11:04 +0530
 Subject: [PATCH 43/53] Fix the MB-64 bug of handling QI objects
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0044-Patch-Microblaze-We-will-check-the-possibility-of-pe.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0044-Patch-Microblaze-We-will-check-the-possibility-of-pe.patch
index e0d7df3d..14eb812a 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0044-Patch-Microblaze-We-will-check-the-possibility-of-pe.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0044-Patch-Microblaze-We-will-check-the-possibility-of-pe.patch
@@ -4,6 +4,10 @@ Date: Fri, 29 Mar 2019 12:08:39 +0530
 Subject: [PATCH 44/53] [Patch,Microblaze] : We will check the possibility of
  peephole2 optimization,if we can then we will fix the compiler issue.
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 63 +++++++++++++++++------------
  1 file changed, 38 insertions(+), 25 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0045-Patch-MicroBlaze-fixed-typos-in-mul-div-and-mod-asse.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0045-Patch-MicroBlaze-fixed-typos-in-mul-div-and-mod-asse.patch
index 770d0f70..54135b0f 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0045-Patch-MicroBlaze-fixed-typos-in-mul-div-and-mod-asse.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0045-Patch-MicroBlaze-fixed-typos-in-mul-div-and-mod-asse.patch
@@ -4,6 +4,10 @@ Date: Wed, 17 Apr 2019 12:36:16 +0530
 Subject: [PATCH 45/53] [Patch,MicroBlaze]: fixed typos in mul,div and mod
  assembly files.
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  libgcc/config/microblaze/divsi3.S  | 47 ++++++++++++++++++++----
  libgcc/config/microblaze/modsi3.S  | 40 ++++++++++++++++++---
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0046-Patch-microblaze-MB-64-removal-of-barrel-shift-instr.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0046-Patch-microblaze-MB-64-removal-of-barrel-shift-instr.patch
index 29a7b4eb..def10321 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0046-Patch-microblaze-MB-64-removal-of-barrel-shift-instr.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0046-Patch-microblaze-MB-64-removal-of-barrel-shift-instr.patch
@@ -8,6 +8,10 @@ Subject: [PATCH 46/53] [Patch, microblaze]: MB-64 removal of barrel-shift
  enabled. Similarly to double instructions as well.
 
         Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc |   2 +-
  gcc/config/microblaze/microblaze.md | 269 ++++++++++++++++++++++++++--
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0047-Added-new-MB-64-single-register-arithmetic-instructi.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0047-Added-new-MB-64-single-register-arithmetic-instructi.patch
index 774fad5a..318abe7b 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0047-Added-new-MB-64-single-register-arithmetic-instructi.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0047-Added-new-MB-64-single-register-arithmetic-instructi.patch
@@ -3,6 +3,10 @@ From: Nagaraju <nmekala@xilinx.com>
 Date: Fri, 23 Aug 2019 16:16:53 +0530
 Subject: [PATCH 47/53] Added new MB-64 single register arithmetic instructions
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.md | 56 +++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0048-Patch-MicroBlaze-Added-support-for-64-bit-Immediate-.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0048-Patch-MicroBlaze-Added-support-for-64-bit-Immediate-.patch
index a442bf0f..09514a7d 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0048-Patch-MicroBlaze-Added-support-for-64-bit-Immediate-.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0048-Patch-MicroBlaze-Added-support-for-64-bit-Immediate-.patch
@@ -4,6 +4,10 @@ Date: Mon, 26 Aug 2019 15:55:22 +0530
 Subject: [PATCH 48/53] [Patch,MicroBlaze] : Added support for 64 bit Immediate
  values.
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/constraints.md | 4 ++--
  gcc/config/microblaze/microblaze.md  | 3 +--
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0049-Patch-microblaze-Fix-Compiler-crash-with-freg-struct.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0049-Patch-microblaze-Fix-Compiler-crash-with-freg-struct.patch
index 5732000d..6258e799 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0049-Patch-microblaze-Fix-Compiler-crash-with-freg-struct.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0049-Patch-microblaze-Fix-Compiler-crash-with-freg-struct.patch
@@ -7,6 +7,10 @@ Subject: [PATCH 49/53] [Patch, microblaze]: Fix Compiler crash with
      With this patch all other modes are handled properly
 
     Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 11 ++++++++++-
  gcc/config/microblaze/microblaze.h  | 19 -------------------
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0050-Patch-microblaze-Add-TARGET_OPTION_OPTIMIZATION-and-.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0050-Patch-microblaze-Add-TARGET_OPTION_OPTIMIZATION-and-.patch
index ed48daf7..8d99c93d 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0050-Patch-microblaze-Add-TARGET_OPTION_OPTIMIZATION-and-.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0050-Patch-microblaze-Add-TARGET_OPTION_OPTIMIZATION-and-.patch
@@ -9,6 +9,8 @@ Added TARGET_OPTION_OPTIMIZATIONS and Turn off ivopts by default.
  * gcc/common/config/microblaze/microblaze-common.c
    (microblaze_option_optimization_table): Disable fivopts by default.
 
+Upstream-Status: Pending
+
 Signed-off-by: Nagaraju Mekala <nmekala@xilinx.com>
                Mahesh Bodapati <mbodapat@xilinx.com>
 Conflicts:
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0051-Patch-microblaze-Reducing-Stack-space-for-arguments.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0051-Patch-microblaze-Reducing-Stack-space-for-arguments.patch
index b9575eac..64069e3c 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0051-Patch-microblaze-Reducing-Stack-space-for-arguments.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0051-Patch-microblaze-Reducing-Stack-space-for-arguments.patch
@@ -9,6 +9,10 @@ Subject: [PATCH 51/53] [Patch, microblaze]: Reducing Stack space for arguments
 
     Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
                   :Ajit Agarwal  <ajitkum@xilinx.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze-protos.h |   1 +
  gcc/config/microblaze/microblaze.cc       | 130 ++++++++++++++++++++++
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0052-Patch-MicroBlaze.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0052-Patch-MicroBlaze.patch
index d504a092..63feff79 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0052-Patch-MicroBlaze.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0052-Patch-MicroBlaze.patch
@@ -8,6 +8,10 @@ Subject: [PATCH 52/53] [Patch,MicroBlaze] :     If we use break_handler
  break_handler attribute.       signed-off-by : Mahesh Bodapati
  <mbodapat@xilinx.com>
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gcc/config/microblaze/microblaze.cc | 13 +++++--------
  1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-12/0053-patch-microblaze64-Add-Zero_extended-instructions.patch b/meta-microblaze/recipes-devtools/gcc/gcc-12/0053-patch-microblaze64-Add-Zero_extended-instructions.patch
index 6b3f4ddd..1552a5e9 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-12/0053-patch-microblaze64-Add-Zero_extended-instructions.patch
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-12/0053-patch-microblaze64-Add-Zero_extended-instructions.patch
@@ -9,6 +9,8 @@ Subject: [PATCH 53/53] [patch, microblaze64]: Add Zero_extended instructions
 
     [CR/TSR]: TSR-974519
 
+Upstream-Status: Pending
+
     Signed-off-by: Nagaraju Mekala<nmekala@xilinx.com>
                    Mahesh Bodapati<mbodapat@xilinx.com>
 ---
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-common.inc b/meta-microblaze/recipes-devtools/gcc/gcc-common.inc
new file mode 100644
index 00000000..5ac82b1b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-common.inc
@@ -0,0 +1,118 @@
+SUMMARY = "GNU cc and gcc C compilers"
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+DESCRIPTION = "The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Ada, Go, and D, as well as libraries for these languages (libstdc++,...). GCC was originally written as the compiler for the GNU operating system."
+SECTION = "devel"
+LICENSE = "GPL"
+
+NATIVEDEPS = ""
+
+CVE_PRODUCT = "gcc"
+
+inherit autotools gettext texinfo
+
+BPN = "gcc"
+COMPILERDEP = "virtual/${TARGET_PREFIX}gcc:do_gcc_stash_builddir"
+
+python extract_stashed_builddir () {
+    src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}")
+    dest = d.getVar("B")
+    oe.path.copyhardlinktree(src, dest)
+    staging_processfixme([src + "/fixmepath"], dest, d.getVar("RECIPE_SYSROOT"), d.getVar("RECIPE_SYSROOT_NATIVE"), d)
+}
+
+def get_gcc_float_setting(bb, d):
+    if d.getVar('ARMPKGSFX_EABI') == "hf" and d.getVar('TRANSLATED_TARGET_ARCH') == "arm":
+        return "--with-float=hard"
+    if d.getVar('TARGET_FPU') in [ 'soft' ]:
+        return "--with-float=soft"
+    if d.getVar('TARGET_FPU') in [ 'ppc-efd' ]:
+        return "--enable-e500_double"
+    return ""
+
+get_gcc_float_setting[vardepvalue] = "${@get_gcc_float_setting(bb, d)}"
+
+def get_gcc_x86_64_arch_setting(bb, d):
+    import re
+    march = re.match(r'^.*-march=([^\s]*)', d.getVar('TUNE_CCARGS'))
+    if march:
+        return "--with-arch=%s " % march.group(1)
+    # The earliest supported x86-64 CPU
+    return "--with-arch=core2"
+
+get_gcc_x86_64_arch_setting[vardepvalue] = "${@get_gcc_x86_64_arch_setting(bb, d)}"
+
+def get_gcc_mips_plt_setting(bb, d):
+    if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d):
+        return "--with-mips-plt"
+    return ""
+
+def get_gcc_ppc_plt_settings(bb, d):
+    if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and not bb.utils.contains('DISTRO_FEATURES', 'bssplt', True, False, d):
+        return "--enable-secureplt"
+    return ""
+
+def get_gcc_multiarch_setting(bb, d):
+    target_arch = d.getVar('TRANSLATED_TARGET_ARCH')
+    multiarch_options = {
+        "i586":    "--enable-targets=all",
+        "i686":    "--enable-targets=all",
+        "powerpc": "--enable-targets=powerpc64",
+        "powerpc64le": "--enable-targets=powerpcle",
+        "mips":    "--enable-targets=all",
+        "sparc":   "--enable-targets=all",
+    }
+
+    if bb.utils.contains('DISTRO_FEATURES', 'multiarch', True, False, d):
+        if target_arch in multiarch_options :
+            return multiarch_options[target_arch]
+    return ""
+
+# this is used by the multilib setup of gcc
+def get_tune_parameters(tune, d):
+    availtunes = d.getVar('AVAILTUNES')
+    if tune not in availtunes.split():
+        bb.error('The tune: %s is not one of the available tunes: %s' % (tune or None, availtunes))
+
+    localdata = bb.data.createCopy(d)
+    override = ':tune-' + tune
+    localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override)
+
+    retdict = {}
+    retdict['tune'] = tune
+    retdict['ccargs'] = localdata.getVar('TUNE_CCARGS')
+    retdict['features'] = localdata.getVar('TUNE_FEATURES')
+    # BASELIB is used by the multilib code to change library paths
+    retdict['baselib'] = localdata.getVar('BASE_LIB') or localdata.getVar('BASELIB')
+    retdict['arch'] = localdata.getVar('TUNE_ARCH')
+    retdict['abiextension'] = localdata.getVar('ABIEXTENSION')
+    retdict['target_fpu'] = localdata.getVar('TARGET_FPU')
+    retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH')
+    retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS')
+    return retdict
+
+get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS"
+
+DEBIANNAME:${MLPREFIX}libgcc = "libgcc1"
+
+MIRRORS =+ "\
+    ${GNU_MIRROR}/gcc https://gcc.gnu.org/pub/gcc/releases/ \
+"
+#
+# Set some default values
+#
+gcclibdir = "${libdir}/gcc"
+BINV = "${PV}"
+#S = "${WORKDIR}/gcc-${PV}"
+S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
+
+B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
+
+target_includedir ?= "${includedir}"
+target_libdir ?= "${libdir}"
+target_base_libdir ?= "${base_libdir}"
+target_prefix ?= "${prefix}"
+
+# We need to ensure that for the shared work directory, the do_patch signatures match
+# The real WORKDIR location isn't a dependency for the shared workdir.
+src_patches[vardepsexclude] = "WORKDIR"
+should_apply[vardepsexclude] += "PN"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-configure-common.inc b/meta-microblaze/recipes-devtools/gcc/gcc-configure-common.inc
new file mode 100644
index 00000000..e4cdb73f
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-configure-common.inc
@@ -0,0 +1,123 @@
+require gcc-multilib-config.inc
+require gcc-shared-source.inc
+#
+# Build the list of lanaguages to build.
+#
+# These can be overridden by the version specific .inc file.
+
+# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
+FORTRAN ?= ",f77"
+LANGUAGES ?= "c,c++${FORTRAN}"
+
+EXTRA_OECONF_BASE ?= ""
+EXTRA_OECONF_PATHS ?= ""
+
+GCCMULTILIB ?= "--disable-multilib"
+GCCTHREADS ?= "posix"
+
+GCCPIE ??= ""
+
+SYMVERS_CONF ?= "--enable-symvers=gnu"
+
+EXTRA_OECONF = "\
+    ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS') != 'no']} \
+    --with-gnu-ld \
+    --enable-shared \
+    --enable-languages=${LANGUAGES} \
+    --enable-threads=${GCCTHREADS} \
+    ${GCCMULTILIB} \
+    ${GCCPIE} \
+    --enable-c99 \
+    --enable-long-long \
+    ${SYMVERS_CONF} \
+    --enable-libstdcxx-pch \
+    --program-prefix=${TARGET_PREFIX} \
+    --without-local-prefix \
+    --disable-install-libiberty \
+    ${EXTRA_OECONF_BASE} \
+    ${EXTRA_OECONF_GCC_FLOAT} \
+    ${EXTRA_OECONF_PATHS} \
+    ${@get_gcc_mips_plt_setting(bb, d)} \
+    ${@get_gcc_ppc_plt_settings(bb, d)} \
+    ${@get_gcc_multiarch_setting(bb, d)} \
+        --enable-standard-branch-protection \
+"
+
+# glibc version is a minimum controlling whether features are enabled. 
+# Doesn't need to track glibc exactly
+EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 "
+
+# Set this here since GCC configure won't auto-detect and enable
+# initfini-arry when cross compiling.
+EXTRA_OECONF:append = " --enable-initfini-array"
+
+export gcc_cv_collect2_libs = 'none required'
+# We need to set gcc_cv_collect2_libs else there is cross-compilation badness
+# in the config.log files (which might not get generated until do_compile
+# hence being missed by the insane do_configure check).
+
+EXTRA_OECONF:append:linux = " --enable-__cxa_atexit"
+
+EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6"
+EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6"
+
+EXTRA_OECONF_GCC_FLOAT ??= ""
+CPPFLAGS = ""
+
+SYSTEMHEADERS = "${target_includedir}"
+SYSTEMLIBS = "${target_base_libdir}/"
+SYSTEMLIBS1 = "${target_libdir}/"
+
+do_configure:prepend () {
+        # teach gcc to find correct target includedir when checking libc ssp support
+        mkdir -p ${B}/gcc
+        echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
+        cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
+        cat >>${B}/gcc/defaults.h.new <<_EOF
+#define NATIVE_SYSTEM_HEADER_DIR "${SYSTEMHEADERS}"
+#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
+#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
+#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
+#endif /* ! GCC_DEFAULTS_H */
+_EOF
+        mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
+}
+
+do_configure () {
+        # Setup these vars for cross building only
+        # ... because foo_FOR_TARGET apparently gets misinterpreted inside the
+        # gcc build stuff when the build is producing a cross compiler - i.e.
+        # when the 'current' target is the 'host' system, and the host is not
+        # the target (because the build is actually making a cross compiler!)
+        if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+                export CC_FOR_TARGET="${CC}"
+                export GCC_FOR_TARGET="${CC}"
+                export CXX_FOR_TARGET="${CXX}"
+                export AS_FOR_TARGET="${HOST_PREFIX}as"
+                export LD_FOR_TARGET="${HOST_PREFIX}ld"
+                export NM_FOR_TARGET="${HOST_PREFIX}nm"
+                export AR_FOR_TARGET="${HOST_PREFIX}ar"
+                export GFORTRAN_FOR_TARGET="gfortran"
+                export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+        fi
+        export CC_FOR_BUILD="${BUILD_CC}"
+        export CXX_FOR_BUILD="${BUILD_CXX}"
+        export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+        export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+        export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+        export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+        export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
+        export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
+        export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
+        export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
+
+
+        oe_runconf
+}
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian.inc
new file mode 100644
index 00000000..ec87b462
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -0,0 +1,187 @@
+inherit cross-canadian
+
+SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)"
+PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
+
+GCCMULTILIB = "--enable-multilib"
+
+require gcc-configure-common.inc
+
+EXTRA_OECONF += "--with-plugin-ld=ld"
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
+    --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+# We have to point gcc at a sysroot but we don't need to rebuild if this changes
+# e.g. we switch between different machines with different tunes.
+EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
+TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
+get_gcc_float_setting[vardepvalue] = ""
+
+#
+# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
+# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
+#
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool"
+export CC_FOR_TARGET = "${TARGET_PREFIX}gcc"
+export CXX_FOR_TARGET = "${TARGET_PREFIX}g++"
+export GCC_FOR_TARGET = "${TARGET_PREFIX}gcc"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export OBJDUMP_FOR_TARGET = "${TARGET_PREFIX}objdump"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+export STRIP_FOR_TARGET = "${TARGET_PREFIX}strip"
+export WINDRES_FOR_TARGET = "${TARGET_PREFIX}windres"
+
+#
+# We need to override this and make sure the compiler can find staging
+#
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET}"
+
+do_configure () {
+        if [ ! -d ${RECIPE_SYSROOT}/${target_includedir} ]; then
+            mkdir -p ${RECIPE_SYSROOT}/${target_includedir}
+        fi
+        export CC_FOR_BUILD="${BUILD_CC}"
+        export CXX_FOR_BUILD="${BUILD_CXX}"
+        export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+        export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+        export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+        export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+        export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
+        export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
+        export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
+        export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
+        oe_runconf
+}
+
+do_compile () {
+        oe_runmake all-host configure-target-libgcc
+        (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc"
+
+FILES:${PN} = "\
+    ${exec_prefix}/bin/* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.* \
+    ${libdir}/bfd-plugins/*.so \
+    ${includedir}/c++/${BINV} \
+    ${prefix}/${TARGET_SYS}/bin/* \
+    ${prefix}/${TARGET_SYS}/lib/* \
+    ${prefix}/${TARGET_SYS}${target_includedir}/* \
+"
+INSANE_SKIP:${PN} += "dev-so"
+
+FILES:${PN}-doc = "\
+    ${infodir} \
+    ${mandir} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
+
+EXEEXT = ""
+
+# Compute how to get from libexecdir to bindir in python (easier than shell)
+BINRELPATH = "${@os.path.relpath(d.expand("${bindir}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
+# linker plugin path
+LIBRELPATH = "${@os.path.relpath(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${libdir}/bfd-plugins"))}"
+
+do_install () {
+        ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h )
+        oe_runmake 'DESTDIR=${D}' install-host
+
+        # Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+        rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+        rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+        rm -rf ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+
+        # We care about g++ not c++
+        rm -f ${D}${bindir}/*c++
+
+        # We don't care about the gcc-<version> copies
+        rm -f ${D}${bindir}/*gcc-${BINV}*
+
+        # Cleanup empty directories which are not shipped
+        # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
+        # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
+        local empty_dirs="${D}${libdir}/../lib ${D}${prefix}/${TARGET_SYS}/lib ${D}${prefix}/${TARGET_SYS} ${D}${includedir}"
+        for i in $empty_dirs; do
+                [ -d $i ] && rmdir --ignore-fail-on-non-empty $i
+        done
+
+        # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+        # found.
+        dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
+        install -d $dest
+        suffix=${EXEEXT}
+        for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
+                if [ "$t" = "g77" -o "$t" = "gfortran" ] && [ ! -e ${D}${bindir}/${TARGET_PREFIX}$t$suffix ]; then
+                        continue
+                fi
+
+                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t$suffix $dest$t$suffix
+        done
+
+        # libquadmath headers need to  be available in the gcc libexec dir
+        install -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+        cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+        cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+
+        # install LTO linker plugins where binutils tools can find it
+        install -d ${D}${libdir}/bfd-plugins
+        ln -sf ${LIBRELPATH}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so
+
+        chown -R root:root ${D}
+
+        cross_canadian_bindirlinks
+
+        for i in linux ${CANADIANEXTRAOS}
+        do
+                for v in ${CANADIANEXTRAVENDOR}
+                do
+                        d=${D}${bindir}/../${TARGET_ARCH}$v-$i
+                        install -d $d
+                        for j in ${TARGET_PREFIX}gcc${EXEEXT} ${TARGET_PREFIX}g++${EXEEXT}
+                        do
+                                p=${TARGET_ARCH}$v-$i-`echo $j | sed -e s,${TARGET_PREFIX},,`
+                                case $i in
+                                *musl*)
+                                        rm -rf $d/$p
+                                        echo "#!/usr/bin/env sh" > $d/$p
+                                        echo "exec \`dirname \$0\`/../${TARGET_SYS}/$j -mmusl \$@" >> $d/$p
+                                        chmod 0755 $d/$p
+                                        ;;
+                                *)
+                                        ;;
+                                esac
+                        done
+                done
+        done
+}
+
+ELFUTILS = "nativesdk-elfutils"
+DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib nativesdk-zstd"
+RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
+
+SYSTEMHEADERS = "${target_includedir}/"
+SYSTEMLIBS = "${target_base_libdir}/"
+SYSTEMLIBS1 = "${target_libdir}/"
+
+EXTRA_OECONF += "--enable-poison-system-directories"
+
+# gcc 4.7 needs -isystem
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb
new file mode 100644
index 00000000..bf53c5cd
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb
@@ -0,0 +1,5 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-cross-canadian.inc
+
+
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross.inc b/meta-microblaze/recipes-devtools/gcc/gcc-cross.inc
new file mode 100644
index 00000000..a540fb24
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross.inc
@@ -0,0 +1,163 @@
+inherit cross
+
+INHIBIT_DEFAULT_DEPS = "1"
+EXTRADEPENDS = ""
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+python () {
+    if d.getVar("TARGET_OS").startswith("linux"):
+        d.setVar("EXTRADEPENDS", "linux-libc-headers")
+}
+
+PN = "gcc-cross-${TARGET_ARCH}"
+
+# Ignore how TARGET_ARCH is computed.
+TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}"
+
+require gcc-configure-common.inc
+
+# While we want the 'gnu' hash style, we explicitly set it to sysv here to
+# ensure that any recipe which doesn't obey our LDFLAGS (which also set it to
+# gnu) will hit a QA failure.
+LINKER_HASH_STYLE ?= "sysv"
+
+EXTRA_OECONF += "--enable-poison-system-directories=error"
+EXTRA_OECONF:append:sh4 = " \
+    --with-multilib-list= \
+    --enable-incomplete-targets \
+"
+
+EXTRA_OECONF += "\
+    --with-system-zlib \
+"
+
+EXTRA_OECONF:append:libc-baremetal = " --without-headers"
+EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix"
+EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix"
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
+
+
+do_configure:prepend () {
+        install -d ${RECIPE_SYSROOT}${target_includedir}
+        touch ${RECIPE_SYSROOT}${target_includedir}/limits.h
+}
+
+do_compile () {
+        export CC="${BUILD_CC}"
+        export AR_FOR_TARGET="${TARGET_SYS}-ar"
+        export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+        export LD_FOR_TARGET="${TARGET_SYS}-ld"
+        export NM_FOR_TARGET="${TARGET_SYS}-nm"
+        export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+        export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
+        export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
+        export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
+        export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
+
+        # Prevent native/host sysroot path from being used in configargs.h header,
+        # as it will be rewritten when used by other sysroots preventing support
+        # for gcc plugins
+        oe_runmake configure-gcc
+        sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h
+        sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h
+
+        # Prevent sysroot/workdir paths from being used in checksum-options.
+        # checksum-options is used to generate a checksum which is embedded into
+        # the output binary.
+        oe_runmake TARGET-gcc=checksum-options all-gcc
+        sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
+        sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options
+
+        oe_runmake all-host configure-target-libgcc
+        (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+# Compute how to get from libexecdir to bindir in python (easier than shell)
+BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
+# linker plugin path
+LIBRELPATH = "${@os.path.relpath(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/bfd-plugins"))}"
+
+do_install () {
+        ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h )
+        oe_runmake 'DESTDIR=${D}' install-host
+
+        install -d ${D}${target_base_libdir}
+        install -d ${D}${target_libdir}
+
+        # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
+        # gfortran is fully backwards compatible. This is a safe and practical solution.
+        if [ -n "${@d.getVar('FORTRAN')}" ]; then
+                ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true
+                fortsymlinks="g77 gfortran"
+        fi
+
+        # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+        # found. These need to be relative paths so they work in different locations.
+        dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
+        install -d $dest
+        for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip gcc cpp $fortsymlinks; do
+                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+                ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
+        done
+
+        # Remove things we don't need but keep share/java
+        for d in info man share/doc share/locale share/man share/info; do
+                rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d
+        done
+
+        # libquadmath headers need to  be available in the gcc libexec dir
+        install -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+        cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+        cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+
+        find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
+
+        # install LTO linker plugins where binutils tools can find it
+        install -d ${D}${libdir}/bfd-plugins
+        ln -sf ${LIBRELPATH}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so
+}
+
+do_package[noexec] = "1"
+do_packagedata[noexec] = "1"
+do_package_write_ipk[noexec] = "1"
+do_package_write_rpm[noexec] = "1"
+do_package_write_deb[noexec] = "1"
+
+inherit chrpath
+
+python gcc_stash_builddir_fixrpaths() {
+    # rewrite rpaths, breaking hardlinks as required
+    process_dir("/", d.getVar("BUILDDIRSTASH"), d, break_hardlinks = True)
+}
+
+BUILDDIRSTASH = "${WORKDIR}/stashed-builddir/build"
+do_gcc_stash_builddir[dirs] = "${B}"
+do_gcc_stash_builddir[cleandirs] = "${BUILDDIRSTASH}"
+do_gcc_stash_builddir[postfuncs] += "gcc_stash_builddir_fixrpaths"
+do_gcc_stash_builddir () {
+        dest=${BUILDDIRSTASH}
+        hardlinkdir . $dest
+        # Makefile does move-if-change which can end up with 'timestamp' as file contents so break links to those files
+        rm $dest/gcc/include/*.h
+        cp gcc/include/*.h $dest/gcc/include/
+        sysroot-relativelinks.py $dest
+}
+addtask do_gcc_stash_builddir after do_compile before do_install
+SSTATETASKS += "do_gcc_stash_builddir"
+do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
+do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
+do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
+
+python do_gcc_stash_builddir_setscene () {
+    sstate_setscene(d)
+}
+addtask do_gcc_stash_builddir_setscene
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc-cross_12.2.bb
new file mode 100644
index 00000000..b43cca0c
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross_12.2.bb
@@ -0,0 +1,3 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-cross.inc
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-cross_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk.inc b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk.inc
new file mode 100644
index 00000000..bd65b1fe
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk.inc
@@ -0,0 +1,12 @@
+inherit crosssdk
+
+PN = "gcc-crosssdk-${SDK_SYS}"
+
+SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
+SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
+SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
+
+GCCMULTILIB = "--disable-multilib"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_12.2.bb
new file mode 100644
index 00000000..40a6c4fe
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_12.2.bb
@@ -0,0 +1,2 @@
+require recipes-devtools/gcc/gcc-cross_${PV}.bb
+require gcc-crosssdk.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-multilib-config.inc b/meta-microblaze/recipes-devtools/gcc/gcc-multilib-config.inc
new file mode 100644
index 00000000..2dbbc23c
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -0,0 +1,249 @@
+# following code modifies these definitions in the gcc config
+#    MULTILIB_OPTIONS
+#    MULTILIB_DIRNAMES
+#    MULTILIB_OSDIRNAMES
+#    GLIBC_DYNAMIC_LINKER32
+#    GLIBC_DYNAMIC_LINKER64
+#    GLIBC_DYNAMIC_LINKERX32
+#    GLIBC_DYNAMIC_LINKERN32
+#  For more information on use of these variables look at these files in the gcc source code
+#    gcc/config/i386/t-linux64
+#    gcc/config/mips/t-linux64
+#    gcc/config/rs6000/t-linux64
+#    gcc/config/i386/linux64.h
+#    gcc/config/mips/linux64.h
+#    gcc/config/rs6000/linux64.h
+
+MULTILIB_OPTION_WHITELIST ??= "-m32 -m64 -mx32 -mabi=n32 -mabi=32 -mabi=64" 
+
+python gcc_multilib_setup() {
+    import re
+    import shutil
+    import glob
+
+    srcdir = d.getVar('S')
+    builddir = d.getVar('B')
+    src_conf_dir = '%s/gcc/config' % srcdir
+    build_conf_dir = '%s/gcc/config' % builddir
+
+    bb.utils.remove(build_conf_dir, True)
+    ml_globs = ('%s/*/t-linux64' % src_conf_dir,
+                '%s/*/linux64.h' % src_conf_dir,
+                '%s/aarch64/t-aarch64' % src_conf_dir,
+                '%s/aarch64/aarch64.h' % src_conf_dir,
+                '%s/aarch64/aarch64-linux.h' % src_conf_dir,
+                '%s/aarch64/aarch64-cores.def' % src_conf_dir,
+                '%s/arm/linux-eabi.h' % src_conf_dir,
+                '%s/*/linux.h' % src_conf_dir,
+                '%s/linux.h' % src_conf_dir)
+
+    # copy the target multilib config files to ${B}
+    for ml_glob in ml_globs:
+        for fn in glob.glob(ml_glob):
+            rel_path = os.path.relpath(fn, src_conf_dir)
+            parent_dir = os.path.dirname(rel_path)
+            bb.utils.mkdirhier('%s/%s' % (build_conf_dir, parent_dir))
+            bb.utils.copyfile(fn, '%s/%s' % (build_conf_dir, rel_path))
+
+    pn = d.getVar('PN')
+    multilibs = (d.getVar('MULTILIB_VARIANTS') or '').split()
+    if not multilibs and pn != "nativesdk-gcc":
+        return
+
+    mlprefix = d.getVar('MLPREFIX')
+
+    if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')) and pn != "nativesdk-gcc":
+        return
+
+
+    def write_config(root, files, options, dirnames, osdirnames):
+        for ml_conf_file in files:
+            with open(root + '/' + ml_conf_file, 'r') as f:
+                filelines = f.readlines()
+                # recreate multilib configuration variables
+                substs = [
+                    (r'^(\s*(MULTILIB_OPTIONS\s*=).*)$', r'\2 %s' % '/'.join(options)),
+                    (r'^(\s*MULTILIB_OPTIONS\s*\+=.*)$', ''),
+                    (r'^(\s*(MULTILIB_DIRNAMES\s*=).*)$', r'\2 %s' % ' '.join(dirnames)),
+                    (r'^(\s*MULTILIB_DIRNAMES\s*\+=.*)$', ''),
+                    (r'^(\s*(MULTILIB_OSDIRNAMES\s*=).*)$', r'\2 %s' % ' '.join(osdirnames)),
+                    (r'^(\s*MULTILIB_OSDIRNAMES\s*\+=.*)$', ''),
+                ]
+
+                for (i, line) in enumerate(filelines):
+                    for subst in substs:
+                        line = re.sub(subst[0], subst[1], line)
+                    filelines[i] = line
+
+                with open(root + '/' + ml_conf_file, 'w') as f:
+                    f.write(''.join(filelines))
+
+    def write_headers(root, files, libdir32, libdir64, libdirx32, libdirn32):
+        def wrap_libdir(libdir):
+            if libdir.find('SYSTEMLIBS_DIR') != -1:
+                return '"%r"'
+            else:
+                return '"/%s/"' % libdir
+
+        for ml_conf_file in files:
+            fn = root + '/' + ml_conf_file
+            if not os.path.exists(fn):
+                continue
+            with open(fn, 'r') as f:
+                filelines = f.readlines()
+
+                # replace lines like
+                # #define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
+                # by
+                # #define GLIBC_DYNAMIC_LINKER32 "/lib/" "ld-linux.so.2"
+                # this is needed to put the correct dynamic loader path in the generated binaries
+                substs = [
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\"\S+\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*\"\S+\"\s*)(\S+)(\s*\"\S+\"\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3' + wrap_libdir(libdir64) + r'\5'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirx32) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirn32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirn32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirx32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*MUSL_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*MUSL_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3'),
+                    (r'^(#define\s*MUSL_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirx32) + r'\3'),
+                    (r'^(#define\s*MUSL_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                ]
+
+                for (i, line) in enumerate(filelines):
+                    for subst in substs:
+                        line = re.sub(subst[0], subst[1], line)
+                    filelines[i] = line
+
+                with open(root + '/' + ml_conf_file, 'w') as f:
+                    f.write(''.join(filelines))
+
+
+    gcc_target_config_files = {
+        'x86_64'    : ['gcc/config/i386/t-linux64'],
+        'i586'      : ['gcc/config/i386/t-linux64'],
+        'i686'      : ['gcc/config/i386/t-linux64'],
+        'mips'      : ['gcc/config/mips/t-linux64'],
+        'mips64'    : ['gcc/config/mips/t-linux64'],
+        'powerpc'   : ['gcc/config/rs6000/t-linux64'],
+        'powerpc64' : ['gcc/config/rs6000/t-linux64'],
+        'aarch64'   : ['gcc/config/aarch64/t-aarch64'],
+        'arm'       : ['gcc/config/aarch64/t-aarch64'],
+    }
+
+    gcc_header_config_files = {
+        'x86_64'    : ['gcc/config/linux.h', 'gcc/config/i386/linux.h', 'gcc/config/i386/linux64.h'],
+        'i586'      : ['gcc/config/linux.h', 'gcc/config/i386/linux.h', 'gcc/config/i386/linux64.h'],
+        'i686'      : ['gcc/config/linux.h', 'gcc/config/i386/linux.h', 'gcc/config/i386/linux64.h'],
+        'mips'      : ['gcc/config/linux.h', 'gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
+        'mips64'    : ['gcc/config/linux.h', 'gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
+        'powerpc'   : ['gcc/config/linux.h', 'gcc/config/rs6000/linux64.h'],
+        'powerpc64' : ['gcc/config/linux.h', 'gcc/config/rs6000/linux64.h'],
+        'aarch64'   : ['gcc/config/linux.h', 'gcc/config/aarch64/aarch64-linux.h', 'gcc/config/arm/linux-eabi.h'],
+        'arm'       : ['gcc/config/linux.h', 'gcc/config/aarch64/aarch64-linux.h', 'gcc/config/arm/linux-eabi.h'],
+    }
+
+    libdir32 = 'SYSTEMLIBS_DIR'
+    libdir64 = 'SYSTEMLIBS_DIR'
+    libdirx32 = 'SYSTEMLIBS_DIR'
+    libdirn32 = 'SYSTEMLIBS_DIR'
+
+
+    target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL') if mlprefix
+                    else d.getVar('TARGET_ARCH'))
+    if pn == "nativesdk-gcc":
+        header_config_files = gcc_header_config_files[d.getVar("SDK_ARCH")]
+        write_headers(builddir, header_config_files, libdir32, libdir64, libdirx32, libdirn32)
+        return
+
+    if target_arch not in gcc_target_config_files:
+        bb.warn('gcc multilib setup is not supported for TARGET_ARCH=' + target_arch)
+        return
+
+    target_config_files = gcc_target_config_files[target_arch]
+    header_config_files = gcc_header_config_files[target_arch]
+
+    ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE']
+    mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs]
+    if mlprefix:
+        mlindex = 0
+        for ml in multilibs:
+            if mlprefix == ml + '-':
+                break
+            mlindex += 1
+
+        ml_list.extend(mltunes[:mlindex] + ['DEFAULTTUNE'] + mltunes[(mlindex + 1):])
+    else:
+        ml_list.extend(mltunes)
+
+    options = []
+    dirnames = []
+    osdirnames = []
+    optsets = []
+
+    for ml in ml_list:
+        tune = d.getVar(ml)
+        if not tune:
+            bb.warn("%s doesn't have a corresponding tune. Skipping..." % ml)
+            continue
+        tune_parameters = get_tune_parameters(tune, d)
+
+        tune_baselib = tune_parameters['baselib']
+        if not tune_baselib:
+            bb.warn("Tune %s doesn't have a baselib set. Skipping..." % tune)
+            continue
+
+        if tune_baselib == 'lib64':
+            libdir64 = tune_baselib
+        elif tune_baselib == 'libx32':
+            libdirx32 = tune_baselib
+        elif tune_baselib == 'lib32':
+            libdirn32 = tune_baselib
+        elif tune_baselib == 'lib':
+            libdir32 = tune_baselib
+        else:
+            bb.error('Unknown libdir (%s) of the tune : %s' % (tune_baselib, tune))
+
+        # take out '-' mcpu='s and march='s from parameters
+        opts = []
+        whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST") or "").split()
+        for i in d.expand(tune_parameters['ccargs']).split():
+            if i in whitelist:
+                # Need to strip '-' from option
+                opts.append(i[1:])
+        options.append(" ".join(opts))
+
+        if tune_baselib == 'lib':
+            dirnames.append('32')  # /lib => 32bit lib
+        else:
+            dirnames.append(tune_baselib.replace('lib', ''))
+        osdirnames.append('../' + tune_baselib)
+
+    write_config(builddir, target_config_files, options, dirnames, osdirnames)
+    write_headers(builddir, header_config_files, libdir32, libdir64, libdirx32, libdirn32)
+}
+
+gcc_multilib_setup[cleandirs] = "${B}/gcc/config"
+gcc_multilib_setup[vardepsexclude] = "SDK_ARCH"
+
+EXTRACONFFUNCS += "gcc_multilib_setup"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-runtime.inc b/meta-microblaze/recipes-devtools/gcc/gcc-runtime.inc
new file mode 100644
index 00000000..8bb58631
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-runtime.inc
@@ -0,0 +1,310 @@
+require gcc-configure-common.inc
+
+SUMMARY = "Runtime libraries from GCC"
+
+# Over-ride the LICENSE set by gcc-${PV}.inc to remove "& GPLv3"
+# All gcc-runtime packages are now covered by the runtime exception.
+LICENSE = "GPL-3.0-with-GCC-exception"
+
+CXXFLAGS:remove = "-fvisibility-inlines-hidden"
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=${includedir}/c++/${BINV} \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"
+EXTRA_OECONF:append = " --cache-file=${B}/config.cache"
+EXTRA_OECONF:append:libc-newlib = " --with-newlib --with-target-subdir"
+EXTRA_OECONF:append:libc-baremetal = " --with-target-subdir"
+
+# Disable ifuncs for libatomic on arm conflicts -march/-mcpu
+EXTRA_OECONF:append:arm = " libat_cv_have_ifunc=no "
+EXTRA_OECONF:append:armeb = " libat_cv_have_ifunc=no "
+
+DISABLE_STATIC:class-nativesdk ?= ""
+
+# Newlib does not support symbol versioning on libsdtcc++
+SYMVERS_CONF:libc-newlib = ""
+
+# Building with thumb enabled on armv6t fails
+ARM_INSTRUCTION_SET:armv6 = "arm"
+
+RUNTIMELIBITM = "libitm"
+RUNTIMELIBITM:arc = ""
+RUNTIMELIBITM:mipsarch = ""
+RUNTIMELIBITM:nios2 = ""
+RUNTIMELIBITM:microblaze = ""
+RUNTIMELIBITM:riscv32 = ""
+RUNTIMELIBITM:riscv64 = ""
+RUNTIMELIBITM:loongarch64 = ""
+RUNTIMELIBSSP ?= ""
+RUNTIMELIBSSP:mingw32 ?= "libssp"
+
+RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
+    ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \
+"
+# Only build libstdc++ for newlib
+RUNTIMETARGET:libc-newlib = "libstdc++-v3"
+
+# libiberty
+# libgfortran needs separate recipe due to libquadmath dependency
+
+do_configure () {
+        export CXX="${CXX} -nostdinc++ -L${WORKDIR}/dummylib"
+        # libstdc++ isn't built yet so CXX would error not able to find it which breaks stdc++'s configure
+        # tests. Create a dummy empty lib for the purposes of configure.
+        mkdir -p ${WORKDIR}/dummylib
+        ${CC} -x c /dev/null -c -o ${WORKDIR}/dummylib/dummylib.o
+        ${AR} rcs ${WORKDIR}/dummylib/libstdc++.a ${WORKDIR}/dummylib/dummylib.o
+        for d in libgcc ${RUNTIMETARGET}; do
+                echo "Configuring $d"
+                rm -rf ${B}/${TARGET_SYS}/$d/
+                mkdir -p ${B}/${TARGET_SYS}/$d/
+                cd ${B}/${TARGET_SYS}/$d/
+                chmod a+x ${S}/$d/configure
+                ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+                if [ "$d" = "libgcc" ]; then
+                        (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
+                fi
+        done
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+        for d in libgcc ${RUNTIMETARGET}; do
+                cd ${B}/${TARGET_SYS}/$d/
+                oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/
+        done
+}
+
+do_install () {
+        for d in ${RUNTIMETARGET}; do
+                cd ${B}/${TARGET_SYS}/$d/
+                oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ install
+        done
+        if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then
+                install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include 
+                mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+                rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
+        fi
+        rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
+        rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir
+        rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
+        if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
+                rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+        fi
+        if [ -d ${D}${infodir} ]; then
+                rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+        fi
+}
+
+do_install:append:class-target () {
+        if [ "${TARGET_OS}" = "linux-gnuspe" ]; then
+                ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+        fi
+
+        if [ "${TARGET_OS}" = "linux-gnun32" ]; then
+                if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                        mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                        ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+                elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                        mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                        ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
+                else
+                        ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                fi
+        elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+                if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                        mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                        ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+                elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                        mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                        ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
+                else
+                        ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                fi
+        elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
+                ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+                ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
+        fi
+
+        if [ "${TARGET_ARCH}" == "x86_64" -a "${MULTILIB_VARIANTS}" != "" ];then
+                ln -sf ../${X86ARCH32}${TARGET_VENDOR}-${TARGET_OS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}/32
+        fi
+
+        if [ "${TCLIBC}" != "glibc" ]; then
+                case "${TARGET_OS}" in
+                        "linux-musl" | "linux-*spe") extra_target_os="linux";;
+                        "linux-musleabi") extra_target_os="linux-gnueabi";;
+                        *) extra_target_os="linux";;
+                esac
+                ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
+        fi
+        chown -R root:root ${D}
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc virtual/${MLPREFIX}libc"
+PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
+
+#BBCLASSEXTEND = "nativesdk"
+
+PACKAGES = "\
+    ${PN}-dbg \
+    libstdc++ \
+    libstdc++-precompile-dev \
+    libstdc++-dev \
+    libstdc++-staticdev \
+    libg2c \
+    libg2c-dev \
+    libssp \
+    libssp-dev \
+    libssp-staticdev \
+    libquadmath \
+    libquadmath-dev \
+    libquadmath-staticdev \
+    libgomp \
+    libgomp-dev \
+    libgomp-staticdev \
+    libatomic \
+    libatomic-dev \
+    libatomic-staticdev \
+    libitm \
+    libitm-dev \
+    libitm-staticdev \
+"
+# The base package doesn't exist, so we clear the recommends.
+RRECOMMENDS:${PN}-dbg = ""
+
+# include python debugging scripts
+FILES:${PN}-dbg += "\
+    ${libdir}/libstdc++.*-gdb.py \
+    ${datadir}/gcc-${BINV}/python/libstdcxx \
+"
+
+FILES:libg2c = "${target_libdir}/libg2c.so.*"
+SUMMARY:libg2c = "Companion runtime library for g77"
+FILES:libg2c-dev = "\
+    ${libdir}/libg2c.so \
+    ${libdir}/libg2c.a \
+    ${libdir}/libfrtbegin.a \
+"
+SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files"
+
+FILES:libstdc++ = "${libdir}/libstdc++.so.*"
+SUMMARY:libstdc++ = "GNU standard C++ library"
+FILES:libstdc++-dev = "\
+    ${includedir}/c++/ \
+    ${libdir}/libstdc++.so \
+    ${libdir}/libstdc++*.la \
+    ${libdir}/libsupc++.la \
+"
+SUMMARY:libstdc++-dev = "GNU standard C++ library - development files"
+FILES:libstdc++-staticdev = "\
+    ${libdir}/libstdc++*.a \
+    ${libdir}/libsupc++.a \
+"
+SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files"
+
+FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
+SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files"
+
+FILES:libssp = "${libdir}/libssp.so.*"
+SUMMARY:libssp = "GNU stack smashing protection library"
+FILES:libssp-dev = "\
+    ${libdir}/libssp*.so \
+    ${libdir}/libssp*_nonshared.a \
+    ${libdir}/libssp*.la \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/ssp \
+"
+SUMMARY:libssp-dev = "GNU stack smashing protection library - development files"
+FILES:libssp-staticdev = "${libdir}/libssp*.a"
+SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files"
+
+FILES:libquadmath = "${libdir}/libquadmath*.so.*"
+SUMMARY:libquadmath = "GNU quad-precision math library"
+FILES:libquadmath-dev = "\
+    ${libdir}/${TARGET_SYS}/${BINV}/include/quadmath* \
+    ${libdir}/libquadmath*.so \
+    ${libdir}/libquadmath.la \
+"
+SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files"
+FILES:libquadmath-staticdev = "${libdir}/libquadmath.a"
+SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files"
+
+FILES:libgomp = "${libdir}/libgomp*${SOLIBS}"
+SUMMARY:libgomp = "GNU OpenMP parallel programming library"
+FILES:libgomp-dev = "\
+    ${libdir}/libgomp*${SOLIBSDEV} \
+    ${libdir}/libgomp*.la \
+    ${libdir}/libgomp.spec \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/acc_prof.h \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \
+"
+SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files"
+FILES:libgomp-staticdev = "${libdir}/libgomp*.a"
+SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files"
+
+FILES:libatomic = "${libdir}/libatomic.so.*"
+SUMMARY:libatomic = "GNU C++11 atomics support library"
+FILES:libatomic-dev = "\
+    ${libdir}/libatomic.so \
+    ${libdir}/libatomic.la \
+"
+SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files"
+FILES:libatomic-staticdev = "${libdir}/libatomic.a"
+SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files"
+
+FILES:libitm = "${libdir}/libitm.so.*"
+SUMMARY:libitm = "GNU transactional memory support library"
+FILES:libitm-dev = "\
+    ${libdir}/libitm.so \
+    ${libdir}/libitm.la \
+    ${libdir}/libitm.spec \
+"
+SUMMARY:libitm-dev = "GNU transactional memory support library - development files"
+FILES:libitm-staticdev = "${libdir}/libitm.a"
+SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files"
+
+require gcc-testsuite.inc
+
+EXTRA_OEMAKE:prepend:task-check = "${PARALLEL_MAKE} "
+
+MAKE_CHECK_TARGETS ??= "check-gcc ${@" ".join("check-target-" + i for i in d.getVar("RUNTIMETARGET").split())}"
+# prettyprinters and xmethods require gdb tooling
+MAKE_CHECK_IGNORE ??= "prettyprinters.exp xmethods.exp"
+MAKE_CHECK_RUNTESTFLAGS ??= "${MAKE_CHECK_BOARDARGS} --ignore '${MAKE_CHECK_IGNORE}'"
+
+# specific host and target dependencies required for test suite running
+do_check[depends] += "dejagnu-native:do_populate_sysroot expect-native:do_populate_sysroot"
+do_check[depends] += "virtual/libc:do_populate_sysroot"
+# only depend on qemu if targeting linux user execution
+do_check[depends] += "${@'qemu-native:do_populate_sysroot' if "user" in d.getVar('TOOLCHAIN_TEST_TARGET') else ''}"
+# extend the recipe sysroot to include the built libraries (for qemu usermode)
+do_check[prefuncs] += "extend_recipe_sysroot"
+do_check[prefuncs] += "check_prepare"
+do_check[dirs] = "${WORKDIR}/dejagnu ${B}"
+do_check[nostamp] = "1"
+do_check() {
+    export DEJAGNU="${WORKDIR}/dejagnu/site.exp"
+
+    # HACK: this works around the configure setting CXX with -nostd* args
+    sed -i 's#-nostdinc++ -L${WORKDIR}/dummylib##g' $(find ${B} -name testsuite_flags | head -1)
+
+    if [ "${TOOLCHAIN_TEST_TARGET}" = "user" ]; then
+        # qemu user has issues allocating large amounts of memory
+        export G_SLICE=always-malloc
+        # no test should need more that 10G of memory, this prevents tests like pthread7-rope from leaking memory
+        ulimit -m 4194304
+        ulimit -v 10485760
+    fi
+
+    oe_runmake -i ${MAKE_CHECK_TARGETS} RUNTESTFLAGS="${MAKE_CHECK_RUNTESTFLAGS}"
+}
+addtask check after do_compile do_populate_sysroot
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-runtime_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc-runtime_12.2.bb
new file mode 100644
index 00000000..dd430b57
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-runtime_12.2.bb
@@ -0,0 +1,2 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-runtime.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-runtime_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-runtime_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-runtime_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc
new file mode 100644
index 00000000..f6aa9c99
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc
@@ -0,0 +1,120 @@
+require gcc-configure-common.inc
+
+LICENSE = "NCSA | MIT"
+
+LIC_FILES_CHKSUM = "\
+    file://libsanitizer/LICENSE.TXT;md5=0249c37748936faf5b1efd5789587909 \
+"
+
+EXTRA_OECONF_PATHS = "\
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+do_configure () {
+    rm -rf ${B}/${TARGET_SYS}/libsanitizer/
+    mkdir -p ${B}/${TARGET_SYS}/libsanitizer/
+    cd ${B}/${TARGET_SYS}/libsanitizer/
+    chmod a+x ${S}/libsanitizer/configure
+    relpath=${@os.path.relpath("${S}/libsanitizer", "${B}/${TARGET_SYS}/libsanitizer")}
+    $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+    # Easiest way to stop bad RPATHs getting into the library since we have a
+    # broken libtool here
+    sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/libsanitizer/libtool
+    # Link to the sysroot's libstdc++ instead of one gcc thinks it just built
+    sed -i -e '/LIBSTDCXX_RAW_CXX_\(CXXFLAGS\|LDFLAGS\)\s*=/d' ${B}/${TARGET_SYS}/libsanitizer/*/Makefile
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+    cd ${B}/${TARGET_SYS}/libsanitizer/
+    oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/
+}
+
+do_install () {
+    cd ${B}/${TARGET_SYS}/libsanitizer/
+    oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/ install
+    if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then
+        install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+        mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+        rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
+    fi
+    if [ -d ${D}${infodir} ]; then
+        rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+    fi
+    chown -R root:root ${D}
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+ALLOW_EMPTY:${PN} = "1"
+DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc"
+
+# used to fix ../../../../../../../../../work-shared/gcc-8.3.0-r0/gcc-8.3.0/libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+DEBUG_OPTIMIZATION:append = " -Wno-error"
+
+#BBCLASSEXTEND = "nativesdk"
+
+PACKAGES = "${PN} ${PN}-dbg"
+PACKAGES += "libasan libubsan liblsan libtsan"
+PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev"
+PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev"
+
+RDEPENDS:libasan += "libstdc++"
+RDEPENDS:libubsan += "libstdc++"
+RDEPENDS:liblsan += "libstdc++"
+RDEPENDS:libtsan += "libstdc++"
+RDEPENDS:libasan-dev += "${PN}"
+RDEPENDS:libubsan-dev += "${PN}"
+RDEPENDS:liblsan-dev += "${PN}"
+RDEPENDS:libtsan-dev += "${PN}"
+RRECOMMENDS:${PN} += "libasan libubsan"
+RRECOMMENDS:${PN}:append:x86 = " liblsan"
+RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan"
+
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
+
+# Only x86, powerpc, sparc, s390, arm, and aarch64 are supported
+COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux'
+# musl is currently broken entirely
+COMPATIBLE_HOST:libc-musl = 'null'
+
+FILES:libasan += "${libdir}/libasan.so.* ${libdir}/libhwasan.so.*"
+FILES:libasan-dev += "\
+    ${libdir}/libasan_preinit.o \
+    ${libdir}/libasan.so \
+    ${libdir}/libhwasan.so \
+    ${libdir}/libasan.la \
+"
+FILES:libasan-staticdev += "${libdir}/libasan.a \
+    ${libdir}/libhwasan.a \
+"
+
+FILES:libubsan += "${libdir}/libubsan.so.*"
+FILES:libubsan-dev += "\
+    ${libdir}/libubsan.so \
+    ${libdir}/libubsan.la \
+"
+FILES:libubsan-staticdev += "${libdir}/libubsan.a"
+
+FILES:liblsan += "${libdir}/liblsan.so.*"
+FILES:liblsan-dev += "\
+    ${libdir}/liblsan.so \
+    ${libdir}/liblsan.la \
+    ${libdir}/liblsan_preinit.o \
+"
+FILES:liblsan-staticdev += "${libdir}/liblsan.a"
+
+FILES:libtsan += "${libdir}/libtsan.so.*"
+FILES:libtsan-dev += "\
+    ${libdir}/libtsan.so \
+    ${libdir}/libtsan.la \
+    ${libdir}/libtsan_*.o \
+"
+FILES:libtsan-staticdev += "${libdir}/libtsan.a"
+
+FILES:${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_12.2.bb
new file mode 100644
index 00000000..8bda2cca
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_12.2.bb
@@ -0,0 +1,7 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-sanitizers.inc
+
+# Building with thumb enabled on armv4t armv5t fails with
+# sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8'
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-shared-source.inc b/meta-microblaze/recipes-devtools/gcc/gcc-shared-source.inc
new file mode 100644
index 00000000..03f520b0
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-shared-source.inc
@@ -0,0 +1,21 @@
+do_fetch() {
+        :
+}
+do_fetch[noexec] = "1"
+deltask do_unpack
+deltask do_patch
+
+SRC_URI = ""
+
+do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
+do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"
+do_deploy_source_date_epoch[depends] += "gcc-source-${PV}:do_deploy_source_date_epoch"
+
+# Copy the SDE from the shared workdir to the recipe workdir
+do_deploy_source_date_epoch () {
+        sde_file=${SDE_FILE}
+        sde_file=${sde_file#${WORKDIR}/}
+        mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE})
+        cp -p $(dirname ${S})/$sde_file ${SDE_DEPLOYDIR}
+        cp -p $(dirname ${S})/$sde_file ${SDE_FILE}
+}
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-source.inc b/meta-microblaze/recipes-devtools/gcc/gcc-source.inc
new file mode 100644
index 00000000..265bcf4b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-source.inc
@@ -0,0 +1,45 @@
+deltask do_configure 
+deltask do_compile 
+deltask do_install 
+deltask do_populate_sysroot
+deltask do_populate_lic 
+RM_WORK_EXCLUDE += "${PN}"
+
+inherit nopackages
+
+PN = "gcc-source-${PV}"
+WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}"
+SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:"
+
+STAMP = "${STAMPS_DIR}/work-shared/gcc-${PV}-${PR}"
+STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-${PV}-*"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = ""
+PACKAGES = ""
+TARGET_ARCH = "allarch"
+TARGET_AS_ARCH = "none"
+TARGET_CC_ARCH = "none"
+TARGET_LD_ARCH = "none"
+TARGET_OS = "linux"
+baselib = "lib"
+PACKAGE_ARCH = "all"
+
+B = "${WORKDIR}/build"
+
+# This needs to be Python to avoid lots of shell variables becoming dependencies.
+python do_preconfigure () {
+    import subprocess
+    cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+    cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+
+    # Easiest way to stop bad RPATHs getting into the library since we have a
+    # broken libtool here (breaks cross-canadian and target at least)
+    cmd = d.expand("sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure")
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+}
+addtask do_preconfigure after do_patch
+do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot"
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-source_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc-source_12.2.bb
new file mode 100644
index 00000000..b890fa33
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-source_12.2.bb
@@ -0,0 +1,4 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require recipes-devtools/gcc/gcc-source.inc
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-target.inc b/meta-microblaze/recipes-devtools/gcc/gcc-target.inc
new file mode 100644
index 00000000..7dac3ef4
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-target.inc
@@ -0,0 +1,259 @@
+GCCMULTILIB = "--enable-multilib"
+require gcc-configure-common.inc
+
+EXTRA_OECONF_PATHS = "\
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"
+
+# Configure gcc running on the target to default to an architecture which will
+# be compatible with that of gcc-runtime (which is cross compiled to be target
+# specific). For example, for ARM, ARMv6+ adds atomic instructions that may
+# affect the ABI in the gcc-runtime libs. Since we can't rely on gcc on the
+# target to always be passed -march etc, its built-in default needs to be safe.
+
+ARMFPARCHEXT ?= ""
+
+EXTRA_OECONF:append:armv6:class-target = " --with-arch=armv6${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}"
+EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}"
+EXTRA_OECONF:append:x86-64:class-target = " ${@get_gcc_x86_64_arch_setting(bb, d)}"
+
+# libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
+# set in subdir gcc, so subdir libcc1 can't use it, export it here to
+# fix the problem.
+export gcc_cv_objdump = "${TARGET_PREFIX}objdump"
+
+EXTRA_OECONF_GCC_FLOAT = "${@get_gcc_float_setting(bb, d)}"
+
+PACKAGES = "\
+    ${PN} ${PN}-plugins ${PN}-symlinks \
+    g++ g++-symlinks \
+    cpp cpp-symlinks \
+    g77 g77-symlinks \
+    gfortran gfortran-symlinks \
+    gcov gcov-symlinks \
+    ${PN}-doc \
+    ${PN}-dev \
+    ${PN}-dbg \
+"
+
+FILES:${PN} = "\
+    ${bindir}/${TARGET_PREFIX}gcc* \
+    ${bindir}/${TARGET_PREFIX}lto* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/g++-mapper-server \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
+    ${libdir}/bfd-plugins/*.so \
+"
+INSANE_SKIP:${PN} += "dev-so"
+RRECOMMENDS:${PN} += "\
+    libssp \
+    libssp-dev \
+"
+RDEPENDS:${PN} += "cpp"
+
+FILES:${PN}-dev = "\
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \
+"
+FILES:${PN}-symlinks = "\
+    ${bindir}/cc \
+    ${bindir}/gcc \
+    ${bindir}/gccbug \
+"
+
+FILES:${PN}-plugins = "\
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \
+"
+ALLOW_EMPTY:${PN}-plugins = "1"
+
+FILES:g77 = "\
+    ${bindir}/${TARGET_PREFIX}g77 \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+"
+FILES:g77-symlinks = "\
+    ${bindir}/g77 \
+    ${bindir}/f77 \
+"
+RRECOMMENDS:g77 = "\
+    libg2c \
+    libg2c-dev \
+"
+
+FILES:gfortran = "\
+    ${bindir}/${TARGET_PREFIX}gfortran \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
+"
+RRECOMMENDS:gfortran = "\
+    libquadmath \
+    libquadmath-dev \
+"
+FILES:gfortran-symlinks = "\
+    ${bindir}/gfortran \
+    ${bindir}/f95"
+
+FILES:cpp = "\
+    ${bindir}/${TARGET_PREFIX}cpp* \
+    ${base_libdir}/cpp \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
+FILES:cpp-symlinks = "${bindir}/cpp"
+
+FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \
+    ${bindir}/${TARGET_PREFIX}gcov-tool* \
+"
+FILES:gcov-symlinks = "${bindir}/gcov \
+    ${bindir}/gcov-tool \
+"
+
+FILES:g++ = "\
+    ${bindir}/${TARGET_PREFIX}g++* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES:g++-symlinks = "\
+    ${bindir}/c++ \
+    ${bindir}/g++ \
+"
+RRECOMMENDS:g++ = "\
+    libstdc++ \
+    libstdc++-dev \
+    libatomic \
+    libatomic-dev \
+"
+
+FILES:${PN}-doc = "\
+    ${infodir} \
+    ${mandir} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
+
+do_compile () {
+        # Prevent full target sysroot path from being used in configargs.h header,
+        # as it will be rewritten when used by other sysroots preventing support
+        # for gcc plugins. Additionally the path is embeddeded into the output
+        # binary, this prevents building a reproducible binary.
+        oe_runmake configure-gcc
+        sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/configargs.h
+        sed -i 's@${STAGING_DIR_HOST}@/@g' ${B}/gcc/configargs.h
+
+        # Prevent sysroot/workdir paths from being used in checksum-options.
+        # checksum-options is used to generate a checksum which is embedded into
+        # the output binary.
+        oe_runmake TARGET-gcc=checksum-options all-gcc
+        sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
+        sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/checksum-options
+
+        oe_runmake all-host
+}
+
+do_install () {
+        oe_runmake 'DESTDIR=${D}' install-host
+
+        # Add unwind.h, it comes from libgcc which we don't want to build again
+        install ${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/gcc/${TARGET_SYS}/${BINV}/include/unwind.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+
+        # Info dir listing isn't interesting at this point so remove it if it exists.
+        if [ -e "${D}${infodir}/dir" ]; then
+                rm -f ${D}${infodir}/dir
+        fi
+
+        # Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+        rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+        rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+        rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
+        rmdir ${D}${includedir}
+        rm -rf ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+
+        # Hack around specs file assumptions
+        test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
+
+        # Cleanup manpages..
+        rm -rf ${D}${mandir}/man7
+
+        # Don't package details about the build host
+        rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h
+        rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h
+
+        cd ${D}${bindir}
+
+        # We care about g++ not c++
+        rm -f *c++*
+
+        # We don't care about the gcc-<version> ones for this
+        rm -f *gcc-?*.?*
+
+        # Not sure why we end up with these but we don't want them...
+        rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
+
+        # Symlinks so we can use these trivially on the target
+        if [ -e ${TARGET_PREFIX}g77 ]; then
+                ln -sf ${TARGET_PREFIX}g77 g77 || true
+                ln -sf g77 f77 || true
+        fi
+        if [ -e ${TARGET_PREFIX}gfortran ]; then
+                ln -sf ${TARGET_PREFIX}gfortran gfortran || true
+                ln -sf gfortran f95 || true
+        fi
+        ln -sf ${TARGET_PREFIX}g++ g++
+        ln -sf ${TARGET_PREFIX}gcc gcc
+        ln -sf ${TARGET_PREFIX}cpp cpp
+        ln -sf ${TARGET_PREFIX}gcov gcov
+        ln -sf ${TARGET_PREFIX}gcov-tool gcov-tool
+        install -d ${D}${base_libdir}
+        ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${base_libdir}/cpp
+        ln -sf g++ c++
+        ln -sf gcc cc
+        install -d ${D}${libdir}/bfd-plugins
+        ln -sf ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so
+        chown -R root:root ${D}
+}
+
+do_install:append () {
+        #
+        # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header
+        # files and places the modified files into
+        # {D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed folder. This makes the
+        # build not deterministic. The following code prunes all those headers
+        # except those under include-fixed/linux, *limits.h and README, yielding
+        # the same include-fixed folders no matter what sysroot
+
+        include_fixed="${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed"
+        for f in $(find ${include_fixed} -type f); do
+                case $f in
+                */include-fixed/linux/*)
+                    continue
+                    ;;
+                */include-fixed/*limits.h)
+                    continue
+                    ;;
+                */include-fixed/README)
+                    continue
+                    ;;
+                *)
+                    # remove file and directory if empty
+                    bbdebug 2 "Pruning $f"
+                    rm $f
+                    find $(dirname $f) -maxdepth 0 -empty -exec rmdir {} \;
+                    ;;
+                esac
+        done
+}
+
+# Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross
+# and one from here. These can confuse gcc cross where includes use #include_next
+# and builds track file dependencies (e.g. perl and its makedepends code).
+# For determinism we don't install this ever and rely on the copy from gcc-cross.
+# [YOCTO #7287]
+SYSROOT_DIRS_IGNORE += "${libdir}/gcc"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-testsuite.inc b/meta-microblaze/recipes-devtools/gcc/gcc-testsuite.inc
new file mode 100644
index 00000000..f68fec58
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-testsuite.inc
@@ -0,0 +1,107 @@
+inherit qemu
+
+TOOLCHAIN_TEST_TARGET ??= "user"
+TOOLCHAIN_TEST_HOST ??= "localhost"
+TOOLCHAIN_TEST_HOST_USER ??= "root"
+TOOLCHAIN_TEST_HOST_PORT ??= "2222"
+
+MAKE_CHECK_BOARDFLAGS ??= ""
+MAKE_CHECK_BOARDARGS ??= "--target_board=${TOOLCHAIN_TEST_TARGET}${MAKE_CHECK_BOARDFLAGS}"
+
+python () {
+    # Provide the targets compiler args via targets options. This allows dejagnu to
+    # correctly mark incompatible tests as UNSUPPORTED (e.g. needs soft-float
+    # but running on hard-float target).
+    #
+    # These options are called "multilib_flags" within the gcc test suite. Most
+    # architectures handle these options in a sensible way such that tests that
+    # are incompatible with the provided multilib are marked as UNSUPPORTED.
+    #
+    # Note: multilib flags are added to the compile command after the args
+    # provided by any test (through dg-options), CFLAGS_FOR_TARGET is always
+    # added to the compile command before any other args but is not interpted
+    # as options like multilib flags.
+    #
+    # i686, x86-64 and aarch64 are special, since most toolchains built for
+    # these targets don't do multilib the tests do not get correctly marked as
+    # UNSUPPORTED. More importantly the test suite itself does not handle
+    # overriding the multilib flags where it could (like other archs do). As
+    # such do not pass the target compiler args for these targets.
+    args = d.getVar("TUNE_CCARGS").split()
+    if d.getVar("TUNE_ARCH") in ["i686", "x86_64", "aarch64"]:
+        args = []
+    d.setVar("MAKE_CHECK_BOARDFLAGS", ("/" + "/".join(args)) if len(args) != 0 else "")
+}
+
+python check_prepare() {
+    def generate_qemu_linux_user_config(d):
+        content = []
+        content.append('load_generic_config "sim"')
+        content.append('load_base_board_description "basic-sim"')
+        content.append('process_multilib_options ""')
+
+        # qemu args
+        qemu_binary = qemu_target_binary(d)
+        if not qemu_binary:
+            bb.fatal("Missing target qemu linux-user binary")
+
+        args = []
+        # QEMU_OPTIONS is not always valid due to -cross recipe
+        args += ["-r", d.getVar("OLDEST_KERNEL")]
+        # enable all valid instructions, since the test suite itself does not
+        # limit itself to the target cpu options.
+        #   - valid for x86*, powerpc, arm, arm64
+        if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "ppc", "arm", "aarch64"]:
+            args += ["-cpu", "max"]
+
+        sysroot = d.getVar("RECIPE_SYSROOT")
+        args += ["-L", sysroot]
+        # lib paths are static here instead of using $libdir since this is used by a -cross recipe
+        libpaths = [sysroot + "/usr/lib", sysroot + "/lib"]
+        args += ["-E", "LD_LIBRARY_PATH={0}".format(":".join(libpaths))]
+
+        content.append('set_board_info is_simulator 1')
+        content.append('set_board_info sim "{0}"'.format(qemu_binary))
+        content.append('set_board_info sim,options "{0}"'.format(" ".join(args)))
+
+        # target build/test config
+        content.append('set_board_info target_install {%s}' % d.getVar("TARGET_SYS"))
+        content.append('set_board_info ldscript ""')
+        #content.append('set_board_info needs_status_wrapper 1') # qemu-linux-user return codes work, and abort works fine
+        content.append('set_board_info gcc,stack_size 16834')
+        content.append('set_board_info gdb,nosignals 1')
+        content.append('set_board_info gcc,timeout 60')
+
+        return "\n".join(content)
+
+    def generate_remote_ssh_linux_config(d):
+        content = []
+        content.append('load_generic_config "unix"')
+        content.append('process_multilib_options ""')
+        content.append("set_board_info hostname {0}".format(d.getVar("TOOLCHAIN_TEST_HOST")))
+        content.append("set_board_info username {0}".format(d.getVar("TOOLCHAIN_TEST_HOST_USER")))
+
+        port = d.getVar("TOOLCHAIN_TEST_HOST_PORT")
+        content.append("set_board_info rsh_prog \"/usr/bin/ssh -p {0} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no\"".format(port))
+        content.append("set_board_info rcp_prog \"/usr/bin/scp -P {0} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no\"".format(port))
+
+        return "\n".join(content)
+
+    dejagnudir = d.expand("${WORKDIR}/dejagnu")
+    if not os.path.isdir(dejagnudir):
+        os.makedirs(dejagnudir)
+
+    # write out target qemu board config
+    with open(os.path.join(dejagnudir, "user.exp"), "w") as f:
+        f.write(generate_qemu_linux_user_config(d))
+
+    # write out target ssh board config
+    with open(os.path.join(dejagnudir, "ssh.exp"), "w") as f:
+        f.write(generate_remote_ssh_linux_config(d))
+
+    # generate site.exp to provide boards
+    with open(os.path.join(dejagnudir, "site.exp"), "w") as f:
+        f.write("lappend boards_dir {0}\n".format(dejagnudir))
+        f.write("set CFLAGS_FOR_TARGET \"{0}\"\n".format(d.getVar("TOOLCHAIN_OPTIONS")))
+}
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
new file mode 100644
index 00000000..66e582ca
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -0,0 +1,39 @@
+From 31f94ef5b43a984a98f0eebd2dcf1b53aa1d7bce Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 08:37:11 +0400
+Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5dcaab14ae9..f76310a36bb 100755
+--- a/configure
++++ b/configure
+@@ -10165,7 +10165,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
+diff --git a/configure.ac b/configure.ac
+index 85977482aee..8b9097c7a45 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3346,7 +3346,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch
new file mode 100644
index 00000000..5aa635b3
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch
@@ -0,0 +1,239 @@
+From 99f1e61b2957226254a116fde7fd73bf07034012 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 8 Mar 2021 16:04:20 -0800
+Subject: [PATCH] gcc: poison-system-directories
+
+Add /sw/include and /opt/include based on the original
+zecke-no-host-includes.patch patch.  The original patch checked for
+/usr/include, /sw/include and /opt/include and then triggered a failure and
+aborted.
+
+Instead, we add the two missing items to the current scan.  If the user
+wants this to be a failure, they can add "-Werror=poison-system-directories".
+
+Upstream-Status: Pending
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/common.opt      |  4 ++++
+ gcc/config.in       | 10 ++++++++++
+ gcc/configure       | 19 +++++++++++++++++++
+ gcc/configure.ac    | 16 ++++++++++++++++
+ gcc/doc/invoke.texi |  9 +++++++++
+ gcc/gcc.cc          | 15 ++++++++++++---
+ gcc/incpath.cc      | 21 +++++++++++++++++++++
+ 7 files changed, 91 insertions(+), 3 deletions(-)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index 8a0dafc52..0357868e2 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -710,6 +710,10 @@ Wreturn-local-addr
+ Common Var(warn_return_local_addr) Init(1) Warning
+ Warn about returning a pointer/reference to a local or temporary variable.
+ 
++Wpoison-system-directories
++Common Var(flag_poison_system_directories) Init(1) Warning
++Warn for -I and -L options using system directories if cross compiling
++
+ Wshadow
+ Common Var(warn_shadow) Warning
+ Warn when one variable shadows another.  Same as -Wshadow=global.
+diff --git a/gcc/config.in b/gcc/config.in
+index 64c27c9cf..a693cb8a8 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -230,6 +230,16 @@
+ #endif
+ 
+ 
++/* Define to warn for use of native system header directories */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++#endif
++/* Define to warn for use of native system header directories */
++#ifndef USED_FOR_TARGET
++#undef POISON_BY_DEFAULT
++#endif
++
++
+ /* Define if you want all operations on RTL (the basic data structure of the
+    optimizer and back end) to be checked for dynamic type safety at runtime.
+    This is quite expensive. */
+diff --git a/gcc/configure b/gcc/configure
+index 2b83acfb0..8bb97578c 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -1023,6 +1023,7 @@ enable_maintainer_mode
+ enable_link_mutex
+ enable_link_serialization
+ enable_version_specific_runtime_libs
++enable_poison_system_directories
+ enable_plugin
+ enable_host_shared
+ enable_libquadmath_support
+@@ -1785,6 +1786,8 @@ Optional Features:
+   --enable-version-specific-runtime-libs
+                           specify that runtime libraries should be installed
+                           in a compiler-specific directory
++  --enable-poison-system-directories
++                          warn for use of native system header directories
+   --enable-plugin         enable plugin support
+   --enable-host-shared    build host code as shared libraries
+   --disable-libquadmath-support
+@@ -31996,6 +31999,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" != "xno"; then
++
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++if test "$enable_poison_system_directories" = "error"; then
++$as_echo "#define POISON_BY_DEFAULT 1" >>confdefs.h
++fi
++
++fi
++
+ # Substitute configuration variables
+ 
+ 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index daf2a708c..6155b83a7 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -7435,6 +7435,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+                 [specify that runtime libraries should be
+                  installed in a compiler-specific directory])])
+ 
++AC_ARG_ENABLE([poison-system-directories],
++             AS_HELP_STRING([--enable-poison-system-directories],
++                            [warn for use of native system header directories (no/yes/error)]),,
++             [enable_poison_system_directories=no])
++AC_MSG_NOTICE([poisoned directories $enable_poison_system_directories])
++if test "x${enable_poison_system_directories}" != "xno"; then
++  AC_MSG_NOTICE([poisoned directories enabled])
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++           [1],
++           [Define to warn for use of native system header directories])
++  if test $enable_poison_system_directories = "error"; then
++   AC_MSG_NOTICE([poisoned directories are fatal])
++   AC_DEFINE([POISON_BY_DEFAULT], [1], [Define to make poison warnings errors])
++  fi
++fi
++
+ # Substitute configuration variables
+ AC_SUBST(subdirs)
+ AC_SUBST(srcdir)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index ff6c338be..a8ebfa59a 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -379,6 +379,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
+ -Wparentheses  -Wno-pedantic-ms-format @gol
+ -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
++-Wno-poison-system-directories @gol
+ -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
+ -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
+ -Wno-scalar-storage-order  -Wsequence-point @gol
+@@ -8029,6 +8030,14 @@ made up of data only and thus requires no special treatment.  But, for
+ most targets, it is made up of code and thus requires the stack to be
+ made executable in order for the program to work properly.
+ 
++@item -Wno-poison-system-directories
++@opindex Wno-poison-system-directories
++Do not warn for @option{-I} or @option{-L} options using system
++directories such as @file{/usr/include} when cross compiling.  This
++option is intended for use in chroot environments when such
++directories contain the correct headers and libraries for the target
++system rather than the host.
++
+ @item -Wfloat-equal
+ @opindex Wfloat-equal
+ @opindex Wno-float-equal
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index beefde7f6..4e6557b3c 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -1162,6 +1162,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
++    %{Wno-poison-system-directories:--no-poison-system-directories} \
++    %{Werror=poison-system-directories:--error-poison-system-directories} \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
+     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
+     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
+@@ -1257,8 +1259,11 @@ static const char *cpp_unique_options =
+ static const char *cpp_options =
+ "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
+  %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
+- %{!fno-working-directory:-fworking-directory}}} %{O*}\
+- %{undef} %{save-temps*:-fpch-preprocess}";
++ %{!fno-working-directory:-fworking-directory}}} %{O*}"
++#ifdef POISON_BY_DEFAULT
++ " %{!Wno-error=poison-system-directories:-Werror=poison-system-directories}"
++#endif
++ " %{undef} %{save-temps*:-fpch-preprocess}";
+ 
+ /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
+ 
+@@ -1287,7 +1292,11 @@ static const char *cc1_options =
+  %{coverage:-fprofile-arcs -ftest-coverage}\
+  %{fprofile-arcs|fprofile-generate*|coverage:\
+    %{!fprofile-update=single:\
+-     %{pthread:-fprofile-update=prefer-atomic}}}";
++     %{pthread:-fprofile-update=prefer-atomic}}}"
++#ifdef POISON_BY_DEFAULT
++ " %{!Wno-error=poison-system-directories:-Werror=poison-system-directories}"
++#endif
++  ;
+ 
+ static const char *asm_options =
+ "%{-target-help:%:print-asm-header()} "
+diff --git a/gcc/incpath.cc b/gcc/incpath.cc
+index 622204a38..5ac03c086 100644
+--- a/gcc/incpath.cc
++++ b/gcc/incpath.cc
+@@ -26,6 +26,7 @@
+ #include "intl.h"
+ #include "incpath.h"
+ #include "cppdefault.h"
++#include "diagnostic-core.h"
+ 
+ /* Microsoft Windows does not natively support inodes.
+    VMS has non-numeric inodes.  */
+@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+        }
+       fprintf (stderr, _("End of search list.\n"));
+     }
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (flag_poison_system_directories)
++    {
++       struct cpp_dir *p;
++
++       for (p = heads[INC_QUOTE]; p; p = p->next)
++         {
++          if ((!strncmp (p->name, "/usr/include", 12))
++              || (!strncmp (p->name, "/usr/local/include", 18))
++              || (!strncmp (p->name, "/usr/X11R6/include", 18))
++              || (!strncmp (p->name, "/sw/include", 11))
++              || (!strncmp (p->name, "/opt/include", 12)))
++            warning (OPT_Wpoison_system_directories,
++                     "include location \"%s\" is unsafe for "
++                     "cross-compilation",
++                     p->name);
++         }
++    }
++#endif
+ }
+ 
+ /* Use given -I paths for #include "..." but not #include <...>, and
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch
new file mode 100644
index 00000000..e83f05b8
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch
@@ -0,0 +1,134 @@
+From 34b861e7a4cfd7b1f0d2c0f8cf9bb0b0b81eb61a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:10:06 +0400
+Subject: [PATCH] 64-bit multilib hack.
+
+GCC has internal multilib handling code but it assumes a very specific rigid directory
+layout. The build system implementation of multilib layout is very generic and allows
+complete customisation of the library directories.
+
+This patch is a partial solution to allow any custom directories to be passed into gcc
+and handled correctly. It forces gcc to use the base_libdir (which is the current
+directory, "."). We need to do this for each multilib that is configured as we don't
+know which compiler options may be being passed into the compiler. Since we have a compiler
+per mulitlib at this point that isn't an issue.
+
+The one problem is the target compiler is only going to work for the default multlilib at
+this point. Ideally we'd figure out which multilibs were being enabled with which paths
+and be able to patch these entries with a complete set of correct paths but this we
+don't have such code at this point. This is something the target gcc recipe should do
+and override these platform defaults in its build config.
+
+Do same for riscv64, aarch64 & arc
+
+RP 15/8/11
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/t-aarch64-linux |  8 ++++----
+ gcc/config/arc/t-multilib-linux    |  4 ++--
+ gcc/config/i386/t-linux64          |  6 ++----
+ gcc/config/mips/t-linux64          | 10 +++-------
+ gcc/config/riscv/t-linux           |  6 ++++--
+ gcc/config/rs6000/t-linux64        |  5 ++---
+ 6 files changed, 17 insertions(+), 22 deletions(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index d0cd546002a..f4056d68372 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -21,8 +21,8 @@
+ LIB1ASMSRC   = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
+-MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
++#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
++#MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
++#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux
+index ecb9ae6859f..12a164028d4 100644
+--- a/gcc/config/arc/t-multilib-linux
++++ b/gcc/config/arc/t-multilib-linux
+@@ -16,9 +16,9 @@
+ # along with GCC; see the file COPYING3.  If not see
+ # <http://www.gnu.org/licenses/>.
+ 
+-MULTILIB_OPTIONS = mcpu=hs/mcpu=archs/mcpu=hs38/mcpu=hs38_linux/mcpu=arc700/mcpu=nps400
++#MULTILIB_OPTIONS = mcpu=hs/mcpu=archs/mcpu=hs38/mcpu=hs38_linux/mcpu=arc700/mcpu=nps400
+ 
+-MULTILIB_DIRNAMES = hs archs hs38 hs38_linux arc700 nps400
++#MULTILIB_DIRNAMES = hs archs hs38 hs38_linux arc700 nps400
+ 
+ # Aliases:
+ MULTILIB_MATCHES += mcpu?arc700=mA7
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index 5526ad0e6cc..fa51c88912b 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -32,7 +32,5 @@
+ #
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+-MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
++MULTILIB_DIRNAMES = . .
++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
+index 2fdd8e00407..04f2099250f 100644
+--- a/gcc/config/mips/t-linux64
++++ b/gcc/config/mips/t-linux64
+@@ -17,10 +17,6 @@
+ # <http://www.gnu.org/licenses/>.
+ 
+ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+-MULTILIB_DIRNAMES = n32 32 64
+-MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
+-MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
+-MULTILIB_OSDIRNAMES = \
+-       ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
+-       ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+-       ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
++MULTILIB_DIRNAMES = . . .
++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
++
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..e4d817621fc 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,5 @@
+ # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
+-MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_DIRNAMES := . .
++#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
+index 47e0efd5764..05f5a3f188e 100644
+--- a/gcc/config/rs6000/t-linux64
++++ b/gcc/config/rs6000/t-linux64
+@@ -26,10 +26,9 @@
+ # MULTILIB_OSDIRNAMES according to what is found on the target.
+ 
+ MULTILIB_OPTIONS    := m64/m32
+-MULTILIB_DIRNAMES   := 64 32
++MULTILIB_DIRNAMES   := . .
+ MULTILIB_EXTRA_OPTS := 
+-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
++MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+ 
+ rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc
+        $(COMPILE) $<
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch
new file mode 100644
index 00000000..e8f21634
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch
@@ -0,0 +1,64 @@
+From 7f40f8321fb999e9b34d948724517d3fb0d26820 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Thu, 28 Oct 2021 11:33:40 +0100
+Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these
+ errors.
+
+If CXXFLAGS contains something unsupported by the build CXX, we see build failures (e.g. using -fmacro-prefix-map for the target).
+
+2021-10-28 Richard Purdie <richard.purdie@linuxfoundation.org>
+
+ChangeLog:
+
+    * Makefile.in: Regenerate.
+    * Makefile.tpl: Add missing CXXFLAGS_FOR_BUILD overrides
+
+Upstream-Status: Pending [should be submittable]
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in  | 2 ++
+ Makefile.tpl | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 593495e1650..1d9c83cc566 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -176,6 +176,7 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+        CFLAGS="$(CFLAGS_FOR_BUILD)" \
++       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
+        LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+@@ -207,6 +208,7 @@ HOST_EXPORTS = \
+        CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \
+        CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \
+        CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \
++       CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \
+        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+        DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \
+        LD="$(LD)"; export LD; \
+diff --git a/Makefile.tpl b/Makefile.tpl
+index ef58fac2b9a..bab04f335c2 100644
+--- a/Makefile.tpl
++++ b/Makefile.tpl
+@@ -179,6 +179,7 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+        CFLAGS="$(CFLAGS_FOR_BUILD)" \
++       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
+        LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+@@ -210,6 +211,7 @@ HOST_EXPORTS = \
+        CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \
+        CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \
+        CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \
++       CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \
+        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+        DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \
+        LD="$(LD)"; export LD; \
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
new file mode 100644
index 00000000..e34eb2cf
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -0,0 +1,92 @@
+From 5455fc1de74897a27c1199dc5611ec02243e24af Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:17:25 +0400
+Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}
+
+Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
+the source can be shared between gcc-cross-initial,
+gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+While compiling gcc-crosssdk-initial-x86_64 on some host, there is
+occasionally failure that test the existance of default.h doesn't
+work, the reason is tm_include_list='** defaults.h' rather than
+tm_include_list='** ./defaults.h'
+
+So we add the test condition for this situation.
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ gcc/Makefile.in  | 2 +-
+ gcc/configure    | 4 ++--
+ gcc/configure.ac | 4 ++--
+ gcc/mkconfig.sh  | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 31ff95500c9..a8277254696 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -553,7 +553,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
+ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
+ 
+ xmake_file=@xmake_file@
+-tmake_file=@tmake_file@
++tmake_file=@tmake_file@ ./t-oe
+ TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
+ TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
+ TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
+diff --git a/gcc/configure b/gcc/configure
+index dc2d59701ad..3fc0e2f5813 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -13381,8 +13381,8 @@ for f in $tm_file; do
+        tm_include_list="${tm_include_list} $f"
+        ;;
+     defaults.h )
+-       tm_file_list="${tm_file_list} \$(srcdir)/$f"
+-       tm_include_list="${tm_include_list} $f"
++       tm_file_list="${tm_file_list} ./$f"
++       tm_include_list="${tm_include_list} ./$f"
+        ;;
+     * )
+        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 36ce78924de..46de496b256 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -2332,8 +2332,8 @@ for f in $tm_file; do
+        tm_include_list="${tm_include_list} $f"
+        ;;
+     defaults.h )
+-       tm_file_list="${tm_file_list} \$(srcdir)/$f"
+-       tm_include_list="${tm_include_list} $f"
++       tm_file_list="${tm_file_list} ./$f"
++       tm_include_list="${tm_include_list} ./$f"
+        ;;
+     * )
+        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
+index 91cc43f69ff..8de33713cd8 100644
+--- a/gcc/mkconfig.sh
++++ b/gcc/mkconfig.sh
+@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
+     if [ $# -ge 1 ]; then
+        echo '#ifdef IN_GCC' >> ${output}T
+        for file in "$@"; do
+-           if test x"$file" = x"defaults.h"; then
++           if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then
+                postpone_defaults_h="yes"
+            else
+                echo "# include \"$file\"" >> ${output}T
+@@ -106,7 +106,7 @@ esac
+ 
+ # If we postponed including defaults.h, add the #include now.
+ if test x"$postpone_defaults_h" = x"yes"; then
+-    echo "# include \"defaults.h\"" >> ${output}T
++    echo "# include \"./defaults.h\"" >> ${output}T
+ fi
+ 
+ # Add multiple inclusion protection guard, part two.
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch
new file mode 100644
index 00000000..b08aecc7
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch
@@ -0,0 +1,53 @@
+From abc3b82ab24169277f2090e9df1ceac3573142be Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:22:00 +0400
+Subject: [PATCH] cpp: honor sysroot.
+
+Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
+preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
+rather than the --sysroot option specified on the commandline. If access to that directory is
+permission denied (unreadable), gcc will error.
+
+This happens when ccache is in use due to the fact it uses preprocessed source files.
+
+The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix,
+-isystem, -isysroot happen and the correct sysroot is used.
+
+[YOCTO #2074]
+
+RP 2012/04/13
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ gcc/cp/lang-specs.h | 2 +-
+ gcc/gcc.cc          | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
+index f35c9fab76b..19ddc98ce7f 100644
+--- a/gcc/cp/lang-specs.h
++++ b/gcc/cp/lang-specs.h
+@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3.  If not see
+   {".ii", "@c++-cpp-output", 0, 0, 0},
+   {"@c++-cpp-output",
+       "%{!E:%{!M:%{!MM:"
+-      "  cc1plus -fpreprocessed %i %(cc1_options) %2"
++      "  cc1plus -fpreprocessed %i %I %(cc1_options) %2"
+       "  %{!fsyntax-only:"
+       "    %{fmodule-only:%{!S:-o %g.s%V}}"
+       "    %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index ce161d3c853..aa4cf92fb78 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -1476,7 +1476,7 @@ static const struct compiler default_compilers[] =
+                                           %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
+   {".i", "@cpp-output", 0, 0, 0},
+   {"@cpp-output",
+-   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
++   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+   {".s", "@assembler", 0, 0, 0},
+   {"@assembler",
+    "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
new file mode 100644
index 00000000..b59eed57
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -0,0 +1,403 @@
+From 4de00af67b57b5440bdf61ab364ad959ad0aeee7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:24:50 +0400
+Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
+ relative to SYSTEMLIBS_DIR
+
+This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
+relative to SYSTEMLIBS_DIR which can be set in generated headers
+This breaks the assumption of hardcoded multilib in gcc
+Change is only for the supported architectures in OE including
+SH, sparc, alpha for possible future support (if any)
+
+Removes the do_headerfix task in metadata
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [OE configuration]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/aarch64-linux.h |  4 ++--
+ gcc/config/alpha/linux-elf.h       |  4 ++--
+ gcc/config/arm/linux-eabi.h        |  6 +++---
+ gcc/config/arm/linux-elf.h         |  2 +-
+ gcc/config/i386/linux.h            |  4 ++--
+ gcc/config/i386/linux64.h          | 12 ++++++------
+ gcc/config/linux.h                 |  8 ++++----
+ gcc/config/loongarch/gnu-user.h    |  4 ++--
+ gcc/config/microblaze/linux.h      |  4 ++--
+ gcc/config/mips/linux.h            | 18 +++++++++---------
+ gcc/config/nios2/linux.h           |  4 ++--
+ gcc/config/riscv/linux.h           |  4 ++--
+ gcc/config/rs6000/linux64.h        | 15 +++++----------
+ gcc/config/rs6000/sysv4.h          |  4 ++--
+ gcc/config/s390/linux.h            |  8 ++++----
+ gcc/config/sh/linux.h              |  4 ++--
+ gcc/config/sparc/linux.h           |  2 +-
+ gcc/config/sparc/linux64.h         |  4 ++--
+ 18 files changed, 53 insertions(+), 58 deletions(-)
+
+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index 5e4553d79f5..877e8841eb2 100644
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -21,10 +21,10 @@
+ #ifndef GCC_AARCH64_LINUX_H
+ #define GCC_AARCH64_LINUX_H
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define GLIBC_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define MUSL_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
+ #undef  ASAN_CC1_SPEC
+ #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
+diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
+index 17f16a55910..0a7be38fa63 100644
+--- a/gcc/config/alpha/linux-elf.h
++++ b/gcc/config/alpha/linux-elf.h
+@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3.  If not see
+ #define EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+ 
+-#define GLIBC_DYNAMIC_LINKER   "/lib/ld-linux.so.2"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER   SYSTEMLIBS_DIR "ld-linux.so.2"
++#define UCLIBC_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-uClibc.so.0"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
+index 50cc0bc6d08..17c18b27145 100644
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -65,8 +65,8 @@
+    GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
+ 
+ #undef  GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
+-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3"
+ #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
+ 
+ #define GLIBC_DYNAMIC_LINKER \
+@@ -89,7 +89,7 @@
+ #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
+ #endif
+ #define MUSL_DYNAMIC_LINKER \
+-  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1"
+ 
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index df3da67c4f0..37456e9d5a4 100644
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+ 
+ #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
+    %{static:-Bstatic} \
+diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
+index 5d99ee56d5b..a76022c9ccc 100644
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1"
+diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
+index 8681e36f10d..ddce49b6b60 100644
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
+ #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-i386.so.1"
+ #undef MUSL_DYNAMIC_LINKER64
+-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1"
+ #undef MUSL_DYNAMIC_LINKERX32
+-#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
++#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 74f70793d90..4ce173384ef 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -99,10 +99,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
+    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
+    supporting both 32-bit and 64-bit compilation.  */
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
+ #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
+ #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
+diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h
+index 664dc9206ad..082bd7cfc6f 100644
+--- a/gcc/config/loongarch/gnu-user.h
++++ b/gcc/config/loongarch/gnu-user.h
+@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #undef GLIBC_DYNAMIC_LINKER
+ #define GLIBC_DYNAMIC_LINKER \
+-  "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1"
++  SYSTEMLIBS_DIR "ld-linux-loongarch-" ABI_SPEC ".so.1"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER \
+-  "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1"
++  SYSTEMLIBS_DIR "ld-musl-loongarch-" ABI_SPEC ".so.1"
+ 
+ #undef GNU_USER_TARGET_LINK_SPEC
+ #define GNU_USER_TARGET_LINK_SPEC \
+diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h
+index 5b1a365eda4..2e63df1ae9c 100644
+--- a/gcc/config/microblaze/linux.h
++++ b/gcc/config/microblaze/linux.h
+@@ -28,7 +28,7 @@
+ #undef TLS_NEEDS_GOT
+ #define TLS_NEEDS_GOT 1
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+ 
+ #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
+ 
+ #undef  SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
+index 230b7789bb8..d96d134bfcf 100644
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -22,29 +22,29 @@ along with GCC; see the file COPYING3.  If not see
+ #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 \
+-  "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
+ #define GLIBC_DYNAMIC_LINKER64 \
+-  "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
+ #define GLIBC_DYNAMIC_LINKERN32 \
+-  "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
+ 
+ #undef UCLIBC_DYNAMIC_LINKER32
+ #define UCLIBC_DYNAMIC_LINKER32 \
+-  "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}"
+ #undef UCLIBC_DYNAMIC_LINKER64
+ #define UCLIBC_DYNAMIC_LINKER64 \
+-  "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld64-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld64-uClibc.so.0}"
+ #define UCLIBC_DYNAMIC_LINKERN32 \
+-  "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}"
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+ #define MUSL_DYNAMIC_LINKER32 \
+-  "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1"
+ #undef MUSL_DYNAMIC_LINKER64
+ #define MUSL_DYNAMIC_LINKER64 \
+-  "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1"
+ #define MUSL_DYNAMIC_LINKERN32 \
+-  "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1"
+ 
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
+ #define GNU_USER_DYNAMIC_LINKERN32 \
+diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h
+index f5dd813acad..7a13e1c9799 100644
+--- a/gcc/config/nios2/linux.h
++++ b/gcc/config/nios2/linux.h
+@@ -29,8 +29,8 @@
+ #undef CPP_SPEC
+ #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1"
+-#define MUSL_DYNAMIC_LINKER  "/lib/ld-musl-nios2.so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-nios2.so.1"
++#define MUSL_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-musl-nios2.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC LINK_SPEC_ENDIAN \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 38803723ba9..d5ef8a96a19 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
+     GNU_USER_TARGET_OS_CPP_BUILTINS();                         \
+   } while (0)
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
+ 
+ #define MUSL_ABI_SUFFIX \
+   "%{mabi=ilp32:-sf}" \
+@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3.  If not see
+   "%{mabi=lp64d:}"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1"
++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1"
+ 
+ /* Because RISC-V only has word-sized atomics, it requries libatomic where
+    others do not.  So link libatomic by default, as needed.  */
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index b2a7afabc73..364c1a5b155 100644
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -339,24 +339,19 @@ extern int dot_symbols;
+ #undef LINK_OS_DEFAULT_SPEC
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
+-
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1"
+ #ifdef LINUX64_DEFAULT_ABI_ELFv2
+-#define GLIBC_DYNAMIC_LINKER64 \
+-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
+-":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
++#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:" SYSTEMLIBS_DIR "ld64.so.1;:" SYSTEMLIBS_DIR "ld64.so.2}"
+ #else
+-#define GLIBC_DYNAMIC_LINKER64 \
+-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
+-":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
++#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:" SYSTEMLIBS_DIR "ld64.so.2;:" SYSTEMLIBS_DIR "ld64.so.1}"
+ #endif
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+ #define MUSL_DYNAMIC_LINKER32 \
+-  "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ #undef MUSL_DYNAMIC_LINKER64
+ #define MUSL_DYNAMIC_LINKER64 \
+-  "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ 
+ #undef  DEFAULT_ASM_ENDIAN
+ #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index 7e2519de5d4..a73954d9de5 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -779,10 +779,10 @@ GNU_USER_TARGET_CC1_SPEC
+ 
+ #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1"
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER \
+-  "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ 
+ #ifndef GNU_USER_DYNAMIC_LINKER
+ #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index d7b7e7a7b02..0139b4d06ca 100644
+--- a/gcc/config/s390/linux.h
++++ b/gcc/config/s390/linux.h
+@@ -72,13 +72,13 @@ along with GCC; see the file COPYING3.  If not see
+ #define MULTILIB_DEFAULTS { "m31" }
+ #endif
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64.so.1"
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1"
++#define MUSL_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-musl-s390.so.1"
+ #undef MUSL_DYNAMIC_LINKER64
+-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
++#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-s390x.so.1"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
+index d96d077c99e..7d27f9893ee 100644
+--- a/gcc/config/sh/linux.h
++++ b/gcc/config/sh/linux.h
+@@ -61,10 +61,10 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER \
+-  "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
++  SYSTEMLIBS_DIR "ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
+   "%{mfdpic:-fdpic}.so.1"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
+diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
+index 6a809e9092d..60603765ad6 100644
+--- a/gcc/config/sparc/linux.h
++++ b/gcc/config/sparc/linux.h
+@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
+diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
+index d08a2ef96fe..e6955da0a5b 100644
+--- a/gcc/config/sparc/linux64.h
++++ b/gcc/config/sparc/linux64.h
+@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3.  If not see
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #ifdef SPARC_BI_ARCH
+ 
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0008-libtool.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0008-libtool.patch
new file mode 100644
index 00000000..c9bc38cc
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0008-libtool.patch
@@ -0,0 +1,39 @@
+From 5117519c1897a49b09fe7fff213b9c2ea15d37f5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:29:11 +0400
+Subject: [PATCH] libtool
+
+libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64
+when running on am x86_64 build host.
+
+This patch stops this speading to libdir in the libstdc++.la file within libtool.
+Arguably, it shouldn't be passing this into libtool in the first place but
+for now this resolves the nastiest problems this causes.
+
+func_normal_abspath would resolve an empty path to `pwd` so we need
+to filter the zero case.
+
+RP 2012/8/24
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ ltmain.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 70990740b6c..ee938056bef 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -6359,6 +6359,10 @@ func_mode_link ()
+        func_warning "ignoring multiple \`-rpath's for a libtool library"
+ 
+       install_libdir="$1"
++      if test -n "$install_libdir"; then
++       func_normal_abspath "$install_libdir"
++       install_libdir=$func_normal_abspath_result
++      fi
+ 
+       oldlibs=
+       if test -z "$rpath"; then
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
new file mode 100644
index 00000000..dd67b115
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -0,0 +1,40 @@
+From 32129f9682d0d27fc67af10f077ad2768935cbe6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:30:32 +0400
+Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI.
+
+The LINK_SPEC for linux gets overwritten by linux-eabi.h which
+means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result
+the option is not passed to linker when chosing march=armv4
+This patch redefines this in linux-eabi.h and reinserts it
+for eabi defaulting toolchains.
+
+We might want to send it upstream.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ gcc/config/arm/linux-eabi.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
+index 17c18b27145..8eacb099317 100644
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -91,10 +91,14 @@
+ #define MUSL_DYNAMIC_LINKER \
+   SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1"
+ 
++/* For armv4 we pass --fix-v4bx to linker to support EABI */
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC EABI_LINK_SPEC                                       \
++#define LINK_SPEC TARGET_FIX_V4BX_SPEC EABI_LINK_SPEC                  \
+   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,                         \
+                       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
+ 
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch
new file mode 100644
index 00000000..45edc62e
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -0,0 +1,99 @@
+From bf85b8bbcb4b77725d4c22c1bb25a29f6ff21038 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:33:04 +0400
+Subject: [PATCH] Use the multilib config files from ${B} instead of using the
+ ones from ${S}
+
+Use the multilib config files from ${B} instead of using the ones from ${S}
+so that the source can be shared between gcc-cross-initial,
+gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+---
+ gcc/configure    | 22 ++++++++++++++++++----
+ gcc/configure.ac | 22 ++++++++++++++++++----
+ 2 files changed, 36 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index 3fc0e2f5813..2f0f0e057a9 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -13361,10 +13361,20 @@ done
+ tmake_file_=
+ for f in ${tmake_file}
+ do
+-       if test -f ${srcdir}/config/$f
+-       then
+-               tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
+-       fi
++  case $f in
++    */t-linux64 )
++       if test -f ./config/$f
++       then
++         tmake_file_="${tmake_file_} ./config/$f"
++       fi
++       ;;
++    * )
++       if test -f ${srcdir}/config/$f
++       then
++         tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
++       fi
++       ;;
++  esac
+ done
+ tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
+ 
+@@ -13375,6 +13385,10 @@ tm_file_list="options.h"
+ tm_include_list="options.h insn-constants.h"
+ for f in $tm_file; do
+   case $f in
++    */linux64.h )
++       tm_file_list="${tm_file_list} ./config/$f"
++       tm_include_list="${tm_include_list} ./config/$f"
++       ;;
+     ./* )
+        f=`echo $f | sed 's/^..//'`
+        tm_file_list="${tm_file_list} $f"
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 46de496b256..6155b83a732 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -2312,10 +2312,20 @@ done
+ tmake_file_=
+ for f in ${tmake_file}
+ do
+-       if test -f ${srcdir}/config/$f
+-       then
+-               tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
+-       fi
++  case $f in
++    */t-linux64 )
++       if test -f ./config/$f
++       then
++         tmake_file_="${tmake_file_} ./config/$f"
++       fi
++       ;;
++    * )
++       if test -f ${srcdir}/config/$f
++       then
++         tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
++       fi
++       ;;
++  esac
+ done
+ tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
+ 
+@@ -2326,6 +2336,10 @@ tm_file_list="options.h"
+ tm_include_list="options.h insn-constants.h"
+ for f in $tm_file; do
+   case $f in
++    */linux64.h )
++       tm_file_list="${tm_file_list} ./config/$f"
++       tm_include_list="${tm_include_list} ./config/$f"
++       ;;
+     ./* )
+        f=`echo $f | sed 's/^..//'`
+        tm_file_list="${tm_file_list} $f"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
new file mode 100644
index 00000000..352c6eec
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -0,0 +1,28 @@
+From e5463727ff028cee5e452da38f5b4c44d52e412e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Feb 2015 09:39:38 +0000
+Subject: [PATCH] Avoid using libdir from .la which usually points to a host
+ path
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ltmain.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index ee938056bef..9ebc7e3d1e0 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5628,6 +5628,9 @@ func_mode_link ()
+            absdir="$abs_ladir"
+            libdir="$abs_ladir"
+          else
++           # Instead of using libdir from .la which usually points to a host path,
++           # use the path the .la is contained in.
++           libdir="$abs_ladir"
+            dir="$libdir"
+            absdir="$libdir"
+          fi
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch
new file mode 100644
index 00000000..f52e21ed
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch
@@ -0,0 +1,55 @@
+From 710d1325474e708e6b34eebe09f3f130420af293 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 31 Jan 2023 22:03:38 -0800
+Subject: [PATCH] aarch64: Fix include paths when S != B
+
+aarch64.h gets copied into build directory when built out of tree, in
+this case build uses this file but does not find the includes inside it
+since they are not found in any of include paths specified in compiler
+cmdline.
+
+Fixes build errors like
+
+% g++ -c   -isystem/mnt/b/yoe/master/build/tmp/work/x86_64-linux/gcc-cross-aarch64/13.0.1-r0/recipe-sysroot-native/usr/include -O2 -pipe   -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE   -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Wconditionally-supported -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings   -DHAVE_CONFIG_H  -DGENERATOR_FILE -I. -Ibuild -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/build -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/../include  -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/../libcpp/include -o build/gencheck.o ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc
+In file included from ./tm.h:34,
+                 from ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc:23:
+./config/aarch64/aarch64.h:164:10: fatal error: aarch64-option-extensions.def: No such file or directory
+  164 | #include "aarch64-option-extensions.def"
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+compilation terminated.
+
+See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105144
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/aarch64.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
+index 155cace6afe..07d68958908 100644
+--- a/gcc/config/aarch64/aarch64.h
++++ b/gcc/config/aarch64/aarch64.h
+@@ -161,8 +161,8 @@
+ enum class aarch64_feature : unsigned char {
+ #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT,
+ #define AARCH64_ARCH(A, B, IDENT, D, E) IDENT,
+-#include "aarch64-option-extensions.def"
+-#include "aarch64-arches.def"
++#include "config/aarch64/aarch64-option-extensions.def"
++#include "config/aarch64/aarch64-arches.def"
+ };
+ 
+ /* Define unique flags for each of the above.  */
+@@ -171,8 +171,8 @@ enum class aarch64_feature : unsigned char {
+     = aarch64_feature_flags (1) << int (aarch64_feature::IDENT);
+ #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT)
+ #define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT)
+-#include "aarch64-option-extensions.def"
+-#include "aarch64-arches.def"
++#include "config/aarch64/aarch64-option-extensions.def"
++#include "config/aarch64/aarch64-arches.def"
+ #undef HANDLE
+ 
+ #endif
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
new file mode 100644
index 00000000..b05be59c
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -0,0 +1,28 @@
+From e8e8a0ab572cfceb9758f99599c0db4c962e49c0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Feb 2015 09:39:38 +0000
+Subject: [PATCH] Avoid using libdir from .la which usually points to a host
+ path
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ltmain.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index ee938056bef..9ebc7e3d1e0 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5628,6 +5628,9 @@ func_mode_link ()
+            absdir="$abs_ladir"
+            libdir="$abs_ladir"
+          else
++           # Instead of using libdir from .la which usually points to a host path,
++           # use the path the .la is contained in.
++           libdir="$abs_ladir"
+            dir="$libdir"
+            absdir="$libdir"
+          fi
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch
new file mode 100644
index 00000000..61e61ecc
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch
@@ -0,0 +1,113 @@
+From 612801d426e75ff997cfabda380dbe52c2cbc532 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Feb 2015 10:25:11 +0000
+Subject: [PATCH] Ensure target gcc headers can be included
+
+There are a few headers installed as part of the OpenEmbedded
+gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe
+built for the target architecture, these are within the target
+sysroot and not cross/nativesdk; thus they weren't able to be
+found by gcc with the existing search paths. Add support for
+picking up these headers under the sysroot supplied on the gcc
+command line in order to resolve this.
+
+Extend target gcc headers search to musl too
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/Makefile.in           | 2 ++
+ gcc/config/linux.h        | 8 ++++++++
+ gcc/config/rs6000/sysv4.h | 8 ++++++++
+ gcc/cppdefault.cc         | 4 ++++
+ 4 files changed, 22 insertions(+)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index a8277254696..07fa63b6640 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -632,6 +632,7 @@ libexecdir = @libexecdir@
+ 
+ # Directory in which the compiler finds libraries etc.
+ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
++libsubdir_target = $(target_noncanonical)/$(version)
+ # Directory in which the compiler finds executables
+ libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
+ # Directory in which all plugin resources are installed
+@@ -3024,6 +3025,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
+ 
+ PREPROCESSOR_DEFINES = \
+   -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
++  -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \
+   -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
+   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+   -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 4ce173384ef..8a3cd4f2d34 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -170,6 +170,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define INCLUDE_DEFAULTS_MUSL_TOOL
+ #endif
+ 
++#ifdef GCC_INCLUDE_SUBDIR_TARGET
++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET            \
++    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET
++#endif
++
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE                   \
+     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },       \
+@@ -196,6 +203,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+     INCLUDE_DEFAULTS_MUSL_PREFIX                       \
+     INCLUDE_DEFAULTS_MUSL_CROSS                                \
+     INCLUDE_DEFAULTS_MUSL_TOOL                         \
++    INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET                        \
+     INCLUDE_DEFAULTS_MUSL_NATIVE                       \
+     { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },            \
+     { 0, 0, 0, 0, 0, 0 }                               \
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index a73954d9de5..e5dd6538358 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -994,6 +994,13 @@ ncrtn.o%s"
+ #define INCLUDE_DEFAULTS_MUSL_TOOL
+ #endif
+ 
++#ifdef GCC_INCLUDE_SUBDIR_TARGET
++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET            \
++    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET
++#endif
++
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE                   \
+     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },       \
+@@ -1020,6 +1027,7 @@ ncrtn.o%s"
+     INCLUDE_DEFAULTS_MUSL_PREFIX                       \
+     INCLUDE_DEFAULTS_MUSL_CROSS                                \
+     INCLUDE_DEFAULTS_MUSL_TOOL                         \
++    INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET                        \
+     INCLUDE_DEFAULTS_MUSL_NATIVE                       \
+     { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },            \
+     { 0, 0, 0, 0, 0, 0 }                               \
+diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc
+index 7888300f277..52cf14e92f8 100644
+--- a/gcc/cppdefault.cc
++++ b/gcc/cppdefault.cc
+@@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[]
+     /* This is the dir for gcc's private headers.  */
+     { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
+ #endif
++#ifdef GCC_INCLUDE_SUBDIR_TARGET
++    /* This is the dir for gcc's private headers under the specified sysroot.  */
++    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 },
++#endif
+ #ifdef LOCAL_INCLUDE_DIR
+     /* /usr/local/include comes before the fixincluded header files.  */
+     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch
new file mode 100644
index 00000000..94308b2a
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -0,0 +1,35 @@
+From 9ae49e7b88c208ab79ec9c2fc4a2fa8a3f1e85bb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 3 Mar 2015 08:21:19 +0000
+Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix
+ is provided
+
+http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html
+
+Upstream-Status: Submitted
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ltmain.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 9ebc7e3d1e0..7ea79fa8be6 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -6004,12 +6004,13 @@ func_mode_link ()
+              fi
+            else
+              # We cannot seem to hardcode it, guess we'll fake it.
++             # Default if $libdir is not relative to the prefix:
+              add_dir="-L$libdir"
+-             # Try looking first in the location we're being installed to.
++
+              if test -n "$inst_prefix_dir"; then
+                case $libdir in
+                  [\\/]*)
+-                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
++                   add_dir="-L$inst_prefix_dir$libdir"
+                    ;;
+                esac
+              fi
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch
new file mode 100644
index 00000000..ce9635ce
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -0,0 +1,51 @@
+From bf918db7117f41d3c04162095641165ca241707d Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sun, 5 Jul 2015 20:25:18 -0700
+Subject: [PATCH] libcc1: fix libcc1's install path and rpath
+
+* Install libcc1.so and libcc1plugin.so into
+  $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
+  had done to lto-plugin.
+* Fix bad RPATH iussue:
+  gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file
+ /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0
+ [rpaths]
+
+Upstream-Status: Inappropriate [OE configuration]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ libcc1/Makefile.am | 4 ++--
+ libcc1/Makefile.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
+index 6e3a34ff7e2..3f3f6391aba 100644
+--- a/libcc1/Makefile.am
++++ b/libcc1/Makefile.am
+@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
+            $(Wc)$(libiberty_normal)))
+ libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
+ 
+-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
+-cc1libdir = $(libdir)/$(libsuffix)
++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++plugindir = $(cc1libdir)
+ 
+ if ENABLE_PLUGIN
+ plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
+diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
+index f8f590d71e9..56462492045 100644
+--- a/libcc1/Makefile.in
++++ b/libcc1/Makefile.in
+@@ -396,8 +396,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
+            $(Wc)$(libiberty_normal)))
+ 
+ libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
+-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
+-cc1libdir = $(libdir)/$(libsuffix)
++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++plugindir = $(cc1libdir)
+ @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
+ @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
+ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch
new file mode 100644
index 00000000..3b547195
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -0,0 +1,510 @@
+From 4fbbd40d7db89cdbeaf93df1e1da692b1f80a5bc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:39:54 +0000
+Subject: [PATCH] handle sysroot support for nativesdk-gcc
+
+Being able to build a nativesdk gcc is useful, particularly in cases
+where the host compiler may be of an incompatible version (or a 32
+bit compiler is needed).
+
+Sadly, building nativesdk-gcc is not straight forward. We install
+nativesdk-gcc into a relocatable location and this means that its
+library locations can change. "Normal" sysroot support doesn't help
+in this case since the values of paths like "libdir" change, not just
+base root directory of the system.
+
+In order to handle this we do two things:
+
+a) Add %r into spec file markup which can be used for injected paths
+   such as SYSTEMLIBS_DIR (see gcc_multilib_setup()).
+b) Add other paths which need relocation into a .gccrelocprefix section
+   which the relocation code will notice and adjust automatically.
+
+Upstream-Status: Inappropriate
+RP 2015/7/28
+
+Extend the gccrelocprefix support to musl config too, this ensures
+that gcc will get right bits in SDK installations
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Added PREFIXVAR and EXEC_PREFIXVAR to support runtime relocation.  Without
+these as part of the gccrelocprefix the system can't do runtime relocation
+if the executable is moved.  (These paths were missed in the original
+implementation.)
+
+Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+---
+ gcc/c-family/c-opts.cc    |  4 +--
+ gcc/config/linux.h        | 24 +++++++--------
+ gcc/config/rs6000/sysv4.h | 24 +++++++--------
+ gcc/cppdefault.cc         | 63 ++++++++++++++++++++++++---------------
+ gcc/cppdefault.h          | 13 ++++----
+ gcc/gcc.cc                | 20 +++++++++----
+ gcc/incpath.cc            | 12 ++++----
+ gcc/prefix.cc             |  6 ++--
+ 8 files changed, 94 insertions(+), 72 deletions(-)
+
+diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc
+index a341a061758..83b0bef4dbb 100644
+--- a/gcc/c-family/c-opts.cc
++++ b/gcc/c-family/c-opts.cc
+@@ -1458,8 +1458,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain)
+   size_t prefix_len, suffix_len;
+ 
+   suffix_len = strlen (suffix);
+-  prefix     = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR;
+-  prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len;
++  prefix     = iprefix ? iprefix : GCC_INCLUDE_DIRVAR;
++  prefix_len = iprefix ? strlen (iprefix) : strlen(GCC_INCLUDE_DIRVAR) - 7;
+ 
+   path = (char *) xmalloc (prefix_len + suffix_len + 1);
+   memcpy (path, prefix, prefix_len);
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 8a3cd4f2d34..58143dff731 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -134,53 +134,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+  * Unfortunately, this is mostly duplicated from cppdefault.cc */
+ #if DEFAULT_LIBC == LIBC_MUSL
+ #define INCLUDE_DEFAULTS_MUSL_GPP                      \
+-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,              \
++    { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1,           \
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },          \
+-    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,         \
++    { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1,      \
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },          \
+-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,     \
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1,  \
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
+ 
+ #ifdef LOCAL_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_LOCAL                    \
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },              \
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 },           \
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 },
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_LOCAL
+ #endif
+ 
+ #ifdef PREFIX_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_PREFIX                   \
+-    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++    { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_PREFIX
+ #endif
+ 
+ #ifdef CROSS_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_CROSS                    \
+-    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++    { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_CROSS
+ #endif
+ 
+ #ifdef TOOL_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_TOOL                     \
+-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++    { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_TOOL
+ #endif
+ 
+ #ifdef GCC_INCLUDE_SUBDIR_TARGET
+ #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET            \
+-    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0},
++    { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET
+ #endif
+ 
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE                   \
+-    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },       \
+-    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++    { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 2 },    \
++    { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 0 },
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE
+ #endif
+@@ -205,7 +205,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+     INCLUDE_DEFAULTS_MUSL_TOOL                         \
+     INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET                        \
+     INCLUDE_DEFAULTS_MUSL_NATIVE                       \
+-    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },            \
++    { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 },         \
+     { 0, 0, 0, 0, 0, 0 }                               \
+   }
+ #endif
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index e5dd6538358..b496849b792 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -958,53 +958,53 @@ ncrtn.o%s"
+ /* Include order changes for musl, same as in generic linux.h.  */
+ #if DEFAULT_LIBC == LIBC_MUSL
+ #define INCLUDE_DEFAULTS_MUSL_GPP                      \
+-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,              \
++    { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1,           \
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },          \
+-    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,         \
++    { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1,      \
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },          \
+-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,     \
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1,  \
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
+ 
+ #ifdef LOCAL_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_LOCAL                    \
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },              \
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 },           \
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 },
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_LOCAL
+ #endif
+ 
+ #ifdef PREFIX_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_PREFIX                   \
+-    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++    { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_PREFIX
+ #endif
+ 
+ #ifdef CROSS_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_CROSS                    \
+-    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++    { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_CROSS
+ #endif
+ 
+ #ifdef TOOL_INCLUDE_DIR
+ #define INCLUDE_DEFAULTS_MUSL_TOOL                     \
+-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++    { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_TOOL
+ #endif
+ 
+ #ifdef GCC_INCLUDE_SUBDIR_TARGET
+ #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET            \
+-    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0},
++    { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0},
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET
+ #endif
+ 
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE                   \
+-    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },       \
+-    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++    { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 2 },    \
++    { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 0 },
+ #else
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE
+ #endif
+@@ -1029,7 +1029,7 @@ ncrtn.o%s"
+     INCLUDE_DEFAULTS_MUSL_TOOL                         \
+     INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET                        \
+     INCLUDE_DEFAULTS_MUSL_NATIVE                       \
+-    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },            \
++    { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 },         \
+     { 0, 0, 0, 0, 0, 0 }                               \
+   }
+ #endif
+diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc
+index 52cf14e92f8..d8977afc05e 100644
+--- a/gcc/cppdefault.cc
++++ b/gcc/cppdefault.cc
+@@ -35,6 +35,30 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+ 
++static char GPLUSPLUS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_INCLUDE_DIR;
++char GCC_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GCC_INCLUDE_DIR;
++static char GPLUSPLUS_TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_TOOL_INCLUDE_DIR;
++static char GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_BACKWARD_INCLUDE_DIR;
++static char STANDARD_STARTFILE_PREFIX_2VAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET;
++#ifdef LOCAL_INCLUDE_DIR
++static char LOCAL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = LOCAL_INCLUDE_DIR;
++#endif
++#ifdef PREFIX_INCLUDE_DIR
++static char PREFIX_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX_INCLUDE_DIR;
++#endif
++#ifdef FIXED_INCLUDE_DIR
++static char FIXED_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = FIXED_INCLUDE_DIR;
++#endif
++#ifdef CROSS_INCLUDE_DIR
++static char CROSS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = CROSS_INCLUDE_DIR;
++#endif
++#ifdef TOOL_INCLUDE_DIR
++static char TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = TOOL_INCLUDE_DIR;
++#endif
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++static char NATIVE_SYSTEM_HEADER_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = NATIVE_SYSTEM_HEADER_DIR;
++#endif
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+@@ -42,17 +66,17 @@ const struct default_include cpp_include_defaults[]
+ = {
+ #ifdef GPLUSPLUS_INCLUDE_DIR
+     /* Pick up GNU C++ generic include files.  */
+-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,
++    { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1,
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
+ #endif
+ #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
+     /* Pick up GNU C++ target-dependent include files.  */
+-    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,
++    { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1,
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },
+ #endif
+ #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
+     /* Pick up GNU C++ backward and deprecated include files.  */
+-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1,
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
+ #endif
+ #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR
+@@ -62,23 +86,23 @@ const struct default_include cpp_include_defaults[]
+ #endif
+ #ifdef GCC_INCLUDE_DIR
+     /* This is the dir for gcc's private headers.  */
+-    { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
++    { GCC_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 },
+ #endif
+ #ifdef GCC_INCLUDE_SUBDIR_TARGET
+     /* This is the dir for gcc's private headers under the specified sysroot.  */
+-    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 },
++    { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0 },
+ #endif
+ #ifdef LOCAL_INCLUDE_DIR
+     /* /usr/local/include comes before the fixincluded header files.  */
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 },
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 },
+ #endif
+ #ifdef PREFIX_INCLUDE_DIR
+-    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 },
++    { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0 },
+ #endif
+ #ifdef FIXED_INCLUDE_DIR
+     /* This is the dir for fixincludes.  */
+-    { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0,
++    { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0,
+       /* A multilib suffix needs adding if different multilibs use
+         different headers.  */
+ #ifdef SYSROOT_HEADERS_SUFFIX_SPEC
+@@ -90,33 +114,24 @@ const struct default_include cpp_include_defaults[]
+ #endif
+ #ifdef CROSS_INCLUDE_DIR
+     /* One place the target system's headers might be.  */
+-    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
++    { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 },
+ #endif
+ #ifdef TOOL_INCLUDE_DIR
+     /* Another place the target system's headers might be.  */
+-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 },
++    { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0 },
+ #endif
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+     /* /usr/include comes dead last.  */
+-    { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 },
+-    { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 },
++    { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 },
++    { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 },
+ #endif
+     { 0, 0, 0, 0, 0, 0 }
+   };
+ #endif /* no INCLUDE_DEFAULTS */
+ 
+-#ifdef GCC_INCLUDE_DIR
+-const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR;
+-const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8;
+-#else
+-const char cpp_GCC_INCLUDE_DIR[] = "";
+-const size_t cpp_GCC_INCLUDE_DIR_len = 0;
+-#endif
+-
+ /* The configured prefix.  */
+-const char cpp_PREFIX[] = PREFIX;
+-const size_t cpp_PREFIX_len = sizeof PREFIX - 1;
+-const char cpp_EXEC_PREFIX[] = STANDARD_EXEC_PREFIX;
++char PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX;
++char EXEC_PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX;
+ 
+ /* This value is set by cpp_relocated at runtime */
+ const char *gcc_exec_prefix;
+diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
+index fb97c0b5814..6267150facc 100644
+--- a/gcc/cppdefault.h
++++ b/gcc/cppdefault.h
+@@ -33,7 +33,8 @@
+ 
+ struct default_include
+ {
+-  const char *const fname;     /* The name of the directory.  */
++  const char *fname;     /* The name of the directory.  */
++
+   const char *const component; /* The component containing the directory
+                                   (see update_path in prefix.cc) */
+   const char cplusplus;                /* When this is non-zero, we should only
+@@ -55,17 +56,13 @@ struct default_include
+ };
+ 
+ extern const struct default_include cpp_include_defaults[];
+-extern const char cpp_GCC_INCLUDE_DIR[];
+-extern const size_t cpp_GCC_INCLUDE_DIR_len;
++extern char GCC_INCLUDE_DIRVAR[] __attribute__ ((section (".gccrelocprefix")));
+ 
+ /* The configure-time prefix, i.e., the value supplied as the argument
+    to --prefix=.  */
+-extern const char cpp_PREFIX[];
++extern char PREFIXVAR[] __attribute__ ((section (".gccrelocprefix")));
+ /* The length of the configure-time prefix.  */
+-extern const size_t cpp_PREFIX_len;
+-/* The configure-time execution prefix.  This is typically the lib/gcc
+-   subdirectory of cpp_PREFIX.  */
+-extern const char cpp_EXEC_PREFIX[];
++extern char EXEC_PREFIXVAR[] __attribute__ ((section (".gccrelocprefix")));
+ /* The run-time execution prefix.  This is typically the lib/gcc
+    subdirectory of the actual installation.  */
+ extern const char *gcc_exec_prefix;
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index aa4cf92fb78..5569a39a14a 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL;
+ #endif
+ static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT;
+ 
++static char target_relocatable_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = SYSTEMLIBS_DIR;
++
+ /* Nonzero means pass the updated target_system_root to the compiler.  */
+ 
+ static int target_system_root_changed;
+@@ -575,6 +577,7 @@ or with constant text in a single argument.
+  %G     process LIBGCC_SPEC as a spec.
+  %R     Output the concatenation of target_system_root and
+         target_sysroot_suffix.
++ %r     Output the base path target_relocatable_prefix
+  %S     process STARTFILE_SPEC as a spec.  A capital S is actually used here.
+  %E     process ENDFILE_SPEC as a spec.  A capital E is actually used here.
+  %C     process CPP_SPEC as a spec.
+@@ -1627,10 +1630,10 @@ static const char *gcc_libexec_prefix;
+    gcc_exec_prefix is set because, in that case, we know where the
+    compiler has been installed, and use paths relative to that
+    location instead.  */
+-static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
+-static const char *const standard_libexec_prefix = STANDARD_LIBEXEC_PREFIX;
+-static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX;
+-static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
++static char standard_exec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX;
++static char standard_libexec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_LIBEXEC_PREFIX;
++static char standard_bindir_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_BINDIR_PREFIX;
++static char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+ 
+ /* For native compilers, these are well-known paths containing
+    components that may be provided by the system.  For cross
+@@ -1638,9 +1641,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+ static const char *md_exec_prefix = MD_EXEC_PREFIX;
+ static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
+ static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
+-static const char *const standard_startfile_prefix_1
++static char standard_startfile_prefix_1[4096] __attribute__ ((section (".gccrelocprefix")))
+   = STANDARD_STARTFILE_PREFIX_1;
+-static const char *const standard_startfile_prefix_2
++static char standard_startfile_prefix_2[4096] __attribute__ ((section (".gccrelocprefix")))
+   = STANDARD_STARTFILE_PREFIX_2;
+ 
+ /* A relative path to be used in finding the location of tools
+@@ -6676,6 +6679,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
+              }
+            break;
+ 
++          case 'r':
++              obstack_grow (&obstack, target_relocatable_prefix,
++                     strlen (target_relocatable_prefix));
++            break;
++
+          case 'S':
+            value = do_spec_1 (startfile_spec, 0, NULL);
+            if (value != 0)
+diff --git a/gcc/incpath.cc b/gcc/incpath.cc
+index c80f100f476..5ac03c08693 100644
+--- a/gcc/incpath.cc
++++ b/gcc/incpath.cc
+@@ -135,7 +135,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+   int relocated = cpp_relocated ();
+   size_t len;
+ 
+-  if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
++  if (iprefix && (len = strlen(GCC_INCLUDE_DIRVAR) - 7) != 0)
+     {
+       /* Look for directories that start with the standard prefix.
+         "Translate" them, i.e. replace /usr/local/lib/gcc... with
+@@ -150,7 +150,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+                 now.  */
+              if (sysroot && p->add_sysroot)
+                continue;
+-             if (!filename_ncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
++             if (!filename_ncmp (p->fname, GCC_INCLUDE_DIRVAR, len))
+                {
+                  char *str = concat (iprefix, p->fname + len, NULL);
+                  if (p->multilib == 1 && imultilib)
+@@ -191,7 +191,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+              free (sysroot_no_trailing_dir_separator);
+            }
+          else if (!p->add_sysroot && relocated
+-                  && !filename_ncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len))
++                  && !filename_ncmp (p->fname, PREFIXVAR, strlen(PREFIXVAR)))
+            {
+              static const char *relocated_prefix;
+              char *ostr;
+@@ -208,12 +208,12 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+                  dummy = concat (gcc_exec_prefix, "dummy", NULL);
+                  relocated_prefix
+                    = make_relative_prefix (dummy,
+-                                           cpp_EXEC_PREFIX,
+-                                           cpp_PREFIX);
++                                           EXEC_PREFIXVAR,
++                                           PREFIXVAR);
+                  free (dummy);
+                }
+              ostr = concat (relocated_prefix,
+-                            p->fname + cpp_PREFIX_len,
++                            p->fname + strlen(PREFIXVAR),
+                             NULL);
+              str = update_path (ostr, p->component);
+              free (ostr);
+diff --git a/gcc/prefix.cc b/gcc/prefix.cc
+index 096ed5afa3d..2526f0ecc39 100644
+--- a/gcc/prefix.cc
++++ b/gcc/prefix.cc
+@@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3.  If not see
+ #include "prefix.h"
+ #include "common/common-target.h"
+ 
+-static const char *std_prefix = PREFIX;
++char PREFIXVAR1[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX;
++
++static const char *std_prefix = PREFIXVAR1;
+ 
+ static const char *get_key_value (char *);
+ static char *translate_name (char *);
+@@ -212,7 +214,7 @@ translate_name (char *name)
+        prefix = getenv (key);
+ 
+       if (prefix == 0)
+-       prefix = PREFIX;
++       prefix = PREFIXVAR1;
+ 
+       /* We used to strip trailing DIR_SEPARATORs here, but that can
+         sometimes yield a result with no separator when one was coded
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch
new file mode 100644
index 00000000..9b05da64
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -0,0 +1,99 @@
+From 33a1f07a4417247dc24819d4e583ca09f56d5a7b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:41:45 +0000
+Subject: [PATCH] Search target sysroot gcc version specific dirs with
+ multilib.
+
+We install the gcc libraries (such as crtbegin.p) into
+<sysroot><libdir>/<target-sys>/5.2.0/
+which is a default search path for GCC (aka multi_suffix in the
+code below). <target-sys> is 'machine' in gcc's terminology. We use
+these directories so that multiple gcc versions could in theory
+co-exist on target.
+
+We only want to build one gcc-cross-canadian per arch and have this work
+for all multilibs. <target-sys> can be handled by mapping the multilib
+<target-sys> to the one used by gcc-cross-canadian, e.g.
+mips64-polkmllib32-linux
+is symlinked to by mips64-poky-linux.
+
+The default gcc search path in the target sysroot for a "lib64" mutlilib
+is:
+
+<sysroot>/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/lib32/../lib64/
+<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/usr/lib32/../lib64/
+<sysroot>/lib32/
+<sysroot>/usr/lib32/
+
+which means that the lib32 crtbegin.o will be found and the lib64 ones
+will not which leads to compiler failures.
+
+This patch injects a multilib version of that path first so the lib64
+binaries can be found first. With this change the search path becomes:
+
+<sysroot>/lib32/../lib64/mips64-poky-linux/5.2.0/
+<sysroot>/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/lib32/../lib64/
+<sysroot>/usr/lib32/../lib64/mips64-poky-linux/5.2.0/
+<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/usr/lib32/../lib64/
+<sysroot>/lib32/
+<sysroot>/usr/lib32/
+
+Upstream-Status: Pending
+RP 2015/7/31
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/gcc.cc | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 5569a39a14a..4598f6cd7c9 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -2817,7 +2817,7 @@ for_each_path (const struct path_prefix *paths,
+       if (path == NULL)
+        {
+          len = paths->max_len + extra_space + 1;
+-         len += MAX (MAX (suffix_len, multi_os_dir_len), multiarch_len);
++         len += MAX ((suffix_len + multi_os_dir_len), multiarch_len);
+          path = XNEWVEC (char, len);
+        }
+ 
+@@ -2829,6 +2829,33 @@ for_each_path (const struct path_prefix *paths,
+          /* Look first in MACHINE/VERSION subdirectory.  */
+          if (!skip_multi_dir)
+            {
++             if (!(pl->os_multilib ? skip_multi_os_dir : skip_multi_dir))
++               {
++                 const char *this_multi;
++                 size_t this_multi_len;
++
++                 if (pl->os_multilib)
++                   {
++                     this_multi = multi_os_dir;
++                     this_multi_len = multi_os_dir_len;
++                   }
++                 else
++                   {
++                     this_multi = multi_dir;
++                     this_multi_len = multi_dir_len;
++                   }
++
++                 /* Look in multilib MACHINE/VERSION subdirectory first */
++                 if (this_multi_len)
++                   {
++                     memcpy (path + len, this_multi, this_multi_len + 1);
++                     memcpy (path + len + this_multi_len, multi_suffix, suffix_len + 1);
++                     ret = callback (path, callback_info);
++                       if (ret)
++                         break;
++                   }
++               }
++
+              memcpy (path + len, multi_suffix, suffix_len + 1);
+              ret = callback (path, callback_info);
+              if (ret)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
new file mode 100644
index 00000000..56793e03
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
@@ -0,0 +1,84 @@
+From d7dc2861840e88a4592817a398a054a886c3f3ee Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 27 Jun 2017 18:10:54 -0700
+Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets
+
+when -fstack-protector options are enabled we need to
+link with ssp_shared on musl since it does not provide
+the __stack_chk_fail_local() so essentially it provides
+libssp but not libssp_nonshared something like
+TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED
+ where-as for glibc the needed symbols
+are already present in libc_nonshared library therefore
+we do not need any library helper on glibc based systems
+but musl needs the libssp_noshared from gcc
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/linux.h          |  7 +++++++
+ gcc/config/rs6000/linux.h   | 10 ++++++++++
+ gcc/config/rs6000/linux64.h | 10 ++++++++++
+ 3 files changed, 27 insertions(+)
+
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 58143dff731..d2409ccac26 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -208,6 +208,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+     { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 },         \
+     { 0, 0, 0, 0, 0, 0 }                               \
+   }
++#ifdef TARGET_LIBC_PROVIDES_SSP
++#undef LINK_SSP_SPEC
++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
++                      "|fstack-protector-strong|fstack-protector-explicit" \
++                      ":-lssp_nonshared}"
++#endif
++
+ #endif
+ 
+ #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
+diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
+index 8c9039ac1e5..259cd485973 100644
+--- a/gcc/config/rs6000/linux.h
++++ b/gcc/config/rs6000/linux.h
+@@ -99,6 +99,16 @@
+                                         " -m elf32ppclinux")
+ #endif
+ 
++/* link libssp_nonshared.a with musl */
++#if DEFAULT_LIBC == LIBC_MUSL
++#ifdef TARGET_LIBC_PROVIDES_SSP
++#undef LINK_SSP_SPEC
++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
++                      "|fstack-protector-strong|fstack-protector-explicit" \
++                      ":-lssp_nonshared}"
++#endif
++#endif
++
+ #undef LINK_OS_LINUX_SPEC
+ #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
+   %{!static-pie: \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index 364c1a5b155..e33d9ae98e0 100644
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -372,6 +372,16 @@ extern int dot_symbols;
+                                           " -m elf64ppc")
+ #endif
+ 
++/* link libssp_nonshared.a with musl */
++#if DEFAULT_LIBC == LIBC_MUSL
++#ifdef TARGET_LIBC_PROVIDES_SSP
++#undef LINK_SSP_SPEC
++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
++                      "|fstack-protector-strong|fstack-protector-explicit" \
++                      ":-lssp_nonshared}"
++#endif
++#endif
++
+ #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
+   %{!static-pie: \
+     %{rdynamic:-export-dynamic} \
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch
new file mode 100644
index 00000000..bb1699be
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch
@@ -0,0 +1,39 @@
+From bf0d7c463e1fab62804556099b56319fe94be1eb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 6 Jun 2018 12:10:22 -0700
+Subject: [PATCH] Re-introduce spe commandline options
+
+This should ensure that we keep accepting
+spe options
+
+Upstream-Status: Inappropriate [SPE port is removed from rs600 port]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/rs6000/rs6000.opt | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
+index 4931d781c4e..3fb87b6f7d5 100644
+--- a/gcc/config/rs6000/rs6000.opt
++++ b/gcc/config/rs6000/rs6000.opt
+@@ -348,6 +348,19 @@ mdebug=
+ Target RejectNegative Joined
+ -mdebug=       Enable debug output.
+ 
++; PPC SPE ABI
++mspe
++Target Var(rs6000_spe) Save
++Generate SPE SIMD instructions on E500.
++
++mabi=spe
++Target RejectNegative Var(rs6000_spe_abi) Save
++Use the SPE ABI extensions.
++
++mabi=no-spe
++Target RejectNegative Var(rs6000_spe_abi, 0)
++Do not use the SPE ABI extensions.
++
+ ; Altivec ABI
+ mabi=altivec
+ Target RejectNegative Var(rs6000_altivec_abi) Save
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
new file mode 100644
index 00000000..f3709208
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
@@ -0,0 +1,83 @@
+From a32c75b37209d6836eaaa943dc6b1207acba5d27 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sat, 24 Oct 2015 20:09:53 +0000
+Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of
+ symver
+
+Adapter from
+
+https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00899.html
+
+This fix was debated but hasnt been applied gcc upstream since
+they expect musl to support '@' in symbol versioning which is
+a sun/gnu versioning extention. This patch however avoids the
+need for the '@' symbols at all
+
+libgcc/Changelog:
+
+2015-05-11  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+        * config/i386/cpuinfo.c (__cpu_indicator_init_local): Add.
+        (__cpu_indicator_init@GCC_4.8.0, __cpu_model@GCC_4.8.0): Remove.
+
+        * config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Remove -DUSE_ELF_SYMVER.
+
+gcc/Changelog:
+
+2015-05-11  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+        * config/i386/i386-expand.c (ix86_expand_builtin): Make __builtin_cpu_init
+        call __cpu_indicator_init_local instead of __cpu_indicator_init.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/i386/i386-expand.cc | 4 ++--
+ libgcc/config/i386/cpuinfo.c   | 6 +++---
+ libgcc/config/i386/t-linux     | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
+index 68978ef8dc2..0c71f36b572 100644
+--- a/gcc/config/i386/i386-expand.cc
++++ b/gcc/config/i386/i386-expand.cc
+@@ -12321,10 +12321,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+     {
+     case IX86_BUILTIN_CPU_INIT:
+       {
+-       /* Make it call __cpu_indicator_init in libgcc.  */
++       /* Make it call __cpu_indicator_init_local in libgcc.a.  */
+        tree call_expr, fndecl, type;
+        type = build_function_type_list (integer_type_node, NULL_TREE);
+-       fndecl = build_fn_decl ("__cpu_indicator_init", type);
++       fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
+        call_expr = build_call_expr (fndecl, 0);
+        return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
+       }
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index dab1d98060f..cf824b4114a 100644
+--- a/libgcc/config/i386/cpuinfo.c
++++ b/libgcc/config/i386/cpuinfo.c
+@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
+                             __cpu_features2);
+ }
+ 
+-#if defined SHARED && defined USE_ELF_SYMVER
+-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
+-__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
++#ifndef SHARED
++int __cpu_indicator_init_local (void)
++  __attribute__ ((weak, alias ("__cpu_indicator_init")));
+ #endif
+diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
+index 8506a635790..564296f788e 100644
+--- a/libgcc/config/i386/t-linux
++++ b/libgcc/config/i386/t-linux
+@@ -3,5 +3,5 @@
+ # t-slibgcc-elf-ver and t-linux
+ SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
+ 
+-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
++HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
+ CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
new file mode 100644
index 00000000..f5f04ae3
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
@@ -0,0 +1,182 @@
+From 4efc42b99c96b026f560b0918de7e237ac3dc8d1 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 10 Mar 2020 08:26:53 -0700
+Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining
+ reproducibility
+
+Inserting line numbers into generated code means its not always reproducible wth
+differing versions of host gcc. Void the issue by not adding these.
+
+Upstream-Status: Inappropriate [OE Reproducibility specific]
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/gengtype.cc |  6 +++---
+ gcc/genmodes.cc | 32 ++++++++++++++++----------------
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc
+index 386ae1b0506..9762e914296 100644
+--- a/gcc/gengtype.cc
++++ b/gcc/gengtype.cc
+@@ -1006,7 +1006,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt,
+ /* Create a fake field with the given type and name.  NEXT is the next
+    field in the chain.  */
+ #define create_field(next,type,name) \
+-    create_field_all (next,type,name, 0, this_file, __LINE__)
++    create_field_all (next,type,name, 0, this_file, 0)
+ 
+ /* Like create_field, but the field is only valid when condition COND
+    is true.  */
+@@ -1039,7 +1039,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name,
+ }
+ 
+ #define create_optional_field(next,type,name,cond)     \
+-       create_optional_field_(next,type,name,cond,__LINE__)
++       create_optional_field_(next,type,name,cond,0)
+ 
+ /* Reverse a linked list of 'struct pair's in place.  */
+ pair_p
+@@ -5238,7 +5238,7 @@ main (int argc, char **argv)
+       /* These types are set up with #define or else outside of where
+          we can see them.  We should initialize them before calling
+          read_input_list.  */
+-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \
++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \
+        Call;} while (0)
+       POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos));
+       POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos));
+diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc
+index 59850bb070a..e187f8542a1 100644
+--- a/gcc/genmodes.cc
++++ b/gcc/genmodes.cc
+@@ -440,7 +440,7 @@ complete_all_modes (void)
+ }
+ 
+ /* For each mode in class CLASS, construct a corresponding complex mode.  */
+-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__)
++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0)
+ static void
+ make_complex_modes (enum mode_class cl,
+                    const char *file, unsigned int line)
+@@ -499,7 +499,7 @@ make_complex_modes (enum mode_class cl,
+    having as many components as necessary.  ORDER is the sorting order
+    of the mode, with smaller numbers indicating a higher priority.  */
+ #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \
+-  make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, __LINE__)
++  make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, 0)
+ #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0)
+ static void ATTRIBUTE_UNUSED
+ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
+@@ -552,7 +552,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
+    BYTESIZE bytes in total.  */
+ #define VECTOR_BOOL_MODE(NAME, COUNT, COMPONENT, BYTESIZE)             \
+   make_vector_bool_mode (#NAME, COUNT, #COMPONENT, BYTESIZE,           \
+-                        __FILE__, __LINE__)
++                        __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ make_vector_bool_mode (const char *name, unsigned int count,
+                       const char *component, unsigned int bytesize,
+@@ -574,7 +574,7 @@ make_vector_bool_mode (const char *name, unsigned int count,
+ /* Input.  */
+ 
+ #define _SPECIAL_MODE(C, N) \
+-  make_special_mode (MODE_##C, #N, __FILE__, __LINE__)
++  make_special_mode (MODE_##C, #N, __FILE__, 0)
+ #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N)
+ #define CC_MODE(N) _SPECIAL_MODE (CC, N)
+ 
+@@ -587,7 +587,7 @@ make_special_mode (enum mode_class cl, const char *name,
+ 
+ #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y)
+ #define FRACTIONAL_INT_MODE(N, B, Y) \
+-  make_int_mode (#N, B, Y, __FILE__, __LINE__)
++  make_int_mode (#N, B, Y, __FILE__, 0)
+ 
+ static void
+ make_int_mode (const char *name,
+@@ -628,16 +628,16 @@ make_opaque_mode (const char *name,
+ }
+ 
+ #define FRACT_MODE(N, Y, F) \
+-       make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__)
++       make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0)
+ 
+ #define UFRACT_MODE(N, Y, F) \
+-       make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__)
++       make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0)
+ 
+ #define ACCUM_MODE(N, Y, I, F) \
+-       make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__)
++       make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0)
+ 
+ #define UACCUM_MODE(N, Y, I, F) \
+-       make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__)
++       make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0)
+ 
+ /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT,
+    FILE, and LINE.  */
+@@ -658,7 +658,7 @@ make_fixed_point_mode (enum mode_class cl,
+ 
+ #define FLOAT_MODE(N, Y, F)             FRACTIONAL_FLOAT_MODE (N, -1U, Y, F)
+ #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \
+-  make_float_mode (#N, B, Y, #F, __FILE__, __LINE__)
++  make_float_mode (#N, B, Y, #F, __FILE__, 0)
+ 
+ static void
+ make_float_mode (const char *name,
+@@ -675,7 +675,7 @@ make_float_mode (const char *name,
+ #define DECIMAL_FLOAT_MODE(N, Y, F)    \
+        FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F)
+ #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F)      \
+-  make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__)
++  make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0)
+ 
+ static void
+ make_decimal_float_mode (const char *name,
+@@ -690,7 +690,7 @@ make_decimal_float_mode (const char *name,
+ }
+ 
+ #define RESET_FLOAT_FORMAT(N, F) \
+-  reset_float_format (#N, #F, __FILE__, __LINE__)
++  reset_float_format (#N, #F, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ reset_float_format (const char *name, const char *format,
+                    const char *file, unsigned int line)
+@@ -711,7 +711,7 @@ reset_float_format (const char *name, const char *format,
+ 
+ /* __intN support.  */
+ #define INT_N(M,PREC)                          \
+-  make_int_n (#M, PREC, __FILE__, __LINE__)
++  make_int_n (#M, PREC, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ make_int_n (const char *m, int bitsize,
+             const char *file, unsigned int line)
+@@ -740,7 +740,7 @@ make_int_n (const char *m, int bitsize,
+ /* Partial integer modes are specified by relation to a full integer
+    mode.  */
+ #define PARTIAL_INT_MODE(M,PREC,NAME)                          \
+-  make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__)
++  make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ make_partial_integer_mode (const char *base, const char *name,
+                           unsigned int precision,
+@@ -767,7 +767,7 @@ make_partial_integer_mode (const char *base, const char *name,
+ /* A single vector mode can be specified by naming its component
+    mode and the number of components.  */
+ #define VECTOR_MODE_WITH_PREFIX(PREFIX, C, M, N, ORDER) \
+-  make_vector_mode (MODE_##C, #PREFIX, #M, N, ORDER, __FILE__, __LINE__);
++  make_vector_mode (MODE_##C, #PREFIX, #M, N, ORDER, __FILE__, 0);
+ #define VECTOR_MODE(C, M, N) VECTOR_MODE_WITH_PREFIX(V, C, M, N, 0);
+ static void ATTRIBUTE_UNUSED
+ make_vector_mode (enum mode_class bclass,
+@@ -814,7 +814,7 @@ make_vector_mode (enum mode_class bclass,
+ 
+ /* Adjustability.  */
+ #define _ADD_ADJUST(A, M, X, C1, C2) \
+-  new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__)
++  new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0)
+ 
+ #define ADJUST_NUNITS(M, X)    _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM)
+ #define ADJUST_BYTESIZE(M, X)  _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM)
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch
new file mode 100644
index 00000000..cb8969b1
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch
@@ -0,0 +1,42 @@
+From c3870d073eb9e5d82f9d3067d0fa15038b69713a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 13 May 2020 15:10:38 -0700
+Subject: [PATCH] libatomic: Do not enforce march on aarch64
+
+OE passes the right options via gcc compiler cmdline via TUNE_CCARGS
+this can conflict between -mcpu settings and -march setting here, since
+-mcpu will translate into an appropriate -march, lets depend on that
+instead of setting it explicitly
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libatomic/Makefile.am | 1 -
+ libatomic/Makefile.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
+index c6c8d81c56a..d959a5d040e 100644
+--- a/libatomic/Makefile.am
++++ b/libatomic/Makefile.am
+@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
+ ## On a target-specific basis, include alternates to be selected by IFUNC.
+ if HAVE_IFUNC
+ if ARCH_AARCH64_LINUX
+-IFUNC_OPTIONS       = -march=armv8-a+lse
+ libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)))
+ libatomic_la_SOURCES += atomic_16.S
+ 
+diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
+index a0fa3dfc8cc..e70d389874a 100644
+--- a/libatomic/Makefile.in
++++ b/libatomic/Makefile.in
+@@ -447,7 +447,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
+ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \
+        _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_3) \
+        $(am__append_4) $(am__append_5)
+-@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse
+ @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64
+ @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586
+ @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 -mcx16
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch
new file mode 100644
index 00000000..11f42c59
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch
@@ -0,0 +1,31 @@
+From 7bd6e631e4a5273f5ecc41a5a48830a1342e5926 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei.gherzan@huawei.com>
+Date: Wed, 22 Dec 2021 12:49:25 +0100
+Subject: [PATCH] Fix install path of linux64.h
+
+We add linux64.h to tm includes[1] as a relative path to B. This patch
+adapts the install path of linux64.h to match the include in tm.h.
+
+[1] 0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+
+Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/Makefile.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 065ce7e9a5b..d4c723968aa 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3738,6 +3738,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
+          "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \
+          | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \
+            base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \
++         */linux64.h ) \
++           base=`dirname $$path`;;\
+          *) base=`basename $$path` ;; \
+          esac; \
+          dest=$(plugin_includedir)/$$base; \
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0023-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0023-libatomic-Do-not-enforce-march-on-aarch64.patch
new file mode 100644
index 00000000..2f016598
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0023-libatomic-Do-not-enforce-march-on-aarch64.patch
@@ -0,0 +1,42 @@
+From 52931ec7a708b58d68e69ce9eb99001ae9f099dd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 13 May 2020 15:10:38 -0700
+Subject: [PATCH] libatomic: Do not enforce march on aarch64
+
+OE passes the right options via gcc compiler cmdline via TUNE_CCARGS
+this can conflict between -mcpu settings and -march setting here, since
+-mcpu will translate into an appropriate -march, lets depend on that
+instead of setting it explicitly
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libatomic/Makefile.am | 1 -
+ libatomic/Makefile.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
+index d88515e4a03..e0e2f8b442a 100644
+--- a/libatomic/Makefile.am
++++ b/libatomic/Makefile.am
+@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
+ ## On a target-specific basis, include alternates to be selected by IFUNC.
+ if HAVE_IFUNC
+ if ARCH_AARCH64_LINUX
+-IFUNC_OPTIONS       = -march=armv8-a+lse
+ libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)))
+ endif
+ if ARCH_ARM_LINUX
+diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
+index 80d25653dc7..7377689ab34 100644
+--- a/libatomic/Makefile.in
++++ b/libatomic/Makefile.in
+@@ -434,7 +434,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
+ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \
+        _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \
+        $(am__append_3) $(am__append_4)
+-@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse
+ @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64
+ @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586
+ @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 -mcx16
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch
new file mode 100644
index 00000000..ad826901
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch
@@ -0,0 +1,28 @@
+From 4623d87d779853a2862ee92a15a41fded81eddb8 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Sat, 20 Aug 2022 09:04:14 -0700
+Subject: [PATCH] Avoid hardcoded build paths into ppc libgcc
+
+Avoid encoding build paths into sources used for floating point on powerpc.
+(MACHINE=qemuppc bitbake libgcc).
+
+Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599882.html]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libgcc/config/rs6000/t-float128 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgcc/config/rs6000/t-float128 b/libgcc/config/rs6000/t-float128
+index b09b5664af0..513e63748f1 100644
+--- a/libgcc/config/rs6000/t-float128
++++ b/libgcc/config/rs6000/t-float128
+@@ -103,7 +103,7 @@ $(ibm128_dec_objs)  : INTERNAL_CFLAGS += $(IBM128_CFLAGS_DECIMAL)
+ $(fp128_softfp_src) : $(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@)) $(fp128_dep)
+        @src="$(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@))"; \
+        echo "Create $@"; \
+-       (echo "/* file created from $$src */"; \
++       (echo "/* file created from `basename $$src` */"; \
+         echo; \
+         sed -f $(fp128_sed) < $$src) > $@
+ 
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0024-Fix-install-path-of-linux64.h.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0024-Fix-install-path-of-linux64.h.patch
new file mode 100644
index 00000000..555be623
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0024-Fix-install-path-of-linux64.h.patch
@@ -0,0 +1,31 @@
+From 3e67c9c77e46132c252911bf1e5e4222dfd3aa34 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei.gherzan@huawei.com>
+Date: Wed, 22 Dec 2021 12:49:25 +0100
+Subject: [PATCH] Fix install path of linux64.h
+
+We add linux64.h to tm includes[1] as a relative path to B. This patch
+adapts the install path of linux64.h to match the include in tm.h.
+
+[1] 0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+
+Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/Makefile.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 07fa63b6640..0def7394454 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3706,6 +3706,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
+          "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \
+          | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \
+            base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \
++         */linux64.h ) \
++           base=`dirname $$path`;;\
+          *) base=`basename $$path` ;; \
+          esac; \
+          dest=$(plugin_includedir)/$$base; \
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/0026-rust-recursion-limit.patch b/meta-microblaze/recipes-devtools/gcc/gcc/0026-rust-recursion-limit.patch
new file mode 100644
index 00000000..bbe2f18f
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/0026-rust-recursion-limit.patch
@@ -0,0 +1,92 @@
+From 9234cdca6ee88badfc00297e72f13dac4e540c79 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Fri, 1 Jul 2022 15:58:52 +0100
+Subject: [PATCH] Add a recursion limit to the demangle_const function in the
+ Rust demangler.
+
+libiberty/
+        PR demangler/105039
+        * rust-demangle.c (demangle_const): Add recursion limit.
+
+Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=9234cdca6ee88badfc00297e72f13dac4e540c79]
+---
+ libiberty/rust-demangle.c | 29 ++++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
+index bb58d900e27..36afcfae278 100644
+--- a/libiberty/rust-demangle.c
++++ b/libiberty/rust-demangle.c
+@@ -126,7 +126,7 @@ parse_integer_62 (struct rust_demangler *rdm)
+     return 0;
+ 
+   x = 0;
+-  while (!eat (rdm, '_'))
++  while (!eat (rdm, '_') && !rdm->errored)
+     {
+       c = next (rdm);
+       x *= 62;
+@@ -1148,6 +1148,15 @@ demangle_const (struct rust_demangler *rdm)
+   if (rdm->errored)
+     return;
+ 
++  if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
++    {
++      ++ rdm->recursion;
++      if (rdm->recursion > RUST_MAX_RECURSION_COUNT)
++       /* FIXME: There ought to be a way to report
++          that the recursion limit has been reached.  */
++       goto fail_return;
++    }
++
+   if (eat (rdm, 'B'))
+     {
+       backref = parse_integer_62 (rdm);
+@@ -1158,7 +1167,7 @@ demangle_const (struct rust_demangler *rdm)
+           demangle_const (rdm);
+           rdm->next = old_next;
+         }
+-      return;
++      goto pass_return;
+     }
+ 
+   ty_tag = next (rdm);
+@@ -1167,7 +1176,7 @@ demangle_const (struct rust_demangler *rdm)
+     /* Placeholder. */
+     case 'p':
+       PRINT ("_");
+-      return;
++      goto pass_return;
+ 
+     /* Unsigned integer types. */
+     case 'h':
+@@ -1200,18 +1209,20 @@ demangle_const (struct rust_demangler *rdm)
+       break;
+ 
+     default:
+-      rdm->errored = 1;
+-      return;
++      goto fail_return;
+     }
+ 
+-  if (rdm->errored)
+-    return;
+-
+-  if (rdm->verbose)
++  if (!rdm->errored && rdm->verbose)
+     {
+       PRINT (": ");
+       PRINT (basic_type (ty_tag));
+     }
++
++ fail_return:
++  rdm->errored = 1;
++ pass_return:
++  if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
++    -- rdm->recursion;
+ }
+ 
+ static void
+-- 
+2.31.1
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/hardcoded-paths.patch b/meta-microblaze/recipes-devtools/gcc/gcc/hardcoded-paths.patch
new file mode 100644
index 00000000..f3485858
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/hardcoded-paths.patch
@@ -0,0 +1,19 @@
+Avoid encoding build paths into sources used for floating point on powerpc.
+(MACHINE=qemuppc bitbake libgcc).
+
+Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599882.html]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: gcc-12.1.0/libgcc/config/rs6000/t-float128
+===================================================================
+--- gcc-12.1.0.orig/libgcc/config/rs6000/t-float128
++++ gcc-12.1.0/libgcc/config/rs6000/t-float128
+@@ -103,7 +103,7 @@ $(ibm128_dec_objs)  : INTERNAL_CFLAGS +=
+ $(fp128_softfp_src) : $(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@)) $(fp128_dep)
+        @src="$(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@))"; \
+        echo "Create $@"; \
+-       (echo "/* file created from $$src */"; \
++       (echo "/* file created from `basename $$src` */"; \
+         echo; \
+         sed -f $(fp128_sed) < $$src) > $@
+ 
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc/prefix-map-realpath.patch b/meta-microblaze/recipes-devtools/gcc/gcc/prefix-map-realpath.patch
new file mode 100644
index 00000000..7f1a2dee
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc/prefix-map-realpath.patch
@@ -0,0 +1,63 @@
+Relative paths don't work with -fdebug-prefix-map and friends. This
+can lead to paths which the user wanted to be remapped being missed.
+Setting -fdebug-prefix-map to work with a relative path isn't practical
+either.
+
+Instead, call gcc's realpath function on the incomming path name before
+comparing it with the remapping. This means other issues like symlinks
+are also accounted for and leads to a more consistent remapping experience.
+
+Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599885.html]
+[Also https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599884.html]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+
+Index: gcc-12.1.0/gcc/file-prefix-map.cc
+===================================================================
+--- gcc-12.1.0.orig/gcc/file-prefix-map.cc
++++ gcc-12.1.0/gcc/file-prefix-map.cc
+@@ -70,19 +70,28 @@ remap_filename (file_prefix_map *maps, c
+   file_prefix_map *map;
+   char *s;
+   const char *name;
++  char *realname;
+   size_t name_len;
+ 
++  if (lbasename (filename) == filename)
++    return filename;
++
++  realname = lrealpath (filename);
++
+   for (map = maps; map; map = map->next)
+-    if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)
++    if (filename_ncmp (realname, map->old_prefix, map->old_len) == 0)
+       break;
+-  if (!map)
++  if (!map) {
++    free (realname);
+     return filename;
+-  name = filename + map->old_len;
++  }
++  name = realname + map->old_len;
+   name_len = strlen (name) + 1;
+ 
+   s = (char *) ggc_alloc_atomic (name_len + map->new_len);
+   memcpy (s, map->new_prefix, map->new_len);
+   memcpy (s + map->new_len, name, name_len);
++  free (realname);
+   return s;
+ }
+ 
+Index: gcc-12.1.0/libcpp/macro.cc
+===================================================================
+--- gcc-12.1.0.orig/libcpp/macro.cc
++++ gcc-12.1.0/libcpp/macro.cc
+@@ -563,7 +563,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi
+            if (!name)
+              abort ();
+          }
+-       if (pfile->cb.remap_filename)
++       if (pfile->cb.remap_filename && !pfile->state.in_directive)
+          name = pfile->cb.remap_filename (name);
+        len = strlen (name);
+        buf = _cpp_unaligned_alloc (pfile, len * 2 + 3);
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc_12.2.bb b/meta-microblaze/recipes-devtools/gcc/gcc_12.2.bb
new file mode 100644
index 00000000..c1996ab1
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc_12.2.bb
@@ -0,0 +1,14 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-target.inc
+
+# Building with thumb enabled on armv4t armv5t fails with
+# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs
+# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
+
+ARMFPARCHEXT:armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+
+#BBCLASSEXTEND = "nativesdk"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc b/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc
new file mode 100644
index 00000000..ac0a5a7b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc
@@ -0,0 +1,163 @@
+BPN = "libgcc"
+
+require gcc-configure-common.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_configure () {
+        install -d ${D}${base_libdir} ${D}${libdir}
+        mkdir -p ${B}/${BPN}
+        mkdir -p ${B}/${TARGET_SYS}/${BPN}/
+        cd ${B}/${BPN}
+        chmod a+x ${S}/${BPN}/configure
+        ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+        cd ${B}/${BPN}
+        oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/${BPN}/
+}
+
+do_install () {
+        cd ${B}/${BPN}
+        oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/${BPN}/ install
+
+        # Move libgcc_s into /lib
+        mkdir -p ${D}${base_libdir}
+        if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
+                mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
+        else
+                mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
+        fi
+
+        # install the runtime in /usr/lib/ not in /usr/lib/gcc on target
+        # so that cross-gcc can find it in the sysroot
+
+        mv ${D}${libdir}/gcc/* ${D}${libdir}
+        rm -rf ${D}${libdir}/gcc/
+        # unwind.h is installed here which is shipped in gcc-cross
+        # as well as target gcc and they are identical so we dont
+        # ship one with libgcc here
+        rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+}
+
+do_install:append:libc-baremetal () {
+        if [ "${base_libdir}" != "${libdir}" ]; then
+                rmdir ${D}${base_libdir}
+        fi
+}
+do_install:append:libc-newlib () {
+        if [ "${base_libdir}" != "${libdir}" ]; then
+                rmdir ${D}${base_libdir}
+        fi
+}
+
+# No rpm package is actually created but -dev depends on it, avoid dnf error
+DEV_PKG_DEPENDENCY:libc-baremetal = ""
+DEV_PKG_DEPENDENCY:libc-newlib = ""
+
+#BBCLASSEXTEND = "nativesdk"
+
+addtask multilib_install after do_install before do_package do_populate_sysroot
+# this makes multilib gcc files findable for target gcc
+# e.g.
+#    /usr/lib/i586-pokymllib32-linux/4.7/
+# by creating this symlink to it
+#    /usr/lib64/x86_64-poky-linux/4.7/32
+
+fakeroot python do_multilib_install() {
+    import re
+
+    multilibs = d.getVar('MULTILIB_VARIANTS')
+    if not multilibs or bb.data.inherits_class('nativesdk', d):
+        return
+
+    binv = d.getVar('BINV')
+
+    mlprefix = d.getVar('MLPREFIX')
+    if ('%slibgcc' % mlprefix) != d.getVar('PN'):
+        return
+
+    if mlprefix:
+        orig_tune = d.getVar('DEFAULTTUNE_MULTILIB_ORIGINAL')
+        orig_tune_params = get_tune_parameters(orig_tune, d)
+        orig_tune_baselib = orig_tune_params['baselib']
+        orig_tune_bitness = orig_tune_baselib.replace('lib', '')
+        if not orig_tune_bitness:
+            orig_tune_bitness = '32'
+
+        src = '../../../' + orig_tune_baselib + '/' + \
+            d.getVar('TARGET_SYS_MULTILIB_ORIGINAL') + '/' + binv + '/'
+
+        dest = d.getVar('D') + d.getVar('libdir') + '/' + \
+            d.getVar('TARGET_SYS') + '/' + binv + '/' + orig_tune_bitness
+
+        if os.path.lexists(dest):
+            os.unlink(dest)
+        os.symlink(src, dest)
+        return
+
+
+    for ml in multilibs.split():
+        tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml)
+        if not tune:
+            bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml)
+            continue
+
+        tune_parameters = get_tune_parameters(tune, d)
+        tune_baselib = tune_parameters['baselib']
+        if not tune_baselib:
+            bb.warn("Tune %s doesn't have a baselib set. Skipping..." % tune)
+            continue
+
+        tune_arch = tune_parameters['arch']
+        tune_bitness = tune_baselib.replace('lib', '')
+        if not tune_bitness:
+            tune_bitness = '32' # /lib => 32bit lib
+
+        tune_abiextension = tune_parameters['abiextension']
+        if tune_abiextension:
+            libcextension = '-gnu' + tune_abiextension
+        else:
+            libcextension = ''
+
+        src = '../../../' + tune_baselib + '/' + \
+            tune_arch + d.getVar('TARGET_VENDOR') + 'ml' + ml + \
+            '-' + d.getVar('TARGET_OS') + libcextension +  '/' + binv + '/'
+
+        dest = d.getVar('D') + d.getVar('libdir') + '/' + \
+            d.getVar('TARGET_SYS') + '/' + binv + '/' + tune_bitness
+
+        if os.path.lexists(dest):
+            os.unlink(dest)
+        os.symlink(src, dest)
+}
+
+def get_original_os(d):
+    vendoros = d.expand('${TARGET_ARCH}${ORIG_TARGET_VENDOR}-${TARGET_OS}')
+    for suffix in [d.getVar('ABIEXTENSION'), d.getVar('LIBCEXTENSION')]:
+        if suffix and vendoros.endswith(suffix):
+            vendoros = vendoros[:-len(suffix)]
+    # Arm must use linux-gnueabi not linux as only the former is accepted by gcc
+    if vendoros.startswith("arm-") and not vendoros.endswith("-gnueabi"):
+        vendoros = vendoros + "-gnueabi"
+    return vendoros
+
+ORIG_TARGET_VENDOR := "${TARGET_VENDOR}"
+BASETARGET_SYS = "${@get_original_os(d)}"
+
+addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot
+fakeroot python do_extra_symlinks() {
+    if bb.data.inherits_class('nativesdk', d):
+        return
+
+    targetsys = d.getVar('BASETARGET_SYS')
+
+    if targetsys != d.getVar('TARGET_SYS'):
+        dest = d.getVar('D') + d.getVar('libdir') + '/' + targetsys
+        src = d.getVar('TARGET_SYS')
+        if not os.path.lexists(dest) and os.path.lexists(d.getVar('D') + d.getVar('libdir')):
+            os.symlink(src, dest)
+}
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-initial.inc b/meta-microblaze/recipes-devtools/gcc/libgcc-initial.inc
new file mode 100644
index 00000000..8251e3c2
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc-initial.inc
@@ -0,0 +1,58 @@
+#
+# Notes on the way the OE cross toolchain now works
+#
+# We need a libgcc to build glibc. Tranditionally we therefore built
+# a non-threaded and non-shared compiler (gcc-cross-initial), then use
+# that to build libgcc-initial which is used to build glibc which we can
+# then build gcc-cross and libgcc against.
+#
+# We were able to drop the glibc dependency from gcc-cross, with two tweaks:
+
+# a) specify the minimum glibc version to support in a configure option
+# b) create a dummy limits.h file so that later when glibc creates one,
+#    the headers structure has support for it. We can do this with a simple
+#    empty file
+#
+# Once gcc-cross is libc independent, we can use it to build both
+# libgcc-initial and then later libgcc.
+#
+# libgcc-initial is tricky as we need to imitate the non-threaded and
+# non-shared case. We can do that by hacking the threading mode back to
+# "single" even if gcc reports "posix" and disable libc presence for the
+# libgcc-intial build. We have to create the dummy limits.h to avoid
+# compiler errors from a missing header.
+#
+# glibc will fail to link with libgcc-initial due to a missing "exception
+# handler" capable libgcc (libgcc_eh.a). Since we know glibc doesn't need
+# any exception handler, we can safely symlink to libgcc.a.
+#
+
+require libgcc-common.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}gcc"
+
+LICENSE = "GPL-3.0-with-GCC-exception"
+
+PACKAGES = ""
+
+EXTRA_OECONF += "--disable-shared"
+
+inherit nopackages
+
+# We really only want this built by things that need it, not any recrdeptask
+deltask do_build
+
+do_configure:prepend () {
+        install -d ${STAGING_INCDIR}
+        touch ${STAGING_INCDIR}/limits.h
+        sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars
+        sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile
+}
+
+do_configure:append () {
+        sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile
+}
+
+do_install:append () {
+        ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-initial_12.2.bb b/meta-microblaze/recipes-devtools/gcc/libgcc-initial_12.2.bb
new file mode 100644
index 00000000..a259082b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc-initial_12.2.bb
@@ -0,0 +1,5 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require libgcc-initial.inc
+
+# Building with thumb enabled on armv6t fails
+ARM_INSTRUCTION_SET:armv6 = "arm"
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-initial_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/libgcc-initial_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc-initial_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc.inc b/meta-microblaze/recipes-devtools/gcc/libgcc.inc
new file mode 100644
index 00000000..84a2d930
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc.inc
@@ -0,0 +1,53 @@
+require libgcc-common.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc"
+
+do_install:append:class-target () {
+        if [ "${TCLIBC}" != "glibc" ]; then
+                case "${TARGET_OS}" in
+                        "linux-musl" | "linux-*spe") extra_target_os="linux";;
+                        "linux-musleabi") extra_target_os="linux-gnueabi";;
+                        *) extra_target_os="linux";;
+                esac
+                if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then
+                        ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
+                fi
+        fi
+        if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then
+                case "${TARGET_OS}" in
+                        "linux-musleabi") extra_target_os="linux-musleabihf";;
+                        "linux-gnueabi") extra_target_os="linux-gnueabihf";;
+                esac
+                if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then
+                        ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
+                fi
+        fi
+}
+
+PACKAGES = "\
+    ${PN} \
+    ${PN}-dev \
+    ${PN}-dbg \
+"
+
+# All libgcc source is marked with the exception.
+#
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"
+
+
+FILES:${PN}-dev = "\
+    ${base_libdir}/libgcc*.so \
+    ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \
+    ${libdir}/${TARGET_SYS}/${BINV}* \
+    ${libdir}/${TARGET_ARCH}${TARGET_VENDOR}* \
+"
+
+do_package[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+
+INSANE_SKIP:${PN}-dev = "staticdev"
+
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc_12.2.bb b/meta-microblaze/recipes-devtools/gcc/libgcc_12.2.bb
new file mode 100644
index 00000000..f88963b0
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc_12.2.bb
@@ -0,0 +1,5 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require libgcc.inc
+
+# Building with thumb enabled on armv6t fails
+ARM_INSTRUCTION_SET:armv6 = "arm"
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/libgcc_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/libgfortran.inc b/meta-microblaze/recipes-devtools/gcc/libgfortran.inc
new file mode 100644
index 00000000..99fdd89c
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgfortran.inc
@@ -0,0 +1,88 @@
+require gcc-configure-common.inc
+
+EXTRA_OECONF_PATHS = "\
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+# An arm hard float target like raspberrypi4 won't build
+# as CFLAGS don't make it to the fortran compiler otherwise
+# (the configure script sets FC to $GFORTRAN unconditionally)
+export GFORTRAN = "${FC}"
+
+do_configure () {
+        for target in libbacktrace libgfortran
+        do
+                rm -rf ${B}/${TARGET_SYS}/$target/
+                mkdir -p ${B}/${TARGET_SYS}/$target/
+                cd ${B}/${TARGET_SYS}/$target/
+                chmod a+x ${S}/$target/configure
+                relpath=${@os.path.relpath("${S}", "${B}/${TARGET_SYS}")}
+                ../$relpath/$target/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+                # Easiest way to stop bad RPATHs getting into the library since we have a
+                # broken libtool here
+                sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/$target/libtool
+        done
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+        for target in libbacktrace libgfortran
+        do
+                cd ${B}/${TARGET_SYS}/$target/
+                oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$target/
+        done
+}
+
+do_install () {
+        cd ${B}/${TARGET_SYS}/libgfortran/
+        oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libgfortran/ install
+        if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
+                rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+        fi
+        if [ -d ${D}${infodir} ]; then
+                rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+        fi
+        chown -R root:root ${D}
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-runtime gcc-cross-${TARGET_ARCH}"
+
+#BBCLASSEXTEND = "nativesdk"
+
+PACKAGES = "\
+    ${PN}-dbg \
+    libgfortran \
+    libgfortran-dev \
+    libgfortran-staticdev \
+"
+
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"
+
+FILES:${PN} = "${libdir}/libgfortran.so.*"
+FILES:${PN}-dev = "\
+    ${libdir}/libgfortran*.so \
+    ${libdir}/libgfortran.spec \
+    ${libdir}/libgfortran.la \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ \
+"
+FILES:${PN}-staticdev = "${libdir}/libgfortran.a"
+
+INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev"
+
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+
+python __anonymous () {
+    f = d.getVar("FORTRAN")
+    if "fortran" not in f:
+        raise bb.parse.SkipRecipe("libgfortran needs fortran support to be enabled in the compiler")
+}
diff --git a/meta-microblaze/recipes-devtools/gcc/libgfortran_12.2.bb b/meta-microblaze/recipes-devtools/gcc/libgfortran_12.2.bb
new file mode 100644
index 00000000..71dd8b4b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgfortran_12.2.bb
@@ -0,0 +1,3 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require libgfortran.inc
+
diff --git a/meta-microblaze/recipes-devtools/gcc/libgfortran_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/libgfortran_13.%.bbappend
new file mode 100644
index 00000000..d1df2061
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/libgfortran_13.%.bbappend
@@ -0,0 +1 @@
+require microblaze-block.inc
diff --git a/meta-microblaze/recipes-devtools/gcc/microblaze-block.inc b/meta-microblaze/recipes-devtools/gcc/microblaze-block.inc
new file mode 100644
index 00000000..67c40845
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/microblaze-block.inc
@@ -0,0 +1 @@
+COMPATIBLE_HOST:microblaze = "^$"
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
new file mode 100644
index 00000000..925b0c2f
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
@@ -0,0 +1,66 @@
+SUMMARY = "GNU debugger"
+HOMEPAGE = "http://www.gnu.org/software/gdb/"
+DESCRIPTION = "GDB, the GNU Project debugger, allows you to see what is going on inside another program while it executes -- or what another program was doing at the moment it crashed."
+SECTION = "devel"
+DEPENDS = "expat gmp zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
+
+LTTNGUST = "lttng-ust"
+LTTNGUST:arc = ""
+LTTNGUST:aarch64 = ""
+LTTNGUST:mipsarch = ""
+LTTNGUST:sh4 = ""
+
+inherit autotools texinfo
+
+UPSTREAM_CHECK_GITTAGREGEX = "gdb\-(?P<pver>.+)\-release"
+
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}"
+
+EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \
+                --with-curses --disable-multilib --disable-sim \
+                --without-guile \
+                ${GDBPROPREFIX} ${EXPAT} \
+                ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \
+                --disable-rpath \
+                --disable-gas --disable-binutils \
+                --disable-ld --disable-gold \
+                --disable-gprof \
+                --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \
+"
+
+PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}"
+# Use --without-system-readline to compile with readline 5.
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs"
+PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
+# ncurses is already a hard DEPENDS, but would be added here if it weren't
+PACKAGECONFIG[tui] = "--enable-tui,--disable-tui"
+PACKAGECONFIG[xz] = "--with-lzma --with-liblzma-prefix=${STAGING_DIR_HOST},--without-lzma,xz"
+PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils"
+
+GDBPROPREFIX = "--program-prefix=''"
+
+DISABLE_STATIC = ""
+
+do_configure () {
+        # override this function to avoid the autoconf/automake/aclocal/autoheader
+        # calls for now
+        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        oe_runconf
+}
+
+# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
+# right bits installed by binutils.  Same for bfd.info -- also from binutils.
+do_install:append() {
+        rm -rf ${D}${libdir}
+        rm -rf ${D}${includedir}
+        rm -rf ${D}${datadir}/locale
+        rm -f ${D}${infodir}/bfd.info
+}
+
+RRECOMMENDS:gdb:append:linux = " glibc-thread-db "
+RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db "
+RRECOMMENDS:gdbserver:append:linux = " glibc-thread-db "
+RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db "
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
new file mode 100644
index 00000000..c463574b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -0,0 +1,44 @@
+inherit cross-canadian
+inherit python3-dir
+inherit pkgconfig
+
+SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)"
+PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+BPN = "gdb"
+
+DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp \
+           virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc"
+
+GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
+
+# Overrides PACKAGECONFIG variables in gdb-common.inc
+PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
+                         nativesdk-python3-core \
+                         nativesdk-python3-codecs nativesdk-python3-netclient \
+                         "
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
+PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk-elfutils"
+
+SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb"
+
+do_configure:prepend() {
+cat > ${WORKDIR}/python << EOF
+#! /bin/sh
+case "\$2" in
+        --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
+        --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
+        --exec-prefix) echo "${exec_prefix}" ;;
+        *) exit 1 ;;
+esac
+exit 0
+EOF
+        chmod +x ${WORKDIR}/python
+}
+
+# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
+# right bits installed by binutils.
+do_install:append() {
+        rm -rf ${D}${exec_prefix}/lib
+        cross_canadian_bindirlinks
+}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb
new file mode 100644
index 00000000..4ab2b715
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb
@@ -0,0 +1,3 @@
+require gdb-common.inc
+require gdb-cross-canadian.inc
+require gdb.inc
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
new file mode 100644
index 00000000..b418f3a3
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
@@ -0,0 +1,31 @@
+require gdb-common.inc
+
+DEPENDS = "expat-native gmp-native ncurses-native flex-native bison-native"
+
+inherit python3native pkgconfig
+
+# Overrides PACKAGECONFIG variables in gdb-common.inc
+PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}"
+PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native"
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
+PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native"
+
+do_compile:prepend() {
+    export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
+    export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
+}
+
+#EXTRA_OEMAKE += "LDFLAGS='${BUILD_LDFLAGS}'"
+
+GDBPROPREFIX = ""
+
+PN = "gdb-cross-${TARGET_ARCH}"
+BPN = "gdb"
+
+# Ignore how TARGET_ARCH is computed.
+TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}"
+
+inherit cross
+inherit gettext
+
+datadir .= "/gdb-${TARGET_SYS}${TARGET_VENDOR}-${TARGET_OS}"
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross_12.1.bb b/meta-microblaze/recipes-devtools/gdb/gdb-cross_12.1.bb
new file mode 100644
index 00000000..3b654a2f
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross_12.1.bb
@@ -0,0 +1,2 @@
+require gdb-cross.inc
+require gdb.inc
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb.inc b/meta-microblaze/recipes-devtools/gdb/gdb.inc
new file mode 100644
index 00000000..a5dc5545
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb.inc
@@ -0,0 +1,20 @@
+LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.0-only & LGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+                    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
+
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \
+           file://0001-make-man-install-relative-to-DESTDIR.patch \
+           file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
+           file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
+           file://0004-Dont-disable-libreadline.a-when-using-disable-static.patch \
+           file://0005-use-asm-sgidefs.h.patch \
+           file://0006-Change-order-of-CFLAGS.patch \
+           file://0007-resolve-restrict-keyword-conflict.patch \
+           file://0008-Fix-invalid-sigprocmask-call.patch \
+           file://0009-gdbserver-ctrl-c-handling.patch \
+           file://readline-8.2.patch \
+           file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
+           "
+SRC_URI[sha256sum] = "0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed"
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0001-Add-initial-port-of-linux-gdbserver.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0001-Add-initial-port-of-linux-gdbserver.patch
index a5f3acd2..050bdde5 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0001-Add-initial-port-of-linux-gdbserver.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0001-Add-initial-port-of-linux-gdbserver.patch
@@ -17,6 +17,8 @@ architecture specific setup - may need to add in future
  * add set_gdbarch_fetch_tls_load_module_address
  * Force reading of r0 as 0, prevent stores
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@petalogix.com>
 Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
 Signed-off-by: Mahesh Bodapati <mbodapat@xilinx.com>
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
new file mode 100644
index 00000000..16d6cf19
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
@@ -0,0 +1,28 @@
+From 8eca28eddcda4ce8a345ca031f43ff1ed6f37089 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 2 Mar 2015 02:27:55 +0000
+Subject: [PATCH 1/9] make man install relative to DESTDIR
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ sim/common/Make-common.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
+index 74e5dad3049..9e95c224ba4 100644
+--- a/sim/common/Make-common.in
++++ b/sim/common/Make-common.in
+@@ -70,7 +70,7 @@ tooldir = $(libdir)/$(target_alias)
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ mandir = @mandir@
+-man1dir = $(mandir)/man1
++man1dir = $(DESTDIR)$(mandir)/man1
+ infodir = @infodir@
+ includedir = @includedir@
+ 
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0002-Patch-MicroBlaze-Initial-port-of-core-reading-suppor.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0002-Patch-MicroBlaze-Initial-port-of-core-reading-suppor.patch
index a871b582..f7af2a62 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0002-Patch-MicroBlaze-Initial-port-of-core-reading-suppor.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0002-Patch-MicroBlaze-Initial-port-of-core-reading-suppor.patch
@@ -6,6 +6,8 @@ Subject: [PATCH 2/8] [Patch,MicroBlaze]: Initial port of core reading support
  PRSTATUS and PSINFO information for rebuilding ".reg" sections of core dumps
  at run time.
 
+Upstream-Status: Pending
+
 Signed-off-by: David Holsgrove <david.holsgrove@petalogix.com>
 Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
 Signed-off-by: Mahesh Bodapati <mbodapat@xilinx.com>
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
new file mode 100644
index 00000000..8d263de8
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
@@ -0,0 +1,35 @@
+From 37d3afd2eaa95c89ad7cb5d0079b017752e4d0ea Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 23 Mar 2016 06:30:09 +0000
+Subject: [PATCH 2/9] mips-linux-nat: Define _ABIO32 if not defined
+
+This helps building gdb on mips64 on musl, since
+musl does not provide sgidefs.h this define is
+only defined when GCC is using o32 ABI, in that
+case gcc emits it as built-in define and hence
+it works ok for mips32
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdb/mips-linux-nat.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index 20e12b6889e..6adc61235aa 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -41,6 +41,10 @@
+ #ifndef PTRACE_GET_THREAD_AREA
+ #define PTRACE_GET_THREAD_AREA 25
+ #endif
++/* musl does not define and relies on compiler built-in macros for it   */
++#ifndef _ABIO32
++#define _ABIO32 1
++#endif
+ 
+ class mips_linux_nat_target final : public linux_nat_trad_target
+ {
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0003-Fix-debug-message-when-register-is-unavailable.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0003-Fix-debug-message-when-register-is-unavailable.patch
index d2d06b54..d8ba6fca 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0003-Fix-debug-message-when-register-is-unavailable.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0003-Fix-debug-message-when-register-is-unavailable.patch
@@ -3,6 +3,8 @@ From: Nathan Rossi <nathan.rossi@petalogix.com>
 Date: Tue, 8 May 2012 18:11:17 +1000
 Subject: [PATCH 3/8] Fix debug message when register is unavailable
 
+Upstream-Status: Pending
+
 Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
 
 Conflicts:
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
new file mode 100644
index 00000000..7e09404b
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -0,0 +1,52 @@
+From e689eec672ee8c53b3adb2ade2b5deb9b7cd99d4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Apr 2016 18:32:14 -0700
+Subject: [PATCH 3/9] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdb/nat/ppc-linux.h        | 6 ++++++
+ gdbserver/linux-ppc-low.cc | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index 1094f6b0be3..d8588a646c2 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef NAT_PPC_LINUX_H
+ #define NAT_PPC_LINUX_H
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ #include <asm/cputable.h>
+ 
+ /* This sometimes isn't defined.  */
+diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc
+index 08824887003..69afbae5359 100644
+--- a/gdbserver/linux-ppc-low.cc
++++ b/gdbserver/linux-ppc-low.cc
+@@ -23,7 +23,13 @@
+ #include "elf/common.h"
+ #include <sys/uio.h>
+ #include <elf.h>
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ 
+ #include "arch/ppc-linux-common.h"
+ #include "arch/ppc-linux-tdesc.h"
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch
new file mode 100644
index 00000000..a1e85e91
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch
@@ -0,0 +1,50 @@
+From 15ee6a626242efb8f367be49c13e00d0b72317f0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Apr 2016 15:25:03 -0700
+Subject: [PATCH 4/9] Dont disable libreadline.a when using --disable-static
+
+If gdb is configured with --disable-static then this is dutifully passed to
+readline which then disables libreadline.a, which causes a problem when gdb
+tries to link against that.
+
+To ensure that readline always builds static libraries, pass --enable-static to
+the sub-configure.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.def | 3 ++-
+ Makefile.in  | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.def b/Makefile.def
+index acdcd625ed6..78fc31e1199 100644
+--- a/Makefile.def
++++ b/Makefile.def
+@@ -120,7 +120,8 @@ host_modules= { module= libiconv;
+                missing= install-html;
+                missing= install-info; };
+ host_modules= { module= m4; };
+-host_modules= { module= readline; };
++host_modules= { module= readline;
++                extra_configure_flags='--enable-static';};
+ host_modules= { module= sid; };
+ host_modules= { module= sim; };
+ host_modules= { module= texinfo; no_install= true; };
+diff --git a/Makefile.in b/Makefile.in
+index 3aacd2daac9..aa58adada4a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -32791,7 +32791,7 @@ configure-readline:
+          $$s/$$module_srcdir/configure \
+          --srcdir=$${topdir}/$$module_srcdir \
+          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+-         --target=${target_alias}  \
++         --target=${target_alias} --enable-static \
+          || exit 1
+ @endif readline
+ 
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0004-Patch-MicroBlaze-MicroBlaze-native-gdb-port.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0004-Patch-MicroBlaze-MicroBlaze-native-gdb-port.patch
index 90944525..08b0ae17 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0004-Patch-MicroBlaze-MicroBlaze-native-gdb-port.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0004-Patch-MicroBlaze-MicroBlaze-native-gdb-port.patch
@@ -4,6 +4,10 @@ Date: Mon, 10 Oct 2022 18:53:46 +0530
 Subject: [PATCH 4/8] [Patch,MicroBlaze] : MicroBlaze native gdb port.
 
 signed-off-by : Mahesh Bodapati <mbodapat@amd.com>
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gdb/Makefile.in                 |   2 +
  gdb/configure.nat               |   4 +
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0005-Patch-microblaze-Adding-64-bit-MB-support.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0005-Patch-microblaze-Adding-64-bit-MB-support.patch
index caf20303..6eea28fe 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0005-Patch-microblaze-Adding-64-bit-MB-support.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0005-Patch-microblaze-Adding-64-bit-MB-support.patch
@@ -34,6 +34,10 @@ Conflicts:
         gdb/regformats/microblaze-with-stack-protect.dat
         gdbserver/linux-microblaze-low.c
         include/elf/common.h
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  bfd/Makefile.am                               |    2 +
  bfd/Makefile.in                               |    3 +
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch
new file mode 100644
index 00000000..242099b9
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch
@@ -0,0 +1,36 @@
+From 25a75aaf29791f4302f0e4452f7ebaf735d4f083 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <amccurdy@gmail.com>
+Date: Sat, 30 Apr 2016 15:29:06 -0700
+Subject: [PATCH 5/9] use <asm/sgidefs.h>
+
+Build fix for MIPS with musl libc
+
+The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
+but not by musl. Regardless of the libc, the kernel headers provide
+<asm/sgidefs.h> which provides the same definitions, so use that
+instead.
+
+Upstream-Status: Pending
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdb/mips-linux-nat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index 6adc61235aa..afb40066744 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch
new file mode 100644
index 00000000..58c9b1d0
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch
@@ -0,0 +1,30 @@
+From c0e7c34134aa1f9644075c596a2338a50d3d923e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Apr 2016 15:35:39 -0700
+Subject: [PATCH 6/9] Change order of CFLAGS
+
+Lets us override Werror if need be
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdbserver/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
+index 47648b8d962..5599779de57 100644
+--- a/gdbserver/Makefile.in
++++ b/gdbserver/Makefile.in
+@@ -156,7 +156,7 @@ WIN32APILIBS = @WIN32APILIBS@
+ INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
+        ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS)
+ INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
+-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
++INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER
+ 
+ # LDFLAGS is specifically reserved for setting from the command line
+ # when running make.
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0006-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0006-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch
index 402d7fe1..9d12cc53 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0006-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0006-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch
@@ -5,6 +5,10 @@ Subject: [PATCH 6/8] [Patch,MicroBlaze] : these changes will make 64 bit
  vectors as default target types when we built gdb with microblaze 64 bit type
  targets,for instance microblaze-xilinx-elf64/microblazeel-xilinx-elf64
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  bfd/config.bfd | 8 ++++++++
  1 file changed, 8 insertions(+)
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0007-Patch-MicroBlaze-Added-m64-abi-for-64-bit-target-des.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0007-Patch-MicroBlaze-Added-m64-abi-for-64-bit-target-des.patch
index 59449bfa..ec11e7be 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0007-Patch-MicroBlaze-Added-m64-abi-for-64-bit-target-des.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0007-Patch-MicroBlaze-Added-m64-abi-for-64-bit-target-des.patch
@@ -7,6 +7,10 @@ Subject: [PATCH 7/8] [Patch,MicroBlaze] : Added m64 abi for 64 bit target
 Conflicts:
         gdb/microblaze-tdep.c
         gdb/microblaze-tdep.h
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gdb/features/microblaze64.xml |   1 +
  gdb/microblaze-tdep.c         | 159 ++++++++++++++++++++++++++++++++--
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch
new file mode 100644
index 00000000..bbd1f0b2
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch
@@ -0,0 +1,48 @@
+From 44fa1ecfbd8a5fe0cfea12a175fa041686842a0c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 May 2016 08:47:05 -0700
+Subject: [PATCH 7/9] resolve restrict keyword conflict
+
+GCC detects that we call 'restrict' as param name in function
+signatures and complains since both params are called 'restrict'
+therefore we use __restrict to denote the C99 keywork
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gnulib/import/sys_time.in.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h
+index 90a67d18426..664641a1fe8 100644
+--- a/gnulib/import/sys_time.in.h
++++ b/gnulib/import/sys_time.in.h
+@@ -93,20 +93,20 @@ struct timeval
+ #   define gettimeofday rpl_gettimeofday
+ #  endif
+ _GL_FUNCDECL_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ _GL_CXXALIAS_RPL (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict));
++                  (struct timeval *__restrict, void *__restrict));
+ # else
+ #  if !@HAVE_GETTIMEOFDAY@
+ _GL_FUNCDECL_SYS (gettimeofday, int,
+-                  (struct timeval *restrict, void *restrict)
++                  (struct timeval *__restrict, void *__restrict)
+                   _GL_ARG_NONNULL ((1)));
+ #  endif
+ /* Need to cast, because on glibc systems, by default, the second argument is
+                                                   struct timezone *.  */
+ _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
+-                       (struct timeval *restrict, void *restrict));
++                       (struct timeval *__restrict, void *__restrict));
+ # endif
+ _GL_CXXALIASWARN (gettimeofday);
+ # if defined __cplusplus && defined GNULIB_NAMESPACE
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
new file mode 100644
index 00000000..3e293276
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
@@ -0,0 +1,55 @@
+From 48906e1038e469b429aa35d0f967730a929c3880 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Jan 2023 00:16:25 -0800
+Subject: [PATCH 8/8] Define alignof using _Alignof when using C11 or newer
+
+WG14 N2350 made very clear that it is an UB having type definitions
+within "offsetof" [1]. This patch enhances the implementation of macro
+alignof_slot to use builtin "_Alignof" to avoid undefined behavior on
+when using std=c11 or newer
+
+clang 16+ has started to flag this [2]
+
+Fixes build when using -std >= gnu11 and using clang16+
+
+Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
+may support C11, exclude those compilers too
+
+gnulib needs this fix and then it will be applied to downstream packages
+like gdb [3]
+
+[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
+[2] https://reviews.llvm.org/D133574
+[3] https://public-inbox.org/bug-gnulib/20230114232744.215167-1-raj.khem@gmail.com/T/#u
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d404c7dd974cc65f894526f4a1b76bc1dcd8d82]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libiberty/sha1.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libiberty/sha1.c b/libiberty/sha1.c
+index 504f06d3b9b..790ada82443 100644
+--- a/libiberty/sha1.c
++++ b/libiberty/sha1.c
+@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
+   if (len >= 64)
+     {
+ #if !_STRING_ARCH_unaligned
++/* GCC releases before GCC 4.9 had a bug in _Alignof.  See GCC bug 52023
++   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
++   clang versions < 8.0.0 have the same bug.  */
++#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
++     || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
++       && !defined __clang__) \
++     || (defined __clang__ && __clang_major__ < 8))
+ # define alignof(type) offsetof (struct { char c; type x; }, x)
++#else
++# define alignof(type) _Alignof(type)
++#endif
+ # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0)
+       if (UNALIGNED_P (buffer))
+        while (len > 64)
+-- 
+2.39.0
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch
new file mode 100644
index 00000000..ed1310ce
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch
@@ -0,0 +1,49 @@
+From 5bdd15553daef7370ca3c1f12d8f14247fdd4907 Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <yszhou4tech@gmail.com>
+Date: Fri, 24 Mar 2017 10:36:03 +0800
+Subject: [PATCH 8/9] Fix invalid sigprocmask call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The POSIX document says
+
+    The pthread_sigmask() and sigprocmask() functions shall fail if:
+
+    [EINVAL]
+    The value of the how argument is not equal to one of the defined values.
+
+and this is how musl-libc is currently doing.  Fix the call to be safe
+and correct
+
+ [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_sigmask.html
+
+gdb/ChangeLog:
+2017-03-24  Yousong Zhou  <yszhou4tech@gmail.com>
+
+    * common/signals-state-save-restore.c (save_original_signals_state):
+    Fix invalid sigprocmask call.
+
+Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek]
+Signed-off-by: André Draszik <adraszik@tycoint.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdbsupport/signals-state-save-restore.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc
+index 92e799d3551..a4a0234272a 100644
+--- a/gdbsupport/signals-state-save-restore.cc
++++ b/gdbsupport/signals-state-save-restore.cc
+@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet)
+   int i;
+   int res;
+ 
+-  res = gdb_sigmask (0,  NULL, &original_signal_mask);
++  res = gdb_sigmask (SIG_BLOCK,  NULL, &original_signal_mask);
+   if (res == -1)
+     perror_with_name (("sigprocmask"));
+ 
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0008-Patch-MicroBlaze.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0008-Patch-MicroBlaze.patch
index 4c96fb49..941a3b9c 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb/0008-Patch-MicroBlaze.patch
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0008-Patch-MicroBlaze.patch
@@ -12,6 +12,10 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 ---
  gdb/microblaze-tdep.c | 14 +++-----------
  1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch
new file mode 100644
index 00000000..f53d3bd1
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch
@@ -0,0 +1,40 @@
+From bc3b1f6aacf2d8fe66b022fbfcf28cd82c76e52f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 29 Nov 2018 18:00:23 -0800
+Subject: [PATCH 9/9] gdbserver ctrl-c handling
+
+This problem was created by the upstream commit 78708b7c8c
+After applying the commit, it will send SIGINT to the process
+group(-signal_pid).
+But if we use gdbserver send SIGINT, and the attached process is not a
+process
+group leader, then the "kill (-signal_pid, SIGINT)" returns error and
+fails  to
+interrupt the attached process.
+
+Upstream-Status: Submitted
+[https://sourceware.org/bugzilla/show_bug.cgi?id=18945]
+
+Author: Josh Gao
+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gdbserver/linux-low.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
+index 7726a4a0c36..f750e074a03 100644
+--- a/gdbserver/linux-low.cc
++++ b/gdbserver/linux-low.cc
+@@ -5496,7 +5496,7 @@ linux_process_target::request_interrupt ()
+ {
+   /* Send a SIGINT to the process group.  This acts just like the user
+      typed a ^C on the controlling terminal.  */
+-  ::kill (-signal_pid, SIGINT);
++  ::kill (signal_pid, SIGINT);
+ }
+ 
+ bool
+-- 
+2.36.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/readline-8.2.patch b/meta-microblaze/recipes-devtools/gdb/gdb/readline-8.2.patch
new file mode 100644
index 00000000..c2db4c0d
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb/readline-8.2.patch
@@ -0,0 +1,39 @@
+From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@linux-m68k.org>
+Date: Sun, 20 Mar 2022 14:01:54 +0100
+Subject: [PATCH] Add support for readline 8.2
+
+In readline 8.2 the type of rl_completer_word_break_characters changed to
+include const.
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b567a7dee39d99f37b37802034c3fce9c4]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ gdb/completer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/completer.c b/gdb/completer.c
+index d3900ae2014..a51c16ac7f8 100644
+--- a/gdb/completer.c
++++ b/gdb/completer.c
+@@ -36,7 +36,7 @@
+    calling a hook instead so we eliminate the CLI dependency.  */
+ #include "gdbcmd.h"
+ 
+-/* Needed for rl_completer_word_break_characters() and for
++/* Needed for rl_completer_word_break_characters and for
+    rl_filename_completion_function.  */
+ #include "readline/readline.h"
+ 
+@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw ()
+       rl_basic_quote_characters = NULL;
+     }
+ 
+-  return rl_completer_word_break_characters;
++  return (char *) rl_completer_word_break_characters;
+ }
+ 
+ char *
+-- 
+2.31.1
+
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb b/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb
new file mode 100644
index 00000000..9c6db4ca
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb
@@ -0,0 +1,39 @@
+require gdb-common.inc
+
+inherit gettext pkgconfig
+
+#LDFLAGS:append = " -s"
+#export CFLAGS:append=" -L${STAGING_LIBDIR}"
+
+# cross-canadian must not see this
+PACKAGES =+ "gdbserver"
+FILES:gdbserver = "${bindir}/gdbserver"
+
+require gdb.inc
+
+inherit python3-dir
+
+EXTRA_OEMAKE:append:libc-musl = "\
+                                 gt_cv_func_gnugettext1_libc=yes \
+                                 gt_cv_func_gnugettext2_libc=yes \
+                                 gl_cv_func_working_strerror=yes \
+                                 gl_cv_func_strerror_0_works=yes \
+                                 gl_cv_func_gettimeofday_clobber=no \
+                                "
+
+do_configure:prepend() {
+        if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
+                cat > ${WORKDIR}/python << EOF
+#!/bin/sh
+case "\$2" in
+        --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
+        --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
+        --exec-prefix) echo "${exec_prefix}" ;;
+        *) exit 1 ;;
+esac
+exit 0
+EOF
+                chmod +x ${WORKDIR}/python
+        fi
+}
+
diff --git a/meta-microblaze/recipes-devtools/m4/files/m4-stack-direction-microblaze.patch b/meta-microblaze/recipes-devtools/m4/files/m4-stack-direction-microblaze.patch
index b8b40fb8..2821e55f 100644
--- a/meta-microblaze/recipes-devtools/m4/files/m4-stack-direction-microblaze.patch
+++ b/meta-microblaze/recipes-devtools/m4/files/m4-stack-direction-microblaze.patch
@@ -1,3 +1,9 @@
+Need a broader match for microblazeel.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+
 --- m4-1.4.19/m4/stack-direction.m4.orig        2021-11-30 13:19:56.005640547 -0800
 +++ m4-1.4.19/m4/stack-direction.m4     2021-11-30 13:20:03.917640741 -0800
 @@ -35,7 +35,7 @@
diff --git a/meta-microblaze/recipes-devtools/python/python3_%.bbappend b/meta-microblaze/recipes-devtools/python/python3_%.bbappend
new file mode 100644
index 00000000..9ea0eac5
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/python/python3_%.bbappend
@@ -0,0 +1,3 @@
+# Microblaze's libpython seems to be named slightly differently
+#  /usr/lib/python3.11/config-3.11/libpython3.11.a
+FILES:libpython3-staticdev:append:microblaze = " ${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}/libpython${PYTHON_MAJMIN}.a"
diff --git a/meta-microblaze/recipes-extended/grep/files/m4-stack-direction-microblaze.patch b/meta-microblaze/recipes-extended/grep/files/m4-stack-direction-microblaze.patch
deleted file mode 100644
index b8b40fb8..00000000
--- a/meta-microblaze/recipes-extended/grep/files/m4-stack-direction-microblaze.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4-1.4.19/m4/stack-direction.m4.orig        2021-11-30 13:19:56.005640547 -0800
-+++ m4-1.4.19/m4/stack-direction.m4     2021-11-30 13:20:03.917640741 -0800
-@@ -35,7 +35,7 @@
-       m68* | \
-       m88k | \
-       mcore | \
--      microblaze | \
-+      microblaze* | \
-       mips* | \
-       mmix | \
-       mn10200 | \
diff --git a/meta-microblaze/recipes-extended/grep/grep_%.bbappend b/meta-microblaze/recipes-extended/grep/grep_%.bbappend
deleted file mode 100644
index c0afc82d..00000000
--- a/meta-microblaze/recipes-extended/grep/grep_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/files"
-SRC_URI:append:microblaze = " \
-    file://m4-stack-direction-microblaze.patch \
-"
diff --git a/meta-microblaze/recipes-extended/xz/xz_%.bbappend b/meta-microblaze/recipes-extended/xz/xz_%.bbappend
new file mode 100644
index 00000000..be8fffd8
--- /dev/null
+++ b/meta-microblaze/recipes-extended/xz/xz_%.bbappend
@@ -0,0 +1,5 @@
+# Microblaze doesn't support versioned symbols
+#
+#  ../../../xz-5.4.1/src/liblzma/common/stream_encoder_mt.c:1283:1: error: symver is only supported on ELF platforms
+#
+EXTRA_OECONF:append:microblaze = " --disable-symbol-versions"
diff --git a/meta-microblaze/recipes-graphics/mesa/mesa_%.bbappend b/meta-microblaze/recipes-graphics/mesa/mesa_%.bbappend
new file mode 100644
index 00000000..7c80fb6c
--- /dev/null
+++ b/meta-microblaze/recipes-graphics/mesa/mesa_%.bbappend
@@ -0,0 +1,14 @@
+# mesa doesn't compile with microblaze compiler
+
+#
+# When building POKY, it's advised that the user set the following:
+#
+# POKY_DEFAULT_DISTRO_FEATURES:microblaze = "ptest"
+#
+# The original version is: POKY_DEFAULT_DISTRO_FEATURES = "opengl ptest multiarch wayland vulkan"
+#
+# opengl, wayland and vulkan are not supported, primarily due to mesa not compiling.
+#
+# multiarch is not something we have on microblaze, so can be left or removed
+#
+COMPATIBLE_MACHINE:microblaze = "none"