binutils: Upgraade to honister version

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

59 files changed, 3912 insertions, 5446 deletions

diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
index 44f4cc79..462bbefd 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
@@ -14,47 +14,29 @@ SRC_URI:append = " \
      file://0011-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch \
      file://0012-fixing-the-constant-range-check-issue.patch \
      file://0013-Patch-Microblaze-Compiler-will-give-error-messages-i.patch \
-     file://0014-intial-commit-of-MB-64-bit.patch \
-     file://0015-MB-X-initial-commit.patch \
-     file://0016-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch \
-     file://0017-Added-relocations-for-MB-X.patch \
-     file://0018-Fixed-MB-x-relocation-issues.patch \
-     file://0019-Fixing-the-branch-related-issues.patch \
-     file://0020-Fixed-address-computation-issues-with-64bit-address.patch \
-     file://0021-Adding-new-relocation-to-support-64bit-rodata.patch \
-     file://0022-fixing-the-.bss-relocation-issue.patch \
-     file://0023-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch \
-     file://0024-Revert-ld-Remove-unused-expression-state.patch \
-     file://0025-fixing-the-long-long-long-mingw-toolchain-issue.patch \
-     file://0026-Added-support-to-new-arithmetic-single-register-inst.patch \
-     file://0027-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch \
-     file://0028-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch \
-     file://0029-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch \
-     file://0030-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch \
+     file://0014-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch \
+     file://0015-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch \
+     file://0016-Added-relocations-for-MB-X.patch \
+     file://0017-Fixed-MB-x-relocation-issues.patch \
+     file://0018-Fixing-the-branch-related-issues.patch \
+     file://0019-Fixed-address-computation-issues-with-64bit-address.patch \
+     file://0020-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch \
+     file://0021-fixing-the-.bss-relocation-issue.patch \
+     file://0022-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch \
+     file://0023-Revert-ld-Remove-unused-expression-state.patch \
+     file://0024-fixing-the-long-long-long-mingw-toolchain-issue.patch \
+     file://0025-Added-support-to-new-arithmetic-single-register-inst.patch \
+     file://0026-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch \
+     file://0027-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch \
+     file://0028-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch \
+     file://0029-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch \
+     file://0030-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch \
      file://0031-gas-revert-moving-of-md_pseudo_table-from-const.patch \
      file://0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch \
-     file://0033-Add-initial-port-of-linux-gdbserver-add-gdb_proc_ser.patch \
-     file://0034-Initial-port-of-core-reading-support-Added-support-f.patch \
+     file://0033-Add-initial-port-of-linux-gdbserver.patch \
+     file://0034-Initial-port-of-core-reading-support.patch \
      file://0035-Fix-debug-message-when-register-is-unavailable.patch \
-     file://0036-revert-master-rebase-changes-to-gdbserver.patch \
-     file://0037-revert-master-rebase-changes-to-gdbserver-previous-c.patch \
-     file://0038-microblaze-Add-build_gdbserver-yes-to-top-level-conf.patch \
-     file://0039-Initial-support-for-native-gdb.patch \
-     file://0040-Fixing-the-issues-related-to-GDB-7.12-added-all-the-.patch \
-     file://0041-Adding-64-bit-MB-support-Added-new-architecture-to-M.patch \
-     file://0042-porting-GDB-for-linux.patch \
-     file://0043-Binutils-security-check-is-causing-build-error-for-w.patch \
-     file://0044-Correcting-the-register-names-from-slr-shr-to-rslr-r.patch \
-     file://0045-Removing-the-header-gdb_assert.h-from-MB-target-file.patch \
-     file://0046-bfd-cpu-microblaze.c-Enhance-disassembler.patch \
-     file://0047-bfd-elf64-microblaze.c-Fix-build-failures.patch \
-     file://0048-bfd-elf-microblaze.c-Remove-obsolete-entries.patch \
-     file://0049-bfd-elf64-microblaze.c-Resolve-various-compiler-warn.patch \
-     file://0050-opcodes-microblaze-dis.c-Fix-compile-warnings.patch \
-     file://0051-gdb-microblaze-tdep.c-Remove-unused-functions.patch \
-     file://0052-sim-Allow-microblaze-architecture.patch \
-     file://0053-gdb-Fix-microblaze-target-compilation.patch \
-     file://0054-Patch-MicroBlaze.patch \
-     file://0055-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch \
-     file://0056-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch \
+     file://0036-microblaze-Add-build_gdbserver-yes-to-top-level-conf.patch \
+     file://0037-Fixing-the-issues-related-to-GDB-7.12.patch \
+     file://0038-Patch-MB-MB-binutils-Upstream-port-issues.patch \
      "
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
index fe3f2bff..c34600e5 100644
--- 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
@@ -1,7 +1,7 @@
-From 212bd1115f13cc0904fb5556751585c775bc51a6 Mon Sep 17 00:00:00 2001
+From baa73267935dc5854f4e07c809a46e42aa8cca4b 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/52] Add wdc.ext.clear and wdc.ext.flush insns
+Subject: [PATCH 01/38] 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
@@ -15,7 +15,7 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 27d8684df0..b6c5016e4d 100644
+index 080d238bd2b..746566fdb87 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -91,6 +91,7 @@
@@ -33,9 +33,9 @@ index 27d8684df0..b6c5016e4d 100644
 -#define MAX_OPCODES 289
 +#define MAX_OPCODES 291
  
- struct op_code_struct
+ const struct op_code_struct
  {
-@@ -174,7 +175,9 @@ 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 },
@@ -46,7 +46,7 @@ index 27d8684df0..b6c5016e4d 100644
    {"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 aa53dfe6bb..795c57b5ff 100644
+index 6dd3694f4be..10d7e883366 100644
 --- a/opcodes/microblaze-opcm.h
 +++ b/opcodes/microblaze-opcm.h
 @@ -33,8 +33,8 @@ enum microblaze_instr
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
index 78f4be14..03fcf2f0 100644
--- 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
@@ -1,7 +1,7 @@
-From 23ed5e7ab73a2b5dc1ca09362d4815a643a2d187 Mon Sep 17 00:00:00 2001
+From 2c240d885b5871571d93af64baf2e67f077f735c Mon Sep 17 00:00:00 2001
 From: nagaraju <nmekala@xilix.com>
 Date: Tue, 19 Mar 2013 17:18:23 +0530
-Subject: [PATCH 02/52] Add mlittle-endian and mbig-endian flags
+Subject: [PATCH 02/38] Add mlittle-endian and mbig-endian flags
 
 Added support in gas for mlittle-endian and mbig-endian flags
 as options.
@@ -16,7 +16,7 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index ae5d36dc9c..34eeb97235 100644
+index 881172d5274..d6fc400cef9 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -37,6 +37,8 @@
@@ -27,8 +27,8 @@ index ae5d36dc9c..34eeb97235 100644
 +#define OPTION_BIG (OPTION_MD_BASE + 3)
  
  void microblaze_generate_symbol (char *sym);
- static bfd_boolean check_spl_reg (unsigned *);
-@@ -1842,6 +1844,8 @@ struct option md_longopts[] =
+ 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},
@@ -37,7 +37,7 @@ index ae5d36dc9c..34eeb97235 100644
    { NULL,          no_argument, NULL, 0}
  };
  
-@@ -2494,9 +2498,11 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
+@@ -2507,9 +2511,11 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
    switch (c)
      {
      case OPTION_EB:
@@ -49,7 +49,7 @@ index ae5d36dc9c..34eeb97235 100644
        target_big_endian = 0;
        break;
      default:
-@@ -2511,6 +2517,9 @@ md_show_usage (FILE * stream ATTRIBUTE_UNUSED)
+@@ -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")); */
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
index 96ddefa0..b76020f5 100644
--- 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
@@ -1,15 +1,18 @@
-From f74d7754befd636c6139261e6c6b23ed49aa0fa9 Mon Sep 17 00:00:00 2001
+From fc6844169e72155a008d963c3991ed084e0d0890 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/52] Disable the warning message for eh_frame_hdr
+Subject: [PATCH 03/38] 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 7a129b00f8..d5e4a5c062 100644
+index 6ce6d225cff..c6b0c122459 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,
@@ -23,7 +26,7 @@ index 7a129b00f8..d5e4a5c062 100644
      (_("error in %pB(%pA); no .eh_frame_hdr table will be created"),
       abfd, sec);
 +}
-   hdr_info->u.dwarf.table = FALSE;
+   hdr_info->u.dwarf.table = false;
    free (sec_info);
   success:
 -- 
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
index a63ad020..03b84798 100644
--- 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
@@ -1,7 +1,7 @@
-From 6aadc146948741df27125cc2253ba9a50efa5cfc Mon Sep 17 00:00:00 2001
+From 786c2252440ed07d05c1ab37675e5138e7b44bb8 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/52] [LOCAL]: Fix relaxation of assembler resolved
+Subject: [PATCH 04/38] [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
@@ -17,6 +17,9 @@ Conflicts:
         bfd/elf32-microblaze.c
         binutils/readelf.c
         include/elf/microblaze.h
+
+Conflicts:
+        binutils/readelf.c
 ---
  bfd/bfd-in2.h              |   5 ++
  bfd/elf32-microblaze.c     | 126 ++++++++++++++++++++++++++++---------
@@ -28,10 +31,10 @@ Conflicts:
  7 files changed, 119 insertions(+), 29 deletions(-)
 
 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 35ef4d755b..1bd19a2b63 100644
+index 9a698316980..943bc2e914c 100644
 --- a/bfd/bfd-in2.h
 +++ b/bfd/bfd-in2.h
-@@ -5428,6 +5428,11 @@ value relative to the read-write small data area anchor  */
+@@ -5423,6 +5423,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,
  
@@ -44,11 +47,11 @@ index 35ef4d755b..1bd19a2b63 100644
  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 693fc71f73..e9715eae6a 100644
+index d9c0d93a01a..2316e085d1f 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -177,6 +177,20 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
-          FALSE),               /* PC relative offset?  */
+@@ -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.  */
@@ -68,7 +71,7 @@ index 693fc71f73..e9715eae6a 100644
     HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
           0,                    /* Rightshift.  */
           3,                    /* Size (0 = byte, 1 = short, 2 = long).  */
-@@ -562,7 +576,10 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+@@ -560,7 +574,10 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
      case BFD_RELOC_NONE:
        microblaze_reloc = R_MICROBLAZE_NONE;
        break;
@@ -80,7 +83,7 @@ index 693fc71f73..e9715eae6a 100644
        microblaze_reloc = R_MICROBLAZE_64_NONE;
        break;
      case BFD_RELOC_32:
-@@ -1914,18 +1931,26 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1910,18 +1927,26 @@ microblaze_elf_relax_section (bfd *abfd,
                 }
               break;
             case R_MICROBLAZE_NONE:
@@ -111,7 +114,7 @@ index 693fc71f73..e9715eae6a 100644
               }
               break;
             case R_MICROBLAZE_64_NONE:
-@@ -1969,30 +1994,73 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1965,30 +1990,73 @@ microblaze_elf_relax_section (bfd *abfd,
           irelscanend = irelocs + o->reloc_count;
           for (irelscan = irelocs; irelscan < irelscanend; irelscan++)
             {
@@ -208,7 +211,7 @@ index 693fc71f73..e9715eae6a 100644
                                                              o->rawsize))
                                 goto error_return;
                               elf_section_data (o)->this_hdr.contents = ocontents;
-@@ -2028,7 +2096,7 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2024,7 +2092,7 @@ microblaze_elf_relax_section (bfd *abfd,
                               elf_section_data (o)->this_hdr.contents = ocontents;
                             }
                         }
@@ -218,10 +221,10 @@ index 693fc71f73..e9715eae6a 100644
                                                         0,
                                                         sec);
 diff --git a/bfd/libbfd.h b/bfd/libbfd.h
-index b97534fc9f..c1551b9240 100644
+index c37ddc03cfd..4153b94564d 100644
 --- a/bfd/libbfd.h
 +++ b/bfd/libbfd.h
-@@ -2967,6 +2967,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
+@@ -2988,6 +2988,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",
@@ -230,10 +233,10 @@ index b97534fc9f..c1551b9240 100644
    "BFD_RELOC_MICROBLAZE_64_GOTPC",
    "BFD_RELOC_MICROBLAZE_64_GOT",
 diff --git a/bfd/reloc.c b/bfd/reloc.c
-index 9aba84ca81..9b39b41941 100644
+index 6d920e1df06..3a08f7a8a42 100644
 --- a/bfd/reloc.c
 +++ b/bfd/reloc.c
-@@ -6858,6 +6858,12 @@ ENUM
+@@ -6896,6 +6896,12 @@ ENUM
  ENUMDOC
    This is a 32 bit reloc for the microblaze to handle
    expressions of the form "Symbol Op Symbol"
@@ -247,13 +250,13 @@ index 9aba84ca81..9b39b41941 100644
    BFD_RELOC_MICROBLAZE_64_NONE
  ENUMDOC
 diff --git a/binutils/readelf.c b/binutils/readelf.c
-index 6057515a89..2b797ef2db 100644
+index a6073f7ec80..5b25fb9a52a 100644
 --- a/binutils/readelf.c
 +++ b/binutils/readelf.c
-@@ -13187,6 +13187,10 @@ is_8bit_abs_reloc (Filedata * filedata, unsigned int reloc_type)
+@@ -14057,6 +14057,10 @@ is_8bit_abs_reloc (Filedata * filedata, unsigned int reloc_type)
        return reloc_type == 1;  /* R_Z80_8.  */
      default:
-       return FALSE;
+       return false;
 +    case EM_MICROBLAZE:
 +      return reloc_type == 33 /* R_MICROBLAZE_32_NONE.  */
 +             || reloc_type == 0 /* R_MICROBLAZE_NONE.  */
@@ -262,10 +265,10 @@ index 6057515a89..2b797ef2db 100644
  }
  
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 34eeb97235..74a63abeb0 100644
+index d6fc400cef9..87efc2b7a46 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
-@@ -2198,9 +2198,12 @@ md_apply_fix (fixS *   fixP,
+@@ -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;
@@ -278,7 +281,7 @@ index 34eeb97235..74a63abeb0 100644
      }
    return;
  }
-@@ -2421,6 +2424,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
+@@ -2434,6 +2437,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
    switch (fixp->fx_r_type)
      {
      case BFD_RELOC_NONE:
@@ -287,7 +290,7 @@ index 34eeb97235..74a63abeb0 100644
      case BFD_RELOC_32:
      case BFD_RELOC_MICROBLAZE_32_LO:
 diff --git a/include/elf/microblaze.h b/include/elf/microblaze.h
-index 2fec296967..3978a3dc01 100644
+index 66b4fda8f54..936ef484289 100644
 --- a/include/elf/microblaze.h
 +++ b/include/elf/microblaze.h
 @@ -61,6 +61,8 @@ START_RELOC_NUMBERS (elf_microblaze_reloc_type)
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
index 95e4a363..f2419c4c 100644
--- 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
@@ -1,7 +1,7 @@
-From 4fc5075cebc9c76053b5ff683ab75c9e8b46ca1a Mon Sep 17 00:00:00 2001
+From 48e989bf1ff9ce0250256afc95d40d75fa098e21 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/52] upstream change to garbage collection sweep causes mb
+Subject: [PATCH 05/38] upstream change to garbage collection sweep causes mb
  regression
 
 Upstream change for PR13177 now clears the def_regular during gc_sweep of a
@@ -18,18 +18,21 @@ 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 998b72f228..2daf8fdf6a 100644
+index 9a05208253c..bdfbcecef92 100644
 --- a/bfd/elflink.c
 +++ b/bfd/elflink.c
-@@ -6372,7 +6372,6 @@ elf_gc_sweep_symbol (struct elf_link_hash_entry *h, void *data)
+@@ -6432,7 +6432,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);
+       (*inf->hide_symbol) (inf->info, h, true);
 -      h->def_regular = 0;
        h->ref_regular = 0;
        h->ref_regular_nonweak = 0;
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
index fcbd662e..5221bb33 100644
--- 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
@@ -1,7 +1,7 @@
-From 4e8bd012d3025a6f6b2b2794930f1bfbad7932e8 Mon Sep 17 00:00:00 2001
+From a150edd000f83578755a749bb8c44553e0dbc1f0 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/52] Fix bug in TLSTPREL Relocation
+Subject: [PATCH 06/38] 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
@@ -13,10 +13,10 @@ big & little-endian compilers
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index e9715eae6a..9c4f809eaa 100644
+index 2316e085d1f..e0729c6a194 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -1447,9 +1447,9 @@ microblaze_elf_relocate_section (bfd *output_bfd,
+@@ -1443,9 +1443,9 @@ microblaze_elf_relocate_section (bfd *output_bfd,
               relocation += addend;
               relocation -= dtprel_base(info);
               bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
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
index fd15e23c..2f1d83d7 100644
--- 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
@@ -1,7 +1,7 @@
-From 1d1344e5786d435f4f492739d0c477befa4c6906 Mon Sep 17 00:00:00 2001
+From fc3bbcce05e1726bf98948cebfef841b84df73cb 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/52] Added Address extension instructions
+Subject: [PATCH 07/38] Added Address extension instructions
 
 This patch adds the support of new instructions which are required
 for supporting Address extension feature.
@@ -24,10 +24,10 @@ Conflicts:
  2 files changed, 16 insertions(+), 5 deletions(-)
 
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index b6c5016e4d..1f1ade40b2 100644
+index 746566fdb87..5d165dcdf91 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
-@@ -178,8 +178,11 @@ struct op_code_struct
+@@ -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 },
@@ -39,7 +39,7 @@ index b6c5016e4d..1f1ade40b2 100644
    {"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 @@ struct op_code_struct
+@@ -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 },
@@ -64,7 +64,7 @@ index b6c5016e4d..1f1ade40b2 100644
    {"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 @@ struct op_code_struct
+@@ -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.  */
@@ -74,7 +74,7 @@ index b6c5016e4d..1f1ade40b2 100644
    {"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 795c57b5ff..b05e319862 100644
+index 10d7e883366..250fd6a250a 100644
 --- a/opcodes/microblaze-opcm.h
 +++ b/opcodes/microblaze-opcm.h
 @@ -33,13 +33,13 @@ enum microblaze_instr
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0008-fixing-the-MAX_OPCODES-to-correct-value.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0008-fixing-the-MAX_OPCODES-to-correct-value.patch
index 8564003c..4c3caa51 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0008-fixing-the-MAX_OPCODES-to-correct-value.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0008-fixing-the-MAX_OPCODES-to-correct-value.patch
@@ -1,14 +1,14 @@
-From b2e494ee992ef0509bd2a4512f62841098631219 Mon Sep 17 00:00:00 2001
+From bb27e620e2911e472eee6c1ee4fb2a1e722b65aa Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Thu, 28 Jan 2016 14:07:34 +0530
-Subject: [PATCH 08/52] fixing the MAX_OPCODES to correct value
+Subject: [PATCH 08/38] fixing the MAX_OPCODES to correct value
 
 ---
  opcodes/microblaze-opc.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 1f1ade40b2..c7a506b845 100644
+index 5d165dcdf91..bf53e492b9a 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -102,7 +102,7 @@
@@ -18,7 +18,7 @@ index 1f1ade40b2..c7a506b845 100644
 -#define MAX_OPCODES 291
 +#define MAX_OPCODES 299
  
- struct op_code_struct
+ const struct op_code_struct
  {
 -- 
 2.17.1
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Add-new-bit-field-instructions.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Add-new-bit-field-instructions.patch
index 0188629d..16e086fb 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Add-new-bit-field-instructions.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Add-new-bit-field-instructions.patch
@@ -1,7 +1,7 @@
-From cea8d524fca305c2878374433d9745b938e4c78f Mon Sep 17 00:00:00 2001
+From c5c42765e7436fa20cc2069fa0426995cf940e5a Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 18 Jul 2016 12:24:28 +0530
-Subject: [PATCH 09/52] Add new bit-field instructions
+Subject: [PATCH 09/38] Add new bit-field instructions
 
 This patches adds new bsefi and bsifi instructions.
 BSEFI- The instruction shall extract a bit field from a
@@ -23,7 +23,7 @@ Conflicts:
  4 files changed, 104 insertions(+), 5 deletions(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 74a63abeb0..765abfb388 100644
+index 87efc2b7a46..aa58a18f05c 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -917,7 +917,7 @@ md_assemble (char * str)
@@ -35,7 +35,7 @@ index 74a63abeb0..765abfb388 100644
    expressionS exp;
    char name[20];
  
-@@ -1172,7 +1172,76 @@ md_assemble (char * str)
+@@ -1178,7 +1178,76 @@ md_assemble (char * str)
        inst |= (reg2 << RA_LOW) & RA_MASK;
        inst |= (immed << IMM_LOW) & IMM5_MASK;
        break;
@@ -113,7 +113,7 @@ index 74a63abeb0..765abfb388 100644
        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 be1534c257..315c6e9350 100644
+index 1696f559a0b..1fe8da2e51b 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)
@@ -151,7 +151,7 @@ index be1534c257..315c6e9350 100644
           print_func (stream, "\t%s", get_field_rd (&buf, inst));
           break;
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index c7a506b845..f61f4ef66d 100644
+index bf53e492b9a..6fcded04b49 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -59,6 +59,9 @@
@@ -181,9 +181,9 @@ index c7a506b845..f61f4ef66d 100644
 -#define MAX_OPCODES 299
 +#define MAX_OPCODES 301
  
- struct op_code_struct
+ const struct op_code_struct
  {
-@@ -159,6 +164,8 @@ 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 },
@@ -202,7 +202,7 @@ index c7a506b845..f61f4ef66d 100644
  #endif /* MICROBLAZE_OPC */
  
 diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index b05e319862..fa921c90c9 100644
+index 250fd6a250a..78a2ac44960 100644
 --- a/opcodes/microblaze-opcm.h
 +++ b/opcodes/microblaze-opcm.h
 @@ -29,7 +29,7 @@ enum microblaze_instr
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.patch
index 892205cd..1c939a84 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.patch
@@ -1,7 +1,7 @@
-From d6ccef90be40de63ee6da4943a601edaf7b1a136 Mon Sep 17 00:00:00 2001
+From ca1e831754eba0e38c1b7ceefd6a3d25c7d36e59 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 10 Jul 2017 16:07:28 +0530
-Subject: [PATCH 10/52] fixing the imm bug. with relax option imm -1 is also
+Subject: [PATCH 10/38] fixing the imm bug. with relax option imm -1 is also
  getting removed this is corrected now.
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 10/52] fixing the imm bug. with relax option imm -1 is also
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 9c4f809eaa..c22130fd8c 100644
+index e0729c6a194..e378542b902 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -1865,8 +1865,7 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1861,8 +1861,7 @@ microblaze_elf_relax_section (bfd *abfd,
        else
         symval += irel->r_addend;
  
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
index db23fe14..3118ea8c 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
@@ -1,7 +1,7 @@
-From 3bb637b058c5f2622950e6984695e36f9cac067a Mon Sep 17 00:00:00 2001
+From b844e6bdbb6aa0dd63055e8c763f68f83ab15318 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Fri, 29 Sep 2017 18:00:23 +0530
-Subject: [PATCH 11/52] [Patch,Microblaze]: fixed bug in GCC so that It will
+Subject: [PATCH 11/38] [Patch,Microblaze]: fixed bug in GCC so that It will
  support .long 0U and .long 0u
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 11/52] [Patch,Microblaze]: fixed bug in GCC so that It will
  1 file changed, 9 insertions(+)
 
 diff --git a/gas/expr.c b/gas/expr.c
-index 6f8ccb8230..0e34ca53d9 100644
+index 03caa91f4d1..469a52cfd56 100644
 --- a/gas/expr.c
 +++ b/gas/expr.c
-@@ -803,6 +803,15 @@ operand (expressionS *expressionP, enum expr_mode mode)
+@@ -832,6 +832,15 @@ operand (expressionS *expressionP, enum expr_mode mode)
               break;
             }
         }
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0012-fixing-the-constant-range-check-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0012-fixing-the-constant-range-check-issue.patch
index 4145b0da..45953906 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0012-fixing-the-constant-range-check-issue.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0012-fixing-the-constant-range-check-issue.patch
@@ -1,7 +1,7 @@
-From e1cb5c37efd76b44a878574ee3baad4c7a882e3b Mon Sep 17 00:00:00 2001
+From 5d4d7383a152bfc87ac7fdf5fcaef7eaca500836 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 16 Oct 2017 15:44:23 +0530
-Subject: [PATCH 12/52] fixing the constant range check issue sample error: not
+Subject: [PATCH 12/38] fixing the constant range check issue sample error: not
  in range ffffffff80000000..7fffffff, not ffffffff70000000
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 12/52] fixing the constant range check issue sample error: not
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 765abfb388..5810a74a5f 100644
+index aa58a18f05c..98d0c259246 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)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-Compiler-will-give-error-messages-i.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
index a74f2b9e..22404408 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
@@ -1,7 +1,7 @@
-From 1a3f130008b4ebcd9a6e45cdac7188bde88f2f28 Mon Sep 17 00:00:00 2001
+From 094a9534b55a51982857859553c582492bf91815 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 21 Feb 2018 12:32:02 +0530
-Subject: [PATCH 13/52] [Patch,Microblaze]: Compiler will give error messages
+Subject: [PATCH 13/38] [Patch,Microblaze]: Compiler will give error messages
  in more detail for mxl-gp-opt flag..
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 13/52] [Patch,Microblaze]: Compiler will give error messages
  1 file changed, 12 insertions(+)
 
 diff --git a/ld/ldmain.c b/ld/ldmain.c
-index 08be9030cb..613d748fef 100644
+index 42660eb9a3c..7849f060aad 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -1515,6 +1515,18 @@ reloc_overflow (struct bfd_link_info *info,
+@@ -1562,6 +1562,18 @@ reloc_overflow (struct bfd_link_info *info,
           break;
         case bfd_link_hash_defined:
         case bfd_link_hash_defweak:
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0014-intial-commit-of-MB-64-bit.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch
index f0037e1f..0ba67003 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0014-intial-commit-of-MB-64-bit.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch
@@ -1,27 +1,26 @@
-From d25d934f076297615cb0287488449fb32b9c46e8 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Sun, 30 Sep 2018 16:28:28 +0530
-Subject: [PATCH 14/52] intial commit of MB 64-bit
+From b53570b1b4eb3e57b21e44515c202dc710b438ce Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Mon, 1 Nov 2021 19:06:53 +0530
+Subject: [PATCH 14/38] [Patch,MicroBlaze] : initial support for MicroBlaze 64
+ bit [-m64]
 
-Conflicts:
-        bfd/configure
-        bfd/configure.ac
-        bfd/cpu-microblaze.c
-        ld/Makefile.am
-        ld/Makefile.in
-        opcodes/microblaze-dis.c
 ---
  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/elf64-microblaze.c             | 3610 ++++++++++++++++++++++++++++
+ bfd/elf32-microblaze.c             |   65 +-
+ bfd/elf64-microblaze.c             | 3577 ++++++++++++++++++++++++++++
+ bfd/libbfd.h                       |    2 +
+ bfd/reloc.c                        |   12 +
  bfd/targets.c                      |    6 +
- gas/config/tc-microblaze.c         |  274 ++-
+ 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 +
@@ -29,17 +28,17 @@ Conflicts:
  ld/emulparams/elf64microblazeel.sh |   23 +
  opcodes/microblaze-dis.c           |   35 +-
  opcodes/microblaze-opc.h           |  162 +-
- opcodes/microblaze-opcm.h          |   20 +-
- 19 files changed, 4197 insertions(+), 40 deletions(-)
+ opcodes/microblaze-opcm.h          |   24 +-
+ 24 files changed, 4375 insertions(+), 69 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 c88c448000..d86f1c5697 100644
+index ed2f701805d..0dc77afa8ad 100644
 --- a/bfd/Makefile.am
 +++ b/bfd/Makefile.am
-@@ -562,6 +562,7 @@ BFD64_BACKENDS = \
+@@ -558,6 +558,7 @@ BFD64_BACKENDS = \
         elf64-riscv.lo \
         elfxx-riscv.lo \
         elf64-s390.lo \
@@ -47,7 +46,7 @@ index c88c448000..d86f1c5697 100644
         elf64-sparc.lo \
         elf64-tilegx.lo \
         elf64-x86-64.lo \
-@@ -596,6 +597,7 @@ BFD64_BACKENDS_CFILES = \
+@@ -592,6 +593,7 @@ BFD64_BACKENDS_CFILES = \
         elf64-nfp.c \
         elf64-ppc.c \
         elf64-s390.c \
@@ -56,10 +55,10 @@ index c88c448000..d86f1c5697 100644
         elf64-tilegx.c \
         elf64-x86-64.c \
 diff --git a/bfd/Makefile.in b/bfd/Makefile.in
-index d0d14c6ab3..a54abeca48 100644
+index 12807d99760..01ac4805eb8 100644
 --- a/bfd/Makefile.in
 +++ b/bfd/Makefile.in
-@@ -988,6 +988,7 @@ BFD64_BACKENDS = \
+@@ -985,6 +985,7 @@ BFD64_BACKENDS = \
         elf64-riscv.lo \
         elfxx-riscv.lo \
         elf64-s390.lo \
@@ -67,7 +66,7 @@ index d0d14c6ab3..a54abeca48 100644
         elf64-sparc.lo \
         elf64-tilegx.lo \
         elf64-x86-64.lo \
-@@ -1022,6 +1023,7 @@ BFD64_BACKENDS_CFILES = \
+@@ -1019,6 +1020,7 @@ BFD64_BACKENDS_CFILES = \
         elf64-nfp.c \
         elf64-ppc.c \
         elf64-s390.c \
@@ -75,7 +74,7 @@ index d0d14c6ab3..a54abeca48 100644
         elf64-sparc.c \
         elf64-tilegx.c \
         elf64-x86-64.c \
-@@ -1501,6 +1503,7 @@ distclean-compile:
+@@ -1498,6 +1500,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@
@@ -83,11 +82,37 @@ index d0d14c6ab3..a54abeca48 100644
  @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 943bc2e914c..2a1d7563643 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -5433,11 +5433,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 14523caf0c..437c03bb9d 100644
+index 30087e3b8f8..108b77ac9c1 100644
 --- a/bfd/config.bfd
 +++ b/bfd/config.bfd
-@@ -825,11 +825,15 @@ case "${targ}" in
+@@ -822,11 +822,15 @@ case "${targ}" in
    microblazeel*-*)
      targ_defvec=microblaze_elf32_le_vec
      targ_selvecs=microblaze_elf32_vec
@@ -104,10 +129,10 @@ index 14523caf0c..437c03bb9d 100644
  
  #ifdef BFD64
 diff --git a/bfd/configure b/bfd/configure
-index 0340ed541b..ff5ae4706c 100755
+index 41586f00f93..ffcd8ad4be0 100755
 --- a/bfd/configure
 +++ b/bfd/configure
-@@ -14903,6 +14903,8 @@ do
+@@ -13445,6 +13445,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 ;;
@@ -117,10 +142,10 @@ index 0340ed541b..ff5ae4706c 100755
      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 8e86f8399c..408092d3be 100644
+index fec067b2135..9a7df353285 100644
 --- a/bfd/configure.ac
 +++ b/bfd/configure.ac
-@@ -639,6 +639,8 @@ do
+@@ -625,6 +625,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 ;;
@@ -130,7 +155,7 @@ index 8e86f8399c..408092d3be 100644
      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 05a3f767e2..194920b20b 100644
+index d461d01e08f..ec94cc13595 100644
 --- a/bfd/cpu-microblaze.c
 +++ b/bfd/cpu-microblaze.c
 @@ -23,7 +23,24 @@
@@ -150,7 +175,7 @@ index 05a3f767e2..194920b20b 100644
 +  "microblaze",                        /* Architecture name.  */
 +  "MicroBlaze",                        /* Printable name.  */
 +  3,                           /* Section align power.  */
-+  FALSE,                               /* Is this the default architecture ?  */
++  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.  */
@@ -174,7 +199,7 @@ index 05a3f767e2..194920b20b 100644
 +  "microblaze",                        /* Architecture name.  */
 +  "MicroBlaze",                        /* Printable name.  */
 +  3,                           /* Section align power.  */
-+  TRUE,                                /* Is this the default architecture ?  */
++  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.  */
@@ -189,7 +214,7 @@ index 05a3f767e2..194920b20b 100644
 +  "microblaze",                        /* Architecture name.  */
 +  "MicroBlaze",                        /* Printable name.  */
 +  3,                           /* Section align power.  */
-+  FALSE,                               /* Is this the default architecture ?  */
++  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.  */
@@ -198,15 +223,135 @@ index 05a3f767e2..194920b20b 100644
 +}
 +#endif
  };
+diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
+index e378542b902..2f2e1ef7f41 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.  */
+@@ -179,15 +193,15 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
+           0,                   /* Rightshift.  */
+           2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+           32,                  /* Bitsize.  */
+-          TRUE,                        /* PC_relative.  */
++          false,                       /* PC_relative.  */
+           0,                   /* Bitpos.  */
+           complain_overflow_bitfield,  /* Complain on overflow.  */
+           NULL,                  /* Special Function.  */
+           "R_MICROBLAZE_32_NONE",/* Name.  */
+-          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
+           0,                   /* Source Mask.  */
+           0,                   /* Dest Mask.  */
+-          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
+ 
+    HOWTO (R_MICROBLAZE_64_NONE,        /* 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;
+@@ -1459,7 +1494,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
+                      {
+@@ -1925,6 +1960,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 0000000000..a357388115
+index 00000000000..46c4aba46f1
 --- /dev/null
 +++ b/bfd/elf64-microblaze.c
-@@ -0,0 +1,3610 @@
+@@ -0,0 +1,3577 @@
 +/* Xilinx MicroBlaze-specific support for 32-bit ELF
 +
-+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
++   Copyright (C) 2009-2021 Free Software Foundation, Inc.
 +
 +   This file is part of BFD, the Binary File Descriptor library.
 +
@@ -226,8 +371,6 @@ index 0000000000..a357388115
 +   Boston, MA 02110-1301, USA.  */
 +
 +
-+int dbg1 = 0;
-+
 +#include "sysdep.h"
 +#include "bfd.h"
 +#include "bfdlink.h"
@@ -252,387 +395,448 @@ index 0000000000..a357388115
 +          0,                   /* Rightshift.  */
 +          3,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          0,                   /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          false,               /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_dont,  /* Complain on overflow.  */
 +          NULL,                  /* Special Function.  */
 +          "R_MICROBLAZE_NONE",         /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0,                   /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* A standard 32 bit relocation.  */
 +   HOWTO (R_MICROBLAZE_32,             /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          32,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          false,               /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_bitfield, /* Complain on overflow.  */
 +          bfd_elf_generic_reloc,/* Special Function.  */
 +          "R_MICROBLAZE_32",           /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0xffffffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* A standard PCREL 32 bit relocation.  */
 +   HOWTO (R_MICROBLAZE_32_PCREL,/* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          32,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          true,                        /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0xffffffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
 +
 +   /* A 64 bit PCREL relocation.  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_64_PCREL,/* Type.  */
 +          0,                   /* Rightshift.  */
 +          4,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          64,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
 +
 +   /* The low half of a PCREL 32 bit relocation.  */
 +   HOWTO (R_MICROBLAZE_32_PCREL_LO,    /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
++
++   /* A 64 bit relocation.  Table entry not really used.  */
++   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.  */
++          true),               /* 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.  */
++          false,               /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_dont, /* Complain on overflow.  */
 +          bfd_elf_generic_reloc,/* Special Function.  */
 +          "R_MICROBLAZE_64",           /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* The low half of a 32 bit relocation.  */
 +   HOWTO (R_MICROBLAZE_32_LO,   /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* Read-only small data section relocation.  */
 +   HOWTO (R_MICROBLAZE_SRO32,   /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          false,               /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_bitfield, /* Complain on overflow.  */
 +          bfd_elf_generic_reloc,/* Special Function.  */
 +          "R_MICROBLAZE_SRO32", /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* Read-write small data area relocation.  */
 +   HOWTO (R_MICROBLAZE_SRW32,   /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          false,               /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_bitfield, /* Complain on overflow.  */
 +          bfd_elf_generic_reloc,/* Special Function.  */
 +          "R_MICROBLAZE_SRW32", /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   HOWTO (R_MICROBLAZE_32_NONE,   /* Type.  */
 +          0,         /* Rightshift.  */
 +          2,            /* Size (0 = byte, 1 = short, 2 = long).  */
 +          32,           /* Bitsize.  */
-+          TRUE,         /* PC_relative.  */
++          true,         /* PC_relative.  */
 +          0,           /* Bitpos.  */
 +          complain_overflow_bitfield,  /* Complain on overflow.  */
 +          NULL,                  /* Special Function.  */
 +          "R_MICROBLAZE_32_NONE",/* Name.  */
-+          FALSE,       /* Partial Inplace.  */
++          false,       /* Partial Inplace.  */
 +          0,          /* Source Mask.  */
 +          0,         /* Dest Mask.  */
-+          FALSE),       /* PC relative offset?  */
++          false),       /* PC relative offset?  */
 +
 +   /* This reloc does nothing.  Used for relaxation.  */
 +   HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
 +          0,                   /* Rightshift.  */
 +          3,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          0,                   /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          true,                        /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_dont, /* Complain on overflow.  */
 +          NULL,                  /* Special Function.  */
 +          "R_MICROBLAZE_64_NONE",/* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0,                   /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* Symbol Op Symbol relocation.  */
 +   HOWTO (R_MICROBLAZE_32_SYM_OP_SYM,          /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          32,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0xffffffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* GNU extension to record C++ vtable hierarchy.  */
 +   HOWTO (R_MICROBLAZE_GNU_VTINHERIT, /* Type.  */
 +          0,                     /* Rightshift.  */
 +          2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
 +          0,                     /* Bitsize.  */
-+          FALSE,                 /* PC_relative.  */
++          false,                 /* PC_relative.  */
 +          0,                     /* Bitpos.  */
 +          complain_overflow_dont,/* Complain on overflow.  */
 +          NULL,                  /* Special Function.  */
 +          "R_MICROBLAZE_GNU_VTINHERIT", /* Name.  */
-+          FALSE,                 /* Partial Inplace.  */
++          false,                 /* Partial Inplace.  */
 +          0,                     /* Source Mask.  */
-+          0,                     /* Dest Mask.  */
-+          FALSE),                /* PC relative offset?  */
++          0,                
++                      /* Dest Mask.  */
++          false),                /* PC relative offset?  */
 +
 +   /* GNU extension to record C++ vtable member usage.  */
 +   HOWTO (R_MICROBLAZE_GNU_VTENTRY,   /* Type.  */
 +          0,                     /* Rightshift.  */
 +          2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
 +          0,                     /* Bitsize.  */
-+          FALSE,                 /* PC_relative.  */
++          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.  */
++          false,                 /* Partial Inplace.  */
 +          0,                     /* Source Mask.  */
 +          0,                     /* Dest Mask.  */
-+          FALSE),                /* PC relative offset?  */
++          false),                /* PC relative offset?  */
 +
 +   /* A 64 bit GOTPC relocation.  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_GOTPC_64,       /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          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 GOT relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_GOT_64,  /* Type.  */
++   /* 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.  */
-+          FALSE,               /* PC_relative.  */
++          true,                        /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_GOT_64",/* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          bfd_elf_generic_reloc,       /* Special Function.  */
++          "R_MICROBLAZE_GPC_64",       /* Name.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          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.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
 +
 +   /*  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_REL,    /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          true,                        /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_dont, /* Complain on overflow.  */
 +          bfd_elf_generic_reloc,/* Special Function.  */
 +          "R_MICROBLAZE_REL",  /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
 +
 +   /*  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_JUMP_SLOT,/* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
 +
 +   /*  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_GLOB_DAT,/* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          TRUE,                        /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          TRUE),               /* PC relative offset?  */
++          true),               /* PC relative offset?  */
 +
 +   /* A 64 bit GOT relative relocation.  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_GOTOFF_64,      /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* A 32 bit GOT relative relocation.  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_GOTOFF_32,      /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          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.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
 +
 +   /* COPY relocation.  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_COPY,           /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
 +          16,                  /* Bitsize.  */
-+          FALSE,               /* PC_relative.  */
++          false,               /* PC_relative.  */
 +          0,                   /* Bitpos.  */
 +          complain_overflow_dont, /* Complain on overflow.  */
 +          bfd_elf_generic_reloc,/* Special Function.  */
 +          "R_MICROBLAZE_COPY",         /* Name.  */
-+          FALSE,               /* Partial Inplace.  */
++          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          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 */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLS",            /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,                    /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        false),                /* pcrel_offset */
 +
 +   HOWTO (R_MICROBLAZE_TLSGD,
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSGD",          /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,                    /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        false),                /* pcrel_offset */
 +
 +   HOWTO (R_MICROBLAZE_TLSLD,
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSLD",          /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,            /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        false),                /* pcrel_offset */
 +
 +   /* Computes the load module index of the load module that contains the
 +      definition of its TLS sym.  */
@@ -640,15 +844,15 @@ index 0000000000..a357388115
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSDTPMOD32",    /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,            /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        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
@@ -657,15 +861,15 @@ index 0000000000..a357388115
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSDTPREL32",    /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,            /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        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
@@ -674,15 +878,15 @@ index 0000000000..a357388115
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSDTPREL64",    /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,            /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        false),                /* pcrel_offset */
 +
 +   /* Computes a tp-relative displacement, the difference between the value of
 +      sym+add and the value of the thread pointer (r13).  */
@@ -690,15 +894,15 @@ index 0000000000..a357388115
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSGOTTPREL32",  /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,            /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        false),                /* pcrel_offset */
 +
 +   /* Computes a tp-relative displacement, the difference between the value of
 +      sym+add and the value of the thread pointer (r13).  */
@@ -706,15 +910,15 @@ index 0000000000..a357388115
 +        0,                     /* rightshift */
 +        2,                     /* size (0 = byte, 1 = short, 2 = long) */
 +        32,                    /* bitsize */
-+        FALSE,                 /* pc_relative */
++        false,                 /* pc_relative */
 +        0,                     /* bitpos */
 +        complain_overflow_dont, /* complain_on_overflow */
 +        bfd_elf_generic_reloc, /* special_function */
 +        "R_MICROBLAZE_TLSTPREL32",     /* name */
-+        FALSE,                 /* partial_inplace */
++        false,                 /* partial_inplace */
 +        0,                     /* src_mask */
 +        0x0000ffff,            /* dst_mask */
-+        FALSE),                /* pcrel_offset */
++        false),                /* pcrel_offset */
 +
 +};
 +
@@ -795,12 +999,24 @@ index 0000000000..a357388115
 +    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;
@@ -861,7 +1077,7 @@ index 0000000000..a357388115
 +
 +/* Set the howto pointer for a RCE ELF reloc.  */
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_info_to_howto (bfd * abfd,
 +                             arelent * cache_ptr,
 +                             Elf_Internal_Rela * dst)
@@ -879,58 +1095,35 @@ index 0000000000..a357388115
 +      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
 +                         abfd, r_type);
 +      bfd_set_error (bfd_error_bad_value);
-+      return FALSE;
++      return false;
 +    }
 +
 +  cache_ptr->howto = microblaze_elf_howto_table [r_type];
-+  return TRUE;
++  return true;
 +}
 +
 +/* Microblaze ELF local labels start with 'L.' or '$L', not '.L'.  */
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
 +{
 +  if (name[0] == 'L' && name[1] == '.')
-+    return TRUE;
++    return true;
 +
 +  if (name[0] == '$' && name[1] == 'L')
-+    return TRUE;
++    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);
 +}
 +
-+/* 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. */
@@ -954,18 +1147,6 @@ index 0000000000..a357388115
 +{
 +  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;
@@ -978,9 +1159,10 @@ index 0000000000..a357388115
 +
 +/* Get the ELF linker hash table from a link_info structure.  */
 +
-+#define elf64_mb_hash_table(p)                         \
-+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
-+  == MICROBLAZE_ELF_DATA ? ((struct elf64_mb_link_hash_table *) ((p)->hash)) : NULL)
++#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.  */
 +
@@ -1042,14 +1224,14 @@ index 0000000000..a357388115
 +{
 +  struct bfd_link_hash_entry *h;
 +
-+  h = bfd_link_hash_lookup (info->hash, RO_SDA_ANCHOR_NAME, FALSE, FALSE, TRUE);
++  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);
++  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
@@ -1125,7 +1307,7 @@ index 0000000000..a357388115
 +   section, which means that the addend must be adjusted
 +   accordingly.  */
 +
-+static bfd_boolean
++static int
 +microblaze_elf_relocate_section (bfd *output_bfd,
 +                                struct bfd_link_info *info,
 +                                bfd *input_bfd,
@@ -1141,7 +1323,7 @@ index 0000000000..a357388115
 +  Elf_Internal_Rela *rel, *relend;
 +  int endian = (bfd_little_endian (output_bfd)) ? 0 : 2;
 +  /* Assume success.  */
-+  bfd_boolean ret = TRUE;
++  bool ret = true;
 +  asection *sreloc;
 +  bfd_vma *local_got_offsets;
 +  unsigned int tls_type;
@@ -1151,7 +1333,7 @@ index 0000000000..a357388115
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    return false;
 +
 +  local_got_offsets = elf_local_got_offsets (input_bfd);
 +
@@ -1172,7 +1354,7 @@ index 0000000000..a357388115
 +      const char *sym_name;
 +      bfd_reloc_status_type r = bfd_reloc_ok;
 +      const char *errmsg = NULL;
-+      bfd_boolean unresolved_reloc = FALSE;
++      bool unresolved_reloc = false;
 +
 +      h = NULL;
 +      r_type = ELF64_R_TYPE (rel->r_info);
@@ -1180,10 +1362,11 @@ index 0000000000..a357388115
 +
 +      if (r_type < 0 || r_type >= (int) R_MICROBLAZE_max)
 +       {
-+         (*_bfd_error_handler) (_("%s: unknown relocation type %d"),
-+                                bfd_get_filename (input_bfd), (int) r_type);
++         /* 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;
++         ret = false;
 +         continue;
 +       }
 +
@@ -1233,12 +1416,12 @@ index 0000000000..a357388115
 +      else
 +       {
 +         bfd_vma relocation;
-+         bfd_boolean resolved_to_zero;
++         bool resolved_to_zero;
 +
 +         /* This is a final link.  */
 +         sym = NULL;
 +         sec = NULL;
-+         unresolved_reloc = FALSE;
++         unresolved_reloc = false;
 +
 +         if (r_symndx < symtab_hdr->sh_info)
 +           {
@@ -1256,8 +1439,8 @@ index 0000000000..a357388115
 +         else
 +           {
 +             /* External symbol.  */
-+             bfd_boolean warned ATTRIBUTE_UNUSED;
-+             bfd_boolean ignored ATTRIBUTE_UNUSED;
++             bool warned ATTRIBUTE_UNUSED;
++             bool ignored ATTRIBUTE_UNUSED;
 +
 +             RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
 +                                      r_symndx, symtab_hdr, sym_hashes,
@@ -1294,7 +1477,7 @@ index 0000000000..a357388115
 +                         microblaze_elf_final_sdp (info);
 +                       if (ro_small_data_pointer == 0)
 +                         {
-+                           ret = FALSE;
++                           ret = false;
 +                           r = bfd_reloc_undefined;
 +                           goto check_reloc;
 +                         }
@@ -1319,7 +1502,7 @@ index 0000000000..a357388115
 +                          microblaze_elf_howto_table[(int) r_type]->name,
 +                          sec);
 +                       /*bfd_set_error (bfd_error_bad_value); ??? why? */
-+                       ret = FALSE;
++                       ret = false;
 +                       continue;
 +                     }
 +                 }
@@ -1342,7 +1525,7 @@ index 0000000000..a357388115
 +                         microblaze_elf_final_sdp (info);
 +                       if (rw_small_data_pointer == 0)
 +                         {
-+                           ret = FALSE;
++                           ret = false;
 +                           r = bfd_reloc_undefined;
 +                           goto check_reloc;
 +                         }
@@ -1367,7 +1550,7 @@ index 0000000000..a357388115
 +                          microblaze_elf_howto_table[(int) r_type]->name,
 +                          sec);
 +                       /*bfd_set_error (bfd_error_bad_value); ??? why? */
-+                       ret = FALSE;
++                       ret = false;
 +                       continue;
 +                     }
 +                 }
@@ -1378,8 +1561,20 @@ index 0000000000..a357388115
 +             break; /* Do nothing.  */
 +
 +           case (int) R_MICROBLAZE_GOTPC_64:
-+             relocation = htab->sgotplt->output_section->vma
-+               + htab->sgotplt->output_offset;
++             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);
@@ -1393,13 +1588,13 @@ index 0000000000..a357388115
 +           case (int) R_MICROBLAZE_PLT_64:
 +             {
 +               bfd_vma immediate;
-+               if (htab->splt != NULL && h != NULL
++               if (htab->elf.splt != NULL && h != NULL
 +                   && h->plt.offset != (bfd_vma) -1)
 +                 {
-+                   relocation = (htab->splt->output_section->vma
-+                                 + htab->splt->output_offset
++                   relocation = (htab->elf.splt->output_section->vma
++                                 + htab->elf.splt->output_offset
 +                                 + h->plt.offset);
-+                   unresolved_reloc = FALSE;
++                   unresolved_reloc = false;
 +                   immediate = relocation - (input_section->output_section->vma
 +                                             + input_section->output_offset
 +                                             + offset + INST_WORD_SIZE);
@@ -1435,8 +1630,8 @@ index 0000000000..a357388115
 +               unsigned long indx;
 +               bfd_vma static_value;
 +
-+               bfd_boolean need_relocs = FALSE;
-+               if (htab->sgot == NULL)
++               bool need_relocs = false;
++               if (htab->elf.sgot == NULL)
 +                 abort ();
 +
 +               indx = 0;
@@ -1452,8 +1647,9 @@ index 0000000000..a357388115
 +                 offp = &htab->tlsld_got.offset;
 +               else if (h != NULL)
 +                 {
-+                   if (htab->sgotplt != NULL && h->got.offset != (bfd_vma) -1)
-+                       offp = &h->got.offset;
++                   if (htab->elf.sgotplt != NULL
++                       && h->got.offset != (bfd_vma) -1)
++                     offp = &h->got.offset;
 +                   else
 +                       abort ();
 +                 }
@@ -1476,7 +1672,7 @@ index 0000000000..a357388115
 +               /* Symbol index to use for relocs */
 +               if (h != NULL)
 +                 {
-+                   bfd_boolean dyn =
++                   bool dyn =
 +                       elf_hash_table (info)->dynamic_sections_created;
 +
 +                   if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
@@ -1493,7 +1689,7 @@ index 0000000000..a357388115
 +                   || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
 +                       && !resolved_to_zero)
 +                   || h->root.type != bfd_link_hash_undefweak))
-+                 need_relocs = TRUE;
++                 need_relocs = true;
 +
 +               /* 2. Compute/Emit Static value of r-expression */
 +               static_value = relocation + addend;
@@ -1503,53 +1699,51 @@ index 0000000000..a357388115
 +                 {
 +                   bfd_vma got_offset;
 +
-+                   got_offset = (htab->sgot->output_section->vma
-+                                 + htab->sgot->output_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->sgot->contents + off);
-+                         }
++                         bfd_put_32 (output_bfd, 1,
++                                     htab->elf.sgot->contents + off);
 +                       else
-+                         {
-+                           microblaze_elf_output_dynamic_relocation (output_bfd,
-+                             htab->srelgot, htab->srelgot->reloc_count++,
-+                             /* symindex= */ 0, R_MICROBLAZE_TLSDTPMOD32,
-+                             got_offset, 0);
-+                         }
++                         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->sgot->contents + off);
-+                         }
-+                       else
-+                         {
-+                           microblaze_elf_output_dynamic_relocation (output_bfd,
-+                             htab->srelgot,
-+                             htab->srelgot->reloc_count++,
-+                             /* symindex= */ indx, R_MICROBLAZE_TLSDTPMOD32,
-+                             got_offset, indx ? 0 : static_value);
-+                         }
++                       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->srelgot == NULL)
++                   if (htab->elf.srelgot == NULL)
 +                     abort ();
 +
-+                   got_offset = (htab->sgot->output_section->vma
-+                                 + htab->sgot->output_offset
++                   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->sgot->contents + off2);
++                       /* 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))
 +                     {
@@ -1601,7 +1795,7 @@ index 0000000000..a357388115
 +               bfd_put_16 (input_bfd, relocation & 0xffff,
 +                           contents + offset + endian + INST_WORD_SIZE);
 +
-+               unresolved_reloc = FALSE;
++               unresolved_reloc = false;
 +               break;
 +             }
 +
@@ -1617,7 +1811,8 @@ index 0000000000..a357388115
 +               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);
++               bfd_put_16 (input_bfd, lo,
++                           contents + offset + INST_WORD_SIZE + endian);
 +               break;
 +             }
 +
@@ -1639,6 +1834,8 @@ index 0000000000..a357388115
 +             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:
@@ -1649,7 +1846,7 @@ index 0000000000..a357388115
 +               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
 +                     {
@@ -1657,11 +1854,22 @@ index 0000000000..a357388115
 +                         relocation -= (input_section->output_section->vma
 +                                        + input_section->output_offset
 +                                        + offset + 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);
++                       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;
 +                 }
 +
@@ -1686,7 +1894,7 @@ index 0000000000..a357388115
 +                 {
 +                   Elf_Internal_Rela outrel;
 +                   bfd_byte *loc;
-+                   bfd_boolean skip;
++                   bool skip;
 +
 +                   /* When generating a shared object, these relocations
 +                      are copied into the output file to be resolved at run
@@ -1694,15 +1902,15 @@ index 0000000000..a357388115
 +
 +                   BFD_ASSERT (sreloc != NULL);
 +
-+                   skip = FALSE;
++                   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;
++                     skip = true;
 +                   else if (outrel.r_offset == (bfd_vma) -2)
-+                     skip = TRUE;
++                     skip = true;
 +                   outrel.r_offset += (input_section->output_section->vma
 +                                       + input_section->output_offset);
 +
@@ -1728,11 +1936,11 @@ index 0000000000..a357388115
 +                       else
 +                         {
 +                           BFD_FAIL ();
-+                           (*_bfd_error_handler)
-+                             (_("%B: probably compiled without -fPIC?"),
++                           _bfd_error_handler
++                             (_("%pB: probably compiled without -fPIC?"),
 +                              input_bfd);
 +                           bfd_set_error (bfd_error_bad_value);
-+                           return FALSE;
++                           return false;
 +                         }
 +                     }
 +
@@ -1752,11 +1960,24 @@ index 0000000000..a357388115
 +                         relocation -= (input_section->output_section->vma
 +                                        + input_section->output_offset
 +                                        + offset + 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);
-+                     }
++                       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;
 +                 }
 +             }
@@ -1799,7 +2020,7 @@ index 0000000000..a357388115
 +
 +           case bfd_reloc_undefined:
 +             (*info->callbacks->undefined_symbol)
-+               (info, name, input_bfd, input_section, offset, TRUE);
++               (info, name, input_bfd, input_section, offset, true);
 +             break;
 +
 +           case bfd_reloc_outofrange:
@@ -1827,21 +2048,6 @@ index 0000000000..a357388115
 +
 +  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 bfd_boolean
-+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.  */
 +
@@ -1896,11 +2102,11 @@ index 0000000000..a357388115
 +    bfd_put_32 (abfd, instr_lo, bfd_addr + INST_WORD_SIZE);
 +}
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_relax_section (bfd *abfd,
 +                             asection *sec,
 +                             struct bfd_link_info *link_info,
-+                             bfd_boolean *again)
++                             bool *again)
 +{
 +  Elf_Internal_Shdr *symtab_hdr;
 +  Elf_Internal_Rela *internal_relocs;
@@ -1921,14 +2127,14 @@ index 0000000000..a357388115
 +
 +  /* 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;
++  *again = false;
 +
 +  /* Only do this for a text section.  */
 +  if (bfd_link_relocatable (link_info)
 +      || (sec->flags & SEC_RELOC) == 0
 +      || (sec->reloc_count == 0)
 +      || (sec->flags & SEC_CODE) == 0)
-+    return TRUE;
++    return true;
 +
 +  BFD_ASSERT ((sec->size > 0) || (sec->rawsize > 0));
 +
@@ -1964,7 +2170,8 @@ index 0000000000..a357388115
 +    {
 +      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_64 )
++&& (ELF64_R_TYPE (irel->r_info) != (int) R_MICROBLAZE_TEXTREL_64))
 +       continue; /* Can't delete this reloc.  */
 +
 +      /* Get the section contents.  */
@@ -2034,6 +2241,10 @@ index 0000000000..a357388115
 +              + 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;
 +
@@ -2055,9 +2266,13 @@ index 0000000000..a357388115
 +              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);
++             BFD_ASSERT (false);
 +            }
 +        }
 +    } /* Loop through all relocations.  */
@@ -2095,6 +2310,28 @@ index 0000000000..a357388115
 +                   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:
 +             {
@@ -2149,9 +2386,9 @@ index 0000000000..a357388115
 +            continue;
 +
 +          /* We always cache the relocs.  Perhaps, if info->keep_memory is
-+             FALSE, we should free them, if we are permitted to.  */
++             false, we should free them, if we are permitted to.  */
 +
-+          irelocs = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL, TRUE);
++          irelocs = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL, true);
 +          if (irelocs == NULL)
 +            goto error_return;
 +
@@ -2177,7 +2414,7 @@ index 0000000000..a357388115
 +                     else
 +                       {
 +                         /* We always cache the section contents.
-+                            Perhaps, if info->keep_memory is FALSE, we
++                            Perhaps, if info->keep_memory is false, we
 +                            should free them, if we are permitted to.  */
 +
 +                         if (o->rawsize == 0)
@@ -2216,7 +2453,7 @@ index 0000000000..a357388115
 +                          else
 +                            {
 +                              /* We always cache the section contents.
-+                                 Perhaps, if info->keep_memory is FALSE, we
++                                 Perhaps, if info->keep_memory is false, we
 +                                 should free them, if we are permitted to.  */
 +                             if (o->rawsize == 0)
 +                               o->rawsize = o->size;
@@ -2245,7 +2482,7 @@ index 0000000000..a357388115
 +                         else
 +                           {
 +                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is FALSE, we
++                                Perhaps, if info->keep_memory is false, we
 +                                should free them, if we are permitted to.  */
 +
 +                             if (o->rawsize == 0)
@@ -2267,7 +2504,8 @@ index 0000000000..a357388115
 +                   }
 +               }
 +             else if ((ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_PCREL_LO)
-+                      || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_LO))
++                      || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_LO)
++               || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_TEXTREL_32_LO))
 +               {
 +                 isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 +
@@ -2285,7 +2523,7 @@ index 0000000000..a357388115
 +                         else
 +                           {
 +                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is FALSE, we
++                                Perhaps, if info->keep_memory is false, we
 +                                should free them, if we are permitted to.  */
 +                             if (o->rawsize == 0)
 +                               o->rawsize = o->size;
@@ -2311,7 +2549,8 @@ index 0000000000..a357388115
 +                   }
 +               }
 +
-+             if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64)
++             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);
 +
@@ -2328,7 +2567,7 @@ index 0000000000..a357388115
 +                         else
 +                           {
 +                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is FALSE, we
++                                Perhaps, if info->keep_memory is false, we
 +                                should free them, if we are permitted to.  */
 +
 +                             if (o->rawsize == 0)
@@ -2373,7 +2612,7 @@ index 0000000000..a357388115
 +                         else
 +                           {
 +                             /* We always cache the section contents.
-+                                Perhaps, if info->keep_memory is FALSE, we
++                                Perhaps, if info->keep_memory is false, we
 +                                should free them, if we are permitted to.  */
 +                             if (o->rawsize == 0)
 +                               o->rawsize = o->size;
@@ -2457,11 +2696,8 @@ index 0000000000..a357388115
 +      symtab_hdr->contents = (bfd_byte *) isymbuf;
 +    }
 +
-+  if (free_relocs != NULL)
-+    {
-+      free (free_relocs);
-+      free_relocs = NULL;
-+    }
++  free (free_relocs);
++  free_relocs = NULL;
 +
 +  if (free_contents != NULL)
 +    {
@@ -2475,26 +2711,21 @@ index 0000000000..a357388115
 +
 +  if (sec->relax_count == 0)
 +    {
-+      *again = FALSE;
++      *again = false;
 +      free (sec->relax);
 +      sec->relax = NULL;
 +    }
 +  else
-+    *again = TRUE;
-+  return TRUE;
++    *again = true;
++  return true;
 +
 + error_return:
-+  if (free_relocs != NULL)
-+    free (free_relocs);
-+  if (free_contents != NULL)
-+    free (free_contents);
-+  if (sec->relax != NULL)
-+    {
-+      free (sec->relax);
-+      sec->relax = NULL;
-+      sec->relax_count = 0;
-+    }
-+  return FALSE;
++  free (free_relocs);
++  free (free_contents);
++  free (sec->relax);
++  sec->relax = NULL;
++  sec->relax_count = 0;
++  return false;
 +}
 +
 +/* Return the section that should be marked against GC for a given
@@ -2518,17 +2749,6 @@ index 0000000000..a357388115
 +  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
 +}
 +
-+/* Update the got entry reference counts for the section being removed.  */
-+
-+static bfd_boolean
-+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
@@ -2542,37 +2762,7 @@ index 0000000000..a357388115
 +/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
 +   shortcuts to them in our hash table.  */
 +
-+static bfd_boolean
-+create_got_section (bfd *dynobj, struct bfd_link_info *info)
-+{
-+  struct elf64_mb_link_hash_table *htab;
-+
-+  if (! _bfd_elf_create_got_section (dynobj, info))
-+    return FALSE;
-+  htab = elf64_mb_hash_table (info);
-+  if (htab == NULL)
-+    return FALSE;
-+
-+  htab->sgot = bfd_get_linker_section (dynobj, ".got");
-+  htab->sgotplt = bfd_get_linker_section (dynobj, ".got.plt");
-+  if (!htab->sgot || !htab->sgotplt)
-+    return FALSE;
-+
-+  if ((htab->srelgot = bfd_get_linker_section (dynobj, ".rela.got")) == NULL)
-+    htab->srelgot = bfd_make_section_anyway (dynobj, ".rela.got");
-+  if (htab->srelgot == NULL
-+      || ! bfd_set_section_flags (htab->srelgot, SEC_ALLOC
-+                                  | SEC_LOAD
-+                                  | SEC_HAS_CONTENTS
-+                                  | SEC_IN_MEMORY
-+                                  | SEC_LINKER_CREATED
-+                                  | SEC_READONLY)
-+      || ! bfd_set_section_alignment (htab->srelgot, 2))
-+    return FALSE;
-+  return TRUE;
-+}
-+
-+static bfd_boolean
++static bool
 +update_local_sym_info (bfd *abfd,
 +                      Elf_Internal_Shdr *symtab_hdr,
 +                      unsigned long r_symndx,
@@ -2588,7 +2778,7 @@ index 0000000000..a357388115
 +      size *= (sizeof (*local_got_refcounts) + sizeof (*local_got_tls_masks));
 +      local_got_refcounts = bfd_zalloc (abfd, size);
 +      if (local_got_refcounts == NULL)
-+        return FALSE;
++        return false;
 +      elf_local_got_refcounts (abfd) = local_got_refcounts;
 +    }
 +
@@ -2597,11 +2787,11 @@ index 0000000000..a357388115
 +  local_got_tls_masks[r_symndx] |= tls_type;
 +  local_got_refcounts[r_symndx] += 1;
 +
-+  return TRUE;
++  return true;
 +}
 +/* Look through the relocs for a section during the first phase.  */
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_check_relocs (bfd * abfd,
 +                            struct bfd_link_info * info,
 +                            asection * sec,
@@ -2616,11 +2806,11 @@ index 0000000000..a357388115
 +  asection *sreloc = NULL;
 +
 +  if (bfd_link_relocatable (info))
-+    return TRUE;
++    return true;
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    return false;
 +
 +  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
 +  sym_hashes = elf_sym_hashes (abfd);
@@ -2656,14 +2846,14 @@ index 0000000000..a357388115
 +            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;
++            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;
++            return false;
 +          break;
 +
 +         /* This relocation requires .plt entry.  */
@@ -2676,22 +2866,24 @@ index 0000000000..a357388115
 +          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);
-+        dogottls:
-+          sec->has_tls_reloc = 1;
-+        case R_MICROBLAZE_GOT_64:
-+          if (htab->sgot == NULL)
-+            {
-+              if (htab->elf.dynobj == NULL)
-+                htab->elf.dynobj = abfd;
-+              if (!create_got_section (htab->elf.dynobj, info))
-+                return FALSE;
-+            }
-+          if (h != NULL)
++       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;
@@ -2699,7 +2891,18 @@ index 0000000000..a357388115
 +          else
 +           {
 +             if (! update_local_sym_info(abfd, symtab_hdr, r_symndx, tls_type) )
-+               return FALSE;
++               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;
 +
@@ -2748,14 +2951,14 @@ index 0000000000..a357388115
 +                        && (! 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 elf64_mb_dyn_relocs *p;
-+                struct elf64_mb_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 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
@@ -2772,7 +2975,7 @@ index 0000000000..a357388115
 +                   sreloc = _bfd_elf_make_dynamic_reloc_section (sec, dynobj,
 +                                                                 2, abfd, 1);
 +                   if (sreloc == NULL)
-+                     return FALSE;
++                     return false;
 +                 }
 +
 +               /* If this is a global symbol, we count the number of
@@ -2789,27 +2992,27 @@ index 0000000000..a357388115
 +                   Elf_Internal_Sym *isym;
 +                   void *vpp;
 +
-+                   isym = bfd_sym_from_r_symndx (&htab->sym_sec,
++                   isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,
 +                                                 abfd, r_symndx);
 +                   if (isym == NULL)
-+                     return FALSE;
++                     return false;
 +
 +                   s = bfd_section_from_elf_index (abfd, isym->st_shndx);
 +                   if (s == NULL)
-+                     return FALSE;
++                     return false;
 +
 +                   vpp = &elf_section_data (s)->local_dynrel;
-+                   head = (struct elf64_mb_dyn_relocs **) vpp;
++                   head = (struct elf_dyn_relocs **) vpp;
 +                 }
 +
 +               p = *head;
 +               if (p == NULL || p->sec != sec)
 +                 {
 +                   size_t amt = sizeof *p;
-+                   p = ((struct elf64_mb_dyn_relocs *)
++                   p = ((struct elf_dyn_relocs *)
 +                        bfd_alloc (htab->elf.dynobj, amt));
 +                   if (p == NULL)
-+                     return FALSE;
++                     return false;
 +                   p->next = *head;
 +                   *head = p;
 +                   p->sec = sec;
@@ -2826,35 +3029,7 @@ index 0000000000..a357388115
 +        }
 +    }
 +
-+  return TRUE;
-+}
-+
-+static bfd_boolean
-+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 && !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;
++  return true;
 +}
 +
 +/* Copy the extra info we tack onto an elf_link_hash_entry.  */
@@ -2869,46 +3044,12 @@ index 0000000000..a357388115
 +  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);
 +}
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
 +                                     struct elf_link_hash_entry *h)
 +{
@@ -2922,7 +3063,7 @@ index 0000000000..a357388115
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    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,
@@ -2944,7 +3085,7 @@ index 0000000000..a357388115
 +         h->needs_plt = 0;
 +       }
 +
-+      return TRUE;
++      return true;
 +    }
 +  else
 +    /* It's possible that we incorrectly decided a .plt reloc was
@@ -2963,7 +3104,7 @@ index 0000000000..a357388115
 +      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;
++      return true;
 +    }
 +
 +  /* This is a reference to a symbol defined by a dynamic object which
@@ -2974,34 +3115,26 @@ index 0000000000..a357388115
 +     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;
++    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;
++    return true;
 +
 +  /* If -z nocopyreloc was given, we won't generate them either.  */
 +  if (info->nocopyreloc)
 +    {
 +      h->non_got_ref = 0;
-+      return TRUE;
-+    }
-+
-+  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;
++      return true;
 +    }
 +
-+  /* If we didn't find any dynamic relocs in read-only sections, then
++  /* 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;
++      return true;
 +    }
 +
 +  /* We must allocate the symbol in our .dynbss section, which will
@@ -3044,7 +3177,7 @@ index 0000000000..a357388115
 +  if (power_of_two > s->alignment_power)
 +    {
 +      if (!bfd_set_section_alignment (s, power_of_two))
-+       return FALSE;
++       return false;
 +    }
 +
 +  /* Define the symbol as being at this point in the section.  */
@@ -3053,27 +3186,27 @@ index 0000000000..a357388115
 +
 +  /* Increment the section size to make room for the symbol.  */
 +  s->size += h->size;
-+  return TRUE;
++  return true;
 +}
 +
 +/* Allocate space in .plt, .got and associated reloc sections for
 +   dynamic relocs.  */
 +
-+static bfd_boolean
++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 elf64_mb_dyn_relocs *p;
++  struct elf_dyn_relocs *p;
 +
 +  if (h->root.type == bfd_link_hash_indirect)
-+    return TRUE;
++    return true;
 +
 +  info = (struct bfd_link_info *) dat;
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    return false;
 +
 +  if (htab->elf.dynamic_sections_created
 +      && h->plt.refcount > 0)
@@ -3084,12 +3217,12 @@ index 0000000000..a357388115
 +          && !h->forced_local)
 +        {
 +          if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+            return FALSE;
++            return false;
 +        }
 +
 +      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h))
-+        {
-+          asection *s = htab->splt;
++       {
++         asection *s = htab->elf.splt;
 +
 +          /* The first entry in .plt is reserved.  */
 +          if (s->size == 0)
@@ -3143,7 +3276,7 @@ index 0000000000..a357388115
 +          && !h->forced_local)
 +        {
 +          if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+            return FALSE;
++            return false;
 +        }
 +
 +      need = 0;
@@ -3184,7 +3317,7 @@ index 0000000000..a357388115
 +    h->got.offset = (bfd_vma) -1;
 +
 +  if (h->dyn_relocs == NULL)
-+    return TRUE;
++    return true;
 +
 +  /* In the shared -Bsymbolic case, discard space allocated for
 +     dynamic pc-relative relocs against symbols which turn out to be
@@ -3198,7 +3331,7 @@ index 0000000000..a357388115
 +         && (h->forced_local
 +             || info->symbolic))
 +       {
-+         struct elf64_mb_dyn_relocs **pp;
++         struct elf_dyn_relocs **pp;
 +
 +         for (pp = &h->dyn_relocs; (p = *pp) != NULL; )
 +           {
@@ -3232,7 +3365,7 @@ index 0000000000..a357388115
 +             && !h->forced_local)
 +           {
 +             if (! bfd_elf_link_record_dynamic_symbol (info, h))
-+               return FALSE;
++               return false;
 +           }
 +
 +         /* If that succeeded, we know we'll be keeping all the
@@ -3253,12 +3386,12 @@ index 0000000000..a357388115
 +      sreloc->size += p->count * sizeof (Elf64_External_Rela);
 +    }
 +
-+  return TRUE;
++  return true;
 +}
 +
 +/* Set the sizes of the dynamic sections.  */
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
 +                                     struct bfd_link_info *info)
 +{
@@ -3269,7 +3402,7 @@ index 0000000000..a357388115
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    return false;
 +
 +  dynobj = htab->elf.dynobj;
 +  BFD_ASSERT (dynobj != NULL);
@@ -3290,9 +3423,9 @@ index 0000000000..a357388115
 +
 +      for (s = ibfd->sections; s != NULL; s = s->next)
 +       {
-+         struct elf64_mb_dyn_relocs *p;
++         struct elf_dyn_relocs *p;
 +
-+         for (p = ((struct elf64_mb_dyn_relocs *)
++         for (p = ((struct elf_dyn_relocs *)
 +                   elf_section_data (s)->local_dynrel);
 +              p != NULL;
 +              p = p->next)
@@ -3385,7 +3518,7 @@ index 0000000000..a357388115
 +  for (s = dynobj->sections; s != NULL; s = s->next)
 +    {
 +      const char *name;
-+      bfd_boolean strip = FALSE;
++      bool strip = false;
 +
 +      if ((s->flags & SEC_LINKER_CREATED) == 0)
 +        continue;
@@ -3394,7 +3527,7 @@ index 0000000000..a357388115
 +        of the dynobj section names depend upon the input files.  */
 +      name = bfd_section_name (s);
 +
-+      if (strncmp (name, ".rela", 5) == 0)
++      if (startswith (name, ".rela"))
 +       {
 +         if (s->size == 0)
 +           {
@@ -3407,7 +3540,7 @@ index 0000000000..a357388115
 +                adjust_dynamic_symbol is called, and it is that
 +                function which decides whether anything needs to go
 +                into these sections.  */
-+             strip = TRUE;
++             strip = true;
 +           }
 +         else
 +           {
@@ -3427,67 +3560,31 @@ index 0000000000..a357388115
 +       }
 +
 +      if (strip)
-+        {
-+          s->flags |= SEC_EXCLUDE;
-+          continue;
-+        }
++       {
++         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.  */
++        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;
++       return false;
 +    }
 +
-+  if (elf_hash_table (info)->dynamic_sections_created)
-+    {
-+      /* Add some entries to the .dynamic section.  We fill in the
-+        values later, in microblaze_elf_finish_dynamic_sections, but we
-+        must add the entries now so that we get the correct size for
-+        the .dynamic section.  The DT_DEBUG entry is filled in by the
-+        dynamic linker and used by the debugger.  */
-+#define add_dynamic_entry(TAG, VAL)                    \
-+      _bfd_elf_add_dynamic_entry (info, TAG, VAL)
-+
-+      if (bfd_link_executable (info))
-+        {
-+          if (!add_dynamic_entry (DT_DEBUG, 0))
-+            return FALSE;
-+        }
-+
-+      if (!add_dynamic_entry (DT_RELA, 0)
-+          || !add_dynamic_entry (DT_RELASZ, 0)
-+          || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
-+       return FALSE;
-+
-+      if (htab->splt->size != 0)
-+        {
-+          if (!add_dynamic_entry (DT_PLTGOT, 0)
-+              || !add_dynamic_entry (DT_PLTRELSZ, 0)
-+              || !add_dynamic_entry (DT_PLTREL, DT_RELA)
-+              || !add_dynamic_entry (DT_JMPREL, 0)
-+              || !add_dynamic_entry (DT_BIND_NOW, 1))
-+            return FALSE;
-+        }
-+
-+      if (info->flags & DF_TEXTREL)
-+        {
-+          if (!add_dynamic_entry (DT_TEXTREL, 0))
-+            return FALSE;
-+        }
-+    }
-+#undef add_dynamic_entry
-+  return TRUE;
++  /* ??? 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 bfd_boolean
++static bool
 +microblaze_elf_finish_dynamic_symbol (bfd *output_bfd,
 +                                     struct bfd_link_info *info,
 +                                     struct elf_link_hash_entry *h,
@@ -3498,7 +3595,7 @@ index 0000000000..a357388115
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    return false;
 +
 +  if (h->plt.offset != (bfd_vma) -1)
 +    {
@@ -3515,9 +3612,9 @@ index 0000000000..a357388115
 +         it up.  */
 +      BFD_ASSERT (h->dynindx != -1);
 +
-+      splt = htab->splt;
-+      srela = htab->srelplt;
-+      sgotplt = htab->sgotplt;
++      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.  */
@@ -3593,16 +3690,23 @@ index 0000000000..a357388115
 +      if (bfd_link_pic (info)
 +          && ((info->symbolic && h->def_regular)
 +             || h->dynindx == -1))
-+        {
-+          asection *sec = h->root.u.def.section;
-+          microblaze_elf_output_dynamic_relocation (output_bfd,
-+                                                    srela, srela->reloc_count++,
-+                                                    /* symindex= */ 0,
-+                                                    R_MICROBLAZE_REL, offset,
-+                                                    h->root.u.def.value
-+                                                    + sec->output_section->vma
-+                                                    + sec->output_offset);
-+        }
++       {
++         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,
@@ -3626,16 +3730,17 @@ index 0000000000..a357388115
 +
 +      BFD_ASSERT (h->dynindx != -1);
 +
-+      s = bfd_get_linker_section (htab->elf.dynobj, ".rela.bss");
-+      BFD_ASSERT (s != NULL);
-+
 +      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;
-+      loc = s->contents + s->reloc_count++ * sizeof (Elf64_External_Rela);
-+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
++      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.  */
@@ -3644,13 +3749,13 @@ index 0000000000..a357388115
 +      || h == htab->elf.hplt)
 +    sym->st_shndx = SHN_ABS;
 +
-+  return TRUE;
++  return true;
 +}
 +
 +
 +/* Finish up the dynamic sections.  */
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_finish_dynamic_sections (bfd *output_bfd,
 +                                       struct bfd_link_info *info)
 +{
@@ -3660,7 +3765,7 @@ index 0000000000..a357388115
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
-+    return FALSE;
++    return false;
 +
 +  dynobj = htab->elf.dynobj;
 +
@@ -3671,57 +3776,63 @@ index 0000000000..a357388115
 +      asection *splt;
 +      Elf64_External_Dyn *dyncon, *dynconend;
 +
-+      splt = bfd_get_linker_section (dynobj, ".plt");
-+      BFD_ASSERT (splt != NULL && sdyn != NULL);
-+
-+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
-+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
++      dyncon = (Elf32_External_Dyn *) sdyn->contents;
++      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
 +      for (; dyncon < dynconend; dyncon++)
-+        {
-+          Elf_Internal_Dyn dyn;
-+          const char *name;
-+          bfd_boolean size;
++       {
++         Elf_Internal_Dyn dyn;
++         asection *s;
++         bool size;
 +
 +          bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
 +
-+          switch (dyn.d_tag)
-+            {
-+            case DT_PLTGOT:   name = ".got.plt"; size = FALSE; break;
-+            case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE; break;
-+            case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
-+            case DT_RELA:     name = ".rela.dyn"; size = FALSE; break;
-+            case DT_RELASZ:   name = ".rela.dyn"; size = TRUE; break;
-+            default:     name = NULL; size = FALSE; break;
-+            }
++         switch (dyn.d_tag)
++           {
++           case DT_PLTGOT:
++             s = htab->elf.sgotplt;
++             size = false;
++             break;
 +
-+          if (name != NULL)
-+            {
-+              asection *s;
++           case DT_PLTRELSZ:
++             s = htab->elf.srelplt;
++             size = true;
++             break;
 +
-+              s = bfd_get_section_by_name (output_bfd, name);
-+              if (s == NULL)
-+                dyn.d_un.d_val = 0;
-+              else
-+                {
-+                  if (! size)
-+                    dyn.d_un.d_ptr = s->vma;
-+                  else
-+                    dyn.d_un.d_val = s->size;
-+                }
-+              bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
-+            }
-+        }
++           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);
-+        }
++       {
++         memset (splt->contents, 0, PLT_ENTRY_SIZE);
++         bfd_put_32 (output_bfd, (bfd_vma) 0x80000000 /* nop.  */,
++                     splt->contents + splt->size - 4);
 +
-+      elf_section_data (splt->output_section)->this_hdr.sh_entsize = 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
@@ -3741,13 +3852,13 @@ index 0000000000..a357388115
 +  if (htab->elf.sgot && htab->elf.sgot->size > 0)
 +    elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize = 4;
 +
-+  return TRUE;
++  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 bfd_boolean
++static bool
 +microblaze_elf_add_symbol_hook (bfd *abfd,
 +                               struct bfd_link_info *info,
 +                               Elf_Internal_Sym *sym,
@@ -3764,13 +3875,13 @@ index 0000000000..a357388115
 +        put into .sbss.  */
 +      *secp = bfd_make_section_old_way (abfd, ".sbss");
 +      if (*secp == NULL
-+         || !bfd_set_section_flags (*secp, SEC_IS_COMMON))
-+       return FALSE;
++         || !bfd_set_section_flags (*secp, SEC_IS_COMMON | SEC_SMALL_DATA))
++       return false;
 +
 +      *valp = sym->st_size;
 +    }
 +
-+  return TRUE;
++  return true;
 +}
 +
 +#define TARGET_LITTLE_SYM      microblaze_elf64_le_vec
@@ -3791,34 +3902,78 @@ index 0000000000..a357388115
 +#define bfd_elf64_bfd_is_local_label_name       microblaze_elf_is_local_label_name
 +#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    microblaze_elf_merge_private_bfd_data
++#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_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_check_relocs               microblaze_elf_check_relocs
++#define elf_backend_copy_indirect_symbol       microblaze_elf_copy_indirect_symbol
++#define bfd_elf32_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_rela_normal                1
-+
-+#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_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 4153b94564d..2caaf27bcd7 100644
+--- a/bfd/libbfd.h
++++ b/bfd/libbfd.h
+@@ -2990,7 +2990,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 3a08f7a8a42..288a5026d27 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -6904,12 +6904,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 0732c5e429..1ec226b2f4 100644
+index 89b49e721b4..22543016ffb 100644
 --- a/bfd/targets.c
 +++ b/bfd/targets.c
-@@ -782,6 +782,8 @@ extern const bfd_target mep_elf32_le_vec;
+@@ -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;
@@ -3827,7 +3982,7 @@ index 0732c5e429..1ec226b2f4 100644
  extern const bfd_target mips_ecoff_be_vec;
  extern const bfd_target mips_ecoff_le_vec;
  extern const bfd_target mips_ecoff_bele_vec;
-@@ -1150,6 +1152,10 @@ static const bfd_target * const _bfd_target_vector[] =
+@@ -1156,6 +1158,10 @@ static const bfd_target * const _bfd_target_vector[] =
  
         &metag_elf32_vec,
  
@@ -3839,7 +3994,7 @@ index 0732c5e429..1ec226b2f4 100644
  
         &mips_ecoff_be_vec,
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 5810a74a5f..ffbb843d33 100644
+index 98d0c259246..378fb882f13 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -35,10 +35,13 @@
@@ -3855,8 +4010,45 @@ index 5810a74a5f..ffbb843d33 100644
 +#define OPTION_M64 (OPTION_MD_BASE + 4)
  
  void microblaze_generate_symbol (char *sym);
- static bfd_boolean check_spl_reg (unsigned *);
-@@ -773,6 +776,74 @@ parse_imm (char * s, expressionS * e, offsetT min, offsetT max)
+ 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;
  }
  
@@ -3931,7 +4123,24 @@ index 5810a74a5f..ffbb843d33 100644
  static char *
  check_got (int * got_type, int * got_len)
  {
-@@ -920,6 +991,7 @@ md_assemble (char * str)
+@@ -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, immed2, temp;
    expressionS exp;
    char name[20];
@@ -3939,7 +4148,41 @@ index 5810a74a5f..ffbb843d33 100644
  
    /* Drop leading whitespace.  */
    while (ISSPACE (* str))
-@@ -1129,7 +1201,7 @@ md_assemble (char * 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;
  
@@ -3948,7 +4191,7 @@ index 5810a74a5f..ffbb843d33 100644
        if (strcmp (op_end, ""))
          op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
        else
-@@ -1163,16 +1235,22 @@ md_assemble (char * str)
+@@ -1169,16 +1274,22 @@ md_assemble (char * str)
            immed = exp.X_add_number;
          }
  
@@ -3974,7 +4217,7 @@ index 5810a74a5f..ffbb843d33 100644
        if (strcmp (op_end, ""))
          op_end = parse_reg (op_end + 1, &reg1);  /* Get rd.  */
        else
-@@ -1196,7 +1274,7 @@ md_assemble (char * str)
+@@ -1202,7 +1313,7 @@ md_assemble (char * str)
  
        /* Width immediate value.  */
        if (strcmp (op_end, ""))
@@ -3983,7 +4226,7 @@ index 5810a74a5f..ffbb843d33 100644
        else
          as_fatal (_("Error in statement syntax"));
        if (exp.X_op != O_constant)
-@@ -1208,6 +1286,8 @@ md_assemble (char * str)
+@@ -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"));
@@ -3992,7 +4235,7 @@ index 5810a74a5f..ffbb843d33 100644
  
        /* Shift immediate value.  */
        if (strcmp (op_end, ""))
-@@ -1215,32 +1295,40 @@ md_assemble (char * str)
+@@ -1221,32 +1334,40 @@ md_assemble (char * str)
        else
          as_fatal (_("Error in statement syntax"));
        if (exp.X_op != O_constant)
@@ -4044,7 +4287,7 @@ index 5810a74a5f..ffbb843d33 100644
        break;
      case INST_TYPE_R1_R2:
        if (strcmp (op_end, ""))
-@@ -1808,6 +1896,142 @@ md_assemble (char * str)
+@@ -1820,6 +1941,143 @@ md_assemble (char * str)
        }
        inst |= (immed << IMM_MBAR);
        break;
@@ -4078,6 +4321,7 @@ index 5810a74a5f..ffbb843d33 100644
 +      if (exp.X_op != O_constant)
 +       {
 +         char *opc = NULL;
++         //char *opc = str_microblaze_64;
 +         relax_substateT subtype;
 +
 +         if (exp.X_md != 0)
@@ -4091,7 +4335,7 @@ index 5810a74a5f..ffbb843d33 100644
 +                            subtype,   /* PC-relative or not.  */
 +                            exp.X_add_symbol,
 +                            exp.X_add_number,
-+                            opc);
++                            (char *) opc);
 +         immedl = 0L;
 +        }
 +      else
@@ -4099,7 +4343,7 @@ index 5810a74a5f..ffbb843d33 100644
 +         output = frag_more (isize);
 +         immedl = exp.X_add_number;
 +
-+         opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 +         if (opcode1 == NULL)
 +           {
 +             as_bad (_("unknown opcode \"%s\""), "imml");
@@ -4129,7 +4373,7 @@ index 5810a74a5f..ffbb843d33 100644
 +          reg1 = 0;
 +        }
 +      if (strcmp (op_end, ""))
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMM, MAX_IMM);
++        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
 +      else
 +        as_fatal (_("Error in statement syntax"));
 +
@@ -4139,7 +4383,8 @@ index 5810a74a5f..ffbb843d33 100644
 +
 +      if (exp.X_op != O_constant)
 +       {
-+          char *opc = NULL;
++         //char *opc = NULL;
++          char *opc = str_microblaze_64;
 +          relax_substateT subtype;
 +
 +         if (exp.X_md != 0)
@@ -4153,15 +4398,14 @@ index 5810a74a5f..ffbb843d33 100644
 +                            subtype,   /* PC-relative or not.  */
 +                            exp.X_add_symbol,
 +                            exp.X_add_number,
-+                            opc);
++                            (char *) opc);
 +         immedl = 0L;
 +       }
 +      else
 +       {
 +          output = frag_more (isize);
 +          immedl = exp.X_add_number;
-+
-+         opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 +         if (opcode1 == NULL)
 +           {
 +             as_bad (_("unknown opcode \"%s\""), "imml");
@@ -4187,7 +4431,7 @@ index 5810a74a5f..ffbb843d33 100644
  
      default:
        as_fatal (_("unimplemented opcode \"%s\""), name);
-@@ -1915,6 +2139,7 @@ struct option md_longopts[] =
+@@ -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},
@@ -4195,7 +4439,190 @@ index 5810a74a5f..ffbb843d33 100644
    { NULL,          no_argument, NULL, 0}
  };
  
-@@ -2565,6 +2790,18 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
+@@ -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;
  }
  
@@ -4214,7 +4641,7 @@ index 5810a74a5f..ffbb843d33 100644
  int
  md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
  {
-@@ -2578,6 +2815,10 @@ 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;
@@ -4225,7 +4652,7 @@ index 5810a74a5f..ffbb843d33 100644
      default:
        return 0;
      }
-@@ -2593,6 +2834,7 @@ md_show_usage (FILE * stream ATTRIBUTE_UNUSED)
+@@ -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"));
@@ -4233,8 +4660,20 @@ index 5810a74a5f..ffbb843d33 100644
  }
  
  
+@@ -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 01cb3e894f..7435a70ef5 100644
+index c6d33f873c4..34aa1174ed2 100644
 --- a/gas/config/tc-microblaze.h
 +++ b/gas/config/tc-microblaze.h
 @@ -78,7 +78,9 @@ extern const struct relax_type md_relax_table[];
@@ -4249,31 +4688,44 @@ index 01cb3e894f..7435a70ef5 100644
  #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 4d94c4fd5b..f709a01816 100644
+index 0cca28673dd..a650d624e3c 100644
 --- a/include/elf/common.h
 +++ b/include/elf/common.h
-@@ -340,6 +340,7 @@
- #define EM_RISCV       243     /* RISC-V */
- #define EM_LANAI       244     /* Lanai 32-bit processor.  */
- #define EM_BPF         247     /* Linux BPF – in-kernel virtual machine.  */
-+#define EM_MB_64       248     /* Xilinx MicroBlaze 32-bit RISC soft processor core */
- #define EM_NFP         250     /* Netronome Flow Processor.  */
- #define EM_CSKY                252     /* C-SKY processor family.  */
+@@ -354,6 +354,7 @@
+ #define EM_65816       257     /* WDC 65816/65C816 */
+ #define EM_LOONGARCH   258     /* LoongArch */
+ #define EM_KF32                259     /* ChipON KungFu32 */
++#define EM_MB_64       260     /* 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 936ef484289..1f958724e5f 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 02c4fc1639..d063e2d32c 100644
+index f8e99325361..8d263078750 100644
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -416,6 +416,8 @@ ALL_64_EMULATION_SOURCES = \
+@@ -410,6 +410,8 @@ ALL_64_EMULATION_SOURCES = \
         eelf32ltsmipn32.c \
         eelf32ltsmipn32_fbsd.c \
         eelf32mipswindiss.c \
-+       eelf64microblazeel.c \
-+       eelf64microblaze.c \
-        eelf64_aix.c \
-        eelf64bpf.c \
-        eelf64_ia64.c \
-@@ -898,6 +900,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
++        eelf64microblazeel.c \
++        eelf64microblaze.c \
+        eelf32lriscv.c \
+        eelf32lriscv_ilp32f.c \
+        eelf32lriscv_ilp32.c \
+@@ -902,6 +904,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@
@@ -4283,19 +4735,19 @@ index 02c4fc1639..d063e2d32c 100644
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64bpf.Pc@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64.Pc@am__quote@
 diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 2fe12e14f6..797212859f 100644
+index ef2e99e08da..f7e845b9274 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -898,6 +898,8 @@ ALL_64_EMULATION_SOURCES = \
+@@ -899,6 +899,8 @@ ALL_64_EMULATION_SOURCES = \
         eelf32ltsmipn32.c \
         eelf32ltsmipn32_fbsd.c \
         eelf32mipswindiss.c \
 +       eelf64microblazeel.c \
 +       eelf64microblaze.c \
-        eelf64_aix.c \
-        eelf64bpf.c \
-        eelf64_ia64.c \
-@@ -1338,6 +1340,8 @@ distclean-compile:
+        eelf32lriscv.c \
+        eelf32lriscv_ilp32f.c \
+        eelf32lriscv_ilp32.c \
+@@ -1398,6 +1400,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@
@@ -4304,7 +4756,7 @@ index 2fe12e14f6..797212859f 100644
  @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@
-@@ -2493,6 +2497,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+@@ -2560,6 +2564,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@
@@ -4314,10 +4766,10 @@ index 2fe12e14f6..797212859f 100644
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64bpf.Pc@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64.Pc@am__quote@
 diff --git a/ld/configure.tgt b/ld/configure.tgt
-index 87c7d9a4ca..801d27c9e3 100644
+index 6205d7c9872..3e97dbb311c 100644
 --- a/ld/configure.tgt
 +++ b/ld/configure.tgt
-@@ -469,6 +469,9 @@ microblaze*-linux*) targ_emul="elf32mb_linux"
+@@ -468,6 +468,9 @@ microblaze*-linux*) targ_emul="elf32mb_linux"
  microblazeel*)         targ_emul=elf32microblazeel
                         targ_extra_emuls=elf32microblaze
                         ;;
@@ -4329,7 +4781,7 @@ index 87c7d9a4ca..801d27c9e3 100644
                         ;;
 diff --git a/ld/emulparams/elf64microblaze.sh b/ld/emulparams/elf64microblaze.sh
 new file mode 100644
-index 0000000000..9c7b0eb708
+index 00000000000..9c7b0eb7080
 --- /dev/null
 +++ b/ld/emulparams/elf64microblaze.sh
 @@ -0,0 +1,23 @@
@@ -4358,7 +4810,7 @@ index 0000000000..9c7b0eb708
 +#GENERATE_SHLIB_SCRIPT=yes
 diff --git a/ld/emulparams/elf64microblazeel.sh b/ld/emulparams/elf64microblazeel.sh
 new file mode 100644
-index 0000000000..9c7b0eb708
+index 00000000000..9c7b0eb7080
 --- /dev/null
 +++ b/ld/emulparams/elf64microblazeel.sh
 @@ -0,0 +1,23 @@
@@ -4386,7 +4838,7 @@ index 0000000000..9c7b0eb708
 +TEMPLATE_NAME=elf32
 +#GENERATE_SHLIB_SCRIPT=yes
 diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index 315c6e9350..f643f2600d 100644
+index 1fe8da2e51b..fc15d210fe0 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
 @@ -33,6 +33,7 @@
@@ -4476,7 +4928,7 @@ index 315c6e9350..f643f2600d 100644
         /* For tuqula instruction */
         case INST_TYPE_RD:
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index f61f4ef66d..61eaa39b3e 100644
+index 6fcded04b49..4a1545d8920 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -40,7 +40,7 @@
@@ -4528,17 +4980,17 @@ index f61f4ef66d..61eaa39b3e 100644
 -#define MAX_OPCODES 301
 +#define MAX_OPCODES 412
  
- struct op_code_struct
+ const struct op_code_struct
  {
-@@ -125,6 +132,7 @@ struct op_code_struct
+@@ -125,6 +132,7 @@ const struct op_code_struct
    /* More info about output format here.  */
- } opcodes[MAX_OPCODES] =
+ } 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 @@ struct op_code_struct
+@@ -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 },
@@ -4555,7 +5007,7 @@ index f61f4ef66d..61eaa39b3e 100644
    {"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 @@ struct op_code_struct
+@@ -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 },
@@ -4664,8 +5116,8 @@ index f61f4ef66d..61eaa39b3e 100644
 +  {"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_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE8000000, OPCODE_MASK_H, invalid_inst, memory_load_inst },  /* Identical to 32-bit */
-+  {"sli",     INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xF8000000, OPCODE_MASK_H, invalid_inst, memory_store_inst }, /* Identical to 32-bit */
++  {"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 },
@@ -4704,7 +5156,7 @@ index f61f4ef66d..61eaa39b3e 100644
  #endif /* MICROBLAZE_OPC */
  
 diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index fa921c90c9..1dcd3dca3d 100644
+index 78a2ac44960..70e351f6f4e 100644
 --- a/opcodes/microblaze-opcm.h
 +++ b/opcodes/microblaze-opcm.h
 @@ -25,6 +25,7 @@
@@ -4715,6 +5167,17 @@ index fa921c90c9..1dcd3dca3d 100644
    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,
+   fint, fsqrt,
+   tget, tcget, tnget, tncget, tput, tcput, tnput, tncput,
 @@ -58,6 +59,18 @@ enum microblaze_instr
    aputd, taputd, caputd, tcaputd, naputd, tnaputd, ncaputd, tncaputd,
    eagetd, teagetd, ecagetd, tecagetd, neagetd, tneagetd, necagetd, tnecagetd,
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0015-MB-X-initial-commit.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0015-MB-X-initial-commit.patch
deleted file mode 100644
index 7b87f40f..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0015-MB-X-initial-commit.patch
+++ /dev/null
@@ -1,684 +0,0 @@
-From 550150a8f97738902539ad774fbd0c977ab3a427 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Sun, 30 Sep 2018 16:31:26 +0530
-Subject: [PATCH 15/52] MB-X initial commit code cleanup is needed.
-
-Conflicts:
-        bfd/elf32-microblaze.c
-        gas/config/tc-microblaze.c
-        opcodes/microblaze-opcm.h
----
- bfd/bfd-in2.h              |  10 +++
- bfd/elf32-microblaze.c     |  59 +++++++++++++-
- bfd/elf64-microblaze.c     |  61 ++++++++++++++-
- bfd/libbfd.h               |   2 +
- bfd/reloc.c                |  12 +++
- gas/config/tc-microblaze.c | 154 ++++++++++++++++++++++++++++++-------
- include/elf/microblaze.h   |   2 +
- opcodes/microblaze-opc.h   |   4 +-
- opcodes/microblaze-opcm.h  |   4 +-
- 9 files changed, 275 insertions(+), 33 deletions(-)
-
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 1bd19a2b63..a335182ba1 100644
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -5438,11 +5438,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/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index c22130fd8c..14bb6de052 100644
---- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -116,6 +116,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.  */
-@@ -280,6 +294,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.  */
-@@ -619,9 +648,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;
-@@ -1463,7 +1498,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
-                      {
-@@ -1929,6 +1964,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
-index a357388115..6b1f47d00d 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -116,6 +116,21 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
-           0x0000ffff,          /* Dest Mask.  */
-           TRUE),               /* PC relative offset?  */
- 
-+   /* A 64 bit relocation.  Table entry not really used.  */
-+   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.  */
-+          TRUE),               /* PC relative offset?  */
-+
-    /* A 64 bit relocation.  Table entry not really used.  */
-    HOWTO (R_MICROBLAZE_64,             /* Type.  */
-           0,                   /* Rightshift.  */
-@@ -265,6 +280,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.  */
-@@ -589,9 +619,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;
-@@ -1172,6 +1208,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-              break; /* Do nothing.  */
- 
-            case (int) R_MICROBLAZE_GOTPC_64:
-+           case (int) R_MICROBLAZE_GPC_64:
-              relocation = htab->sgotplt->output_section->vma
-                + htab->sgotplt->output_offset;
-              relocation -= (input_section->output_section->vma
-@@ -1443,7 +1480,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
-                      {
-@@ -1889,6 +1926,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/libbfd.h b/bfd/libbfd.h
-index c1551b9240..b4aace6a70 100644
---- a/bfd/libbfd.h
-+++ b/bfd/libbfd.h
-@@ -2969,7 +2969,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 9b39b41941..0e8a24e9cb 100644
---- a/bfd/reloc.c
-+++ b/bfd/reloc.c
-@@ -6866,12 +6866,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/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index ffbb843d33..33eda2a4da 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -94,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[] =
-@@ -116,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 struct hash_control * opcode_hash_control;      /* Opcode mnemonics.  */
-@@ -396,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},
-@@ -405,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}
-@@ -898,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;
-@@ -930,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 bfd_boolean
- check_spl_reg (unsigned * reg)
-@@ -1174,6 +1180,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 *) 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;
-@@ -1926,6 +1959,7 @@ md_assemble (char * str)
-       if (exp.X_op != O_constant)
-        {
-          char *opc = NULL;
-+         //char *opc = str_microblaze_64;
-          relax_substateT subtype;
- 
-          if (exp.X_md != 0)
-@@ -1939,7 +1973,7 @@ md_assemble (char * str)
-                             subtype,   /* PC-relative or not.  */
-                             exp.X_add_symbol,
-                             exp.X_add_number,
--                            opc);
-+                            (char *) opc);
-          immedl = 0L;
-         }
-       else
-@@ -1977,7 +2011,7 @@ md_assemble (char * str)
-           reg1 = 0;
-         }
-       if (strcmp (op_end, ""))
--        op_end = parse_imml (op_end + 1, & exp, MIN_IMM, MAX_IMM);
-+        op_end = parse_imml (op_end + 1, & exp, MIN_IMML, MAX_IMML);
-       else
-         as_fatal (_("Error in statement syntax"));
- 
-@@ -1987,7 +2021,8 @@ md_assemble (char * str)
- 
-       if (exp.X_op != O_constant)
-        {
--          char *opc = NULL;
-+         //char *opc = NULL;
-+          char *opc = str_microblaze_64;
-           relax_substateT subtype;
- 
-          if (exp.X_md != 0)
-@@ -2001,14 +2036,13 @@ md_assemble (char * str)
-                             subtype,   /* PC-relative or not.  */
-                             exp.X_add_symbol,
-                             exp.X_add_number,
--                            opc);
-+                            (char *) opc);
-          immedl = 0L;
-        }
-       else
-        {
-           output = frag_more (isize);
-           immedl = exp.X_add_number;
--
-          opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-          if (opcode1 == NULL)
-            {
-@@ -2184,13 +2218,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;
-@@ -2412,22 +2456,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 *) 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 *) 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 *) 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);
-@@ -2456,6 +2516,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:
-@@ -2463,12 +2524,16 @@ 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 *) hash_find (opcode_hash_control, "imm");
-+      if (fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_GPC)
-+        opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+      else
-+        opcode1 = (struct op_code_struct *) 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;
-        }
- 
-@@ -2492,6 +2557,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
-@@ -2535,6 +2602,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))
-         {
-@@ -2542,6 +2635,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))
-         {
-@@ -2644,6 +2738,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:
-@@ -2697,7 +2792,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;
-@@ -2730,6 +2825,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:
-@@ -2872,7 +2969,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/include/elf/microblaze.h b/include/elf/microblaze.h
-index 3978a3dc01..938841b240 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/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index 61eaa39b3e..f2139a6839 100644
---- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -538,8 +538,8 @@ struct op_code_struct
-   {"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_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE8000000, OPCODE_MASK_H, invalid_inst, memory_load_inst },  /* Identical to 32-bit */
--  {"sli",     INST_TYPE_RD_R1_IMML, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xF8000000, OPCODE_MASK_H, invalid_inst, memory_store_inst }, /* Identical to 32-bit */
-+  {"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 },
-diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
-index 1dcd3dca3d..fcf259a362 100644
---- a/opcodes/microblaze-opcm.h
-+++ b/opcodes/microblaze-opcm.h
-@@ -40,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,
-   fint, fsqrt,
-   tget, tcget, tnget, tncget, tput, tcput, tnput, tncput,
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0015-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
index 6a3e34c4..0d472331 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0015-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
@@ -1,7 +1,7 @@
-From 5b9a1079eefbfbe23992f231ad69af488040e302 Mon Sep 17 00:00:00 2001
+From e3d5306efa998ff6e72a6b0ca92d1b9bfadf8156 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 11 Sep 2018 13:48:33 +0530
-Subject: [PATCH 16/52] [Patch,Microblaze] : negl instruction is overriding
+Subject: [PATCH 15/38] [Patch,Microblaze] : negl instruction is overriding
  rsubl,fixed it by changing the instruction order...
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 16/52] [Patch,Microblaze] : negl instruction is overriding
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index f2139a6839..f970941209 100644
+index 4a1545d8920..b1635f41529 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
-@@ -275,9 +275,7 @@ struct op_code_struct
+@@ -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.  */
@@ -22,7 +22,7 @@ index f2139a6839..f970941209 100644
    {"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 @@ struct op_code_struct
+@@ -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 },
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0017-Added-relocations-for-MB-X.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Added-relocations-for-MB-X.patch
index 3e0773b0..c42ad41f 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0017-Added-relocations-for-MB-X.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Added-relocations-for-MB-X.patch
@@ -1,11 +1,14 @@
-From 442430f1010a9e16821e68ca2842579538ff564b Mon Sep 17 00:00:00 2001
+From f3d027568966b3c5ff8404656e6aa875c71926a1 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Tue, 11 Sep 2018 17:30:17 +0530
-Subject: [PATCH 17/52] Added relocations for MB-X
+Subject: [PATCH 16/38] 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 +-
@@ -14,10 +17,10 @@ Conflicts:
  4 files changed, 61 insertions(+), 68 deletions(-)
 
 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index a335182ba1..57ea4f6132 100644
+index 2a1d7563643..568bfafee7c 100644
 --- a/bfd/bfd-in2.h
 +++ b/bfd/bfd-in2.h
-@@ -5436,13 +5436,18 @@ done here - only used for relaxing  */
+@@ -5431,13 +5431,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  */
@@ -39,10 +42,10 @@ index a335182ba1..57ea4f6132 100644
  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 b4aace6a70..b4b7ee29a3 100644
+index 2caaf27bcd7..4a21358f5e0 100644
 --- a/bfd/libbfd.h
 +++ b/bfd/libbfd.h
-@@ -2969,14 +2969,14 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
+@@ -2990,14 +2990,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",
@@ -60,10 +63,10 @@ index b4aace6a70..b4b7ee29a3 100644
    "BFD_RELOC_MICROBLAZE_64_TLSGD",
    "BFD_RELOC_MICROBLAZE_64_TLSLD",
 diff --git a/bfd/reloc.c b/bfd/reloc.c
-index 0e8a24e9cb..b5c97da3ff 100644
+index 288a5026d27..472a06a188d 100644
 --- a/bfd/reloc.c
 +++ b/bfd/reloc.c
-@@ -6866,24 +6866,12 @@ ENUMDOC
+@@ -6904,24 +6904,12 @@ ENUMDOC
    done here - only used for relaxing
  ENUM
    BFD_RELOC_MICROBLAZE_64_NONE
@@ -88,7 +91,7 @@ index 0e8a24e9cb..b5c97da3ff 100644
  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
-@@ -6969,6 +6957,20 @@ ENUMDOC
+@@ -7007,6 +6995,20 @@ ENUMDOC
    value in two words (with an imm instruction).  The relocation is
    relative offset from start of TEXT.
  
@@ -110,7 +113,7 @@ index 0e8a24e9cb..b5c97da3ff 100644
    BFD_RELOC_AARCH64_RELOC_START
  ENUMDOC
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 33eda2a4da..5e11a77e70 100644
+index 378fb882f13..685a6e93f2b 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -95,6 +95,7 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP";
@@ -130,8 +133,8 @@ index 33eda2a4da..5e11a77e70 100644
 +  { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE*2, 0 }   /* 20: DEFINED_64_PC_OFFSET.  */
  };
  
- static struct hash_control * opcode_hash_control;      /* Opcode mnemonics.  */
-@@ -1180,33 +1182,6 @@ md_assemble (char * str)
+ static htab_t  opcode_hash_control;    /* Opcode mnemonics.  */
+@@ -1184,33 +1186,6 @@ md_assemble (char * str)
                inst |= (immed << IMM_LOW) & IMM_MASK;
              }
         }
@@ -142,7 +145,7 @@ index 33eda2a4da..5e11a77e70 100644
 -          if ((temp != 0) && (temp != 0xFFFFFFFFFFFF8000))
 -           {
 -              /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+-              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 -              if (opcode1 == NULL)
 -                {
 -                  as_bad (_("unknown opcode \"%s\""), "imml");
@@ -165,7 +168,7 @@ index 33eda2a4da..5e11a77e70 100644
        else
         {
            temp = immed & 0xFFFF8000;
-@@ -1958,8 +1933,8 @@ md_assemble (char * str)
+@@ -1970,8 +1945,8 @@ md_assemble (char * str)
  
        if (exp.X_op != O_constant)
         {
@@ -176,7 +179,7 @@ index 33eda2a4da..5e11a77e70 100644
           relax_substateT subtype;
  
           if (exp.X_md != 0)
-@@ -2218,13 +2193,19 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
+@@ -2230,13 +2205,19 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
        fragP->fr_fix += INST_WORD_SIZE * 2;
        fragP->fr_var = 0;
        break;
@@ -189,25 +192,25 @@ index 33eda2a4da..5e11a77e70 100644
      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);
+-                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_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;
-@@ -2234,7 +2215,7 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
-                 fragP->fr_offset, TRUE, BFD_RELOC_MICROBLAZE_64_GOTPC);
+@@ -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_offset, true, BFD_RELOC_64);
++                fragP->fr_offset, false, BFD_RELOC_64);
        fragP->fr_fix += INST_WORD_SIZE * 2;
        fragP->fr_var = 0;
        break;
-@@ -2453,14 +2434,17 @@ md_apply_fix (fixS *   fixP,
+@@ -2464,14 +2445,17 @@ md_apply_fix (fixS *   fixP,
             }
         }
        break;
@@ -225,8 +228,8 @@ index 33eda2a4da..5e11a77e70 100644
 +            || fixP->fx_r_type == BFD_RELOC_MICROBLAZE_64_PCREL)
          {
            /* Generate the imm instruction.  */
-           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-@@ -2473,6 +2457,10 @@ md_apply_fix (fixS *   fixP,
+           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;
@@ -237,7 +240,7 @@ index 33eda2a4da..5e11a77e70 100644
           }
        else
          {
-@@ -2483,7 +2471,7 @@ md_apply_fix (fixS *   fixP,
+@@ -2494,7 +2482,7 @@ md_apply_fix (fixS *   fixP,
               as_bad (_("unknown opcode \"%s\""), "imm");
               return;
             }
@@ -246,8 +249,8 @@ index 33eda2a4da..5e11a77e70 100644
            inst1 = opcode1->bit_sequence;
            if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
             inst1 |= ((val & 0xFFFF0000) >> 16) & IMM_MASK;
-@@ -2530,7 +2518,7 @@ md_apply_fix (fixS *   fixP,
-         opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
+@@ -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)
@@ -255,7 +258,7 @@ index 33eda2a4da..5e11a77e70 100644
             as_bad (_("unknown opcode \"%s\""), "imml");
            else
             as_bad (_("unknown opcode \"%s\""), "imm");
-@@ -2557,8 +2545,6 @@ md_apply_fix (fixS *   fixP,
+@@ -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;
@@ -264,7 +267,7 @@ index 33eda2a4da..5e11a77e70 100644
        else if (fixP->fx_r_type == BFD_RELOC_32)
         fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE;
        else
-@@ -2609,33 +2595,24 @@ md_estimate_size_before_relax (fragS * fragP,
+@@ -2621,33 +2607,24 @@ md_estimate_size_before_relax (fragS * fragP,
              if(streq (fragP->fr_opcode, str_microblaze_64)) 
               {
                 /* Used as an absolute value.  */
@@ -302,7 +305,7 @@ index 33eda2a4da..5e11a77e70 100644
        else if (S_IS_DEFINED (fragP->fr_symbol)
                && (((S_GET_SEGMENT (fragP->fr_symbol))->flags & SEC_CODE) == 0))
          {
-@@ -2665,6 +2642,13 @@ md_estimate_size_before_relax (fragS * fragP,
+@@ -2677,6 +2654,13 @@ md_estimate_size_before_relax (fragS * fragP,
               /* Variable part does not change.  */
               fragP->fr_var = INST_WORD_SIZE*2;
             }
@@ -316,7 +319,7 @@ index 33eda2a4da..5e11a77e70 100644
           else if (streq (fragP->fr_opcode, str_microblaze_ro_anchor))
             {
                /* It is accessed using the small data read only anchor.  */
-@@ -2739,6 +2723,7 @@ md_estimate_size_before_relax (fragS * fragP,
+@@ -2751,6 +2735,7 @@ md_estimate_size_before_relax (fragS * fragP,
      case TLSTPREL_OFFSET:
      case TLSDTPREL_OFFSET:
      case DEFINED_64_OFFSET:
@@ -324,7 +327,7 @@ index 33eda2a4da..5e11a77e70 100644
        fragP->fr_var = INST_WORD_SIZE*2;
        break;
      case DEFINED_RO_SEGMENT:
-@@ -2792,7 +2777,7 @@ md_pcrel_from_section (fixS * fixp, segT sec ATTRIBUTE_UNUSED)
+@@ -2804,7 +2789,7 @@ md_pcrel_from_section (fixS * fixp, segT sec ATTRIBUTE_UNUSED)
    else
      {
        /* The case where we are going to resolve things... */
@@ -333,7 +336,7 @@ index 33eda2a4da..5e11a77e70 100644
          return  fixp->fx_where + fixp->fx_frag->fr_address + INST_WORD_SIZE;
        else
          return  fixp->fx_where + fixp->fx_frag->fr_address;
-@@ -2827,6 +2812,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
+@@ -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:
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0018-Fixed-MB-x-relocation-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-MB-x-relocation-issues.patch
index 315d0445..a14b7159 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0018-Fixed-MB-x-relocation-issues.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-MB-x-relocation-issues.patch
@@ -1,72 +1,53 @@
-From 5b1793fe6dfb16755f584821023145bdfc4b55d7 Mon Sep 17 00:00:00 2001
+From 835389f0f82b69f923aad7148717c48372a28828 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Fri, 28 Sep 2018 12:04:55 +0530
-Subject: [PATCH 18/52] -Fixed MB-x relocation issues -Added imml for required
+Subject: [PATCH 17/38] -Fixed MB-x relocation issues -Added imml for required
  MB-x instructions
 
+Conflicts:
+        bfd/elf64-microblaze.c
+        gas/config/tc-microblaze.c
 ---
- bfd/elf64-microblaze.c     |  68 ++++++++++++++---
- gas/config/tc-microblaze.c | 152 +++++++++++++++++++++++++++----------
+ bfd/elf64-microblaze.c     |  48 ++++++++++--
+ gas/config/tc-microblaze.c | 155 ++++++++++++++++++++++++++-----------
  gas/tc.h                   |   2 +-
- 3 files changed, 167 insertions(+), 55 deletions(-)
+ 3 files changed, 152 insertions(+), 53 deletions(-)
 
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 6b1f47d00d..6676d9f93d 100644
+index 46c4aba46f1..010ee1d15b4 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -1488,8 +1488,17 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                          relocation -= (input_section->output_section->vma
-                                         + input_section->output_offset
-                                         + offset + INST_WORD_SIZE);
--                       bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                       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,
-+                                     contents + offset + endian);
-                        bfd_put_16 (input_bfd, relocation & 0xffff,
-                                    contents + offset + endian + INST_WORD_SIZE);
-                      }
-@@ -1580,11 +1589,28 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                    else
-                      {
-                        if (r_type == R_MICROBLAZE_64_PCREL)
--                         relocation -= (input_section->output_section->vma
--                                        + input_section->output_offset
--                                        + offset + INST_WORD_SIZE);
--                       bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                         {
-+                           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);
-+                         }
+@@ -1511,6 +1511,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,
+@@ -1618,6 +1626,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,
-+                                     contents + offset + endian);
-                        bfd_put_16 (input_bfd, relocation & 0xffff,
-                                    contents + offset + endian + INST_WORD_SIZE);
-                      }
-@@ -1703,9 +1729,19 @@ static void
++                        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,
+@@ -1727,9 +1743,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);
@@ -89,7 +70,7 @@ index 6b1f47d00d..6676d9f93d 100644
  }
  
  /* Read-modify-write into the bfd, an immediate value into appropriate fields of
-@@ -1717,10 +1753,18 @@ microblaze_bfd_write_imm_value_64 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
+@@ -1741,10 +1767,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);
@@ -113,7 +94,7 @@ index 6b1f47d00d..6676d9f93d 100644
      instr_lo &= ~0x0000ffff;
      instr_lo |= (val & 0x0000ffff);
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 5e11a77e70..48f306ef41 100644
+index 685a6e93f2b..9b311ed1450 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -392,7 +392,7 @@ microblaze_s_weakext (int ignore ATTRIBUTE_UNUSED)
@@ -155,7 +136,7 @@ index 5e11a77e70..48f306ef41 100644
             opc = str_microblaze_ro_anchor;
           else if (reg2 == REG_RWSDP)
             opc = str_microblaze_rw_anchor;
-@@ -1182,31 +1183,55 @@ md_assemble (char * str)
+@@ -1186,33 +1187,57 @@ md_assemble (char * str)
                inst |= (immed << IMM_LOW) & IMM_MASK;
              }
         }
@@ -170,8 +151,10 @@ index 5e11a77e70..48f306ef41 100644
 +          if (temp != 0 && temp != 0xFFFFFF8000)
 +            {
                /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
-+              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+              opcode1
+                = (struct op_code_struct *) str_hash_find (opcode_hash_control,
+-                                                          "imm");
++                                                          "imml");
                if (opcode1 == NULL)
                  {
 -                  as_bad (_("unknown opcode \"%s\""), "imm");
@@ -203,7 +186,7 @@ index 5e11a77e70..48f306ef41 100644
 +           if ((temp != 0) && (temp != 0xFFFF8000))
 +            {
 +               /* Needs an immediate inst.  */
-+               opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
++               opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
 +               if (opcode1 == NULL)
 +                 {
 +                   as_bad (_("unknown opcode \"%s\""), "imm");
@@ -225,7 +208,7 @@ index 5e11a77e70..48f306ef41 100644
        break;
  
      case INST_TYPE_RD_R1_IMMS:
-@@ -1832,12 +1857,20 @@ md_assemble (char * str)
+@@ -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"));
@@ -249,10 +232,22 @@ index 5e11a77e70..48f306ef41 100644
            relax_substateT subtype;
  
           if (exp.X_md != 0)
-@@ -1860,27 +1893,54 @@ md_assemble (char * str)
+@@ -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")))
@@ -261,22 +256,12 @@ index 5e11a77e70..48f306ef41 100644
 +          if (temp != 0)
 +           {
 +              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 +              if (opcode1 == NULL)
 +                {
 +                  as_bad (_("unknown opcode \"%s\""), "imml");
 +                  return;
 +                }
- 
--      temp = immed & 0xFFFF8000;
--      if ((temp != 0) && (temp != 0xFFFF8000))
--       {
--          /* Needs an immediate inst.  */
--          opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
--          if (opcode1 == NULL)
--            {
--              as_bad (_("unknown opcode \"%s\""), "imm");
--              return;
 +              inst1 = opcode1->bit_sequence;
 +              inst1 |= ((immed & 0xFFFFFFFFFFFF0000L) >> 16) & IMML_MASK;
 +              output[0] = INST_BYTE0 (inst1);
@@ -293,7 +278,7 @@ index 5e11a77e70..48f306ef41 100644
 +          if ((temp != 0) && (temp != 0xFFFF8000))
 +           {
 +              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
++              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
 +              if (opcode1 == NULL)
 +                {
 +                  as_bad (_("unknown opcode \"%s\""), "imm");
@@ -322,7 +307,7 @@ index 5e11a77e70..48f306ef41 100644
        break;
  
      case INST_TYPE_NONE:
-@@ -2456,7 +2516,7 @@ md_apply_fix (fixS *   fixP,
+@@ -2467,7 +2524,7 @@ md_apply_fix (fixS *   fixP,
  
             inst1 = opcode1->bit_sequence;
             if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
@@ -331,7 +316,7 @@ index 5e11a77e70..48f306ef41 100644
             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)
-@@ -2624,7 +2684,14 @@ md_estimate_size_before_relax (fragS * fragP,
+@@ -2636,7 +2693,14 @@ md_estimate_size_before_relax (fragS * fragP,
          }
        else
         {
@@ -347,7 +332,7 @@ index 5e11a77e70..48f306ef41 100644
           fragP->fr_var = INST_WORD_SIZE*2;
         }
        break;
-@@ -2901,6 +2968,7 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
+@@ -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;
@@ -356,7 +341,7 @@ index 5e11a77e70..48f306ef41 100644
      default:
        return 0;
 diff --git a/gas/tc.h b/gas/tc.h
-index da1738d67a..5bdfe5c347 100644
+index c9722307dea..f1fa7495e29 100644
 --- a/gas/tc.h
 +++ b/gas/tc.h
 @@ -22,7 +22,7 @@
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0019-Fixing-the-branch-related-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0018-Fixing-the-branch-related-issues.patch
index 027b8e83..5b76c492 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0019-Fixing-the-branch-related-issues.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0018-Fixing-the-branch-related-issues.patch
@@ -1,7 +1,7 @@
-From 33081da0bb8820f3c695d8f865582436b16002bf Mon Sep 17 00:00:00 2001
+From 2ebffe31b57e7fe73ea8dbd60f3330da1f780243 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Sun, 30 Sep 2018 17:06:58 +0530
-Subject: [PATCH 19/52] Fixing the branch related issues
+Subject: [PATCH 18/38] Fixing the branch related issues
 
 Conflicts:
         bfd/elf64-microblaze.c
@@ -10,10 +10,10 @@ Conflicts:
  1 file changed, 3 insertions(+)
 
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 6676d9f93d..d7b7d9f5e7 100644
+index 010ee1d15b4..f68fc344c1a 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -2545,6 +2545,9 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2521,6 +2521,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;
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-address-computation-issues-with-64bit-address.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0019-Fixed-address-computation-issues-with-64bit-address.patch
index d9de811d..0a5ff410 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-address-computation-issues-with-64bit-address.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0019-Fixed-address-computation-issues-with-64bit-address.patch
@@ -1,12 +1,15 @@
-From 22b1b41a7873fa117642cad6b150f465eb9b60cb Mon Sep 17 00:00:00 2001
+From 46c4a8876203a8799dd4c7fb8b8ae1501e17b672 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Tue, 9 Oct 2018 10:14:22 +0530
-Subject: [PATCH 20/52] - Fixed address computation issues with 64bit address -
+Subject: [PATCH 19/38] - 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
 ---
  bfd/bfd-in2.h              |  5 +++
  bfd/elf64-microblaze.c     | 14 ++++----
@@ -15,10 +18,10 @@ Conflicts:
  4 files changed, 79 insertions(+), 16 deletions(-)
 
 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 57ea4f6132..05fbeb9b3a 100644
+index 568bfafee7c..03794ea1ecf 100644
 --- a/bfd/bfd-in2.h
 +++ b/bfd/bfd-in2.h
-@@ -5443,6 +5443,11 @@ done here - only used for relaxing  */
+@@ -5438,6 +5438,11 @@ done here - only used for relaxing  */
   *   +done here - only used for relaxing  */
      BFD_RELOC_MICROBLAZE_64,
  
@@ -31,29 +34,29 @@ index 57ea4f6132..05fbeb9b3a 100644
   *  +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 d7b7d9f5e7..f42d7f429b 100644
+index f68fc344c1a..2ae1f2b118a 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -121,15 +121,15 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
+@@ -119,15 +119,15 @@ 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.  */
+-          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.  */
+           false,               /* Partial Inplace.  */
            0,                   /* Source Mask.  */
 -          0x0000ffff,          /* Dest Mask.  */
--          TRUE),               /* PC relative offset?  */
+-          true),               /* PC relative offset?  */
 +          0xffffffffffffff,            /* Dest Mask.  */
-+          FALSE),              /* PC relative offset?  */
++          false),              /* PC relative offset?  */
  
     /* A 64 bit relocation.  Table entry not really used.  */
     HOWTO (R_MICROBLAZE_64,             /* Type.  */
-@@ -585,9 +585,9 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+@@ -614,9 +614,9 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
      case BFD_RELOC_32:
        microblaze_reloc = R_MICROBLAZE_32;
        break;
@@ -65,7 +68,7 @@ index d7b7d9f5e7..f42d7f429b 100644
        break;
      case BFD_RELOC_32_PCREL:
        microblaze_reloc = R_MICROBLAZE_32_PCREL;
-@@ -619,7 +619,7 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+@@ -648,7 +648,7 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
      case BFD_RELOC_VTABLE_ENTRY:
        microblaze_reloc = R_MICROBLAZE_GNU_VTENTRY;
        break;
@@ -74,7 +77,7 @@ index d7b7d9f5e7..f42d7f429b 100644
        microblaze_reloc = R_MICROBLAZE_IMML_64;
        break;
      case BFD_RELOC_MICROBLAZE_64_GOTPC:
-@@ -1982,7 +1982,7 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2005,7 +2005,7 @@ microblaze_elf_relax_section (bfd *abfd,
                 efix = calc_fixup (target_address, 0, sec);
  
              /* Validate the in-band val.  */
@@ -84,7 +87,7 @@ index d7b7d9f5e7..f42d7f429b 100644
                 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 48f306ef41..bfb3104720 100644
+index 9b311ed1450..542c68a0857 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -402,7 +402,6 @@ pseudo_typeS md_pseudo_table[] =
@@ -95,7 +98,7 @@ index 48f306ef41..bfb3104720 100644
    {"weakext", microblaze_s_weakext, 0},
    {"rodata", microblaze_s_rdata, 0},
    {"sdata2", microblaze_s_rdata, 1},
-@@ -2475,18 +2474,74 @@ md_apply_fix (fixS *   fixP,
+@@ -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:
@@ -174,7 +177,7 @@ index 48f306ef41..bfb3104720 100644
               buf[3] |= ((val >> 24) & 0xff);
               buf[2] |= ((val >> 16) & 0xff);
               buf[1] |= ((val >> 8) & 0xff);
-@@ -2607,6 +2662,8 @@ md_apply_fix (fixS *   fixP,
+@@ -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;
@@ -183,7 +186,7 @@ index 48f306ef41..bfb3104720 100644
        else
         fixP->fx_r_type = BFD_RELOC_NONE;
        fixP->fx_addsy = section_symbol (absolute_section);
-@@ -2878,6 +2935,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
+@@ -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:
@@ -191,7 +194,7 @@ index 48f306ef41..bfb3104720 100644
      case BFD_RELOC_MICROBLAZE_64:
      case BFD_RELOC_MICROBLAZE_64_PCREL:
      case BFD_RELOC_MICROBLAZE_64_GOT:
-@@ -3023,10 +3081,10 @@ cons_fix_new_microblaze (fragS * frag,
+@@ -3032,10 +3090,10 @@ cons_fix_new_microblaze (fragS * frag,
            r = BFD_RELOC_32;
            break;
          case 8:
@@ -206,7 +209,7 @@ index 48f306ef41..bfb3104720 100644
          default:
            as_bad (_("unsupported BFD relocation size %u"), size);
 diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index f643f2600d..1dc11a2653 100644
+index fc15d210fe0..143a0a9d59e 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
 @@ -77,7 +77,7 @@ static char *
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0021-Adding-new-relocation-to-support-64bit-rodata.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0020-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
index 908f7572..43627c29 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0021-Adding-new-relocation-to-support-64bit-rodata.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0020-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
@@ -1,7 +1,8 @@
-From 9880b06269a176c0b5c4f0ecb9e3784f630a76be Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Sat, 13 Oct 2018 21:17:01 +0530
-Subject: [PATCH 21/52] Adding new relocation to support 64bit rodata
+From e49fe1aee519af464c873425212914c56fa683bc Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Tue, 2 Nov 2021 17:28:24 +0530
+Subject: [PATCH 20/38] [Patch,MicroBlaze : Adding new relocation to support
+ 64bit rodata.
 
 ---
  bfd/elf64-microblaze.c     | 11 +++++++--
@@ -9,10 +10,10 @@ Subject: [PATCH 21/52] Adding new relocation to support 64bit rodata
  2 files changed, 54 insertions(+), 6 deletions(-)
 
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index f42d7f429b..ddcb5baf74 100644
+index 2ae1f2b118a..55c01b44d29 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -1473,6 +1473,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
+@@ -1488,6 +1488,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
             case (int) R_MICROBLAZE_64_PCREL :
             case (int) R_MICROBLAZE_64:
             case (int) R_MICROBLAZE_32:
@@ -20,7 +21,7 @@ index f42d7f429b..ddcb5baf74 100644
               {
                 /* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
                    from removed linkonce sections, or sections discarded by
-@@ -1482,6 +1483,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
+@@ -1497,6 +1498,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);
@@ -29,7 +30,7 @@ index f42d7f429b..ddcb5baf74 100644
                     else
                       {
                         if (r_type == R_MICROBLAZE_64_PCREL)
-@@ -1560,7 +1563,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
+@@ -1585,7 +1588,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
                       }
                     else
                       {
@@ -38,7 +39,7 @@ index f42d7f429b..ddcb5baf74 100644
                           {
                             outrel.r_info = ELF64_R_INFO (0, R_MICROBLAZE_REL);
                             outrel.r_addend = relocation + addend;
-@@ -1586,6 +1589,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
+@@ -1611,6 +1614,8 @@ microblaze_elf_relocate_section (bfd *output_bfd,
                     relocation += addend;
                     if (r_type == R_MICROBLAZE_32)
                       bfd_put_32 (input_bfd, relocation, contents + offset);
@@ -47,7 +48,7 @@ index f42d7f429b..ddcb5baf74 100644
                     else
                       {
                         if (r_type == R_MICROBLAZE_64_PCREL)
-@@ -2098,7 +2103,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2121,7 +2126,8 @@ microblaze_elf_relax_section (bfd *abfd,
                    microblaze_bfd_write_imm_value_32 (abfd, ocontents + irelscan->r_offset,
                                                       irelscan->r_addend);
                }
@@ -57,7 +58,7 @@ index f42d7f429b..ddcb5baf74 100644
                  {
                   isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
  
-@@ -2606,6 +2612,7 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2595,6 +2601,7 @@ microblaze_elf_check_relocs (bfd * abfd,
          case R_MICROBLAZE_64:
          case R_MICROBLAZE_64_PCREL:
          case R_MICROBLAZE_32:
@@ -66,7 +67,7 @@ index f42d7f429b..ddcb5baf74 100644
              if (h != NULL && !bfd_link_pic (info))
               {
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index bfb3104720..532a26eaa5 100644
+index 542c68a0857..6902a1518a6 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -1119,6 +1119,13 @@ md_assemble (char * str)
@@ -83,7 +84,7 @@ index bfb3104720..532a26eaa5 100644
           else if (reg2 == REG_ROSDP)
             opc = str_microblaze_ro_anchor;
           else if (reg2 == REG_RWSDP)
-@@ -1182,7 +1189,10 @@ md_assemble (char * str)
+@@ -1186,7 +1193,10 @@ md_assemble (char * str)
                inst |= (immed << IMM_LOW) & IMM_MASK;
              }
         }
@@ -95,7 +96,7 @@ index bfb3104720..532a26eaa5 100644
          {
            temp = immed & 0xFFFFFF8000;
            if (temp != 0 && temp != 0xFFFFFF8000)
-@@ -1794,6 +1804,11 @@ md_assemble (char * str)
+@@ -1802,6 +1812,11 @@ md_assemble (char * str)
  
           if (exp.X_md != 0)
             subtype = get_imm_otype(exp.X_md);
@@ -107,7 +108,7 @@ index bfb3104720..532a26eaa5 100644
           else
             subtype = opcode->inst_offset_type;
  
-@@ -1811,6 +1826,31 @@ md_assemble (char * str)
+@@ -1819,6 +1834,31 @@ md_assemble (char * str)
            output = frag_more (isize);
            immed = exp.X_add_number;
          }
@@ -117,7 +118,7 @@ index bfb3104720..532a26eaa5 100644
 +          if (temp != 0 && temp != 0xFFFFFF8000)
 +            {
 +              /* Needs an immediate inst.  */
-+              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++              opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 +              if (opcode1 == NULL)
 +                {
 +                  as_bad (_("unknown opcode \"%s\""), "imml");
@@ -139,7 +140,7 @@ index bfb3104720..532a26eaa5 100644
  
        temp = immed & 0xFFFF8000;
        if ((temp != 0) && (temp != 0xFFFF8000))
-@@ -1834,6 +1874,7 @@ md_assemble (char * str)
+@@ -1844,6 +1884,7 @@ md_assemble (char * str)
  
        inst |= (reg1 << RD_LOW) & RD_MASK;
        inst |= (immed << IMM_LOW) & IMM_MASK;
@@ -147,7 +148,7 @@ index bfb3104720..532a26eaa5 100644
        break;
  
      case INST_TYPE_R2:
-@@ -3081,10 +3122,10 @@ cons_fix_new_microblaze (fragS * frag,
+@@ -3090,10 +3131,10 @@ cons_fix_new_microblaze (fragS * frag,
            r = BFD_RELOC_32;
            break;
          case 8:
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-.bss-relocation-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0021-fixing-the-.bss-relocation-issue.patch
index 6c144b8a..bf238389 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-.bss-relocation-issue.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0021-fixing-the-.bss-relocation-issue.patch
@@ -1,35 +1,51 @@
-From e7b6ab1b28fc3ca13ed25687d5e851795ed6e1a3 Mon Sep 17 00:00:00 2001
+From 1131a31133a45553259b3fdb930daae468709bda Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Wed, 24 Oct 2018 12:34:37 +0530
-Subject: [PATCH 22/52] fixing the .bss relocation issue
+Subject: [PATCH 21/38] fixing the .bss relocation issue
 
+Conflicts:
+        bfd/elf64-microblaze.c
 ---
- bfd/elf64-microblaze.c | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
+ bfd/elf64-microblaze.c | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
 
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index ddcb5baf74..861420789b 100644
+index 55c01b44d29..6fb88959357 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -1492,7 +1492,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                                         + input_section->output_offset
-                                         + offset + INST_WORD_SIZE);
-                        unsigned long insn = bfd_get_32 (input_bfd, contents + offset +endian);
--                       if (insn == 0xb2000000 || insn == 0xb2ffffff)
+@@ -1514,14 +1514,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
                           {
-                            insn &= ~0x00ffffff;
-                            insn |= (relocation >> 16) & 0xffffff;
-@@ -1606,7 +1606,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                                             + offset + INST_WORD_SIZE);
+                            bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
+@@ -1632,7 +1632,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 == 0xb2000000 || insn == 0xb2ffffff)
 +                       if ((insn & 0xff000000) == 0xb2000000)
-                          {
-                            insn &= ~0x00ffffff;
-                            insn |= (relocation >> 16) & 0xffffff;
-@@ -1735,7 +1735,7 @@ microblaze_bfd_write_imm_value_32 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
+                           {
+                             insn &= ~0x00ffffff;
+                             insn |= (relocation >> 16) & 0xffffff;
+@@ -1749,7 +1749,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);
  
@@ -38,7 +54,7 @@ index ddcb5baf74..861420789b 100644
        {
          instr &= ~0x00ffffff;
          instr |= (val & 0xffffff);
-@@ -1758,7 +1758,7 @@ microblaze_bfd_write_imm_value_64 (bfd *abfd, bfd_byte *bfd_addr, bfd_vma val)
+@@ -1772,7 +1772,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);
@@ -47,7 +63,7 @@ index ddcb5baf74..861420789b 100644
        {
          instr_hi &= ~0x00ffffff;
          instr_hi |= (val >> 16) & 0xffffff;
-@@ -2251,7 +2251,10 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2276,7 +2276,10 @@ microblaze_elf_relax_section (bfd *abfd,
            unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
                                                  + irelscan->r_offset
                                                  + INST_WORD_SIZE);
@@ -59,7 +75,7 @@ index ddcb5baf74..861420789b 100644
            immediate |= (instr_lo & 0x0000ffff);
                       offset = calc_fixup (irelscan->r_addend, 0, sec);
                       immediate -= offset;
-@@ -2295,7 +2298,10 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2320,7 +2323,10 @@ microblaze_elf_relax_section (bfd *abfd,
            unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
                                                  + irelscan->r_offset
                                                  + INST_WORD_SIZE);
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0023-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0022-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
index 98f05ac8..71098800 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0023-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0022-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
@@ -1,7 +1,7 @@
-From 9b9f53c95e5b1fbccd4de2dd579c6cfae34c191d Mon Sep 17 00:00:00 2001
+From 70b208a66994ba60e36ca3eaa7c525e130b145af Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Wed, 28 Nov 2018 14:00:29 +0530
-Subject: [PATCH 23/52] Fixed the bug in the R_MICROBLAZE_64_NONE relocation.
+Subject: [PATCH 22/38] Fixed the bug in the R_MICROBLAZE_64_NONE relocation.
  It was adjusting only lower 16bits.
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 23/52] Fixed the bug in the R_MICROBLAZE_64_NONE relocation.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 14bb6de052..d77710b1f3 100644
+index 2f2e1ef7f41..2a976ecbe1d 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -2019,8 +2019,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2015,8 +2015,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);
@@ -25,10 +25,10 @@ index 14bb6de052..d77710b1f3 100644
               break;
             }
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 861420789b..338f16eeee 100644
+index 6fb88959357..4d41ddbd953 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -2030,8 +2030,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2053,8 +2053,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);
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0024-Revert-ld-Remove-unused-expression-state.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0023-Revert-ld-Remove-unused-expression-state.patch
index 25d0d7eb..945bad59 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0024-Revert-ld-Remove-unused-expression-state.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0023-Revert-ld-Remove-unused-expression-state.patch
@@ -1,30 +1,36 @@
-From 70fcc4fe0635bdc871bc2ec1087173e3f93cab86 Mon Sep 17 00:00:00 2001
+From 877ba3fffc2a542580ac95a091f3883d30b7797a Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 27 Feb 2019 15:12:32 +0530
-Subject: [PATCH 24/52] Revert "ld: Remove unused expression state"
+Subject: [PATCH 23/38] 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 b4e7c41209..dd3b058110 100644
+index 02c76f8b33c..ec6450965c3 100644
 --- a/ld/ldexp.c
 +++ b/ld/ldexp.c
-@@ -1360,6 +1360,7 @@ static etree_type *
+@@ -1364,6 +1364,7 @@ static etree_type *
  exp_assop (const char *dst,
            etree_type *src,
            enum node_tree_enum class,
-+          bfd_boolean defsym,
-           bfd_boolean hidden)
++          bool defsym,
+           bool hidden)
  {
    etree_type *n;
-@@ -1371,6 +1372,7 @@ exp_assop (const char *dst,
+@@ -1375,6 +1376,7 @@ exp_assop (const char *dst,
    n->assign.type.node_class = class;
    n->assign.src = src;
    n->assign.dst = dst;
@@ -32,43 +38,43 @@ index b4e7c41209..dd3b058110 100644
    n->assign.hidden = hidden;
    return n;
  }
-@@ -1380,7 +1382,7 @@ exp_assop (const char *dst,
+@@ -1384,7 +1386,7 @@ exp_assop (const char *dst,
  etree_type *
- exp_assign (const char *dst, etree_type *src, bfd_boolean hidden)
+ 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);
++  return exp_assop (dst, src, etree_assign, false, hidden);
  }
  
  /* Handle --defsym command-line option.  */
-@@ -1388,7 +1390,7 @@ exp_assign (const char *dst, etree_type *src, bfd_boolean hidden)
+@@ -1392,7 +1394,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);
+-  return exp_assop (dst, src, etree_assign, false);
++  return exp_assop (dst, src, etree_assign, true, false);
  }
  
  /* Handle PROVIDE.  */
-@@ -1396,7 +1398,7 @@ exp_defsym (const char *dst, etree_type *src)
+@@ -1400,7 +1402,7 @@ exp_defsym (const char *dst, etree_type *src)
  etree_type *
- exp_provide (const char *dst, etree_type *src, bfd_boolean hidden)
+ 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);
++  return exp_assop (dst, src, etree_provide, false, hidden);
  }
  
  /* Handle ASSERT.  */
 diff --git a/ld/ldexp.h b/ld/ldexp.h
-index 717e839bd4..852ac6c588 100644
+index ebe82f6088f..96ac1a8e558 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;
-+    bfd_boolean defsym;
-     bfd_boolean hidden;
++    bool defsym;
+     bool hidden;
    } assign;
    struct {
 -- 
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0025-fixing-the-long-long-long-mingw-toolchain-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0024-fixing-the-long-long-long-mingw-toolchain-issue.patch
index 9d1b1794..37783b08 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0025-fixing-the-long-long-long-mingw-toolchain-issue.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0024-fixing-the-long-long-long-mingw-toolchain-issue.patch
@@ -1,7 +1,7 @@
-From 49fdaa5a4f0ed7e20b82ccb8d0db53075777abe9 Mon Sep 17 00:00:00 2001
+From b5d57f6b3d8826400a4e106e08c9387dc3defb11 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Thu, 29 Nov 2018 17:59:25 +0530
-Subject: [PATCH 25/52] fixing the long & long long mingw toolchain issue
+Subject: [PATCH 24/38] fixing the long & long long mingw toolchain issue
 
 ---
  gas/config/tc-microblaze.c | 10 +++++-----
@@ -9,7 +9,7 @@ Subject: [PATCH 25/52] fixing the long & long long mingw toolchain issue
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 532a26eaa5..b00b759893 100644
+index 6902a1518a6..52058d94f98 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)
@@ -38,7 +38,7 @@ index 532a26eaa5..b00b759893 100644
  
    if (atp)
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index f970941209..77d74c17f3 100644
+index b1635f41529..fff7520ae81 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -585,8 +585,8 @@ char pvr_register_prefix[] = "rpvr";
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0026-Added-support-to-new-arithmetic-single-register-inst.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0025-Added-support-to-new-arithmetic-single-register-inst.patch
index 6379a5c4..d0c23c91 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0026-Added-support-to-new-arithmetic-single-register-inst.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0025-Added-support-to-new-arithmetic-single-register-inst.patch
@@ -1,39 +1,43 @@
-From b29e6a15c9f65837dbb560aa6c41c49e591915e9 Mon Sep 17 00:00:00 2001
+From e6c2ad33d4a668107e4828feb174ee08053e8c7e Mon Sep 17 00:00:00 2001
 From: Nagaraju <nmekala@xilinx.com>
 Date: Fri, 23 Aug 2019 16:18:43 +0530
-Subject: [PATCH 26/52] Added support to new arithmetic single register
+Subject: [PATCH 25/38] Added support to new arithmetic single register
  instructions
 
 Conflicts:
         opcodes/microblaze-dis.c
+
+Conflicts:
+        gas/config/tc-microblaze.c
+        opcodes/microblaze-dis.c
 ---
  gas/config/tc-microblaze.c | 147 ++++++++++++++++++++++++++++++++++++-
- opcodes/microblaze-dis.c   |  13 +++-
+ opcodes/microblaze-dis.c   |  11 +++
  opcodes/microblaze-opc.h   |  43 ++++++++++-
  opcodes/microblaze-opcm.h  |   5 +-
- 4 files changed, 201 insertions(+), 7 deletions(-)
+ 4 files changed, 200 insertions(+), 6 deletions(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index b00b759893..eca060b262 100644
+index 52058d94f98..1a543c328f2 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -423,12 +423,33 @@ void
  md_begin (void)
  {
-   struct op_code_struct * opcode;
+   const struct op_code_struct * opcode;
 +  const char *prev_name = "";
  
-   opcode_hash_control = hash_new ();
+   opcode_hash_control = str_htab_create ();
  
    /* Insert unique names into hash table.  */
--  for (opcode = opcodes; opcode->name; opcode ++)
--    hash_insert (opcode_hash_control, opcode->name, (char *) opcode);
-+  for (opcode = (struct opcodes *)opcodes; opcode->name; opcode ++)
+-  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;
-+          hash_insert (opcode_hash_control, opcode->name, (char *) opcode);
++          str_hash_insert (opcode_hash_control, opcode->name, opcode, 0);
 +        }
 +    }
 +}
@@ -153,7 +157,7 @@ index b00b759893..eca060b262 100644
    inst = opcode->bit_sequence;
    isize = 4;
  
-@@ -1480,6 +1574,51 @@ md_assemble (char * str)
+@@ -1486,6 +1580,51 @@ md_assemble (char * str)
        inst |= (immed << IMM_LOW) & IMM15_MASK;
        break;
  
@@ -206,10 +210,10 @@ index b00b759893..eca060b262 100644
        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 1dc11a2653..90d2328659 100644
+index 143a0a9d59e..d945d144c44 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
-@@ -130,9 +130,17 @@ get_field_imm15 (struct string_buf *buf, long instr)
+@@ -130,6 +130,14 @@ get_field_imm15 (struct string_buf *buf, long instr)
    return p;
  }
  
@@ -223,11 +227,7 @@ index 1dc11a2653..90d2328659 100644
 +
  static char *
  get_field_special (struct string_buf *buf, long instr,
--                  struct op_code_struct *op)
-+                   struct op_code_struct *op)
- {
-   char *p = strbuf (buf);
-   char *spr;
+                   const struct op_code_struct *op)
 @@ -456,6 +464,9 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
           /* For mbar 16 or sleep insn.  */
         case INST_TYPE_NONE:
@@ -239,7 +239,7 @@ index 1dc11a2653..90d2328659 100644
         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 77d74c17f3..c1b453c95e 100644
+index fff7520ae81..c25383f2de9 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -69,6 +69,7 @@
@@ -299,9 +299,9 @@ index 77d74c17f3..c1b453c95e 100644
 -#define MAX_OPCODES 412
 +#define MAX_OPCODES 424
  
- struct op_code_struct
+ const struct op_code_struct
  {
-@@ -444,13 +473,21 @@ 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 */
@@ -323,7 +323,7 @@ index 77d74c17f3..c1b453c95e 100644
    {"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 @@ struct op_code_struct
+@@ -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 */
@@ -338,7 +338,7 @@ index 77d74c17f3..c1b453c95e 100644
    {"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 fcf259a362..eca247c63b 100644
+index 70e351f6f4e..cf7512d6a87 100644
 --- a/opcodes/microblaze-opcm.h
 +++ b/opcodes/microblaze-opcm.h
 @@ -61,7 +61,9 @@ enum microblaze_instr
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
index e3826d6f..cdf2854c 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
@@ -1,16 +1,18 @@
-From 653712c23456574468c426aebbeb5ee8dae7237e Mon Sep 17 00:00:00 2001
+From 65677ff251b88389b3de4837f57215dc088dd716 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 26 Aug 2019 15:29:42 +0530
-Subject: [PATCH 27/52] [Patch,MicroBlaze] : double imml generation for 64 bit
+Subject: [PATCH 26/38] [Patch,MicroBlaze] : double imml generation for 64 bit
  values.
 
+Conflicts:
+        gas/config/tc-microblaze.c
 ---
- gas/config/tc-microblaze.c | 322 ++++++++++++++++++++++++++++++-------
+ gas/config/tc-microblaze.c | 321 ++++++++++++++++++++++++++++++-------
  opcodes/microblaze-opc.h   |   4 +-
- 2 files changed, 263 insertions(+), 63 deletions(-)
+ 2 files changed, 262 insertions(+), 63 deletions(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index eca060b262..aef54ad83f 100644
+index 1a543c328f2..18dd8524949 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -1008,7 +1008,7 @@ md_assemble (char * str)
@@ -35,7 +37,7 @@ index eca060b262..aef54ad83f 100644
        else
         as_fatal (_("Error in statement syntax"));
  
-@@ -1288,24 +1293,51 @@ md_assemble (char * str)
+@@ -1292,26 +1297,51 @@ md_assemble (char * str)
                 || streq (name, "lwi") || streq (name, "sbi")
                  || streq (name, "shi") || streq (name, "swi"))))
          {
@@ -45,61 +47,56 @@ index eca060b262..aef54ad83f 100644
 +          if (temp != 0 && temp != 0xFFFFFFFFFFFF8000)
              {
                /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+-             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 *) hash_find (opcode_hash_control, "imml");
++             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 = opcode1->bit_sequence;
-+              inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
++              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);
-+            }
-+         else 
-+           {
-+           opcode2 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) 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;
++              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);
-               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);
-             }
++            }
 +         }
            inst |= (reg1 << RD_LOW) & RD_MASK;
            inst |= (reg2 << RA_LOW) & RA_MASK;
            inst |= (immed << IMM_LOW) & IMM_MASK;
-@@ -1316,14 +1348,13 @@ md_assemble (char * str)
-            if ((temp != 0) && (temp != 0xFFFF8000))
-             {
-                /* Needs an immediate inst.  */
--               opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
-+              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
-                if (opcode1 == NULL)
-                  {
+@@ -1328,8 +1358,7 @@ md_assemble (char * str)
                     as_bad (_("unknown opcode \"%s\""), "imm");
                     return;
                   }
@@ -109,7 +106,7 @@ index eca060b262..aef54ad83f 100644
                 inst1 |= ((immed & 0xFFFF0000) >> 16) & IMM_MASK;
                 output[0] = INST_BYTE0 (inst1);
                 output[1] = INST_BYTE1 (inst1);
-@@ -1564,7 +1595,7 @@ md_assemble (char * str)
+@@ -1570,7 +1599,7 @@ md_assemble (char * str)
          as_fatal (_("Cannot use special register with this instruction"));
  
        if (exp.X_op != O_constant)
@@ -118,18 +115,15 @@ index eca060b262..aef54ad83f 100644
        else
         {
            output = frag_more (isize);
-@@ -1898,8 +1929,9 @@ md_assemble (char * str)
+@@ -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 *) hash_find (opcode_hash_control, "imm");
-+              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
-           if (opcode1 == NULL)
-             {
-               as_bad (_("unknown opcode \"%s\""), "imm");
-@@ -1928,7 +1960,12 @@ md_assemble (char * str)
+          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, ""))
@@ -142,7 +136,7 @@ index eca060b262..aef54ad83f 100644
        else
          as_fatal (_("Error in statement syntax"));
  
-@@ -1967,30 +2004,55 @@ md_assemble (char * str)
+@@ -1975,30 +2010,55 @@ md_assemble (char * str)
          }
        if (streq (name, "brealid") || streq (name, "breaid") || streq (name, "breai"))
          {
@@ -152,10 +146,10 @@ index eca060b262..aef54ad83f 100644
 +          if (temp != 0 && temp != 0xFFFFFFFFFFFF8000)
              {
                /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+-              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 *) hash_find (opcode_hash_control, "imml");
++            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
                if (opcode1 == NULL)
                  {
                    as_bad (_("unknown opcode \"%s\""), "imml");
@@ -171,8 +165,8 @@ index eca060b262..aef54ad83f 100644
                output = frag_more (isize);
              }
 +          else {
-+           opcode2 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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");
@@ -203,7 +197,7 @@ index eca060b262..aef54ad83f 100644
        temp = immed & 0xFFFF8000;
        if ((temp != 0) && (temp != 0xFFFF8000))
         {
-@@ -2076,25 +2138,50 @@ md_assemble (char * str)
+@@ -2086,24 +2146,50 @@ md_assemble (char * str)
              streq (name, "breaid") || 
             streq (name, "brai") || streq (name, "braid")))
          {
@@ -212,28 +206,27 @@ index eca060b262..aef54ad83f 100644
            if (temp != 0)
             {
                /* Needs an immediate inst.  */
--              opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+-              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 *) hash_find (opcode_hash_control, "imml");
++            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);
-+            }
+               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 *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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");
@@ -248,22 +241,22 @@ index eca060b262..aef54ad83f 100644
 +              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);
-             }
++              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
-@@ -2194,21 +2281,45 @@ md_assemble (char * str)
+@@ -2203,21 +2289,45 @@ md_assemble (char * str)
         {
           output = frag_more (isize);
           immedl = exp.X_add_number;
 -
--         opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+-         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 -         if (opcode1 == NULL)
 -           {
 -             as_bad (_("unknown opcode \"%s\""), "imml");
@@ -277,14 +270,14 @@ index eca060b262..aef54ad83f 100644
 -         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 *) hash_find (opcode_hash_control, "imml");
-+          if (opcode1 == NULL)
++         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);
@@ -294,8 +287,8 @@ index eca060b262..aef54ad83f 100644
 +          output = frag_more (isize);
 +        }
 +           else {
-+           opcode2 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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");
@@ -319,11 +312,11 @@ index eca060b262..aef54ad83f 100644
          }
  
        inst |= (reg1 << RD_LOW) & RD_MASK;
-@@ -2257,21 +2368,46 @@ md_assemble (char * str)
+@@ -2266,21 +2376,46 @@ md_assemble (char * str)
         {
            output = frag_more (isize);
            immedl = exp.X_add_number;
--         opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
+-         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 -         if (opcode1 == NULL)
 -           {
 -             as_bad (_("unknown opcode \"%s\""), "imml");
@@ -332,7 +325,7 @@ index eca060b262..aef54ad83f 100644
 -
 +          if (((long long)immedl) > (long long)-549755813888 && ((long long)immedl) < (long long)549755813887)
 +             {
-+            opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 +           if (opcode1 == NULL)
 +            {
 +              as_bad (_("unknown opcode \"%s\""), "imml");
@@ -347,8 +340,8 @@ index eca060b262..aef54ad83f 100644
 +          output = frag_more (isize);
 +          }
 +           else {
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+           opcode2 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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");
@@ -374,7 +367,7 @@ index eca060b262..aef54ad83f 100644
  
        inst |= (reg1 << RA_LOW) & RA_MASK;
        inst |= (immedl << IMM_LOW) & IMM_MASK;
-@@ -2551,8 +2687,8 @@ md_apply_fix (fixS *   fixP,
+@@ -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;
@@ -385,7 +378,7 @@ index eca060b262..aef54ad83f 100644
  
    symname = fixP->fx_addsy ? S_GET_NAME (fixP->fx_addsy) : _("<unknown>");
  
-@@ -2735,30 +2871,75 @@ md_apply_fix (fixS *   fixP,
+@@ -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:
@@ -396,12 +389,13 @@ index eca060b262..aef54ad83f 100644
              || 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 *) hash_find (opcode_hash_control, "imml");
++        opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
            if (opcode1 == NULL)
 -           {
 -             as_bad (_("unknown opcode \"%s\""), "imml");
@@ -416,9 +410,11 @@ index eca060b262..aef54ad83f 100644
             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)
+            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)
+            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);
@@ -430,8 +426,8 @@ index eca060b262..aef54ad83f 100644
 +        for (i = 0; i < INST_WORD_SIZE; i++)
 +        buf[i + INST_WORD_SIZE + 4] = buf[i];
 +
-+           opcode2 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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");
@@ -447,11 +443,9 @@ index eca060b262..aef54ad83f 100644
 +           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)
 +             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; 
++           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);
@@ -469,9 +463,9 @@ index eca060b262..aef54ad83f 100644
 +        for (i = 0; i < INST_WORD_SIZE; i++)
 +        buf[i + INST_WORD_SIZE] = buf[i];
            /* Generate the imm instruction.  */
-           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
+           opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
            if (opcode1 == NULL)
-@@ -2770,12 +2951,11 @@ md_apply_fix (fixS *   fixP,
+@@ -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;
@@ -485,24 +479,24 @@ index eca060b262..aef54ad83f 100644
        /* Add the value only if the symbol is defined.  */
        if (fixP->fx_addsy == NULL || S_IS_DEFINED (fixP->fx_addsy))
         {
-@@ -2807,21 +2987,41 @@ md_apply_fix (fixS *   fixP,
-       /* Add an imm instruction.  First save the current instruction.  */
+@@ -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 *) hash_find (opcode_hash_control, "imml");
+-        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 *) hash_find (opcode_hash_control, "imml");
++           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 *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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
@@ -514,7 +508,7 @@ index eca060b262..aef54ad83f 100644
 +           }
 +       }
        else
-         opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imm");
+         opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imm");
        if (opcode1 == NULL)
         {
 +      for (i = 0; i < INST_WORD_SIZE; i++)
@@ -532,7 +526,7 @@ index eca060b262..aef54ad83f 100644
          within the same section only.  */
        buf[0] = INST_BYTE0 (inst1);
 diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
-index c1b453c95e..ba0b3f8b62 100644
+index c25383f2de9..6f9a5a60dab 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -626,8 +626,8 @@ char pvr_register_prefix[] = "rpvr";
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0028-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0027-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
index e8c55106..02940730 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0028-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0027-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
@@ -1,18 +1,18 @@
-From 2c051a6d5326e34cb4a3170073cda17e7269055d Mon Sep 17 00:00:00 2001
-From: Nagaraju <nmekala@xilinx.com>
-Date: Wed, 22 Jan 2020 16:31:12 +0530
-Subject: [PATCH 28/52] Fixed bug in generation of IMML instruction for the new
- MB-64 instructions with single register.
+From 6b6b0332aa2dcb4fa86911031cafd1cc5442b17f Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Wed, 3 Nov 2021 12:13:32 +0530
+Subject: [PATCH 27/38] 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 aef54ad83f..647cfb6869 100644
+index 18dd8524949..68f19c965ef 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
-@@ -1639,12 +1639,56 @@ md_assemble (char * str)
+@@ -1643,12 +1643,56 @@ md_assemble (char * str)
                               exp.X_add_symbol,
                               exp.X_add_number,
                               (char *) opc);
@@ -29,7 +29,7 @@ index aef54ad83f..647cfb6869 100644
 +              /* Needs an immediate inst.  */
 +           if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
 +           {
-+            opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++            opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
 +              if (opcode1 == NULL)
 +                {
 +                  as_bad (_("unknown opcode \"%s\""), "imml");
@@ -44,8 +44,8 @@ index aef54ad83f..647cfb6869 100644
 +              output = frag_more (isize);
 +            }
 +          else {
-+           opcode2 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
-+           opcode1 = (struct op_code_struct *) hash_find (opcode_hash_control, "imml");
++           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");
@@ -70,7 +70,7 @@ index aef54ad83f..647cfb6869 100644
          }
        inst |= (reg1 << RD_LOW) & RD_MASK;
        inst |= (immed << IMM_LOW) & IMM16_MASK;
-@@ -2138,8 +2182,8 @@ md_assemble (char * str)
+@@ -2146,8 +2190,8 @@ md_assemble (char * str)
              streq (name, "breaid") || 
             streq (name, "brai") || streq (name, "braid")))
          {
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0029-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
index abfcdabc..d738e930 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0029-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
@@ -1,7 +1,7 @@
-From 77751e719ba1470f3dc869ae309485adb02819b6 Mon Sep 17 00:00:00 2001
+From 851a3d7218539c1a886edd92c57efe36b85e29be Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Thu, 16 Apr 2020 18:08:58 +0530
-Subject: [PATCH 29/52]  [Patch,MicroBlaze m64] : This patch will remove imml 0
+Subject: [PATCH 28/38]  [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.
 
@@ -10,10 +10,10 @@ Subject: [PATCH 29/52]  [Patch,MicroBlaze m64] : This patch will remove imml 0
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 647cfb6869..e565b2a99d 100644
+index 68f19c965ef..805d250b6ac 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
-@@ -2150,9 +2150,7 @@ md_assemble (char * str)
+@@ -2158,9 +2158,7 @@ md_assemble (char * str)
        if (exp.X_op != O_constant)
         {
           char *opc;
@@ -24,7 +24,7 @@ index 647cfb6869..e565b2a99d 100644
              opc = str_microblaze_64;
           else
              opc = NULL;
-@@ -2916,7 +2914,7 @@ md_apply_fix (fixS *   fixP,
+@@ -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
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0030-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0029-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
index b8f8b8bd..f220f611 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0030-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0029-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
@@ -1,7 +1,7 @@
-From 2a43e06f14cac633d87f5b213a6bacd16085967f Mon Sep 17 00:00:00 2001
+From aa1705bc097efd5003e5d818e1e2d12ff5fc0c94 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 17 Jun 2020 21:20:26 +0530
-Subject: [PATCH 30/52] [Patch,MicroBlaze] : improper address mapping of
+Subject: [PATCH 29/38] [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.
@@ -11,7 +11,7 @@ Subject: [PATCH 30/52] [Patch,MicroBlaze] : improper address mapping of
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 9977195074..a2c44cf719 100644
+index 37b64c89ee1..5b179daf8f1 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
 @@ -3657,10 +3657,16 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0056-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0030-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
index b69b5a32..85f63b41 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0056-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0030-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
@@ -1,8 +1,8 @@
-From 9897f7ce32daafc2d9438820162df363f4b53274 Mon Sep 17 00:00:00 2001
+From 34c213ce7e7ef7e1f8fd91b686da655df43efca2 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilinx.com>
 Date: Tue, 20 Apr 2021 21:22:06 +0530
-Subject: [PATCH 56] [Patch, microblaze]:Changing the long to long long as in
- Windows long is 32-bit but we need the variable to be 64-bit
+Subject: [PATCH 30/38] [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>
 ---
@@ -10,10 +10,10 @@ Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index df7088d6c3..34222cc866 100644
+index 805d250b6ac..84f60c029c1 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
-@@ -1033,7 +1033,7 @@ md_assemble (char * str)
+@@ -1017,7 +1017,7 @@ md_assemble (char * str)
    unsigned reg2;
    unsigned reg3;
    unsigned isize;
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0031-gas-revert-moving-of-md_pseudo_table-from-const.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0031-gas-revert-moving-of-md_pseudo_table-from-const.patch
index 83b293f3..c96b5757 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0031-gas-revert-moving-of-md_pseudo_table-from-const.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0031-gas-revert-moving-of-md_pseudo_table-from-const.patch
@@ -1,7 +1,7 @@
-From c45a69deeb210ebdb80cf055cef9e62bd0bda053 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@kernel.crashing.org>
-Date: Thu, 16 Jul 2020 12:38:11 -0500
-Subject: [PATCH 31/52] gas: revert moving of md_pseudo_table from const
+From 2a8a925c35909543738ccacafcdc7000525a27c6 Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Mon, 8 Nov 2021 21:57:13 +0530
+Subject: [PATCH 31/38] 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
@@ -18,7 +18,7 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
  2 files changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index e565b2a99d..c6ca913f8b 100644
+index 84f60c029c1..dfcd0ab1569 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -385,6 +385,17 @@ microblaze_s_weakext (int ignore ATTRIBUTE_UNUSED)
@@ -57,7 +57,7 @@ index e565b2a99d..c6ca913f8b 100644
    {"weakext", microblaze_s_weakext, 0},
    {"rodata", microblaze_s_rdata, 0},
    {"sdata2", microblaze_s_rdata, 1},
-@@ -3448,7 +3459,6 @@ md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)
+@@ -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;
@@ -66,7 +66,7 @@ index e565b2a99d..c6ca913f8b 100644
      default:
        return 0;
 diff --git a/gas/tc.h b/gas/tc.h
-index 5bdfe5c347..da1738d67a 100644
+index f1fa7495e29..c9722307dea 100644
 --- a/gas/tc.h
 +++ b/gas/tc.h
 @@ -22,7 +22,7 @@
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
index 8891a77f..83e5a42b 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
@@ -1,7 +1,7 @@
-From 7b285c827edbc34cf79d4ed0f46cdfd4916b687c Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Mon, 30 Nov 2020 16:17:36 -0800
-Subject: [PATCH 32/52] ld/emulparams/elf64microblaze: Fix emulation generation
+From 231121a6d5ff51bcf578c06288181db5f800d66f Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Mon, 8 Nov 2021 22:01:23 +0530
+Subject: [PATCH 32/38] ld/emulparams/elf64microblaze: Fix emulation generation
 
 Compilation fails when building ld-new with:
 
@@ -17,7 +17,7 @@ Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/ld/emulparams/elf64microblaze.sh b/ld/emulparams/elf64microblaze.sh
-index 9c7b0eb708..7b4c7c411b 100644
+index 9c7b0eb7080..7b4c7c411bd 100644
 --- a/ld/emulparams/elf64microblaze.sh
 +++ b/ld/emulparams/elf64microblaze.sh
 @@ -19,5 +19,5 @@ NOP=0x80000000
@@ -28,7 +28,7 @@ index 9c7b0eb708..7b4c7c411b 100644
 +TEMPLATE_NAME=elf
  #GENERATE_SHLIB_SCRIPT=yes
 diff --git a/ld/emulparams/elf64microblazeel.sh b/ld/emulparams/elf64microblazeel.sh
-index 9c7b0eb708..7b4c7c411b 100644
+index 9c7b0eb7080..7b4c7c411bd 100644
 --- a/ld/emulparams/elf64microblazeel.sh
 +++ b/ld/emulparams/elf64microblazeel.sh
 @@ -19,5 +19,5 @@ NOP=0x80000000
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver-add-gdb_proc_ser.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver-add-gdb_proc_ser.patch
deleted file mode 100644
index b296e1b1..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver-add-gdb_proc_ser.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-From 3f506a7c6a8f7b746102276f3c41a7b11bd7ac3c Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 23 Jan 2017 19:07:44 +0530
-Subject: [PATCH 33/52] Add initial port of linux gdbserver add
- gdb_proc_service_h to gdbserver microblaze-linux
-
-gdbserver needs to initialise the microblaze registers
-
-other archs use this step to run a *_arch_setup() to carry out all
-architecture specific setup - may need to add in future
-
- * add linux-ptrace.o to gdbserver configure
- * Update breakpoint opcode
- * fix segfault on connecting gdbserver
- * add microblaze_linux_memory_remove_breakpoint
- * add set_solib_svr4_fetch_link_map_offsets
- * add set_gdbarch_fetch_tls_load_module_address
- * Force reading of r0 as 0, prevent stores
-
-Signed-off-by: David Holsgrove <david.holsgrove@petalogix.com>
-Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
----
- gdb/configure.host                |   3 +
- gdb/microblaze-linux-tdep.c       |  29 ++++-
- gdb/microblaze-tdep.c             |  35 +++++-
- gdb/microblaze-tdep.h             |   4 +-
- gdb/regformats/reg-microblaze.dat |  41 +++++++
- gdbserver/linux-microblaze-low.c  | 189 ++++++++++++++++++++++++++++++
- 6 files changed, 298 insertions(+), 3 deletions(-)
- create mode 100644 gdb/regformats/reg-microblaze.dat
- create mode 100644 gdbserver/linux-microblaze-low.c
-
-diff --git a/gdb/configure.host b/gdb/configure.host
-index ce52823729..cf1a08e8b2 100644
---- a/gdb/configure.host
-+++ b/gdb/configure.host
-@@ -65,6 +65,7 @@ hppa*)                        gdb_host_cpu=pa ;;
- i[34567]86*)           gdb_host_cpu=i386 ;;
- m68*)                  gdb_host_cpu=m68k ;;
- mips*)                 gdb_host_cpu=mips ;;
-+microblaze*)           gdb_host_cpu=microblaze ;;
- powerpc* | rs6000)     gdb_host_cpu=powerpc ;;
- sparcv9 | sparc64)     gdb_host_cpu=sparc ;;
- s390*)                 gdb_host_cpu=s390 ;;
-@@ -133,6 +134,8 @@ mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
- mips*-*-freebsd*)      gdb_host=fbsd ;;
- mips64*-*-openbsd*)    gdb_host=obsd64 ;;
- 
-+microblaze*-*linux*)   gdb_host=linux ;;
-+
- powerpc-*-aix* | rs6000-*-* | powerpc64-*-aix*)
-                        gdb_host=aix ;;
- powerpc*-*-freebsd*)   gdb_host=fbsd ;;
-diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
-index be710bedb6..fb8241884b 100644
---- a/gdb/microblaze-linux-tdep.c
-+++ b/gdb/microblaze-linux-tdep.c
-@@ -37,6 +37,22 @@
- #include "tramp-frame.h"
- #include "linux-tdep.h"
- 
-+static int microblaze_debug_flag = 0;
-+
-+static void
-+microblaze_debug (const char *fmt, ...)
-+{
-+  if (microblaze_debug_flag)
-+    {
-+       va_list args;
-+
-+       va_start (args, fmt);
-+       printf_unfiltered ("MICROBLAZE LINUX: ");
-+       vprintf_unfiltered (fmt, args);
-+       va_end (args);
-+    }
-+}
-+
- static int
- microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, 
-                                           struct bp_target_info *bp_tgt)
-@@ -46,18 +62,25 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-   int val;
-   int bplen;
-   gdb_byte old_contents[BREAKPOINT_MAX];
-+  struct cleanup *cleanup;
- 
-   /* Determine appropriate breakpoint contents and size for this address.  */
-   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
- 
-+  /* Make sure we see the memory breakpoints.  */
-+  cleanup = make_show_memory_breakpoints_cleanup (1);
-   val = target_read_memory (addr, old_contents, bplen);
- 
-   /* If our breakpoint is no longer at the address, this means that the
-      program modified the code on us, so it is wrong to put back the
-      old value.  */
-   if (val == 0 && memcmp (bp, old_contents, bplen) == 0)
--    val = target_write_raw_memory (addr, bp_tgt->shadow_contents, bplen);
-+  {
-+      val = target_write_raw_memory (addr, bp_tgt->shadow_contents, bplen);
-+      microblaze_debug ("microblaze_linux_memory_remove_breakpoint writing back to memory at addr 0x%lx\n", addr);
-+  }
- 
-+  do_cleanups (cleanup);
-   return val;
- }
- 
-@@ -129,6 +152,10 @@ microblaze_linux_init_abi (struct gdbarch_info info,
-   /* Trampolines.  */
-   tramp_frame_prepend_unwinder (gdbarch,
-                                &microblaze_linux_sighandler_tramp_frame);
-+
-+  /* Enable TLS support.  */
-+  set_gdbarch_fetch_tls_load_module_address (gdbarch,
-+                                             svr4_fetch_objfile_link_map);
- }
- 
- void _initialize_microblaze_linux_tdep ();
-diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
-index 5c80413304..443adfb364 100644
---- a/gdb/microblaze-tdep.c
-+++ b/gdb/microblaze-tdep.c
-@@ -137,7 +137,38 @@ microblaze_fetch_instruction (CORE_ADDR pc)
- constexpr gdb_byte microblaze_break_insn[] = MICROBLAZE_BREAKPOINT;
- 
- typedef BP_MANIPULATION (microblaze_break_insn) microblaze_breakpoint;
--
-+static int
-+microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-+                                   struct bp_target_info *bp_tgt)
-+{
-+  CORE_ADDR addr = bp_tgt->placed_address;
-+  const unsigned char *bp;
-+  int val;
-+  int bplen;
-+  gdb_byte old_contents[BREAKPOINT_MAX];
-+  struct cleanup *cleanup;
-+
-+  /* Determine appropriate breakpoint contents and size for this address.  */
-+  bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
-+  if (bp == NULL)
-+    error (_("Software breakpoints not implemented for this target."));
-+
-+  /* Make sure we see the memory breakpoints.  */
-+  cleanup = make_show_memory_breakpoints_cleanup (1);
-+  val = target_read_memory (addr, old_contents, bplen);
-+
-+  /* If our breakpoint is no longer at the address, this means that the
-+     program modified the code on us, so it is wrong to put back the
-+     old value.  */
-+  if (val == 0 && memcmp (bp, old_contents, bplen) == 0)
-+  {
-+    val = target_write_raw_memory (addr, bp_tgt->shadow_contents, bplen);
-+    microblaze_debug ("microblaze_linux_memory_remove_breakpoint writing back to memory at addr 0x%lx\n", addr);
-+  }
-+
-+  do_cleanups (cleanup);
-+  return val;
-+}
- 
- /* Allocate and initialize a frame cache.  */
- 
-@@ -731,6 +762,7 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-                                       microblaze_breakpoint::kind_from_pc);
-   set_gdbarch_sw_breakpoint_from_kind (gdbarch,
-                                       microblaze_breakpoint::bp_from_kind);
-+  set_gdbarch_memory_remove_breakpoint (gdbarch, microblaze_linux_memory_remove_breakpoint);
- 
-   set_gdbarch_frame_args_skip (gdbarch, 8);
- 
-@@ -771,4 +803,5 @@ When non-zero, microblaze specific debugging is enabled."),
-                             NULL,
-                             &setdebuglist, &showdebuglist);
- 
-+
- }
-diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
-index 4fbdf9933f..db0772643d 100644
---- a/gdb/microblaze-tdep.h
-+++ b/gdb/microblaze-tdep.h
-@@ -117,6 +117,8 @@ struct microblaze_frame_cache
- 
- /* MICROBLAZE_BREAKPOINT defines the breakpoint that should be used.
-    Only used for native debugging.  */
--#define MICROBLAZE_BREAKPOINT {0xb9, 0xcc, 0x00, 0x60}
-+#define MICROBLAZE_BREAKPOINT {0xba, 0x0c, 0x00, 0x18}
-+#define MICROBLAZE_BREAKPOINT_LE {0x18, 0x00, 0x0c, 0xba}
-+
- 
- #endif /* microblaze-tdep.h */
-diff --git a/gdb/regformats/reg-microblaze.dat b/gdb/regformats/reg-microblaze.dat
-new file mode 100644
-index 0000000000..bd8a438442
---- /dev/null
-+++ b/gdb/regformats/reg-microblaze.dat
-@@ -0,0 +1,41 @@
-+name:microblaze
-+expedite:r1,pc
-+32:r0
-+32:r1
-+32:r2
-+32:r3
-+32:r4
-+32:r5
-+32:r6
-+32:r7
-+32:r8
-+32:r9
-+32:r10
-+32:r11
-+32:r12
-+32:r13
-+32:r14
-+32:r15
-+32:r16
-+32:r17
-+32:r18
-+32:r19
-+32:r20
-+32:r21
-+32:r22
-+32:r23
-+32:r24
-+32:r25
-+32:r26
-+32:r27
-+32:r28
-+32:r29
-+32:r30
-+32:r31
-+32:pc
-+32:msr
-+32:ear
-+32:esr
-+32:fsr
-+32:slr
-+32:shr
-diff --git a/gdbserver/linux-microblaze-low.c b/gdbserver/linux-microblaze-low.c
-new file mode 100644
-index 0000000000..cba5d6fc58
---- /dev/null
-+++ b/gdbserver/linux-microblaze-low.c
-@@ -0,0 +1,189 @@
-+/* GNU/Linux/Microblaze specific low level interface, for the remote server for
-+   GDB.
-+   Copyright (C) 1995-2013 Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   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, see <http://www.gnu.org/licenses/>.  */
-+
-+#include "server.h"
-+#include "linux-low.h"
-+
-+#include <asm/ptrace.h>
-+#include <sys/procfs.h>
-+#include <sys/ptrace.h>
-+
-+#include "gdb_proc_service.h"
-+
-+static int microblaze_regmap[] =
-+ {PT_GPR(0),     PT_GPR(1),     PT_GPR(2),     PT_GPR(3),
-+  PT_GPR(4),     PT_GPR(5),     PT_GPR(6),     PT_GPR(7),
-+  PT_GPR(8),     PT_GPR(9),     PT_GPR(10),    PT_GPR(11),
-+  PT_GPR(12),    PT_GPR(13),    PT_GPR(14),    PT_GPR(15),
-+  PT_GPR(16),    PT_GPR(17),    PT_GPR(18),    PT_GPR(19),
-+  PT_GPR(20),    PT_GPR(21),    PT_GPR(22),    PT_GPR(23),
-+  PT_GPR(24),    PT_GPR(25),    PT_GPR(26),    PT_GPR(27),
-+  PT_GPR(28),    PT_GPR(29),    PT_GPR(30),    PT_GPR(31),
-+  PT_PC,         PT_MSR,        PT_EAR,        PT_ESR,
-+  PT_FSR
-+  };
-+
-+#define microblaze_num_regs (sizeof microblaze_regmap / sizeof microblaze_regmap[0])
-+
-+/* Defined in auto-generated file microblaze-linux.c.  */
-+void init_registers_microblaze (void);
-+
-+static int
-+microblaze_cannot_store_register (int regno)
-+{
-+  if (microblaze_regmap[regno] == -1 || regno == 0)
-+    return 1;
-+
-+  return 0;
-+}
-+
-+static int
-+microblaze_cannot_fetch_register (int regno)
-+{
-+  return 0;
-+}
-+
-+static CORE_ADDR
-+microblaze_get_pc (struct regcache *regcache)
-+{
-+  unsigned long pc;
-+
-+  collect_register_by_name (regcache, "pc", &pc);
-+  return (CORE_ADDR) pc;
-+}
-+
-+static void
-+microblaze_set_pc (struct regcache *regcache, CORE_ADDR pc)
-+{
-+  unsigned long newpc = pc;
-+
-+  supply_register_by_name (regcache, "pc", &newpc);
-+}
-+
-+/* dbtrap insn */
-+/* brki r16, 0x18; */
-+static const unsigned long microblaze_breakpoint = 0xba0c0018;
-+#define microblaze_breakpoint_len 4
-+
-+static int
-+microblaze_breakpoint_at (CORE_ADDR where)
-+{
-+  unsigned long insn;
-+
-+  (*the_target->read_memory) (where, (unsigned char *) &insn, 4);
-+  if (insn == microblaze_breakpoint)
-+    return 1;
-+  /* If necessary, recognize more trap instructions here.  GDB only uses the
-+     one.  */
-+  return 0;
-+}
-+
-+static CORE_ADDR
-+microblaze_reinsert_addr (struct regcache *regcache)
-+{
-+  unsigned long pc;
-+  collect_register_by_name (regcache, "r15", &pc);
-+  return pc;
-+}
-+
-+#ifdef HAVE_PTRACE_GETREGS
-+
-+static void
-+microblaze_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
-+{
-+  int size = register_size (regno);
-+
-+  memset (buf, 0, sizeof (long));
-+
-+  if (size < sizeof (long))
-+    collect_register (regcache, regno, buf + sizeof (long) - size);
-+  else
-+    collect_register (regcache, regno, buf);
-+}
-+
-+static void
-+microblaze_supply_ptrace_register (struct regcache *regcache,
-+                           int regno, const char *buf)
-+{
-+  int size = register_size (regno);
-+
-+  if (regno == 0) {
-+    unsigned long regbuf_0 = 0;
-+    /* clobbering r0 so that it is always 0 as enforced by hardware */
-+    supply_register (regcache, regno, (const char*)&regbuf_0);
-+  } else {
-+      if (size < sizeof (long))
-+        supply_register (regcache, regno, buf + sizeof (long) - size);
-+      else
-+        supply_register (regcache, regno, buf);
-+  }
-+}
-+
-+/* Provide only a fill function for the general register set.  ps_lgetregs
-+   will use this for NPTL support.  */
-+
-+static void microblaze_fill_gregset (struct regcache *regcache, void *buf)
-+{
-+  int i;
-+
-+  for (i = 0; i < 32; i++)
-+    microblaze_collect_ptrace_register (regcache, i, (char *) buf + microblaze_regmap[i]);
-+}
-+
-+static void
-+microblaze_store_gregset (struct regcache *regcache, const void *buf)
-+{
-+  int i;
-+
-+  for (i = 0; i < 32; i++)
-+    supply_register (regcache, i, (char *) buf + microblaze_regmap[i]);
-+}
-+
-+#endif /* HAVE_PTRACE_GETREGS */
-+
-+struct regset_info target_regsets[] = {
-+#ifdef HAVE_PTRACE_GETREGS
-+  { PTRACE_GETREGS, PTRACE_SETREGS, 0, sizeof (elf_gregset_t), GENERAL_REGS, microblaze_fill_gregset, microblaze_store_gregset },
-+  { 0, 0, 0, -1, -1, NULL, NULL },
-+#endif /* HAVE_PTRACE_GETREGS */
-+  { 0, 0, 0, -1, -1, NULL, NULL }
-+};
-+
-+struct linux_target_ops the_low_target = {
-+  init_registers_microblaze,
-+  microblaze_num_regs,
-+  microblaze_regmap,
-+  NULL,
-+  microblaze_cannot_fetch_register,
-+  microblaze_cannot_store_register,
-+  NULL, /* fetch_register */
-+  microblaze_get_pc,
-+  microblaze_set_pc,
-+  (const unsigned char *) &microblaze_breakpoint,
-+  microblaze_breakpoint_len,
-+  microblaze_reinsert_addr,
-+  0,
-+  microblaze_breakpoint_at,
-+  NULL,
-+  NULL,
-+  NULL,
-+  NULL,
-+  microblaze_collect_ptrace_register,
-+  microblaze_supply_ptrace_register,
-+};
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver.patch
new file mode 100644
index 00000000..402566be
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver.patch
@@ -0,0 +1,1580 @@
+From bf7c7531e54e2f1b995e7ba52213c1df585d7fcc Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Mon, 23 Jan 2017 19:07:44 +0530
+Subject: [PATCH 33/38] Add initial port of linux gdbserver add
+ gdb_proc_service_h to gdbserver microblaze-linux
+
+gdbserver needs to initialise the microblaze registers
+
+other archs use this step to run a *_arch_setup() to carry out all
+architecture specific setup - may need to add in future
+
+ * add linux-ptrace.o to gdbserver configure
+ * Update breakpoint opcode
+ * fix segfault on connecting gdbserver
+ * add microblaze_linux_memory_remove_breakpoint
+ * add set_solib_svr4_fetch_link_map_offsets
+ * add set_gdbarch_fetch_tls_load_module_address
+ * Force reading of r0 as 0, prevent stores
+
+Signed-off-by: David Holsgrove <david.holsgrove@petalogix.com>
+Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
+
+Conflicts:
+        gdb/gdbserver/Makefile.in
+        gdb/gdbserver/configure.srv
+---
+ gdb/configure.host                   |   3 +
+ gdb/features/microblaze-linux.xml    |  12 +
+ gdb/gdbserver/Makefile.in            | 712 +++++++++++++++++++++++++++
+ gdb/gdbserver/configure.srv          | 398 +++++++++++++++
+ gdb/gdbserver/linux-microblaze-low.c | 189 +++++++
+ gdb/microblaze-linux-tdep.c          |  29 +-
+ gdb/microblaze-tdep.c                |  35 +-
+ gdb/microblaze-tdep.h                |   4 +-
+ gdb/regformats/reg-microblaze.dat    |  41 ++
+ 9 files changed, 1420 insertions(+), 3 deletions(-)
+ create mode 100644 gdb/features/microblaze-linux.xml
+ create mode 100644 gdb/gdbserver/Makefile.in
+ create mode 100644 gdb/gdbserver/configure.srv
+ create mode 100644 gdb/gdbserver/linux-microblaze-low.c
+ create mode 100644 gdb/regformats/reg-microblaze.dat
+
+diff --git a/gdb/configure.host b/gdb/configure.host
+index e94a19b0332..4d73af78bc3 100644
+--- a/gdb/configure.host
++++ b/gdb/configure.host
+@@ -66,6 +66,7 @@ hppa*)                        gdb_host_cpu=pa ;;
+ i[34567]86*)           gdb_host_cpu=i386 ;;
+ m68*)                  gdb_host_cpu=m68k ;;
+ mips*)                 gdb_host_cpu=mips ;;
++microblaze*)           gdb_host_cpu=microblaze ;;
+ powerpc* | rs6000)     gdb_host_cpu=powerpc ;;
+ sparcv9 | sparc64)     gdb_host_cpu=sparc ;;
+ s390*)                 gdb_host_cpu=s390 ;;
+@@ -136,6 +137,8 @@ mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
+ mips*-*-freebsd*)      gdb_host=fbsd ;;
+ mips64*-*-openbsd*)    gdb_host=obsd64 ;;
+ 
++microblaze*-*linux*)   gdb_host=linux ;;
++
+ powerpc-*-aix* | rs6000-*-* | powerpc64-*-aix*)
+                        gdb_host=aix ;;
+ powerpc*-*-freebsd*)   gdb_host=fbsd ;;
+diff --git a/gdb/features/microblaze-linux.xml b/gdb/features/microblaze-linux.xml
+new file mode 100644
+index 00000000000..8983e66eb3d
+--- /dev/null
++++ b/gdb/features/microblaze-linux.xml
+@@ -0,0 +1,12 @@
++<?xml version="1.0"?>
++<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc.
++
++     Copying and distribution of this file, with or without modification,
++     are permitted in any medium without royalty provided the copyright
++     notice and this notice are preserved.  -->
++
++<!DOCTYPE target SYSTEM "gdb-target.dtd">
++<target>
++  <osabi>GNU/Linux</osabi>
++  <xi:include href="microblaze-core.xml"/>
++</target>
+diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
+new file mode 100644
+index 00000000000..fb4762a22d5
+--- /dev/null
++++ b/gdb/gdbserver/Makefile.in
+@@ -0,0 +1,712 @@
++# Copyright (C) 1989-2020 Free Software Foundation, Inc.
++
++# This file is part of GDB.
++
++# 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, see <http://www.gnu.org/licenses/>.
++
++# Please keep lists in this file sorted alphabetically, with one item per line.
++# See gdb/Makefile.in for guidelines on ordering files and directories.
++
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++host_alias = @host_noncanonical@
++target_alias = @target_noncanonical@
++program_transform_name = @program_transform_name@
++bindir = @bindir@
++libdir = @libdir@
++tooldir = $(libdir)/$(target_alias)
++
++datarootdir = @datarootdir@
++datadir = @datadir@
++mandir = @mandir@
++man1dir = $(mandir)/man1
++man2dir = $(mandir)/man2
++man3dir = $(mandir)/man3
++man4dir = $(mandir)/man4
++man5dir = $(mandir)/man5
++man6dir = $(mandir)/man6
++man7dir = $(mandir)/man7
++man8dir = $(mandir)/man8
++man9dir = $(mandir)/man9
++infodir = @infodir@
++htmldir = $(prefix)/html
++includedir = @includedir@
++CONFIG_SRC_SUBDIR = @CONFIG_SRC_SUBDIR@
++
++SHELL = @SHELL@
++EXEEXT = @EXEEXT@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
++RANLIB = @RANLIB@
++
++CC = @CC@
++CXX = @CXX@
++CXX_DIALECT = @CXX_DIALECT@
++AR = @AR@
++AR_FLAGS = rc
++
++# Dependency tracking information.
++DEPMODE = @CCDEPMODE@
++DEPDIR = @DEPDIR@
++depcomp = $(SHELL) $(srcdir)/../../depcomp
++
++# Directory containing source files.  Don't clean up the spacing,
++# this exact string is matched for by the "configure" script.
++srcdir = @srcdir@
++abs_top_srcdir = @abs_top_srcdir@
++abs_srcdir = @abs_srcdir@
++VPATH = @srcdir@
++
++include $(srcdir)/../silent-rules.mk
++
++# Note that these are overridden by GNU make-specific code below if
++# GNU make is used.  The overrides implement dependency tracking.
++COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT)
++COMPILE.post = -c -o $@
++COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post)
++POSTCOMPILE = @true
++
++# It is also possible that you will need to add -I/usr/include/sys to the
++# CFLAGS section if your system doesn't have fcntl.h in /usr/include (which
++# is where it should be according to Posix).
++
++# Set this up with gcc if you have gnu ld and the loader will print out
++# line numbers for undefinded refs.
++#CC_LD = g++ -static
++CC_LD = $(CXX) $(CXX_DIALECT)
++
++# Where is the "include" directory?  Traditionally ../include or ./include
++INCLUDE_DIR = ${srcdir}/../../include
++INCLUDE_DEP = $$(INCLUDE_DIR)
++
++LIBIBERTY_BUILDDIR = build-libiberty-gdbserver
++LIBIBERTY = $(LIBIBERTY_BUILDDIR)/libiberty.a
++
++# Where is ust?  These will be empty if ust was not available.
++ustlibs = @ustlibs@
++ustinc = @ustinc@
++
++# gnulib
++GNULIB_BUILDDIR = build-gnulib-gdbserver
++LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
++INCGNU = -I$(srcdir)/../../gnulib/import -I$(GNULIB_BUILDDIR)/import
++
++# Generated headers in the gnulib directory.  These must be listed
++# so that they are generated before other files are compiled.
++GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
++
++# All the includes used for CFLAGS and for lint.
++# -I. for config files.
++# -I${srcdir} for our headers.
++# -I$(srcdir)/../regformats for regdef.h.
++#
++# We do not include ../target or ../nat in here because headers
++# in those directories should be included with the subdirectory.
++# e.g.: "target/wait.h".
++#
++INCLUDE_CFLAGS = -I. -I${srcdir} \
++       -I$(srcdir)/../regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
++       $(INCGNU)
++
++# M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
++# from the config/ directory.
++GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS}
++#PROFILE_CFLAGS = -pg
++
++WARN_CFLAGS = @WARN_CFLAGS@
++WERROR_CFLAGS = @WERROR_CFLAGS@
++
++WARN_CFLAGS_NO_FORMAT = `echo " $(WARN_CFLAGS) " \
++                  | sed "s/ -Wformat-nonliteral / -Wno-format-nonliteral /g"`
++
++# These are specifically reserved for setting from the command line
++# when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
++CFLAGS = @CFLAGS@
++CXXFLAGS = @CXXFLAGS@
++CPPFLAGS = @CPPFLAGS@
++
++PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
++PTHREAD_LIBS = @PTHREAD_LIBS@
++
++# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
++INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${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
++
++# LDFLAGS is specifically reserved for setting from the command line
++# when running make.
++LDFLAGS = @LDFLAGS@
++INTERNAL_LDFLAGS = $(LDFLAGS) @RDYNAMIC@
++
++# All source files that go into linking GDB remote server.
++
++SFILES = \
++       $(srcdir)/debug.c \
++       $(srcdir)/dll.c \
++       $(srcdir)/gdbreplay.c \
++       $(srcdir)/hostio.c \
++       $(srcdir)/hostio-errno.c \
++       $(srcdir)/i387-fp.c \
++       $(srcdir)/inferiors.c \
++       $(srcdir)/linux-aarch64-low.c \
++       $(srcdir)/linux-arm-low.c \
++       $(srcdir)/linux-bfin-low.c \
++       $(srcdir)/linux-cris-low.c \
++       $(srcdir)/linux-crisv32-low.c \
++       $(srcdir)/linux-ia64-low.c \
++       $(srcdir)/linux-low.c \
++       $(srcdir)/linux-m32r-low.c \
++       $(srcdir)/linux-m68k-low.c \
++       $(srcdir)/linux-microblaze-low.c \
++       $(srcdir)/linux-mips-low.c \
++       $(srcdir)/linux-nios2-low.c \
++       $(srcdir)/linux-ppc-low.c \
++       $(srcdir)/linux-s390-low.c \
++       $(srcdir)/linux-sh-low.c \
++       $(srcdir)/linux-sparc-low.c \
++       $(srcdir)/linux-tile-low.c \
++       $(srcdir)/linux-x86-low.c \
++       $(srcdir)/linux-xtensa-low.c \
++       $(srcdir)/mem-break.c \
++       $(srcdir)/proc-service.c \
++       $(srcdir)/proc-service.list \
++       $(srcdir)/regcache.c \
++       $(srcdir)/remote-utils.c \
++       $(srcdir)/server.c \
++       $(srcdir)/symbol.c \
++       $(srcdir)/target.c \
++       $(srcdir)/thread-db.c \
++       $(srcdir)/utils.c \
++       $(srcdir)/win32-arm-low.c \
++       $(srcdir)/win32-i386-low.c \
++       $(srcdir)/win32-low.c \
++       $(srcdir)/wincecompat.c \
++       $(srcdir)/x86-low.c \
++       $(srcdir)/arch/arm.c \
++       $(srcdir)/arch/arm-get-next-pcs.c \
++       $(srcdir)/arch/arm-linux.c \
++       $(srcdir)/arch/ppc-linux-common.c \
++       $(srcdir)/../alloc.c \
++       $(srcdir)/gdbsupport/btrace-common.c \
++       $(srcdir)/gdbsupport/buffer.c \
++       $(srcdir)/gdbsupport/cleanups.c \
++       $(srcdir)/gdbsupport/common-debug.c \
++       $(srcdir)/gdbsupport/common-exceptions.c \
++       $(srcdir)/gdbsupport/common-inferior.c \
++       $(srcdir)/gdbsupport/common-regcache.c \
++       $(srcdir)/gdbsupport/common-utils.c \
++       $(srcdir)/gdbsupport/errors.c \
++       $(srcdir)/gdbsupport/environ.c \
++       $(srcdir)/gdbsupport/fileio.c \
++       $(srcdir)/gdbsupport/filestuff.c \
++       $(srcdir)/gdbsupport/job-control.c \
++       $(srcdir)/gdbsupport/gdb-dlfcn.c \
++       $(srcdir)/gdbsupport/gdb_tilde_expand.c \
++       $(srcdir)/gdbsupport/gdb_vecs.c \
++       $(srcdir)/gdbsupport/netstuff.c \
++       $(srcdir)/gdbsupport/new-op.c \
++       $(srcdir)/gdbsupport/pathstuff.c \
++       $(srcdir)/gdbsupport/print-utils.c \
++       $(srcdir)/gdbsupport/ptid.c \
++       $(srcdir)/gdbsupport/rsp-low.c \
++       $(srcdir)/gdbsupport/safe-strerror.c \
++       $(srcdir)/gdbsupport/tdesc.c \
++       $(srcdir)/gdbsupport/xml-utils.c \
++       $(srcdir)/nat/aarch64-sve-linux-ptrace.c \
++       $(srcdir)/nat/linux-btrace.c \
++       $(srcdir)/nat/linux-namespaces.c \
++       $(srcdir)/nat/linux-osdata.c \
++       $(srcdir)/nat/linux-personality.c \
++       $(srcdir)/nat/microblaze-linux.c \
++       $(srcdir)/nat/mips-linux-watch.c \
++       $(srcdir)/nat/ppc-linux.c \
++       $(srcdir)/nat/fork-inferior.c \
++       $(srcdir)/target/waitstatus.c
++
++DEPFILES = @GDBSERVER_DEPFILES@
++
++LIBOBJS = @LIBOBJS@
++
++SOURCES = $(SFILES)
++TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS}
++
++OBS = \
++       alloc.o \
++       ax.o \
++       gdbsupport/agent.o \
++       gdbsupport/btrace-common.o \
++       gdbsupport/buffer.o \
++       gdbsupport/cleanups.o \
++       gdbsupport/common-debug.o \
++       gdbsupport/common-exceptions.o \
++       gdbsupport/common-inferior.o \
++       gdbsupport/job-control.o \
++       gdbsupport/common-regcache.o \
++       gdbsupport/common-utils.o \
++       gdbsupport/errors.o \
++       gdbsupport/environ.o \
++       gdbsupport/fileio.o \
++       gdbsupport/filestuff.o \
++       gdbsupport/format.o \
++       gdbsupport/gdb-dlfcn.o \
++       gdbsupport/gdb_tilde_expand.o \
++       gdbsupport/gdb_vecs.o \
++       gdbsupport/netstuff.o \
++       gdbsupport/new-op.o \
++       gdbsupport/pathstuff.o \
++       gdbsupport/print-utils.o \
++       gdbsupport/ptid.o \
++       gdbsupport/rsp-low.o \
++       gdbsupport/safe-strerror.o \
++       gdbsupport/signals.o \
++       gdbsupport/signals-state-save-restore.o \
++       gdbsupport/tdesc.o \
++       gdbsupport/xml-utils.o \
++       debug.o \
++       dll.o \
++       event-loop.o \
++       hostio.o \
++       inferiors.o \
++       mem-break.o \
++       notif.o \
++       regcache.o \
++       remote-utils.o \
++       server.o \
++       symbol.o \
++       target.o \
++       tdesc.o \
++       tracepoint.o \
++       utils.o \
++       version.o \
++       waitstatus.o \
++       $(DEPFILES) \
++       $(LIBOBJS) \
++       $(XML_BUILTIN)
++
++GDBREPLAY_OBS = \
++       gdbsupport/cleanups.o \
++       gdbsupport/common-exceptions.o \
++       gdbsupport/common-utils.o \
++       gdbsupport/rsp-low.o \
++       gdbsupport/errors.o \
++       gdbsupport/netstuff.o \
++       gdbsupport/print-utils.o \
++       gdbsupport/safe-strerror.o \
++       gdbreplay.o \
++       utils.o \
++       version.o
++
++GDBSERVER_LIBS = @GDBSERVER_LIBS@ $(PTHREAD_LIBS)
++XM_CLIBS = @LIBS@
++CDEPS = $(srcdir)/proc-service.list
++
++# XML files to compile in to gdbserver, if any.
++XML_DIR = $(srcdir)/../features
++XML_FILES = @srv_xmlfiles@
++XML_BUILTIN = @srv_xmlbuiltin@
++
++IPA_DEPFILES = @IPA_DEPFILES@
++extra_libraries = @extra_libraries@
++
++SUBDIRS = $(GNULIB_BUILDDIR) $(LIBIBERTY_BUILDDIR)
++CLEANDIRS = $(SUBDIRS)
++
++# List of subdirectories in the build tree that must exist.
++# This is used to force build failures in existing trees when
++# a new directory is added.
++# The format here is for the `case' shell command.
++REQUIRED_SUBDIRS = $(GNULIB_BUILDDIR) | $(LIBIBERTY_BUILDDIR)
++
++FLAGS_TO_PASS = \
++       "prefix=$(prefix)" \
++       "exec_prefix=$(exec_prefix)" \
++       "infodir=$(infodir)" \
++       "datarootdir=$(datarootdir)" \
++       "docdir=$(docdir)" \
++       "htmldir=$(htmldir)" \
++       "pdfdir=$(pdfdir)" \
++       "libdir=$(libdir)" \
++       "mandir=$(mandir)" \
++       "datadir=$(datadir)" \
++       "includedir=$(includedir)" \
++       "against=$(against)" \
++       "DESTDIR=$(DESTDIR)" \
++       "AR=$(AR)" \
++       "AR_FLAGS=$(AR_FLAGS)" \
++       "CC=$(CC)" \
++       "CFLAGS=$(CFLAGS)" \
++       "CXX=$(CXX)" \
++       "CXXFLAGS=$(CXXFLAGS)" \
++       "DLLTOOL=$(DLLTOOL)" \
++       "LDFLAGS=$(LDFLAGS)" \
++       "RANLIB=$(RANLIB)" \
++       "MAKEINFO=$(MAKEINFO)" \
++       "MAKEHTML=$(MAKEHTML)" \
++       "MAKEHTMLFLAGS=$(MAKEHTMLFLAGS)" \
++       "INSTALL=$(INSTALL)" \
++       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
++       "INSTALL_DATA=$(INSTALL_DATA)" \
++       "RUNTEST=$(RUNTEST)" \
++       "RUNTESTFLAGS=$(RUNTESTFLAGS)"
++
++# All generated files which can be included by another file.
++generated_files = config.h $(GNULIB_H)
++
++all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
++       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
++
++# Traditionally "install" depends on "all".  But it may be useful
++# not to; for example, if the user has made some trivial change to a
++# source file and doesn't care about rebuilding or just wants to save the
++# time it takes for make to check that all is up to date.
++# install-only is intended to address that need.
++install: all
++       @$(MAKE) $(FLAGS_TO_PASS) install-only
++
++install-only:
++       n=`echo gdbserver | sed '$(program_transform_name)'`; \
++       if [ x$$n = x ]; then n=gdbserver; else true; fi; \
++       if [ x"$(IPA_DEPFILES)" != x ]; then \
++               $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir); \
++               $(INSTALL_PROGRAM) $(IPA_LIB) $(DESTDIR)$(libdir)/$(IPA_LIB); \
++       fi; \
++       $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir); \
++       $(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
++       # Note that we run install and not install-only, as the latter
++       # is not part of GNU standards and in particular not provided
++       # in libiberty.
++       @$(MAKE) $(FLAGS_TO_PASS) DO=install "DODIRS=$(SUBDIRS)" subdir_do
++
++uninstall: force
++       n=`echo gdbserver | sed '$(program_transform_name)'`; \
++       if [ x$$n = x ]; then n=gdbserver; else true; fi; \
++       rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1
++       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
++
++installcheck:
++check:
++info dvi pdf:
++install-info:
++install-pdf:
++html:
++install-html:
++clean-info: force
++       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
++
++gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY)
++       $(SILENCE) rm -f gdbserver$(EXEEXT)
++       $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
++               -o gdbserver$(EXEEXT) $(OBS) $(LIBGNU) $(LIBIBERTY) \
++               $(GDBSERVER_LIBS) $(XM_CLIBS)
++
++$(LIBGNU) $(LIBIBERTY) $(GNULIB_H): all-lib
++all-lib: $(GNULIB_BUILDDIR)/Makefile $(LIBIBERTY_BUILDDIR)/Makefile
++       @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS="$(SUBDIRS)" subdir_do
++.PHONY: all-lib
++
++gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY)
++       $(SILENCE) rm -f gdbreplay$(EXEEXT)
++       $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
++               -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) $(LIBGNU) \
++               $(LIBIBERTY)
++
++IPA_OBJS = \
++       alloc-ipa.o \
++       ax-ipa.o \
++       gdbsupport/common-utils-ipa.o \
++       gdbsupport/errors-ipa.o \
++       gdbsupport/format-ipa.o \
++       gdbsupport/print-utils-ipa.o \
++       gdbsupport/rsp-low-ipa.o \
++       gdbsupport/safe-strerror-ipa.o \
++       gdbsupport/tdesc-ipa.o \
++       regcache-ipa.o \
++       remote-utils-ipa.o \
++       tdesc-ipa.o \
++       tracepoint-ipa.o \
++       utils-ipa.o \
++       ${IPA_DEPFILES}
++
++IPA_LIB = libinproctrace.so
++
++$(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS}
++       $(SILENCE) rm -f $(IPA_LIB)
++       $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
++               -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
++               -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread
++
++# Put the proper machine-specific files first, so M-. on a machine
++# specific routine gets the one for the correct machine.
++# The xyzzy stuff below deals with empty DEPFILES
++TAGS:  ${TAGFILES}
++       etags `find ${srcdir}/../config -name $(DEPRECATED_TM_FILE) -print` \
++         `find ${srcdir}/../config -name ${XM_FILE} -print` \
++         `find ${srcdir}/../config -name ${NAT_FILE} -print` \
++         `for i in yzzy ${DEPFILES}; do \
++            if [ x$$i != xyzzy ]; then \
++              echo ${srcdir}/$$i | sed -e 's/\.o$$/\.c/' ; \
++            fi; \
++          done` \
++         ${TAGFILES}
++tags: TAGS
++
++clean:
++       rm -f *.o ${ADD_FILES} *~
++       rm -f gdbserver$(EXEEXT) gdbreplay$(EXEEXT) core make.log
++       rm -f $(IPA_LIB)
++       rm -f *-generated.c
++       rm -f stamp-xml
++       rm -f $(DEPDIR)/*.Po
++       for i in $(CONFIG_SRC_SUBDIR); do \
++               rm -f $$i/*.o;  \
++               rm -f $$i/$(DEPDIR)/*; \
++       done
++       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
++
++maintainer-clean realclean distclean: clean
++       @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
++       rm -rf $(GNULIB_BUILDDIR)
++       rm -f Makefile config.status config.h stamp-h config.log
++       rm -f Makefile
++       for i in $(CONFIG_SRC_SUBDIR); do \
++               rmdir $$i/$(DEPDIR); \
++       done
++
++subdir_do: force
++       @for i in $(DODIRS); do \
++               case $$i in \
++               $(REQUIRED_SUBDIRS)) \
++                       if [ ! -f ./$$i/Makefile ] ; then \
++                               echo "Missing $$i/Makefile" >&2 ; \
++                               exit 1 ; \
++                       fi ;; \
++               esac ; \
++               if [ -f ./$$i/Makefile ] ; then \
++                       if (cd ./$$i; \
++                               $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
++                       else exit 1 ; fi ; \
++               else true ; fi ; \
++       done
++
++config.h: stamp-h ; @true
++stamp-h: config.in config.status
++       $(SHELL) ./config.status config.h
++
++Makefile: Makefile.in config.status
++       $(SHELL) ./config.status $@
++
++$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../../gnulib/Makefile.in config.status
++         @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
++         CONFIG_COMMANDS="depfiles" \
++         CONFIG_HEADERS= \
++         CONFIG_LINKS= \
++         $(SHELL) config.status
++
++config.status: configure configure.srv $(srcdir)/../../bfd/development.sh
++       $(SHELL) ./config.status --recheck
++
++# automatic rebuilding in automake-generated Makefiles requires
++# this rule in the toplevel Makefile, which, with GNU make, causes
++# the desired updates through the implicit regeneration of the Makefile
++# and all of its prerequisites.
++am--refresh:
++       @:
++
++force:
++
++version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh
++       $(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir)/.. \
++               $(host_alias) $(target_alias) $@
++
++xml-builtin-generated.c: stamp-xml; @true
++stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
++       $(SILENCE) rm -f xml-builtin.tmp
++       $(ECHO_GEN_XML_BUILTIN_GENERATED) $(SHELL) $(XML_DIR)/feature_to_c.sh \
++               xml-builtin.tmp $(XML_FILES)
++       $(SILENCE) $(SHELL) $(srcdir)/../../move-if-change xml-builtin.tmp xml-builtin-generated.c
++       $(SILENCE) echo stamp > stamp-xml
++
++.PRECIOUS: xml-builtin.c
++
++# GNU Make has an annoying habit of putting *all* the Makefile variables
++# into the environment, unless you include this target as a circumvention.
++# Rumor is that this will be fixed (and this target can be removed)
++# in GNU Make 4.0.
++.NOEXPORT:
++
++# GNU Make 3.63 has a different problem: it keeps tacking command line
++# overrides onto the definition of $(MAKE).  This variable setting
++# will remove them.
++MAKEOVERRIDES =
++
++regdat_sh = $(srcdir)/../regformats/regdat.sh
++
++UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION
++
++# Undo gnulib replacements for the IPA shared library build.
++# The gnulib headers are still needed, but gnulib is not linked
++# into the IPA lib so replacement apis don't work.
++UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r
++
++# Note, we only build the IPA if -fvisibility=hidden is supported in
++# the first place.
++IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
++       $(UNDO_GNULIB_CFLAGS) \
++       -fPIC -DIN_PROCESS_AGENT \
++       -fvisibility=hidden
++
++IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
++
++# Rules for special cases.
++
++ax-ipa.o: ax.c
++       $(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
++       $(POSTCOMPILE)
++
++ax.o: ax.c
++       $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
++       $(POSTCOMPILE)
++
++alloc-ipa.o: ../alloc.c
++       $(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
++       $(POSTCOMPILE)
++
++# Rules for objects that go in the in-process agent.
++
++arch/%-ipa.o: ../arch/%.c
++       $(IPAGENT_COMPILE) $<
++       $(POSTCOMPILE)
++
++gdbsupport/%-ipa.o: ../gdbsupport/%.c
++       $(IPAGENT_COMPILE) $<
++       $(POSTCOMPILE)
++
++%-ipa.o: %-generated.c
++       $(IPAGENT_COMPILE) $<
++       $(POSTCOMPILE)
++
++%-ipa.o: %.c
++       $(IPAGENT_COMPILE) $<
++       $(POSTCOMPILE)
++
++# Note: Between two matching pattern rules, GNU Make 3.81 chooses the first one.
++# Therefore, this one needs to be before "%.o: %.c" for it to be considered for
++# files such as linux-amd64-ipa.o generated from linux-amd64-ipa.c.
++#
++# Later versions of GNU Make choose the rule with the shortest stem, so it would
++# work in any order.
++
++%-ipa.o: %-ipa.c
++       $(IPAGENT_COMPILE) $<
++       $(POSTCOMPILE)
++
++# Rules for objects that go in the gdbserver binary.
++
++arch/%.o: ../arch/%.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++gdbsupport/%.o: ../gdbsupport/%.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++%.o: %-generated.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++%.o: %.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++%.o: ../nat/%.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++%.o: ../target/%.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++%.o: ../%.c
++       $(COMPILE) $<
++       $(POSTCOMPILE)
++
++# Rules for register format descriptions.  Suffix destination files with
++# -generated to identify and clean them easily.
++
++%-generated.c: ../regformats/%.dat | $(regdat_sh)
++       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
++
++%-generated.c: ../regformats/arm/%.dat | $(regdat_sh)
++       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
++
++%-generated.c: ../regformats/i386/%.dat | $(regdat_sh)
++       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
++
++%-generated.c: ../regformats/rs6000/%.dat | $(regdat_sh)
++       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
++microblaze-linux.c : $(srcdir)/../regformats/reg-microblaze.dat $(regdat_sh)
++       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-microblaze.dat microblaze-linux.c
++
++#
++# Dependency tracking.
++#
++
++ifeq ($(DEPMODE),depmode=gcc3)
++# Note that we put the dependencies into a .Tpo file, then move them
++# into place if the compile succeeds.  We need this because gcc does
++# not atomically write the dependency output file.
++override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
++       -MF $(@D)/$(DEPDIR)/$(basename $(@F)).Tpo
++override POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(basename $(@F)).Tpo \
++       $(@D)/$(DEPDIR)/$(basename $(@F)).Po
++else
++override COMPILE.pre = source='$<' object='$@' libtool=no \
++       DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) \
++       $(CXX) -x c++ $(CXX_DIALECT)
++# depcomp handles atomicity for us, so we don't need a postcompile
++# step.
++override POSTCOMPILE =
++endif
++
++# A list of all the objects we might care about in this build, for
++# dependency tracking.
++all_object_files = $(OBS) $(GDBREPLAY_OBS) $(IPA_OBJS)
++
++# Ensure that generated files are created early.  Use order-only
++# dependencies if available.  They require GNU make 3.80 or newer,
++# and the .VARIABLES variable was introduced at the same time.
++ifdef .VARIABLES
++$(all_object_files): | $(generated_files)
++else
++$(all_object_files) : $(generated_files)
++endif
++
++# All the .deps files to include.
++all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\
++                  $(dir $(dep))/$(DEPDIR)/$(notdir $(dep)))
++
++# Dependencies.
++-include $(all_deps_files)
++
++# Disable implicit make rules.
++include $(srcdir)/../disable-implicit-rules.mk
++
++# Do not delete intermediate files (e.g. *-generated.c).
++.SECONDARY:
++
++# This is the end of "Makefile.in".
+diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
+new file mode 100644
+index 00000000000..e0d2b2fe04a
+--- /dev/null
++++ b/gdb/gdbserver/configure.srv
+@@ -0,0 +1,398 @@
++# Mappings from configuration triplets to gdbserver build options.
++# This is invoked from the autoconf-generated configure script, to
++# produce the appropriate Makefile substitutions.
++
++# This file sets the following shell variables:
++#   srv_regobj         The register protocol appropriate for this target.
++#   srv_tgtobj         Any other target-specific modules appropriate
++#                      for this target.
++#   srv_hostio_err     The object implementing the hostio_last_error
++#                      target method.
++#   srv_xmlfiles       All XML files which should be available for
++#                      gdbserver in this configuration.
++#   ipa_obj            Any other target-specific modules appropriate
++#                      for this target's in-process agent.
++#
++# In addition, on GNU/Linux the following shell variables will be set:
++#   srv_linux_regsets  Set to "yes" if ptrace(PTRACE_GETREGS) and friends
++#                      may be available on this platform;  unset otherwise.
++#                      They will only be used if <sys/ptrace.h> defines
++#                      PTRACE_GETREGS.
++#   srv_linux_usrregs  Set to "yes" if we can get at registers via
++#                      PTRACE_PEEKUSR / PTRACE_POKEUSR.
++
++# Default hostio_last_error implementation
++srv_hostio_err_objs="hostio-errno.o"
++
++ipa_ppc_linux_regobj="powerpc-32l-ipa.o powerpc-altivec32l-ipa.o powerpc-vsx32l-ipa.o powerpc-isa205-32l-ipa.o powerpc-isa205-altivec32l-ipa.o powerpc-isa205-vsx32l-ipa.o powerpc-isa205-ppr-dscr-vsx32l-ipa.o powerpc-isa207-vsx32l-ipa.o powerpc-isa207-htm-vsx32l-ipa.o powerpc-e500l-ipa.o powerpc-64l-ipa.o powerpc-altivec64l-ipa.o powerpc-vsx64l-ipa.o powerpc-isa205-64l-ipa.o powerpc-isa205-altivec64l-ipa.o powerpc-isa205-vsx64l-ipa.o powerpc-isa205-ppr-dscr-vsx64l-ipa.o powerpc-isa207-vsx64l-ipa.o powerpc-isa207-htm-vsx64l-ipa.o"
++
++# Linux object files.  This is so we don't have to repeat
++# these files over and over again.
++srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-waitpid.o linux-personality.o linux-namespaces.o fork-child.o fork-inferior.o"
++
++# Input is taken from the "${target}" variable.
++
++case "${target}" in
++  aarch64*-*-linux*)   srv_tgtobj="linux-aarch64-low.o aarch64-linux-hw-point.o"
++                       srv_tgtobj="$srv_tgtobj linux-aarch32-low.o"
++                       srv_tgtobj="$srv_tgtobj linux-aarch32-tdesc.o"
++                       srv_tgtobj="${srv_tgtobj} arch/aarch32.o"
++                       srv_tgtobj="${srv_tgtobj} arch/arm.o"
++                       srv_tgtobj="$srv_tgtobj aarch64-linux.o"
++                       srv_tgtobj="$srv_tgtobj arch/aarch64-insn.o"
++                       srv_tgtobj="$srv_tgtobj arch/aarch64.o"
++                       srv_tgtobj="$srv_tgtobj linux-aarch64-tdesc.o"
++                       srv_tgtobj="$srv_tgtobj aarch64-sve-linux-ptrace.o"
++                       srv_tgtobj="${srv_tgtobj} $srv_linux_obj"
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ipa_obj="linux-aarch64-ipa.o"
++                       ipa_obj="${ipa_obj} linux-aarch64-tdesc-ipa.o"
++                       ipa_obj="${ipa_obj} arch/aarch64-ipa.o"
++                       ;;
++  arm*-*-linux*)       srv_tgtobj="$srv_linux_obj linux-arm-low.o"
++                       srv_tgtobj="$srv_tgtobj linux-arm-tdesc.o"
++                       srv_tgtobj="$srv_tgtobj linux-aarch32-low.o"
++                       srv_tgtobj="$srv_tgtobj linux-aarch32-tdesc.o"
++                       srv_tgtobj="${srv_tgtobj} arch/aarch32.o"
++                       srv_tgtobj="${srv_tgtobj} arch/arm.o"
++                       srv_tgtobj="${srv_tgtobj} arch/arm-linux.o"
++                       srv_tgtobj="${srv_tgtobj} arch/arm-get-next-pcs.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  arm*-*-mingw32ce*)   srv_regobj=reg-arm.o
++                       srv_tgtobj="win32-low.o win32-arm-low.o"
++                       srv_tgtobj="${srv_tgtobj} wincecompat.o"
++                       # hostio_last_error implementation is in win32-low.c
++                       srv_hostio_err_objs=""
++                       srv_mingw=yes
++                       srv_mingwce=yes
++                       ;;
++  bfin-*-*linux*)      srv_regobj=reg-bfin.o
++                       srv_tgtobj="$srv_linux_obj linux-bfin-low.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  crisv32-*-linux*)    srv_regobj=reg-crisv32.o
++                       srv_tgtobj="$srv_linux_obj linux-crisv32-low.o"
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  cris-*-linux*)       srv_regobj=reg-cris.o
++                       srv_tgtobj="$srv_linux_obj linux-cris-low.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  i[34567]86-*-cygwin*)        srv_regobj=""
++                       srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o"
++                       srv_tgtobj="${srv_tgtobj} arch/i386.o"
++                       ;;
++  i[34567]86-*-linux*) srv_tgtobj="${srv_tgtobj} arch/i386.o"
++                       srv_tgtobj="${srv_tgtobj} $srv_linux_obj linux-x86-low.o x86-low.o x86-dregs.o i387-fp.o"
++                       srv_tgtobj="${srv_tgtobj} linux-x86-tdesc.o"
++                       srv_tgtobj="${srv_tgtobj} linux-btrace.o x86-linux.o"
++                       srv_tgtobj="${srv_tgtobj} x86-linux-dregs.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       srv_linux_btrace=yes
++                       ipa_obj="linux-i386-ipa.o linux-x86-tdesc-ipa.o"
++                       ipa_obj="${ipa_obj} arch/i386-ipa.o"
++                       ;;
++  i[34567]86-*-lynxos*)        srv_regobj=""
++                       srv_tgtobj="lynx-low.o lynx-i386-low.o fork-child.o fork-inferior.o"
++                       srv_tgtobj="${srv_tgtobj} arch/i386.o"
++                       srv_lynxos=yes
++                       ;;
++  i[34567]86-*-mingw32ce*)
++                       srv_regobj=""
++                       srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o"
++                       srv_tgtobj="${srv_tgtobj} arch/i386.o"
++                       srv_tgtobj="${srv_tgtobj} wincecompat.o"
++                       # hostio_last_error implementation is in win32-low.c
++                       srv_hostio_err_objs=""
++                       srv_mingw=yes
++                       srv_mingwce=yes
++                       ;;
++  i[34567]86-*-mingw*) srv_regobj=""
++                       srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o"
++                       srv_tgtobj="${srv_tgtobj} arch/i386.o"
++                       srv_mingw=yes
++                       ;;
++  i[34567]86-*-nto*)   srv_regobj=""
++                       srv_tgtobj="nto-low.o nto-x86-low.o arch/i386.o"
++                       srv_qnx="yes"
++                       ;;
++  ia64-*-linux*)       srv_regobj=reg-ia64.o
++                       srv_tgtobj="$srv_linux_obj linux-ia64-low.o"
++                       srv_linux_usrregs=yes
++                       ;;
++  m32r*-*-linux*)      srv_regobj=reg-m32r.o
++                       srv_tgtobj="$srv_linux_obj linux-m32r-low.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  m68*-*-linux*)       if test "$gdb_cv_m68k_is_coldfire" = yes; then
++                          srv_regobj=reg-cf.o
++                        else
++                          srv_regobj=reg-m68k.o
++                        fi
++                       srv_tgtobj="$srv_linux_obj linux-m68k-low.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  m68*-*-uclinux*)     if test "$gdb_cv_m68k_is_coldfire" = yes; then
++                          srv_regobj=reg-cf.o
++                        else
++                          srv_regobj=reg-m68k.o
++                        fi
++                       srv_tgtobj="$srv_linux_obj linux-m68k-low.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  mips*-*-linux*)      srv_regobj="mips-linux.o"
++                       srv_regobj="${srv_regobj} mips-dsp-linux.o"
++                       srv_regobj="${srv_regobj} mips64-linux.o"
++                       srv_regobj="${srv_regobj} mips64-dsp-linux.o"
++                       srv_tgtobj="$srv_linux_obj linux-mips-low.o"
++                       srv_tgtobj="${srv_tgtobj} mips-linux-watch.o"
++                       srv_xmlfiles="mips-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips-dsp-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips-cpu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips-cp0.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips-fpu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips-dsp.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips64-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips64-dsp-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips64-cpu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips64-cp0.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips64-fpu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} mips64-dsp.xml"
++                       srv_linux_regsets=yes
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  nios2*-*-linux*)     srv_regobj="nios2-linux.o"
++                       srv_tgtobj="$srv_linux_obj linux-nios2-low.o"
++                       srv_xmlfiles="nios2-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} nios2-cpu.xml"
++                       srv_linux_regsets=yes
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  microblaze*-*-linux*)        srv_regobj="microblaze-linux.o"
++                       srv_tgtobj="linux-low.o linux-osdata.o linux-microblaze-low.o "
++                       srv_tgtobj="${srv_tgtobj} linux-procfs.o linux-ptrace.o"
++                       srv_xmlfiles="microblaze-linux.xml"
++                       srv_linux_regsets=yes
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  powerpc*-*-linux*)   srv_regobj="powerpc-32l.o"
++                       srv_regobj="${srv_regobj} powerpc-altivec32l.o"
++                       srv_regobj="${srv_regobj} powerpc-vsx32l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-32l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-altivec32l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-vsx32l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-ppr-dscr-vsx32l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa207-vsx32l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa207-htm-vsx32l.o"
++                       srv_regobj="${srv_regobj} powerpc-e500l.o"
++                       srv_regobj="${srv_regobj} powerpc-64l.o"
++                       srv_regobj="${srv_regobj} powerpc-altivec64l.o"
++                       srv_regobj="${srv_regobj} powerpc-vsx64l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-64l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-altivec64l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-vsx64l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa205-ppr-dscr-vsx64l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa207-vsx64l.o"
++                       srv_regobj="${srv_regobj} powerpc-isa207-htm-vsx64l.o"
++                       srv_tgtobj="$srv_linux_obj linux-ppc-low.o ppc-linux.o"
++                       srv_tgtobj="${srv_tgtobj} arch/ppc-linux-common.o"
++                       srv_xmlfiles="rs6000/powerpc-32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-vsx32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-altivec32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-vsx32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-ppr-dscr-vsx32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa207-vsx32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa207-htm-vsx32l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-altivec.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-vsx.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-core.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-fpu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-fpu-isa205.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-dscr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-ppr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-tar.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-ebb.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-linux-pmu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-spr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-core.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-fpu.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-altivec.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-vsx.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-ppr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-dscr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-htm-tar.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-e500l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-spe.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-vsx64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-altivec64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-vsx64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-ppr-dscr-vsx64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa207-vsx64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa207-htm-vsx64l.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power64-core.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power64-linux.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power64-htm-core.xml"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ipa_obj="${ipa_ppc_linux_regobj} linux-ppc-ipa.o"
++                       ;;
++  powerpc-*-lynxos*)   srv_regobj="powerpc-32.o"
++                       srv_tgtobj="lynx-low.o lynx-ppc-low.o"
++                       srv_xmlfiles="rs6000/powerpc-32.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-core.xml"
++                       srv_xmlfiles="${srv_xmlfiles} rs6000/power-fpu.xml"
++                       srv_lynxos=yes
++                       ;;
++  s390*-*-linux*)      srv_regobj="s390-linux32.o"
++                       srv_regobj="${srv_regobj} s390-linux32v1.o"
++                       srv_regobj="${srv_regobj} s390-linux32v2.o"
++                       srv_regobj="${srv_regobj} s390-linux64.o"
++                       srv_regobj="${srv_regobj} s390-linux64v1.o"
++                       srv_regobj="${srv_regobj} s390-linux64v2.o"
++                       srv_regobj="${srv_regobj} s390-te-linux64.o"
++                       srv_regobj="${srv_regobj} s390-vx-linux64.o"
++                       srv_regobj="${srv_regobj} s390-tevx-linux64.o"
++                       srv_regobj="${srv_regobj} s390-gs-linux64.o"
++                       srv_regobj="${srv_regobj} s390x-linux64.o"
++                       srv_regobj="${srv_regobj} s390x-linux64v1.o"
++                       srv_regobj="${srv_regobj} s390x-linux64v2.o"
++                       srv_regobj="${srv_regobj} s390x-te-linux64.o"
++                       srv_regobj="${srv_regobj} s390x-vx-linux64.o"
++                       srv_regobj="${srv_regobj} s390x-tevx-linux64.o"
++                       srv_regobj="${srv_regobj} s390x-gs-linux64.o"
++                       srv_tgtobj="$srv_linux_obj linux-s390-low.o"
++                       srv_xmlfiles="s390-linux32.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-linux32v1.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-linux32v2.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-linux64v1.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-linux64v2.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-te-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-vx-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-tevx-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-gs-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-linux64v1.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-linux64v2.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-te-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-vx-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-tevx-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-gs-linux64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-core32.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-core64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390x-core64.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-acr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-fpr.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-tdb.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-vx.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-gs.xml"
++                       srv_xmlfiles="${srv_xmlfiles} s390-gsbc.xml"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ipa_obj="linux-s390-ipa.o"
++                       ipa_obj="${ipa_obj} s390-linux32-ipa.o"
++                       ipa_obj="${ipa_obj} s390-linux32v1-ipa.o"
++                       ipa_obj="${ipa_obj} s390-linux32v2-ipa.o"
++                       ipa_obj="${ipa_obj} s390-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390-linux64v1-ipa.o"
++                       ipa_obj="${ipa_obj} s390-linux64v2-ipa.o"
++                       ipa_obj="${ipa_obj} s390-vx-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390-te-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390-tevx-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390-gs-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-linux64v1-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-linux64v2-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-vx-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-te-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-tevx-linux64-ipa.o"
++                       ipa_obj="${ipa_obj} s390x-gs-linux64-ipa.o"
++                       ;;
++  sh*-*-linux*)                srv_regobj=reg-sh.o
++                       srv_tgtobj="$srv_linux_obj linux-sh-low.o"
++                       srv_linux_usrregs=yes
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  sparc*-*-linux*)     srv_regobj=reg-sparc64.o
++                       srv_tgtobj="$srv_linux_obj linux-sparc-low.o"
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  tic6x-*-uclinux)     if $development; then
++                         srv_regobj="tic6x-c64xp-linux.o"
++                         srv_regobj="${srv_regobj} tic6x-c64x-linux.o"
++                         srv_regobj="${srv_regobj} tic6x-c62x-linux.o"
++                        else
++                         srv_regobj=""
++                        fi
++                       srv_tgtobj="$srv_linux_obj linux-tic6x-low.o"
++                       srv_tgtobj="${srv_tgtobj} arch/tic6x.o"
++                       srv_linux_regsets=yes
++                       srv_linux_usrregs=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  x86_64-*-linux*)     srv_tgtobj="$srv_linux_obj linux-x86-low.o x86-low.o"
++                       srv_tgtobj="${srv_tgtobj} x86-dregs.o i387-fp.o"
++                       srv_tgtobj="${srv_tgtobj} arch/i386.o arch/amd64.o"
++                       srv_tgtobj="${srv_tgtobj} linux-x86-tdesc.o"
++                       srv_tgtobj="${srv_tgtobj} linux-btrace.o x86-linux.o"
++                       srv_tgtobj="${srv_tgtobj} x86-linux-dregs.o"
++                       srv_tgtobj="${srv_tgtobj} amd64-linux-siginfo.o"
++                       srv_linux_usrregs=yes # This is for i386 progs.
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       srv_linux_btrace=yes
++                       ipa_obj="linux-amd64-ipa.o linux-x86-tdesc-ipa.o"
++                       ipa_obj="${ipa_obj} arch/amd64-ipa.o"
++                       ;;
++  x86_64-*-mingw*)     srv_regobj=""
++                       srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o"
++                       srv_tgtobj="${srv_tgtobj} arch/amd64.o"
++                       srv_mingw=yes
++                       ;;
++  x86_64-*-cygwin*)    srv_regobj=""
++                       srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o"
++                       srv_tgtobj="${srv_tgtobj} arch/amd64.o"
++                       ;;
++
++  xtensa*-*-linux*)    srv_regobj=reg-xtensa.o
++                       srv_tgtobj="$srv_linux_obj linux-xtensa-low.o"
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  tilegx-*-linux*)     srv_regobj=reg-tilegx.o
++                       srv_regobj="${srv_regobj} reg-tilegx32.o"
++                       srv_tgtobj="$srv_linux_obj linux-tile-low.o"
++                       srv_linux_regsets=yes
++                       srv_linux_thread_db=yes
++                       ;;
++  *)                   echo "Error: target not supported by gdbserver."
++                       exit 1
++                       ;;
++esac
+diff --git a/gdb/gdbserver/linux-microblaze-low.c b/gdb/gdbserver/linux-microblaze-low.c
+new file mode 100644
+index 00000000000..cba5d6fc585
+--- /dev/null
++++ b/gdb/gdbserver/linux-microblaze-low.c
+@@ -0,0 +1,189 @@
++/* GNU/Linux/Microblaze specific low level interface, for the remote server for
++   GDB.
++   Copyright (C) 1995-2013 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   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, see <http://www.gnu.org/licenses/>.  */
++
++#include "server.h"
++#include "linux-low.h"
++
++#include <asm/ptrace.h>
++#include <sys/procfs.h>
++#include <sys/ptrace.h>
++
++#include "gdb_proc_service.h"
++
++static int microblaze_regmap[] =
++ {PT_GPR(0),     PT_GPR(1),     PT_GPR(2),     PT_GPR(3),
++  PT_GPR(4),     PT_GPR(5),     PT_GPR(6),     PT_GPR(7),
++  PT_GPR(8),     PT_GPR(9),     PT_GPR(10),    PT_GPR(11),
++  PT_GPR(12),    PT_GPR(13),    PT_GPR(14),    PT_GPR(15),
++  PT_GPR(16),    PT_GPR(17),    PT_GPR(18),    PT_GPR(19),
++  PT_GPR(20),    PT_GPR(21),    PT_GPR(22),    PT_GPR(23),
++  PT_GPR(24),    PT_GPR(25),    PT_GPR(26),    PT_GPR(27),
++  PT_GPR(28),    PT_GPR(29),    PT_GPR(30),    PT_GPR(31),
++  PT_PC,         PT_MSR,        PT_EAR,        PT_ESR,
++  PT_FSR
++  };
++
++#define microblaze_num_regs (sizeof microblaze_regmap / sizeof microblaze_regmap[0])
++
++/* Defined in auto-generated file microblaze-linux.c.  */
++void init_registers_microblaze (void);
++
++static int
++microblaze_cannot_store_register (int regno)
++{
++  if (microblaze_regmap[regno] == -1 || regno == 0)
++    return 1;
++
++  return 0;
++}
++
++static int
++microblaze_cannot_fetch_register (int regno)
++{
++  return 0;
++}
++
++static CORE_ADDR
++microblaze_get_pc (struct regcache *regcache)
++{
++  unsigned long pc;
++
++  collect_register_by_name (regcache, "pc", &pc);
++  return (CORE_ADDR) pc;
++}
++
++static void
++microblaze_set_pc (struct regcache *regcache, CORE_ADDR pc)
++{
++  unsigned long newpc = pc;
++
++  supply_register_by_name (regcache, "pc", &newpc);
++}
++
++/* dbtrap insn */
++/* brki r16, 0x18; */
++static const unsigned long microblaze_breakpoint = 0xba0c0018;
++#define microblaze_breakpoint_len 4
++
++static int
++microblaze_breakpoint_at (CORE_ADDR where)
++{
++  unsigned long insn;
++
++  (*the_target->read_memory) (where, (unsigned char *) &insn, 4);
++  if (insn == microblaze_breakpoint)
++    return 1;
++  /* If necessary, recognize more trap instructions here.  GDB only uses the
++     one.  */
++  return 0;
++}
++
++static CORE_ADDR
++microblaze_reinsert_addr (struct regcache *regcache)
++{
++  unsigned long pc;
++  collect_register_by_name (regcache, "r15", &pc);
++  return pc;
++}
++
++#ifdef HAVE_PTRACE_GETREGS
++
++static void
++microblaze_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
++{
++  int size = register_size (regno);
++
++  memset (buf, 0, sizeof (long));
++
++  if (size < sizeof (long))
++    collect_register (regcache, regno, buf + sizeof (long) - size);
++  else
++    collect_register (regcache, regno, buf);
++}
++
++static void
++microblaze_supply_ptrace_register (struct regcache *regcache,
++                           int regno, const char *buf)
++{
++  int size = register_size (regno);
++
++  if (regno == 0) {
++    unsigned long regbuf_0 = 0;
++    /* clobbering r0 so that it is always 0 as enforced by hardware */
++    supply_register (regcache, regno, (const char*)&regbuf_0);
++  } else {
++      if (size < sizeof (long))
++        supply_register (regcache, regno, buf + sizeof (long) - size);
++      else
++        supply_register (regcache, regno, buf);
++  }
++}
++
++/* Provide only a fill function for the general register set.  ps_lgetregs
++   will use this for NPTL support.  */
++
++static void microblaze_fill_gregset (struct regcache *regcache, void *buf)
++{
++  int i;
++
++  for (i = 0; i < 32; i++)
++    microblaze_collect_ptrace_register (regcache, i, (char *) buf + microblaze_regmap[i]);
++}
++
++static void
++microblaze_store_gregset (struct regcache *regcache, const void *buf)
++{
++  int i;
++
++  for (i = 0; i < 32; i++)
++    supply_register (regcache, i, (char *) buf + microblaze_regmap[i]);
++}
++
++#endif /* HAVE_PTRACE_GETREGS */
++
++struct regset_info target_regsets[] = {
++#ifdef HAVE_PTRACE_GETREGS
++  { PTRACE_GETREGS, PTRACE_SETREGS, 0, sizeof (elf_gregset_t), GENERAL_REGS, microblaze_fill_gregset, microblaze_store_gregset },
++  { 0, 0, 0, -1, -1, NULL, NULL },
++#endif /* HAVE_PTRACE_GETREGS */
++  { 0, 0, 0, -1, -1, NULL, NULL }
++};
++
++struct linux_target_ops the_low_target = {
++  init_registers_microblaze,
++  microblaze_num_regs,
++  microblaze_regmap,
++  NULL,
++  microblaze_cannot_fetch_register,
++  microblaze_cannot_store_register,
++  NULL, /* fetch_register */
++  microblaze_get_pc,
++  microblaze_set_pc,
++  (const unsigned char *) &microblaze_breakpoint,
++  microblaze_breakpoint_len,
++  microblaze_reinsert_addr,
++  0,
++  microblaze_breakpoint_at,
++  NULL,
++  NULL,
++  NULL,
++  NULL,
++  microblaze_collect_ptrace_register,
++  microblaze_supply_ptrace_register,
++};
+diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
+index 17cdc2516d4..7d488d12b52 100644
+--- a/gdb/microblaze-linux-tdep.c
++++ b/gdb/microblaze-linux-tdep.c
+@@ -37,6 +37,22 @@
+ #include "tramp-frame.h"
+ #include "linux-tdep.h"
+ 
++static int microblaze_debug_flag = 0;
++
++static void
++microblaze_debug (const char *fmt, ...)
++{
++  if (microblaze_debug_flag)
++    {
++       va_list args;
++
++       va_start (args, fmt);
++       printf_unfiltered ("MICROBLAZE LINUX: ");
++       vprintf_unfiltered (fmt, args);
++       va_end (args);
++    }
++}
++
+ static int
+ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, 
+                                           struct bp_target_info *bp_tgt)
+@@ -50,13 +66,20 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
+   /* Determine appropriate breakpoint contents and size for this address.  */
+   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
+ 
++  /* Make sure we see the memory breakpoints.  */
++  scoped_restore restore_memory
++    = make_scoped_restore_show_memory_breakpoints (1);
++
+   val = target_read_memory (addr, old_contents, bplen);
+ 
+   /* If our breakpoint is no longer at the address, this means that the
+      program modified the code on us, so it is wrong to put back the
+      old value.  */
+   if (val == 0 && memcmp (bp, old_contents, bplen) == 0)
+-    val = target_write_raw_memory (addr, bp_tgt->shadow_contents, bplen);
++  {
++      val = target_write_raw_memory (addr, bp_tgt->shadow_contents, bplen);
++      microblaze_debug ("microblaze_linux_memory_remove_breakpoint writing back to memory at addr 0x%lx\n", addr);
++  }
+ 
+   return val;
+ }
+@@ -129,6 +152,10 @@ microblaze_linux_init_abi (struct gdbarch_info info,
+   /* Trampolines.  */
+   tramp_frame_prepend_unwinder (gdbarch,
+                                &microblaze_linux_sighandler_tramp_frame);
++
++  /* Enable TLS support.  */
++  set_gdbarch_fetch_tls_load_module_address (gdbarch,
++                                             svr4_fetch_objfile_link_map);
+ }
+ 
+ void _initialize_microblaze_linux_tdep ();
+diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
+index 0c3316dece1..2d6eb8ce94e 100644
+--- a/gdb/microblaze-tdep.c
++++ b/gdb/microblaze-tdep.c
+@@ -137,7 +137,38 @@ microblaze_fetch_instruction (CORE_ADDR pc)
+ constexpr gdb_byte microblaze_break_insn[] = MICROBLAZE_BREAKPOINT;
+ 
+ typedef BP_MANIPULATION (microblaze_break_insn) microblaze_breakpoint;
+-
++static int
++microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
++                                   struct bp_target_info *bp_tgt)
++{
++  CORE_ADDR addr = bp_tgt->placed_address;
++  const unsigned char *bp;
++  int val;
++  int bplen;
++  gdb_byte old_contents[BREAKPOINT_MAX];
++
++  /* Determine appropriate breakpoint contents and size for this address.  */
++  bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
++  if (bp == NULL)
++    error (_("Software breakpoints not implemented for this target."));
++
++  /* Make sure we see the memory breakpoints.  */
++  scoped_restore restore_memory
++    = make_scoped_restore_show_memory_breakpoints (1);
++
++  val = target_read_memory (addr, old_contents, bplen);
++
++  /* If our breakpoint is no longer at the address, this means that the
++     program modified the code on us, so it is wrong to put back the
++     old value.  */
++  if (val == 0 && memcmp (bp, old_contents, bplen) == 0)
++  {
++    val = target_write_raw_memory (addr, bp_tgt->shadow_contents, bplen);
++    microblaze_debug ("microblaze_linux_memory_remove_breakpoint writing back to memory at addr 0x%lx\n", addr);
++  }
++
++  return val;
++}
+ 
+ /* Allocate and initialize a frame cache.  */
+ 
+@@ -729,6 +760,7 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+                                       microblaze_breakpoint::kind_from_pc);
+   set_gdbarch_sw_breakpoint_from_kind (gdbarch,
+                                       microblaze_breakpoint::bp_from_kind);
++  set_gdbarch_memory_remove_breakpoint (gdbarch, microblaze_linux_memory_remove_breakpoint);
+ 
+   set_gdbarch_frame_args_skip (gdbarch, 8);
+ 
+@@ -769,4 +801,5 @@ When non-zero, microblaze specific debugging is enabled."),
+                             NULL,
+                             &setdebuglist, &showdebuglist);
+ 
++
+ }
+diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
+index 08af0d191c5..8a429cbf001 100644
+--- a/gdb/microblaze-tdep.h
++++ b/gdb/microblaze-tdep.h
+@@ -117,6 +117,8 @@ struct microblaze_frame_cache
+ 
+ /* MICROBLAZE_BREAKPOINT defines the breakpoint that should be used.
+    Only used for native debugging.  */
+-#define MICROBLAZE_BREAKPOINT {0xb9, 0xcc, 0x00, 0x60}
++#define MICROBLAZE_BREAKPOINT {0xba, 0x0c, 0x00, 0x18}
++#define MICROBLAZE_BREAKPOINT_LE {0x18, 0x00, 0x0c, 0xba}
++
+ 
+ #endif /* microblaze-tdep.h */
+diff --git a/gdb/regformats/reg-microblaze.dat b/gdb/regformats/reg-microblaze.dat
+new file mode 100644
+index 00000000000..bd8a4384424
+--- /dev/null
++++ b/gdb/regformats/reg-microblaze.dat
+@@ -0,0 +1,41 @@
++name:microblaze
++expedite:r1,pc
++32:r0
++32:r1
++32:r2
++32:r3
++32:r4
++32:r5
++32:r6
++32:r7
++32:r8
++32:r9
++32:r10
++32:r11
++32:r12
++32:r13
++32:r14
++32:r15
++32:r16
++32:r17
++32:r18
++32:r19
++32:r20
++32:r21
++32:r22
++32:r23
++32:r24
++32:r25
++32:r26
++32:r27
++32:r28
++32:r29
++32:r30
++32:r31
++32:pc
++32:msr
++32:ear
++32:esr
++32:fsr
++32:slr
++32:shr
+-- 
+2.17.1
+
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0034-Initial-port-of-core-reading-support-Added-support-f.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0034-Initial-port-of-core-reading-support.patch
index 3d5f7ae2..876fc5c8 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0034-Initial-port-of-core-reading-support-Added-support-f.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0034-Initial-port-of-core-reading-support.patch
@@ -1,30 +1,34 @@
-From bcb8a5479a617eea7b4da869bee5e00d4b750c73 Mon Sep 17 00:00:00 2001
+From 9b17875cc7584d41953d9a6f46558482e691881b Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 24 Jan 2017 14:55:56 +0530
-Subject: [PATCH 34/52] Initial port of core reading support Added support for
+Subject: [PATCH 34/38] Initial port of core reading support Added support for
  reading notes in linux core dumps Support for reading of PRSTATUS and PSINFO
  information for rebuilding ".reg" sections of core dumps at run time.
 
 Signed-off-by: David Holsgrove <david.holsgrove@petalogix.com>
 Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
+
+Conflicts:
+        gdb/microblaze-linux-tdep.c
+        gdb/microblaze-tdep.c
 ---
- bfd/elf32-microblaze.c      | 84 ++++++++++++++++++++++++++++++++++
+ bfd/elf32-microblaze.c      | 84 +++++++++++++++++++++++++++++++++++++
  gdb/configure.tgt           |  2 +-
- gdb/microblaze-linux-tdep.c | 57 +++++++++++++++++++++++
- gdb/microblaze-tdep.c       | 90 +++++++++++++++++++++++++++++++++++++
- gdb/microblaze-tdep.h       | 27 +++++++++++
- 5 files changed, 259 insertions(+), 1 deletion(-)
+ gdb/microblaze-linux-tdep.c | 17 +++++++-
+ gdb/microblaze-tdep.c       | 48 +++++++++++++++++++++
+ gdb/microblaze-tdep.h       | 27 ++++++++++++
+ 5 files changed, 176 insertions(+), 2 deletions(-)
 
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index d77710b1f3..7a27e50111 100644
+index 2a976ecbe1d..713f5e8e506 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -767,6 +767,87 @@ microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
+@@ -765,6 +765,87 @@ microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
    return _bfd_elf_is_local_label_name (abfd, name);
  }
  
 +/* Support for core dump NOTE sections.  */
-+static bfd_boolean
++static bool
 +microblaze_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
 +{
 +  int offset;
@@ -33,7 +37,7 @@ index d77710b1f3..7a27e50111 100644
 +  switch (note->descsz)
 +    {
 +      default:
-+        return FALSE;
++        return false;
 +
 +      case 228:         /* Linux/MicroBlaze */
 +        /* pr_cursig */
@@ -54,13 +58,13 @@ index d77710b1f3..7a27e50111 100644
 +                                          size, note->descpos + offset);
 +}
 +
-+static bfd_boolean
++static bool
 +microblaze_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 +{
 +  switch (note->descsz)
 +    {
 +      default:
-+        return FALSE;
++        return false;
 +
 +      case 128:         /* Linux/MicroBlaze elf_prpsinfo */
 +        elf_tdata (abfd)->core->program
@@ -81,7 +85,7 @@ index d77710b1f3..7a27e50111 100644
 +      command[n - 1] = '\0';
 +  }
 +
-+  return TRUE;
++  return true;
 +}
 +
 +/* The microblaze linker (like many others) needs to keep track of
@@ -107,7 +111,7 @@ index d77710b1f3..7a27e50111 100644
  /* ELF linker hash entry.  */
  
  struct elf32_mb_link_hash_entry
-@@ -3576,4 +3657,7 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
+@@ -3572,4 +3653,7 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
  #define elf_backend_size_dynamic_sections      microblaze_elf_size_dynamic_sections
  #define elf_backend_add_symbol_hook            microblaze_elf_add_symbol_hook
  
@@ -116,10 +120,10 @@ index d77710b1f3..7a27e50111 100644
 +
  #include "elf32-target.h"
 diff --git a/gdb/configure.tgt b/gdb/configure.tgt
-index d66f01bb9f..2938fddfe8 100644
+index a928c0227a0..95095e98706 100644
 --- a/gdb/configure.tgt
 +++ b/gdb/configure.tgt
-@@ -389,7 +389,7 @@ mep-*-*)
+@@ -399,7 +399,7 @@ mep-*-*)
  
  microblaze*-linux-*|microblaze*-*-linux*)
         # Target: Xilinx MicroBlaze running Linux
@@ -129,65 +133,36 @@ index d66f01bb9f..2938fddfe8 100644
         gdb_sim=../sim/microblaze/libsim.a
         ;;
 diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
-index fb8241884b..2725ce1789 100644
+index 7d488d12b52..6ea43dd0d3c 100644
 --- a/gdb/microblaze-linux-tdep.c
 +++ b/gdb/microblaze-linux-tdep.c
-@@ -135,11 +135,54 @@ static struct tramp_frame microblaze_linux_sighandler_tramp_frame =
+@@ -36,6 +36,7 @@
+ #include "frame-unwind.h"
+ #include "tramp-frame.h"
+ #include "linux-tdep.h"
++#include "glibc-tdep.h"
+ 
+ static int microblaze_debug_flag = 0;
+ 
+@@ -135,13 +136,16 @@ static struct tramp_frame microblaze_linux_sighandler_tramp_frame =
    microblaze_linux_sighandler_cache_init
  };
  
-+const struct microblaze_gregset microblaze_linux_core_gregset;
-+
-+static void
-+microblaze_linux_supply_core_gregset (const struct regset *regset,
-+                                   struct regcache *regcache,
-+                                   int regnum, const void *gregs, size_t len)
-+{
-+  microblaze_supply_gregset (&microblaze_linux_core_gregset, regcache,
-+                             regnum, gregs);
-+}
-+
-+static void
-+microblaze_linux_collect_core_gregset (const struct regset *regset,
-+                                    const struct regcache *regcache,
-+                                    int regnum, void *gregs, size_t len)
-+{
-+  microblaze_collect_gregset (&microblaze_linux_core_gregset, regcache,
-+                              regnum, gregs);
-+}
-+
-+static void
-+microblaze_linux_supply_core_fpregset (const struct regset *regset,
-+                                    struct regcache *regcache,
-+                                    int regnum, const void *fpregs, size_t len)
-+{
-+  /* FIXME.  */
-+  microblaze_supply_fpregset (regcache, regnum, fpregs);
-+}
-+
-+static void
-+microblaze_linux_collect_core_fpregset (const struct regset *regset,
-+                                     const struct regcache *regcache,
-+                                     int regnum, void *fpregs, size_t len)
-+{
-+  /* FIXME.  */
-+  microblaze_collect_fpregset (regcache, regnum, fpregs);
-+}
- 
+-
  static void
  microblaze_linux_init_abi (struct gdbarch_info info,
                            struct gdbarch *gdbarch)
  {
 +  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 +
-+  tdep->gregset = regset_alloc (gdbarch, microblaze_linux_supply_core_gregset,
-+                                microblaze_linux_collect_core_gregset);
 +  tdep->sizeof_gregset = 200;
-+
-   linux_init_abi (info, gdbarch);
+   linux_init_abi (info, gdbarch, 0);
  
++
    set_gdbarch_memory_remove_breakpoint (gdbarch,
-@@ -153,6 +196,20 @@ microblaze_linux_init_abi (struct gdbarch_info info,
+                                        microblaze_linux_memory_remove_breakpoint);
+ 
+@@ -153,6 +157,17 @@ microblaze_linux_init_abi (struct gdbarch_info info,
    tramp_frame_prepend_unwinder (gdbarch,
                                 &microblaze_linux_sighandler_tramp_frame);
  
@@ -202,109 +177,50 @@ index fb8241884b..2725ce1789 100644
 +  set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
 +  set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver);
 +
-+  set_gdbarch_regset_from_core_section (gdbarch,
-+                                       microblaze_regset_from_core_section);
-+
    /* Enable TLS support.  */
    set_gdbarch_fetch_tls_load_module_address (gdbarch,
                                               svr4_fetch_objfile_link_map);
 diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
-index 443adfb364..1b5cf38e45 100644
+index 2d6eb8ce94e..ceeee26007f 100644
 --- a/gdb/microblaze-tdep.c
 +++ b/gdb/microblaze-tdep.c
-@@ -137,6 +137,14 @@ microblaze_fetch_instruction (CORE_ADDR pc)
- constexpr gdb_byte microblaze_break_insn[] = MICROBLAZE_BREAKPOINT;
- 
- typedef BP_MANIPULATION (microblaze_break_insn) microblaze_breakpoint;
-+static CORE_ADDR
-+microblaze_store_arguments (struct regcache *regcache, int nargs,
-+                           struct value **args, CORE_ADDR sp,
-+                           int struct_return, CORE_ADDR struct_addr)
-+{
-+  error (_("store_arguments not implemented"));
-+  return sp;
-+}
- static int
- microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-                                    struct bp_target_info *bp_tgt)
-@@ -541,6 +549,12 @@ microblaze_frame_base_address (struct frame_info *next_frame,
-   return cache->base;
- }
- 
-+static const struct frame_unwind *
-+microblaze_frame_sniffer (struct frame_info *next_frame)
-+{
-+  return &microblaze_frame_unwind;
-+}
-+
- static const struct frame_base microblaze_frame_base =
- {
-   &microblaze_frame_unwind,
-@@ -677,6 +691,71 @@ microblaze_register_g_packet_guesses (struct gdbarch *gdbarch)
-                                   tdesc_microblaze_with_stack_protect);
+@@ -678,6 +678,43 @@ microblaze_register_g_packet_guesses (struct gdbarch *gdbarch)
+                                  tdesc_microblaze_with_stack_protect);
  }
  
 +void
-+microblaze_supply_gregset (const struct microblaze_gregset *gregset,
++microblaze_supply_gregset (const struct regset *regset,
 +                        struct regcache *regcache,
 +                        int regnum, const void *gregs)
 +{
-+  unsigned int *regs = gregs;
++  const unsigned int *regs = (const unsigned int *)gregs;
 +  if (regnum >= 0)
-+    regcache_raw_supply (regcache, regnum, regs + regnum);
++    regcache->raw_supply (regnum, regs + regnum);
 +
 +  if (regnum == -1) {
 +    int i;
 +
 +    for (i = 0; i < 50; i++) {
-+      regcache_raw_supply (regcache, i, regs + i);
++      regcache->raw_supply (i, regs + i);
 +    }
 +  }
 +}
 +
 +
-+void
-+microblaze_collect_gregset (const struct microblaze_gregset *gregset,
-+                         const struct regcache *regcache,
-+                         int regnum, void *gregs)
-+{
-+   /* FIXME.  */
-+}
-+
-+void
-+microblaze_supply_fpregset (struct regcache *regcache,
-+                         int regnum, const void *fpregs)
-+{
-+   /* FIXME.  */
-+}
-+
-+void
-+microblaze_collect_fpregset (const struct regcache *regcache,
-+                          int regnum, void *fpregs)
-+{
-+   /* FIXME.  */
-+}
-+
-+
 +/* Return the appropriate register set for the core section identified
 +   by SECT_NAME and SECT_SIZE.  */
 +
-+const struct regset *
-+microblaze_regset_from_core_section (struct gdbarch *gdbarch,
-+                                     const char *sect_name, size_t sect_size)
++static void
++microblaze_iterate_over_regset_sections (struct gdbarch *gdbarch,
++                                     iterate_over_regset_sections_cb *cb,
++                                     void *cb_data,
++                                     const struct regcache *regcache)
 +{
 +  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 +
-+  microblaze_debug ("microblaze_regset_from_core_section, sect_name = %s\n", sect_name);
-+
-+  if (strcmp (sect_name, ".reg") == 0 && sect_size >= tdep->sizeof_gregset)
-+    return tdep->gregset;
-+
-+  if (strcmp (sect_name, ".reg2") == 0 && sect_size >= tdep->sizeof_fpregset)
-+    return tdep->fpregset;
++  cb(".reg", tdep->sizeof_gregset, tdep->sizeof_gregset, tdep->gregset, NULL, cb_data);
 +
-+  microblaze_debug ("microblaze_regset_from_core_section returning null :-( \n");
-+  return NULL;
++  cb(".reg2", tdep->sizeof_fpregset, tdep->sizeof_fpregset, tdep->fpregset, NULL, cb_data);
 +}
 +
 +
@@ -312,7 +228,7 @@ index 443adfb364..1b5cf38e45 100644
  static struct gdbarch *
  microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
  {
-@@ -733,6 +812,10 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+@@ -731,6 +768,10 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
    tdep = XCNEW (struct gdbarch_tdep);
    gdbarch = gdbarch_alloc (&info, tdep);
  
@@ -323,22 +239,22 @@ index 443adfb364..1b5cf38e45 100644
    set_gdbarch_long_double_bit (gdbarch, 128);
  
    set_gdbarch_num_regs (gdbarch, MICROBLAZE_NUM_REGS);
-@@ -781,6 +864,13 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
+@@ -779,6 +820,13 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
    frame_base_append_sniffer (gdbarch, dwarf2_frame_base_sniffer);
    if (tdesc_data != NULL)
-     tdesc_use_registers (gdbarch, tdesc, tdesc_data);
+     tdesc_use_registers (gdbarch, tdesc, std::move (tdesc_data));
 +  //frame_base_append_sniffer (gdbarch, microblaze_frame_sniffer);
 +
 +  /* If we have register sets, enable the generic core file support.  */
 +  if (tdep->gregset) {
-+      set_gdbarch_regset_from_core_section (gdbarch,
-+                                          microblaze_regset_from_core_section);
++    set_gdbarch_iterate_over_regset_sections (gdbarch,
++                                          microblaze_iterate_over_regset_sections);
 +  }
  
    return gdbarch;
  }
 diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
-index db0772643d..de66a05cab 100644
+index 8a429cbf001..e91991b8dba 100644
 --- a/gdb/microblaze-tdep.h
 +++ b/gdb/microblaze-tdep.h
 @@ -22,8 +22,22 @@
@@ -368,10 +284,10 @@ index db0772643d..de66a05cab 100644
  #define MICROBLAZE_BREAKPOINT {0xba, 0x0c, 0x00, 0x18}
  #define MICROBLAZE_BREAKPOINT_LE {0x18, 0x00, 0x0c, 0xba}
  
-+extern void microblaze_supply_gregset (const struct microblaze_gregset *gregset,
++extern void microblaze_supply_gregset (const struct regset *regset,
 +                                    struct regcache *regcache,
 +                                    int regnum, const void *gregs);
-+extern void microblaze_collect_gregset (const struct microblaze_gregset *gregset,
++extern void microblaze_collect_gregset (const struct regset *regset,
 +                                     const struct regcache *regcache,
 +                                     int regnum, void *gregs);
 +extern void microblaze_supply_fpregset (struct regcache *regcache,
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-debug-message-when-register-is-unavailable.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-debug-message-when-register-is-unavailable.patch
index 4c26f259..9326e2c0 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-debug-message-when-register-is-unavailable.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-debug-message-when-register-is-unavailable.patch
@@ -1,18 +1,21 @@
-From bc2b702d7f73a231bd67c60465137fe37f67479a Mon Sep 17 00:00:00 2001
+From 59fd18d5155ffe8924ed24283def8ef434067909 Mon Sep 17 00:00:00 2001
 From: Nathan Rossi <nathan.rossi@petalogix.com>
 Date: Tue, 8 May 2012 18:11:17 +1000
-Subject: [PATCH 35/52] Fix debug message when register is unavailable
+Subject: [PATCH 35/38] Fix debug message when register is unavailable
 
 Signed-off-by: Nathan Rossi <nathan.rossi@petalogix.com>
+
+Conflicts:
+        gdb/frame.c
 ---
- gdb/frame.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
+ gdb/frame.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/gdb/frame.c b/gdb/frame.c
-index ff27b9f00e..bf931b370c 100644
+index 3f2d2700541..d557a093f63 100644
 --- a/gdb/frame.c
 +++ b/gdb/frame.c
-@@ -1263,12 +1263,19 @@ frame_unwind_register_value (frame_info *next_frame, int regnum)
+@@ -1261,12 +1261,19 @@ frame_unwind_register_value (frame_info *next_frame, int regnum)
           else
             {
               int i;
@@ -22,17 +25,15 @@ index ff27b9f00e..bf931b370c 100644
 +               buf = value_contents (value);
 +             }
  
-              fprintf_unfiltered (gdb_stdlog, " bytes=");
-              fprintf_unfiltered (gdb_stdlog, "[");
--             for (i = 0; i < register_size (gdbarch, regnum); i++)
--               fprintf_unfiltered (gdb_stdlog, "%02x", buf[i]);
+              fprintf_unfiltered (&debug_file, " bytes=");
+              fprintf_unfiltered (&debug_file, "[");
 +             if (buf != NULL) {
-+               for (i = 0; i < register_size (gdbarch, regnum); i++)
-+                 fprintf_unfiltered (gdb_stdlog, "%02x", buf[i]);
+              for (i = 0; i < register_size (gdbarch, regnum); i++)
+                fprintf_unfiltered (&debug_file, "%02x", buf[i]);
 +             } else {
-+               fprintf_unfiltered (gdb_stdlog, "unavailable");
++               fprintf_unfiltered (&debug_file, "unavailable");
 +             }
-              fprintf_unfiltered (gdb_stdlog, "]");
+              fprintf_unfiltered (&debug_file, "]");
             }
         }
 -- 
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0038-microblaze-Add-build_gdbserver-yes-to-top-level-conf.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0036-microblaze-Add-build_gdbserver-yes-to-top-level-conf.patch
index dede70e8..350dd8c0 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0038-microblaze-Add-build_gdbserver-yes-to-top-level-conf.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0036-microblaze-Add-build_gdbserver-yes-to-top-level-conf.patch
@@ -1,7 +1,7 @@
-From 463a2d331ab68484913a2957614e852eac793583 Mon Sep 17 00:00:00 2001
+From 112d69b1bcebf14e37049a9795ce7128e98c1a23 Mon Sep 17 00:00:00 2001
 From: David Holsgrove <david.holsgrove@xilinx.com>
 Date: Mon, 16 Dec 2013 16:37:32 +1000
-Subject: [PATCH 38/52] microblaze: Add build_gdbserver=yes to top level
+Subject: [PATCH 36/38] microblaze: Add build_gdbserver=yes to top level
  configure.tgt
 
 For Microblaze linux toolchains, set the build_gdbserver=yes
@@ -16,10 +16,10 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/gdb/configure.tgt b/gdb/configure.tgt
-index 2938fddfe8..ac2d35a991 100644
+index 95095e98706..47497ac3d39 100644
 --- a/gdb/configure.tgt
 +++ b/gdb/configure.tgt
-@@ -397,6 +397,7 @@ microblaze*-*-*)
+@@ -407,6 +407,7 @@ microblaze*-*-*)
         # Target: Xilinx MicroBlaze running standalone
         gdb_target_obs="microblaze-tdep.o"
         gdb_sim=../sim/microblaze/libsim.a
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0036-revert-master-rebase-changes-to-gdbserver.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0036-revert-master-rebase-changes-to-gdbserver.patch
deleted file mode 100644
index 81f55f76..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0036-revert-master-rebase-changes-to-gdbserver.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c84c1a62142bcd18c242ec476539f0c505285d6c Mon Sep 17 00:00:00 2001
-From: David Holsgrove <david.holsgrove@xilinx.com>
-Date: Mon, 22 Jul 2013 11:16:05 +1000
-Subject: [PATCH 36/52] revert master-rebase changes to gdbserver
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
----
- gdbserver/configure.srv | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv
-index 5e33bd9c54..7e81388850 100644
---- a/gdbserver/configure.srv
-+++ b/gdbserver/configure.srv
-@@ -155,6 +155,13 @@ case "${gdbserver_host}" in
-                        srv_linux_usrregs=yes
-                        srv_linux_thread_db=yes
-                        ;;
-+  microblaze*-*-linux*)        srv_regobj=microblaze-linux.o
-+                       srv_tgtobj="linux-low.o linux-osdata.o linux-microblaze-low.o "
-+                       srv_tgtobj="${srv_tgtobj} linux-procfs.o linux-ptrace.o"
-+                       srv_linux_regsets=yes
-+                       srv_linux_usrregs=yes
-+                       srv_linux_thread_db=yes
-+                       ;;
-   powerpc*-*-linux*)   srv_regobj="powerpc-32l.o"
-                        srv_regobj="${srv_regobj} powerpc-altivec32l.o"
-                        srv_regobj="${srv_regobj} powerpc-vsx32l.o"
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0040-Fixing-the-issues-related-to-GDB-7.12-added-all-the-.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0037-Fixing-the-issues-related-to-GDB-7.12.patch
index e08f16df..14ebbb63 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0040-Fixing-the-issues-related-to-GDB-7.12-added-all-the-.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0037-Fixing-the-issues-related-to-GDB-7.12.patch
@@ -1,157 +1,56 @@
-From 976a0e2664559cc194eee8040280cd29e2672d26 Mon Sep 17 00:00:00 2001
+From 3d14409964a92753c3176b6af84ba4c80011237f Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Fri, 17 Feb 2017 14:09:40 +0530
-Subject: [PATCH 40/52] Fixing the issues related to GDB-7.12 added all the
- required function which are new in 7.12 and removed few deprecated functions
- from 7.6
+Subject: [PATCH 37/38] Fixing the issues related to GDB-7.12
 
+added all the required function which are new in 7.12 and removed
+few deprecated functions from 7.6
+
+Conflicts:
+        gdb/config/microblaze/linux.mh
 ---
- gdb/config/microblaze/linux.mh   |  4 +-
- gdb/microblaze-linux-tdep.c      | 68 ++++++++++++++++++++--
- gdb/microblaze-tdep.h            |  1 +
- gdbserver/configure.srv          |  3 +-
- gdbserver/linux-microblaze-low.c | 97 +++++++++++++++++++++++++++-----
- 5 files changed, 153 insertions(+), 20 deletions(-)
+ gdb/config/microblaze/linux.mh       | 11 ++++
+ gdb/gdbserver/configure.srv          |  3 +-
+ gdb/gdbserver/linux-microblaze-low.c | 97 ++++++++++++++++++++++++----
+ gdb/microblaze-tdep.h                |  1 +
+ 4 files changed, 97 insertions(+), 15 deletions(-)
+ create mode 100644 gdb/config/microblaze/linux.mh
 
 diff --git a/gdb/config/microblaze/linux.mh b/gdb/config/microblaze/linux.mh
-index a4eaf540e1..74a53b854a 100644
---- a/gdb/config/microblaze/linux.mh
+new file mode 100644
+index 00000000000..74a53b854a4
+--- /dev/null
 +++ b/gdb/config/microblaze/linux.mh
-@@ -1,9 +1,11 @@
- # Host: Microblaze, running Linux
- 
+@@ -0,0 +1,11 @@
++# Host: Microblaze, running Linux
++
 +#linux-nat.o linux-waitpid.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
- NAT_FILE= config/nm-linux.h
- NATDEPFILES= inf-ptrace.o fork-child.o \
-        microblaze-linux-nat.o proc-service.o linux-thread-db.o \
--       linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
++NAT_FILE= config/nm-linux.h
++NATDEPFILES= inf-ptrace.o fork-child.o \
++       microblaze-linux-nat.o proc-service.o linux-thread-db.o \
 +       linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
 +       linux-waitpid.o linux-personality.o linux-namespaces.o
- NAT_CDEPS = $(srcdir)/proc-service.list
- 
- LOADLIBES = -ldl $(RDYNAMIC)
-diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
-index 2725ce1789..a2e858d10f 100644
---- a/gdb/microblaze-linux-tdep.c
-+++ b/gdb/microblaze-linux-tdep.c
-@@ -29,13 +29,76 @@
- #include "regcache.h"
- #include "value.h"
- #include "osabi.h"
--#include "regset.h"
- #include "solib-svr4.h"
- #include "microblaze-tdep.h"
- #include "trad-frame.h"
- #include "frame-unwind.h"
- #include "tramp-frame.h"
- #include "linux-tdep.h"
-+#include "glibc-tdep.h"
-+
-+#include "gdb_assert.h"
-+
-+#ifndef REGSET_H
-+#define REGSET_H 1
-+
-+struct gdbarch;
-+struct regcache;
-+
-+/* Data structure for the supported register notes in a core file.  */
-+struct core_regset_section
-+{
-+  const char *sect_name;
-+  int size;
-+  const char *human_name;
-+};
-+
-+/* Data structure describing a register set.  */
-+
-+typedef void (supply_regset_ftype) (const struct regset *, struct regcache *,
-+                                    int, const void *, size_t);
-+typedef void (collect_regset_ftype) (const struct regset *,
-+                                     const struct regcache *,
-+                                     int, void *, size_t);
-+
-+struct regset
-+{
-+  /* Data pointer for private use by the methods below, presumably
-+     providing some sort of description of the register set.  */
-+  const void *descr;
-+
-+  /* Function supplying values in a register set to a register cache.  */
-+  supply_regset_ftype *supply_regset;
-+
-+  /* Function collecting values in a register set from a register cache.  */
-+  collect_regset_ftype *collect_regset;
-+
-+  /* Architecture associated with the register set.  */
-+  struct gdbarch *arch;
-+};
-+
-+#endif
-+
-+/* Allocate a fresh 'struct regset' whose supply_regset function is
-+   SUPPLY_REGSET, and whose collect_regset function is COLLECT_REGSET.
-+   If the regset has no collect_regset function, pass NULL for
-+   COLLECT_REGSET.
-+
-+   The object returned is allocated on ARCH's obstack.  */
-+
-+struct regset *
-+regset_alloc (struct gdbarch *arch,
-+              supply_regset_ftype *supply_regset,
-+              collect_regset_ftype *collect_regset)
-+{
-+  struct regset *regset = GDBARCH_OBSTACK_ZALLOC (arch, struct regset);
-+
-+  regset->arch = arch;
-+  regset->supply_regset = supply_regset;
-+  regset->collect_regset = collect_regset;
-+
-+  return regset;
-+}
- 
- static int microblaze_debug_flag = 0;
- 
-@@ -207,9 +270,6 @@ microblaze_linux_init_abi (struct gdbarch_info info,
-   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
-   set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver);
- 
--  set_gdbarch_regset_from_core_section (gdbarch,
--                                       microblaze_regset_from_core_section);
--
-   /* Enable TLS support.  */
-   set_gdbarch_fetch_tls_load_module_address (gdbarch,
-                                              svr4_fetch_objfile_link_map);
-diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
-index de66a05cab..1234f8a36f 100644
---- a/gdb/microblaze-tdep.h
-+++ b/gdb/microblaze-tdep.h
-@@ -24,6 +24,7 @@
- /* Microblaze architecture-specific information.  */
- struct microblaze_gregset
- {
-+   microblaze_gregset() {}
-    unsigned int gregs[32];
-    unsigned int fpregs[32];
-    unsigned int pregs[16];
-diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv
-index 7e81388850..456f4b3349 100644
---- a/gdbserver/configure.srv
-+++ b/gdbserver/configure.srv
-@@ -156,8 +156,7 @@ case "${gdbserver_host}" in
++NAT_CDEPS = $(srcdir)/proc-service.list
++
++LOADLIBES = -ldl $(RDYNAMIC)
+diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
+index e0d2b2fe04a..26db2dd2461 100644
+--- a/gdb/gdbserver/configure.srv
++++ b/gdb/gdbserver/configure.srv
+@@ -185,8 +185,7 @@ case "${target}" in
                         srv_linux_thread_db=yes
                         ;;
-   microblaze*-*-linux*)        srv_regobj=microblaze-linux.o
+   microblaze*-*-linux*)        srv_regobj="microblaze-linux.o"
 -                       srv_tgtobj="linux-low.o linux-osdata.o linux-microblaze-low.o "
 -                       srv_tgtobj="${srv_tgtobj} linux-procfs.o linux-ptrace.o"
 +                       srv_tgtobj="$srv_linux_obj linux-microblaze-low.o "
+                        srv_xmlfiles="microblaze-linux.xml"
                         srv_linux_regsets=yes
                         srv_linux_usrregs=yes
-                        srv_linux_thread_db=yes
-diff --git a/gdbserver/linux-microblaze-low.c b/gdbserver/linux-microblaze-low.c
-index cba5d6fc58..a2733f3c21 100644
---- a/gdbserver/linux-microblaze-low.c
-+++ b/gdbserver/linux-microblaze-low.c
+diff --git a/gdb/gdbserver/linux-microblaze-low.c b/gdb/gdbserver/linux-microblaze-low.c
+index cba5d6fc585..a2733f3c21c 100644
+--- a/gdb/gdbserver/linux-microblaze-low.c
++++ b/gdb/gdbserver/linux-microblaze-low.c
 @@ -39,10 +39,11 @@ static int microblaze_regmap[] =
    PT_FSR
    };
@@ -304,6 +203,18 @@ index cba5d6fc58..a2733f3c21 100644
 +{
 +  init_registers_microblaze ();
 +}
+diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
+index e91991b8dba..872a3931f20 100644
+--- a/gdb/microblaze-tdep.h
++++ b/gdb/microblaze-tdep.h
+@@ -24,6 +24,7 @@
+ /* Microblaze architecture-specific information.  */
+ struct microblaze_gregset
+ {
++   microblaze_gregset() {}
+    unsigned int gregs[32];
+    unsigned int fpregs[32];
+    unsigned int pregs[16];
 -- 
 2.17.1
 
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0037-revert-master-rebase-changes-to-gdbserver-previous-c.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0037-revert-master-rebase-changes-to-gdbserver-previous-c.patch
deleted file mode 100644
index 24ae7a8c..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0037-revert-master-rebase-changes-to-gdbserver-previous-c.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 06f1e66daaa1c8a2e1e43254a66f35840945e63b Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 30 Apr 2018 17:09:55 +0530
-Subject: [PATCH 37/52] revert master-rebase changes to gdbserver , previous
- commit typo's
-
-Note: This _WILL NOT WORK_, the format of the files in gdbserver have changed!
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- gdbserver/Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
-index 9d7687be53..df354d636c 100644
---- a/gdbserver/Makefile.in
-+++ b/gdbserver/Makefile.in
-@@ -183,6 +183,7 @@ SFILES = \
-        $(srcdir)/linux-ia64-low.cc \
-        $(srcdir)/linux-low.cc \
-        $(srcdir)/linux-m68k-low.cc \
-+       $(srcdir)/linux-microblaze-low.c \
-        $(srcdir)/linux-mips-low.cc \
-        $(srcdir)/linux-nios2-low.cc \
-        $(srcdir)/linux-ppc-low.cc \
-@@ -217,6 +218,7 @@ SFILES = \
-        $(srcdir)/../gdb/nat/linux-osdata.c \
-        $(srcdir)/../gdb/nat/linux-personality.c \
-        $(srcdir)/../gdb/nat/mips-linux-watch.c \
-+       $(srcdir)/../gdb/nat/microblaze-linux.c \
-        $(srcdir)/../gdb/nat/ppc-linux.c \
-        $(srcdir)/../gdb/nat/riscv-linux-tdesc.c \
-        $(srcdir)/../gdb/nat/fork-inferior.c \
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0038-Patch-MB-MB-binutils-Upstream-port-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0038-Patch-MB-MB-binutils-Upstream-port-issues.patch
new file mode 100644
index 00000000..1fb73946
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0038-Patch-MB-MB-binutils-Upstream-port-issues.patch
@@ -0,0 +1,556 @@
+From 5e492aae0baf2ed8593c2fb2df03c54fbb180e57 Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Sun, 28 Nov 2021 17:17:15 +0530
+Subject: [PATCH 38/38] [Patch,MB]: MB binutils Upstream port issues.
+
+---
+ bfd/elf64-microblaze.c     | 266 ++++++++++++++++++++++++++++---------
+ gas/config/tc-microblaze.c |   2 +-
+ opcodes/microblaze-dis.c   |  12 +-
+ opcodes/microblaze-opc.h   |   2 +-
+ 4 files changed, 208 insertions(+), 74 deletions(-)
+
+diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
+index 4d41ddbd953..210b84b2a50 100644
+--- a/bfd/elf64-microblaze.c
++++ b/bfd/elf64-microblaze.c
+@@ -767,12 +767,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. */
+@@ -796,6 +819,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;
+@@ -1335,8 +1370,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;
+ 
+@@ -1523,13 +1557,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;
+                  }
+ 
+@@ -1619,9 +1651,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;
+@@ -1640,14 +1679,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;
+                  }
+              }
+@@ -1718,6 +1754,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.  */
+ 
+@@ -2391,8 +2442,11 @@ microblaze_elf_relax_section (bfd *abfd,
+       symtab_hdr->contents = (bfd_byte *) isymbuf;
+     }
+ 
+-  free (free_relocs);
+-  free_relocs = NULL;
++  if (free_relocs != NULL)
++    {
++      free (free_relocs);
++      free_relocs = NULL;
++    }
+ 
+   if (free_contents != NULL)
+     {
+@@ -2415,11 +2469,16 @@ microblaze_elf_relax_section (bfd *abfd,
+   return true;
+ 
+  error_return:
+-  free (free_relocs);
+-  free (free_contents);
+-  free (sec->relax);
+-  sec->relax = NULL;
+-  sec->relax_count = 0;
++  if (free_relocs != NULL)
++    free (free_relocs);
++  if (free_contents != NULL)
++    free (free_contents);
++  if (sec->relax != NULL)
++    {
++      free (sec->relax);
++      sec->relax = NULL;
++      sec->relax_count = 0;
++    }
+   return false;
+ }
+ 
+@@ -2444,6 +2503,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
+@@ -2650,14 +2720,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
+@@ -2701,14 +2771,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;
+@@ -2731,6 +2801,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
+@@ -2743,6 +2841,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);
+@@ -2828,9 +2960,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;
+@@ -2849,19 +2989,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;
+     }
+ 
+@@ -2871,11 +3003,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;
+     }
+ 
+@@ -2897,7 +3030,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;
+@@ -2949,7 +3082,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
+         {
+@@ -3015,7 +3148,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
+@@ -3030,9 +3163,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;
+@@ -3124,7 +3257,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)
+@@ -3601,13 +3734,14 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
+ #define bfd_elf64_bfd_is_local_label_name       microblaze_elf_is_local_label_name
+ #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_elf32_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
+@@ -3617,11 +3751,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 dfcd0ab1569..e34af099640 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 d945d144c44..5e8ebb28b8f 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.  */
+@@ -496,7 +496,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.  */
+@@ -538,7 +538,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 6f9a5a60dab..a6165649793 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.17.1
+
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0039-Initial-support-for-native-gdb.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0039-Initial-support-for-native-gdb.patch
deleted file mode 100644
index 646914a4..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0039-Initial-support-for-native-gdb.patch
+++ /dev/null
@@ -1,495 +0,0 @@
-From eef1384ec08bbbac893e4a564981517f92f90b57 Mon Sep 17 00:00:00 2001
-From: David Holsgrove <david.holsgrove@petalogix.com>
-Date: Fri, 20 Jul 2012 15:18:35 +1000
-Subject: [PATCH 39/52] Initial support for native gdb
-
-microblaze: Follow PPC method of getting setting registers
-using PTRACE PEEK/POKE
-
-Signed-off-by: David Holsgrove <david.holsgrove@petalogix.com>
-
-Conflicts:
-        gdb/Makefile.in
----
- gdb/Makefile.in                |   2 +
- gdb/config/microblaze/linux.mh |   9 +
- gdb/microblaze-linux-nat.c     | 431 +++++++++++++++++++++++++++++++++
- 3 files changed, 442 insertions(+)
- create mode 100644 gdb/config/microblaze/linux.mh
- create mode 100644 gdb/microblaze-linux-nat.c
-
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 9ae9fe2d1e..a44464b983 100644
---- a/gdb/Makefile.in
-+++ b/gdb/Makefile.in
-@@ -1328,6 +1328,7 @@ HFILES_NO_SRCDIR = \
-        memory-map.h \
-        memrange.h \
-        microblaze-tdep.h \
-+       microblaze-linux-tdep.h \
-        mips-linux-tdep.h \
-        mips-nbsd-tdep.h \
-        mips-tdep.h \
-@@ -2207,6 +2208,7 @@ ALLDEPFILES = \
-        m68k-tdep.c \
-        microblaze-linux-tdep.c \
-        microblaze-tdep.c \
-+       microblaze-linux-nat.c \
-        mingw-hdep.c \
-        mips-fbsd-nat.c \
-        mips-fbsd-tdep.c \
-diff --git a/gdb/config/microblaze/linux.mh b/gdb/config/microblaze/linux.mh
-new file mode 100644
-index 0000000000..a4eaf540e1
---- /dev/null
-+++ b/gdb/config/microblaze/linux.mh
-@@ -0,0 +1,9 @@
-+# Host: Microblaze, running Linux
-+
-+NAT_FILE= config/nm-linux.h
-+NATDEPFILES= inf-ptrace.o fork-child.o \
-+       microblaze-linux-nat.o proc-service.o linux-thread-db.o \
-+       linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
-+NAT_CDEPS = $(srcdir)/proc-service.list
-+
-+LOADLIBES = -ldl $(RDYNAMIC)
-diff --git a/gdb/microblaze-linux-nat.c b/gdb/microblaze-linux-nat.c
-new file mode 100644
-index 0000000000..e9b8c9c522
---- /dev/null
-+++ b/gdb/microblaze-linux-nat.c
-@@ -0,0 +1,431 @@
-+/* Microblaze GNU/Linux native support.
-+
-+   Copyright (C) 1988-1989, 1991-1992, 1994, 1996, 2000-2012 Free
-+   Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   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, see <http://www.gnu.org/licenses/>.  */
-+
-+#include "defs.h"
-+#include "arch-utils.h"
-+#include "dis-asm.h"
-+#include "frame.h"
-+#include "trad-frame.h"
-+#include "symtab.h"
-+#include "value.h"
-+#include "gdbcmd.h"
-+#include "breakpoint.h"
-+#include "inferior.h"
-+#include "regcache.h"
-+#include "target.h"
-+#include "frame.h"
-+#include "frame-base.h"
-+#include "frame-unwind.h"
-+#include "dwarf2-frame.h"
-+#include "osabi.h"
-+
-+#include "gdb_assert.h"
-+#include "gdb_string.h"
-+#include "target-descriptions.h"
-+#include "opcodes/microblaze-opcm.h"
-+#include "opcodes/microblaze-dis.h"
-+
-+#include "linux-nat.h"
-+#include "target-descriptions.h"
-+
-+#include <sys/user.h>
-+#include <sys/utsname.h>
-+#include <sys/procfs.h>
-+#include <sys/ptrace.h>
-+
-+/* Prototypes for supply_gregset etc. */
-+#include "gregset.h"
-+
-+#include "microblaze-tdep.h"
-+
-+#include <elf/common.h>
-+#include "auxv.h"
-+
-+/* Defines ps_err_e, struct ps_prochandle.  */
-+#include "gdb_proc_service.h"
-+
-+/* On GNU/Linux, threads are implemented as pseudo-processes, in which
-+   case we may be tracing more than one process at a time.  In that
-+   case, inferior_ptid will contain the main process ID and the
-+   individual thread (process) ID.  get_thread_id () is used to get
-+   the thread id if it's available, and the process id otherwise.  */
-+
-+int
-+get_thread_id (ptid_t ptid)
-+{
-+  int tid = TIDGET (ptid);
-+  if (0 == tid)
-+    tid = PIDGET (ptid);
-+  return tid;
-+}
-+
-+#define GET_THREAD_ID(PTID)    get_thread_id (PTID)
-+
-+/* Non-zero if our kernel may support the PTRACE_GETREGS and
-+   PTRACE_SETREGS requests, for reading and writing the
-+   general-purpose registers.  Zero if we've tried one of
-+   them and gotten an error.  */
-+int have_ptrace_getsetregs = 1;
-+
-+static int
-+microblaze_register_u_addr (struct gdbarch *gdbarch, int regno)
-+{
-+  int u_addr = -1;
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
-+     interface, and not the wordsize of the program's ABI.  */
-+  int wordsize = sizeof (long);
-+
-+  /* General purpose registers occupy 1 slot each in the buffer.  */
-+  if (regno >= MICROBLAZE_R0_REGNUM
-+      && regno <= MICROBLAZE_FSR_REGNUM)
-+    u_addr = (regno * wordsize);
-+
-+  return u_addr;
-+}
-+
-+
-+static void
-+fetch_register (struct regcache *regcache, int tid, int regno)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  /* This isn't really an address.  But ptrace thinks of it as one.  */
-+  CORE_ADDR regaddr = microblaze_register_u_addr (gdbarch, regno);
-+  int bytes_transferred;
-+  unsigned int offset;         /* Offset of registers within the u area.  */
-+  char buf[MAX_REGISTER_SIZE];
-+
-+  if (regaddr == -1)
-+  {
-+    memset (buf, '\0', register_size (gdbarch, regno));   /* Supply zeroes */
-+    regcache_raw_supply (regcache, regno, buf);
-+    return;
-+  }
-+
-+  /* Read the raw register using sizeof(long) sized chunks.  On a
-+     32-bit platform, 64-bit floating-point registers will require two
-+     transfers.  */
-+  for (bytes_transferred = 0;
-+       bytes_transferred < register_size (gdbarch, regno);
-+       bytes_transferred += sizeof (long))
-+  {
-+    long l;
-+
-+    errno = 0;
-+    l = ptrace (PTRACE_PEEKUSER, tid, (PTRACE_TYPE_ARG3) regaddr, 0);
-+    regaddr += sizeof (long);
-+    if (errno != 0)
-+    {
-+      char message[128];
-+      sprintf (message, "reading register %s (#%d)",
-+               gdbarch_register_name (gdbarch, regno), regno);
-+      perror_with_name (message);
-+    }
-+    memcpy (&buf[bytes_transferred], &l, sizeof (l));
-+  }
-+
-+  /* Now supply the register.  Keep in mind that the regcache's idea
-+     of the register's size may not be a multiple of sizeof
-+     (long).  */
-+  if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)
-+  {
-+    /* Little-endian values are always found at the left end of the
-+       bytes transferred.  */
-+    regcache_raw_supply (regcache, regno, buf);
-+  }
-+  else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
-+  {
-+    /* Big-endian values are found at the right end of the bytes
-+       transferred.  */
-+    size_t padding = (bytes_transferred - register_size (gdbarch, regno));
-+    regcache_raw_supply (regcache, regno, buf + padding);
-+  }
-+  else
-+    internal_error (__FILE__, __LINE__,
-+                    _("fetch_register: unexpected byte order: %d"),
-+                    gdbarch_byte_order (gdbarch));
-+}
-+
-+/* This function actually issues the request to ptrace, telling
-+   it to get all general-purpose registers and put them into the
-+   specified regset.
-+
-+   If the ptrace request does not exist, this function returns 0
-+   and properly sets the have_ptrace_* flag.  If the request fails,
-+   this function calls perror_with_name.  Otherwise, if the request
-+   succeeds, then the regcache gets filled and 1 is returned.  */
-+static int
-+fetch_all_gp_regs (struct regcache *regcache, int tid)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  gdb_gregset_t gregset;
-+
-+  if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0)
-+  {
-+    if (errno == EIO)
-+    {
-+      have_ptrace_getsetregs = 0;
-+      return 0;
-+    }
-+    perror_with_name (_("Couldn't get general-purpose registers."));
-+  }
-+
-+  supply_gregset (regcache, (const gdb_gregset_t *) &gregset);
-+
-+  return 1;
-+}
-+
-+
-+/* This is a wrapper for the fetch_all_gp_regs function.  It is
-+   responsible for verifying if this target has the ptrace request
-+   that can be used to fetch all general-purpose registers at one
-+   shot.  If it doesn't, then we should fetch them using the
-+   old-fashioned way, which is to iterate over the registers and
-+   request them one by one.  */
-+static void
-+fetch_gp_regs (struct regcache *regcache, int tid)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  int i;
-+
-+  if (have_ptrace_getsetregs)
-+    if (fetch_all_gp_regs (regcache, tid))
-+      return;
-+
-+  /* If we've hit this point, it doesn't really matter which
-+     architecture we are using.  We just need to read the
-+     registers in the "old-fashioned way".  */
-+  for (i = MICROBLAZE_R0_REGNUM; i <= MICROBLAZE_FSR_REGNUM; i++)
-+    fetch_register (regcache, tid, i);
-+}
-+
-+
-+static void
-+store_register (const struct regcache *regcache, int tid, int regno)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  /* This isn't really an address.  But ptrace thinks of it as one.  */
-+  CORE_ADDR regaddr = microblaze_register_u_addr (gdbarch, regno);
-+  int i;
-+  size_t bytes_to_transfer;
-+  char buf[MAX_REGISTER_SIZE];
-+
-+  if (regaddr == -1)
-+    return;
-+
-+  /* First collect the register.  Keep in mind that the regcache's
-+     idea of the register's size may not be a multiple of sizeof
-+     (long).  */
-+  memset (buf, 0, sizeof buf);
-+  bytes_to_transfer = align_up (register_size (gdbarch, regno), sizeof (long));
-+  if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)
-+  {
-+    /* Little-endian values always sit at the left end of the buffer.  */
-+    regcache_raw_collect (regcache, regno, buf);
-+  }
-+  else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
-+  {
-+    /* Big-endian values sit at the right end of the buffer.  */
-+    size_t padding = (bytes_to_transfer - register_size (gdbarch, regno));
-+    regcache_raw_collect (regcache, regno, buf + padding);
-+  }
-+
-+  for (i = 0; i < bytes_to_transfer; i += sizeof (long))
-+  {
-+    long l;
-+
-+    memcpy (&l, &buf[i], sizeof (l));
-+    errno = 0;
-+    ptrace (PTRACE_POKEUSER, tid, (PTRACE_TYPE_ARG3) regaddr, l);
-+    regaddr += sizeof (long);
-+
-+    if (errno != 0)
-+    {
-+      char message[128];
-+      sprintf (message, "writing register %s (#%d)",
-+               gdbarch_register_name (gdbarch, regno), regno);
-+      perror_with_name (message);
-+    }
-+  }
-+}
-+
-+/* This function actually issues the request to ptrace, telling
-+   it to store all general-purpose registers present in the specified
-+   regset.
-+
-+   If the ptrace request does not exist, this function returns 0
-+   and properly sets the have_ptrace_* flag.  If the request fails,
-+   this function calls perror_with_name.  Otherwise, if the request
-+   succeeds, then the regcache is stored and 1 is returned.  */
-+static int
-+store_all_gp_regs (const struct regcache *regcache, int tid, int regno)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  gdb_gregset_t gregset;
-+
-+  if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0)
-+    {
-+      if (errno == EIO)
-+      {
-+        have_ptrace_getsetregs = 0;
-+        return 0;
-+      }
-+      perror_with_name (_("Couldn't get general-purpose registers."));
-+    }
-+
-+  fill_gregset (regcache, &gregset, regno);
-+
-+  if (ptrace (PTRACE_SETREGS, tid, 0, (void *) &gregset) < 0)
-+    {
-+      if (errno == EIO)
-+      {
-+        have_ptrace_getsetregs = 0;
-+        return 0;
-+      }
-+      perror_with_name (_("Couldn't set general-purpose registers."));
-+    }
-+
-+  return 1;
-+}
-+
-+/* This is a wrapper for the store_all_gp_regs function.  It is
-+   responsible for verifying if this target has the ptrace request
-+   that can be used to store all general-purpose registers at one
-+   shot.  If it doesn't, then we should store them using the
-+   old-fashioned way, which is to iterate over the registers and
-+   store them one by one.  */
-+static void
-+store_gp_regs (const struct regcache *regcache, int tid, int regno)
-+{
-+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  int i;
-+
-+  if (have_ptrace_getsetregs)
-+    if (store_all_gp_regs (regcache, tid, regno))
-+      return;
-+
-+  /* If we hit this point, it doesn't really matter which
-+     architecture we are using.  We just need to store the
-+     registers in the "old-fashioned way".  */
-+  for (i = MICROBLAZE_R0_REGNUM; i <= MICROBLAZE_FSR_REGNUM; i++)
-+    store_register (regcache, tid, i);
-+}
-+
-+
-+/* Fetch registers from the child process.  Fetch all registers if
-+   regno == -1, otherwise fetch all general registers or all floating
-+   point registers depending upon the value of regno.  */
-+
-+static void
-+microblaze_linux_fetch_inferior_registers (struct target_ops *ops,
-+                                   struct regcache *regcache, int regno)
-+{
-+  /* Get the thread id for the ptrace call.  */
-+  int tid = GET_THREAD_ID (inferior_ptid);
-+
-+  if (regno == -1)
-+    fetch_gp_regs (regcache, tid);
-+  else
-+    fetch_register (regcache, tid, regno);
-+}
-+
-+/* Store registers back into the inferior.  Store all registers if
-+   regno == -1, otherwise store all general registers or all floating
-+   point registers depending upon the value of regno.  */
-+
-+static void
-+microblaze_linux_store_inferior_registers (struct target_ops *ops,
-+                                   struct regcache *regcache, int regno)
-+{
-+  /* Get the thread id for the ptrace call.  */
-+  int tid = GET_THREAD_ID (inferior_ptid);
-+
-+  if (regno >= 0)
-+    store_register (regcache, tid, regno);
-+  else
-+    store_gp_regs (regcache, tid, -1);
-+}
-+
-+/* Wrapper functions for the standard regset handling, used by
-+   thread debugging.  */
-+
-+void
-+fill_gregset (const struct regcache *regcache,
-+             gdb_gregset_t *gregsetp, int regno)
-+{
-+  microblaze_collect_gregset (NULL, regcache, regno, gregsetp);
-+}
-+
-+void
-+supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregsetp)
-+{
-+  microblaze_supply_gregset (NULL, regcache, -1, gregsetp);
-+}
-+
-+void
-+fill_fpregset (const struct regcache *regcache,
-+             gdb_fpregset_t *fpregsetp, int regno)
-+{
-+  /* FIXME. */
-+}
-+
-+void
-+supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
-+{
-+  /* FIXME. */
-+}
-+
-+static const struct target_desc *
-+microblaze_linux_read_description (struct target_ops *ops)
-+{
-+  CORE_ADDR microblaze_hwcap = 0;
-+
-+  if (target_auxv_search (ops, AT_HWCAP, &microblaze_hwcap) != 1)
-+    return NULL;
-+
-+  return NULL;
-+}
-+
-+
-+void _initialize_microblaze_linux_nat (void);
-+
-+void
-+_initialize_microblaze_linux_nat (void)
-+{
-+  struct target_ops *t;
-+
-+  /* Fill in the generic GNU/Linux methods.  */
-+  t = linux_target ();
-+
-+  /* Add our register access methods.  */
-+  t->to_fetch_registers = microblaze_linux_fetch_inferior_registers;
-+  t->to_store_registers = microblaze_linux_store_inferior_registers;
-+
-+  t->to_read_description = microblaze_linux_read_description;
-+
-+  /* Register the target.  */
-+  linux_nat_add_target (t);
-+}
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0041-Adding-64-bit-MB-support-Added-new-architecture-to-M.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0041-Adding-64-bit-MB-support-Added-new-architecture-to-M.patch
deleted file mode 100644
index 2cb1cc81..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0041-Adding-64-bit-MB-support-Added-new-architecture-to-M.patch
+++ /dev/null
@@ -1,1008 +0,0 @@
-From 90412eba37c683e0526470c39926318ae7f5bd27 Mon Sep 17 00:00:00 2001
-From: Nagaraju Mekala <nmekala@xilix.com>
-Date: Thu, 31 Jan 2019 14:36:00 +0530
-Subject: [PATCH 41/52] Adding 64 bit MB support Added new architecture to
- Microblaze 64-bit support to GDB Signed-off-by :Nagaraju Mekala
- <nmekala@xilix.com>
-
-Conflicts:
-        gdb/Makefile.in
----
- bfd/archures.c                                |   2 +
- bfd/bfd-in2.h                                 |   2 +
- bfd/cpu-microblaze.c                          |   8 +-
- gas/config/tc-microblaze.c                    |  13 ++
- gas/config/tc-microblaze.h                    |   4 +
- gdb/features/Makefile                         |   3 +
- gdb/features/microblaze-core.xml              |   6 +-
- gdb/features/microblaze-stack-protect.xml     |   4 +-
- gdb/features/microblaze-with-stack-protect.c  |   8 +-
- gdb/features/microblaze.c                     |   6 +-
- gdb/features/microblaze64-core.xml            |  69 ++++++
- gdb/features/microblaze64-stack-protect.xml   |  12 +
- .../microblaze64-with-stack-protect.c         |  79 +++++++
- .../microblaze64-with-stack-protect.xml       |  12 +
- gdb/features/microblaze64.c                   |  77 +++++++
- gdb/features/microblaze64.xml                 |  11 +
- gdb/microblaze-tdep.c                         | 207 ++++++++++++++++--
- gdb/microblaze-tdep.h                         |   8 +-
- .../microblaze-with-stack-protect.dat         |   4 +-
- 19 files changed, 491 insertions(+), 44 deletions(-)
- create mode 100644 gdb/features/microblaze64-core.xml
- create mode 100644 gdb/features/microblaze64-stack-protect.xml
- create mode 100644 gdb/features/microblaze64-with-stack-protect.c
- create mode 100644 gdb/features/microblaze64-with-stack-protect.xml
- create mode 100644 gdb/features/microblaze64.c
- create mode 100644 gdb/features/microblaze64.xml
-
-diff --git a/bfd/archures.c b/bfd/archures.c
-index 551ec8732f..627d81261d 100644
---- a/bfd/archures.c
-+++ b/bfd/archures.c
-@@ -522,6 +522,8 @@ DESCRIPTION
- .  bfd_arch_lm32,      {* Lattice Mico32.  *}
- .#define bfd_mach_lm32         1
- .  bfd_arch_microblaze,{* Xilinx MicroBlaze.  *}
-+.#define bfd_mach_microblaze   1
-+.#define bfd_mach_microblaze64 2
- .  bfd_arch_tilepro,   {* Tilera TILEPro.  *}
- .  bfd_arch_tilegx,    {* Tilera TILE-Gx.  *}
- .#define bfd_mach_tilepro      1
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 05fbeb9b3a..788fb2b48b 100644
---- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -1922,6 +1922,8 @@ enum bfd_architecture
-   bfd_arch_lm32,      /* Lattice Mico32.  */
- #define bfd_mach_lm32          1
-   bfd_arch_microblaze,/* Xilinx MicroBlaze.  */
-+#define bfd_mach_microblaze    1
-+#define bfd_mach_microblaze64  2
-   bfd_arch_tilepro,   /* Tilera TILEPro.  */
-   bfd_arch_tilegx,    /* Tilera TILE-Gx.  */
- #define bfd_mach_tilepro       1
-diff --git a/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c
-index 194920b20b..f3e8bbda75 100644
---- a/bfd/cpu-microblaze.c
-+++ b/bfd/cpu-microblaze.c
-@@ -31,7 +31,7 @@ const bfd_arch_info_type bfd_microblaze_arch[] =
-   64,                          /* 32 bits in an address.  */
-   8,                           /* 8 bits in a byte.  */
-   bfd_arch_microblaze,                 /* Architecture.  */
--  0,                           /* Machine number - 0 for now.  */
-+  bfd_mach_microblaze64,       /* 64 bit Machine  */
-   "microblaze",                        /* Architecture name.  */
-   "MicroBlaze",                        /* Printable name.  */
-   3,                           /* Section align power.  */
-@@ -46,7 +46,7 @@ const bfd_arch_info_type bfd_microblaze_arch[] =
-   32,                          /* Bits in an address.  */
-   8,                           /* Bits in a byte.  */
-   bfd_arch_microblaze,         /* Architecture number.  */
--  0,                           /* Machine number - 0 for now.  */
-+  bfd_mach_microblaze,         /* 32 bit Machine  */
-   "microblaze",                        /* Architecture name.  */
-   "MicroBlaze",                        /* Printable name.  */
-   3,                           /* Section align power.  */
-@@ -63,7 +63,7 @@ const bfd_arch_info_type bfd_microblaze_arch[] =
-   32,                          /* 32 bits in an address.  */
-   8,                           /* 8 bits in a byte.  */
-   bfd_arch_microblaze,                 /* Architecture.  */
--  0,                           /* Machine number - 0 for now.  */
-+  bfd_mach_microblaze,         /* 32 bit Machine */
-   "microblaze",                        /* Architecture name.  */
-   "MicroBlaze",                        /* Printable name.  */
-   3,                           /* Section align power.  */
-@@ -78,7 +78,7 @@ const bfd_arch_info_type bfd_microblaze_arch[] =
-   64,                          /* 32 bits in an address.  */
-   8,                           /* 8 bits in a byte.  */
-   bfd_arch_microblaze,                 /* Architecture.  */
--  0,                           /* Machine number - 0 for now.  */
-+  bfd_mach_microblaze64,       /* 64 bit Machine */
-   "microblaze",                        /* Architecture name.  */
-   "MicroBlaze",                        /* Printable name.  */
-   3,                           /* Section align power.  */
-diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index c6ca913f8b..df7088d6c3 100644
---- a/gas/config/tc-microblaze.c
-+++ b/gas/config/tc-microblaze.c
-@@ -438,6 +438,11 @@ md_begin (void)
- 
-   opcode_hash_control = hash_new ();
- 
-+  if (microblaze_arch_size == 64)
-+    bfd_set_arch_mach (stdoutput, bfd_arch_microblaze, bfd_mach_microblaze64);
-+  else
-+    bfd_set_arch_mach (stdoutput, bfd_arch_microblaze, bfd_mach_microblaze);
-+
-   /* Insert unique names into hash table.  */
-   for (opcode = (struct opcodes *)opcodes; opcode->name; opcode ++)
-     {
-@@ -3478,6 +3483,14 @@ md_show_usage (FILE * stream ATTRIBUTE_UNUSED)
-   fprintf (stream, "  -%-23s%s\n", "m64", N_("generate 64-bit elf"));
- }
- 
-+unsigned long
-+microblaze_mach (void)
-+{
-+  if (microblaze_arch_size == 64)
-+    return bfd_mach_microblaze64;
-+  else
-+    return bfd_mach_microblaze;
-+}
- 
- /* Create a fixup for a cons expression.  If parse_cons_expression_microblaze
-    found a machine specific op in an expression,
-diff --git a/gas/config/tc-microblaze.h b/gas/config/tc-microblaze.h
-index 7435a70ef5..90c2a4a555 100644
---- a/gas/config/tc-microblaze.h
-+++ b/gas/config/tc-microblaze.h
-@@ -23,6 +23,10 @@
- #define TC_MICROBLAZE 1
- 
- #define TARGET_ARCH    bfd_arch_microblaze
-+#define TARGET_MACH (microblaze_mach ())
-+#define DEFAULT_MACHINE bfd_mach_microblaze64
-+extern unsigned long microblaze_mach (void);
-+
- #ifndef TARGET_BYTES_BIG_ENDIAN
- /* Used to initialise target_big_endian.  */
- #define TARGET_BYTES_BIG_ENDIAN 1
-diff --git a/gdb/features/Makefile b/gdb/features/Makefile
-index d0af9a47b4..2c3cf91b69 100644
---- a/gdb/features/Makefile
-+++ b/gdb/features/Makefile
-@@ -46,6 +46,7 @@
- # List of .dat files to create in ../regformats/
- WHICH = mips-linux mips-dsp-linux \
-        microblaze-with-stack-protect \
-+       microblaze64-with-stack-protect \
-        mips64-linux mips64-dsp-linux \
-        nios2-linux \
-        rs6000/powerpc-32 \
-@@ -107,7 +108,9 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$(WHICH))
- # to make on the command line.
- XMLTOC = \
-        microblaze-with-stack-protect.xml \
-+       microblaze64-with-stack-protect.xml \
-        microblaze.xml \
-+       microblaze64.xml \
-        mips-dsp-linux.xml \
-        mips-linux.xml \
-        mips64-dsp-linux.xml \
-diff --git a/gdb/features/microblaze-core.xml b/gdb/features/microblaze-core.xml
-index f272650a41..a87f0f2319 100644
---- a/gdb/features/microblaze-core.xml
-+++ b/gdb/features/microblaze-core.xml
-@@ -8,7 +8,7 @@
- <!DOCTYPE feature SYSTEM "gdb-target.dtd">
- <feature name="org.gnu.gdb.microblaze.core">
-   <reg name="r0" bitsize="32" regnum="0"/>
--  <reg name="r1" bitsize="32" type="data_ptr"/>
-+  <reg name="r1" bitsize="32"/>
-   <reg name="r2" bitsize="32"/>
-   <reg name="r3" bitsize="32"/>
-   <reg name="r4" bitsize="32"/>
-@@ -39,7 +39,7 @@
-   <reg name="r29" bitsize="32"/>
-   <reg name="r30" bitsize="32"/>
-   <reg name="r31" bitsize="32"/>
--  <reg name="rpc" bitsize="32" type="code_ptr"/>
-+  <reg name="rpc" bitsize="32"/>
-   <reg name="rmsr" bitsize="32"/>
-   <reg name="rear" bitsize="32"/>
-   <reg name="resr" bitsize="32"/>
-@@ -64,4 +64,6 @@
-   <reg name="rtlbsx" bitsize="32"/>
-   <reg name="rtlblo" bitsize="32"/>
-   <reg name="rtlbhi" bitsize="32"/>
-+  <reg name="slr" bitsize="32"/>
-+  <reg name="shr" bitsize="32"/>
- </feature>
-diff --git a/gdb/features/microblaze-stack-protect.xml b/gdb/features/microblaze-stack-protect.xml
-index 1b16223406..1a67f88c18 100644
---- a/gdb/features/microblaze-stack-protect.xml
-+++ b/gdb/features/microblaze-stack-protect.xml
-@@ -7,6 +7,6 @@
- 
- <!DOCTYPE feature SYSTEM "gdb-target.dtd">
- <feature name="org.gnu.gdb.microblaze.stack-protect">
--  <reg name="rslr" bitsize="32"/>
--  <reg name="rshr" bitsize="32"/>
-+  <reg name="slr" bitsize="32"/>
-+  <reg name="shr" bitsize="32"/>
- </feature>
-diff --git a/gdb/features/microblaze-with-stack-protect.c b/gdb/features/microblaze-with-stack-protect.c
-index b39aa19887..609934e2b4 100644
---- a/gdb/features/microblaze-with-stack-protect.c
-+++ b/gdb/features/microblaze-with-stack-protect.c
-@@ -14,7 +14,7 @@ initialize_tdesc_microblaze_with_stack_protect (void)
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze.core");
-   tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "data_ptr");
-+  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "int");
-@@ -45,7 +45,7 @@ initialize_tdesc_microblaze_with_stack_protect (void)
-   tdesc_create_reg (feature, "r29", 29, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r30", 30, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r31", 31, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "rpc", 32, 1, NULL, 32, "code_ptr");
-+  tdesc_create_reg (feature, "rpc", 32, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rmsr", 33, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rear", 34, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "resr", 35, 1, NULL, 32, "int");
-@@ -72,8 +72,8 @@ initialize_tdesc_microblaze_with_stack_protect (void)
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze.stack-protect");
--  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 32, "int");
- 
-   tdesc_microblaze_with_stack_protect = result;
- }
-diff --git a/gdb/features/microblaze.c b/gdb/features/microblaze.c
-index 6c86fc0770..ceb98ca8b8 100644
---- a/gdb/features/microblaze.c
-+++ b/gdb/features/microblaze.c
-@@ -14,7 +14,7 @@ initialize_tdesc_microblaze (void)
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze.core");
-   tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "data_ptr");
-+  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "int");
-@@ -45,7 +45,7 @@ initialize_tdesc_microblaze (void)
-   tdesc_create_reg (feature, "r29", 29, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r30", 30, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "r31", 31, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "rpc", 32, 1, NULL, 32, "code_ptr");
-+  tdesc_create_reg (feature, "rpc", 32, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rmsr", 33, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rear", 34, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "resr", 35, 1, NULL, 32, "int");
-@@ -70,6 +70,8 @@ initialize_tdesc_microblaze (void)
-   tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze = result;
- }
-diff --git a/gdb/features/microblaze64-core.xml b/gdb/features/microblaze64-core.xml
-new file mode 100644
-index 0000000000..96e99e2fb2
---- /dev/null
-+++ b/gdb/features/microblaze64-core.xml
-@@ -0,0 +1,69 @@
-+<?xml version="1.0"?>
-+<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc.
-+
-+     Copying and distribution of this file, with or without modification,
-+     are permitted in any medium without royalty provided the copyright
-+     notice and this notice are preserved.  -->
-+
-+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
-+<feature name="org.gnu.gdb.microblaze64.core">
-+  <reg name="r0" bitsize="64" regnum="0"/>
-+  <reg name="r1" bitsize="64"/>
-+  <reg name="r2" bitsize="64"/>
-+  <reg name="r3" bitsize="64"/>
-+  <reg name="r4" bitsize="64"/>
-+  <reg name="r5" bitsize="64"/>
-+  <reg name="r6" bitsize="64"/>
-+  <reg name="r7" bitsize="64"/>
-+  <reg name="r8" bitsize="64"/>
-+  <reg name="r9" bitsize="64"/>
-+  <reg name="r10" bitsize="64"/>
-+  <reg name="r11" bitsize="64"/>
-+  <reg name="r12" bitsize="64"/>
-+  <reg name="r13" bitsize="64"/>
-+  <reg name="r14" bitsize="64"/>
-+  <reg name="r15" bitsize="64"/>
-+  <reg name="r16" bitsize="64"/>
-+  <reg name="r17" bitsize="64"/>
-+  <reg name="r18" bitsize="64"/>
-+  <reg name="r19" bitsize="64"/>
-+  <reg name="r20" bitsize="64"/>
-+  <reg name="r21" bitsize="64"/>
-+  <reg name="r22" bitsize="64"/>
-+  <reg name="r23" bitsize="64"/>
-+  <reg name="r24" bitsize="64"/>
-+  <reg name="r25" bitsize="64"/>
-+  <reg name="r26" bitsize="64"/>
-+  <reg name="r27" bitsize="64"/>
-+  <reg name="r28" bitsize="64"/>
-+  <reg name="r29" bitsize="64"/>
-+  <reg name="r30" bitsize="64"/>
-+  <reg name="r31" bitsize="64"/>
-+  <reg name="rpc" bitsize="64"/>
-+  <reg name="rmsr" bitsize="32"/>
-+  <reg name="rear" bitsize="64"/>
-+  <reg name="resr" bitsize="32"/>
-+  <reg name="rfsr" bitsize="32"/>
-+  <reg name="rbtr" bitsize="64"/>
-+  <reg name="rpvr0" bitsize="32"/>
-+  <reg name="rpvr1" bitsize="32"/>
-+  <reg name="rpvr2" bitsize="32"/>
-+  <reg name="rpvr3" bitsize="32"/>
-+  <reg name="rpvr4" bitsize="32"/>
-+  <reg name="rpvr5" bitsize="32"/>
-+  <reg name="rpvr6" bitsize="32"/>
-+  <reg name="rpvr7" bitsize="32"/>
-+  <reg name="rpvr8" bitsize="64"/>
-+  <reg name="rpvr9" bitsize="64"/>
-+  <reg name="rpvr10" bitsize="32"/>
-+  <reg name="rpvr11" bitsize="32"/>
-+  <reg name="redr" bitsize="32"/>
-+  <reg name="rpid" bitsize="32"/>
-+  <reg name="rzpr" bitsize="32"/>
-+  <reg name="rtlbx" bitsize="32"/>
-+  <reg name="rtlbsx" bitsize="32"/>
-+  <reg name="rtlblo" bitsize="32"/>
-+  <reg name="rtlbhi" bitsize="32"/>
-+  <reg name="slr" bitsize="64"/>
-+  <reg name="shr" bitsize="64"/>
-+</feature>
-diff --git a/gdb/features/microblaze64-stack-protect.xml b/gdb/features/microblaze64-stack-protect.xml
-new file mode 100644
-index 0000000000..1bbf5fc3ce
---- /dev/null
-+++ b/gdb/features/microblaze64-stack-protect.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc.
-+
-+     Copying and distribution of this file, with or without modification,
-+     are permitted in any medium without royalty provided the copyright
-+     notice and this notice are preserved.  -->
-+
-+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
-+<feature name="org.gnu.gdb.microblaze64.stack-protect">
-+  <reg name="slr" bitsize="64"/>
-+  <reg name="shr" bitsize="64"/>
-+</feature>
-diff --git a/gdb/features/microblaze64-with-stack-protect.c b/gdb/features/microblaze64-with-stack-protect.c
-new file mode 100644
-index 0000000000..f448c9a749
---- /dev/null
-+++ b/gdb/features/microblaze64-with-stack-protect.c
-@@ -0,0 +1,79 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: microblaze-with-stack-protect.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_microblaze64_with_stack_protect;
-+static void
-+initialize_tdesc_microblaze64_with_stack_protect (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze64.core");
-+  tdesc_create_reg (feature, "r0", 0, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r1", 1, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r2", 2, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r3", 3, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r4", 4, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r5", 5, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r6", 6, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r7", 7, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r8", 8, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r9", 9, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r10", 10, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r11", 11, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r12", 12, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r13", 13, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r14", 14, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r15", 15, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r16", 16, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r17", 17, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r18", 18, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r19", 19, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r20", 20, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r21", 21, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r22", 22, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r23", 23, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r24", 24, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r25", 25, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r26", 26, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r27", 27, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r28", 28, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r29", 29, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r30", 30, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r31", 31, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpc", 32, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rmsr", 33, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rear", 34, 1, NULL, 64, "int");
-+  tdesc_create_reg (feature, "resr", 35, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rfsr", 36, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rbtr", 37, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpvr0", 38, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr1", 39, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr2", 40, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr3", 41, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr4", 42, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr5", 43, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr6", 44, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr7", 45, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr8", 46, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpvr9", 47, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpvr10", 48, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr11", 49, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "redr", 50, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpid", 51, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rzpr", 52, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlbx", 53, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
-+
-+  feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze64.stack-protect");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
-+
-+  tdesc_microblaze64_with_stack_protect = result;
-+}
-diff --git a/gdb/features/microblaze64-with-stack-protect.xml b/gdb/features/microblaze64-with-stack-protect.xml
-new file mode 100644
-index 0000000000..0e9f01611f
---- /dev/null
-+++ b/gdb/features/microblaze64-with-stack-protect.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc.
-+
-+     Copying and distribution of this file, with or without modification,
-+     are permitted in any medium without royalty provided the copyright
-+     notice and this notice are preserved.  -->
-+
-+<!DOCTYPE target SYSTEM "gdb-target.dtd">
-+<target>
-+  <xi:include href="microblaze64-core.xml"/>
-+  <xi:include href="microblaze64-stack-protect.xml"/>
-+</target>
-diff --git a/gdb/features/microblaze64.c b/gdb/features/microblaze64.c
-new file mode 100644
-index 0000000000..1aa37c4512
---- /dev/null
-+++ b/gdb/features/microblaze64.c
-@@ -0,0 +1,77 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: microblaze.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_microblaze64;
-+static void
-+initialize_tdesc_microblaze64 (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze64.core");
-+  tdesc_create_reg (feature, "r0", 0, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r1", 1, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r2", 2, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r3", 3, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r4", 4, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r5", 5, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r6", 6, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r7", 7, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r8", 8, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r9", 9, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r10", 10, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r11", 11, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r12", 12, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r13", 13, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r14", 14, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r15", 15, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r16", 16, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r17", 17, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r18", 18, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r19", 19, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r20", 20, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r21", 21, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r22", 22, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r23", 23, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r24", 24, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r25", 25, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r26", 26, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r27", 27, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r28", 28, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r29", 29, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r30", 30, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "r31", 31, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpc", 32, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rmsr", 33, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rear", 34, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "resr", 35, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rfsr", 36, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rbtr", 37, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpvr0", 38, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr1", 39, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr2", 40, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr3", 41, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr4", 42, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr5", 43, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr6", 44, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr7", 45, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr8", 46, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpvr9", 47, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rpvr10", 48, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpvr11", 49, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "redr", 50, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rpid", 51, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rzpr", 52, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlbx", 53, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
-+
-+  tdesc_microblaze64 = result;
-+}
-diff --git a/gdb/features/microblaze64.xml b/gdb/features/microblaze64.xml
-new file mode 100644
-index 0000000000..515d18e65c
---- /dev/null
-+++ b/gdb/features/microblaze64.xml
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc.
-+
-+     Copying and distribution of this file, with or without modification,
-+     are permitted in any medium without royalty provided the copyright
-+     notice and this notice are preserved.  -->
-+
-+<!DOCTYPE target SYSTEM "gdb-target.dtd">
-+<target>
-+  <xi:include href="microblaze64-core.xml"/>
-+</target>
-diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
-index 1b5cf38e45..f4ea3cc342 100644
---- a/gdb/microblaze-tdep.c
-+++ b/gdb/microblaze-tdep.c
-@@ -40,7 +40,9 @@
- #include "remote.h"
- 
- #include "features/microblaze-with-stack-protect.c"
-+#include "features/microblaze64-with-stack-protect.c"
- #include "features/microblaze.c"
-+#include "features/microblaze64.c"
- 
- /* Instruction macros used for analyzing the prologue.  */
- /* This set of instruction macros need to be changed whenever the
-@@ -75,12 +77,13 @@ static const char *microblaze_register_names[] =
-   "rpvr0", "rpvr1", "rpvr2", "rpvr3", "rpvr4", "rpvr5", "rpvr6",
-   "rpvr7", "rpvr8", "rpvr9", "rpvr10", "rpvr11",
-   "redr", "rpid", "rzpr", "rtlbx", "rtlbsx", "rtlblo", "rtlbhi",
--  "rslr", "rshr"
-+  "slr", "shr"
- };
- 
- #define MICROBLAZE_NUM_REGS ARRAY_SIZE (microblaze_register_names)
- 
- static unsigned int microblaze_debug_flag = 0;
-+int reg_size = 4;
- 
- static void ATTRIBUTE_PRINTF (1, 2)
- microblaze_debug (const char *fmt, ...)
-@@ -145,6 +148,7 @@ microblaze_store_arguments (struct regcache *regcache, int nargs,
-   error (_("store_arguments not implemented"));
-   return sp;
- }
-+#if 0
- static int
- microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-                                    struct bp_target_info *bp_tgt)
-@@ -154,7 +158,7 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-   int val;
-   int bplen;
-   gdb_byte old_contents[BREAKPOINT_MAX];
--  struct cleanup *cleanup;
-+  //struct cleanup *cleanup;
- 
-   /* Determine appropriate breakpoint contents and size for this address.  */
-   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
-@@ -162,7 +166,8 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-     error (_("Software breakpoints not implemented for this target."));
- 
-   /* Make sure we see the memory breakpoints.  */
--  cleanup = make_show_memory_breakpoints_cleanup (1);
-+  scoped_restore 
-+    cleanup = make_scoped_restore_show_memory_breakpoints (1);
-   val = target_read_memory (addr, old_contents, bplen);
- 
-   /* If our breakpoint is no longer at the address, this means that the
-@@ -178,6 +183,7 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-   return val;
- }
- 
-+#endif
- /* Allocate and initialize a frame cache.  */
- 
- static struct microblaze_frame_cache *
-@@ -570,17 +576,16 @@ microblaze_extract_return_value (struct type *type, struct regcache *regcache,
-                                 gdb_byte *valbuf)
- {
-   gdb_byte buf[8];
--
-   /* Copy the return value (starting) in RETVAL_REGNUM to VALBUF.  */
-   switch (TYPE_LENGTH (type))
-     {
-       case 1:  /* return last byte in the register.  */
-        regcache->cooked_read (MICROBLAZE_RETVAL_REGNUM, buf);
--       memcpy(valbuf, buf + MICROBLAZE_REGISTER_SIZE - 1, 1);
-+       memcpy(valbuf, buf + reg_size - 1, 1);
-        return;
-       case 2:  /* return last 2 bytes in register.  */
-        regcache->cooked_read (MICROBLAZE_RETVAL_REGNUM, buf);
--       memcpy(valbuf, buf + MICROBLAZE_REGISTER_SIZE - 2, 2);
-+       memcpy(valbuf, buf + reg_size - 2, 2);
-        return;
-       case 4:  /* for sizes 4 or 8, copy the required length.  */
-       case 8:
-@@ -647,7 +652,119 @@ microblaze_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type)
-   return (TYPE_LENGTH (type) == 16);
- }
- 
--
-+#if 0
-+static std::vector<CORE_ADDR>
-+microblaze_software_single_step (struct regcache *regcache)
-+{
-+//  struct gdbarch *arch = get_frame_arch(frame);
-+  struct gdbarch *arch = get_regcache_arch (regcache);
-+  struct address_space *aspace = get_regcache_aspace (regcache);
-+//  struct address_space *aspace = get_frame_address_space (frame);
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (arch);
-+  static char le_breakp[] = MICROBLAZE_BREAKPOINT_LE;
-+  static char be_breakp[] = MICROBLAZE_BREAKPOINT;
-+  enum bfd_endian byte_order = gdbarch_byte_order (arch);
-+  char *breakp = byte_order == BFD_ENDIAN_BIG ? be_breakp : le_breakp;
-+  std::vector<CORE_ADDR> ret = 0;
-+
-+ /* Save the address and the values of the next_pc and the target */
-+  static struct sstep_breaks
-+  {
-+    CORE_ADDR address;
-+    bfd_boolean valid;
-+    /* Shadow contents.  */
-+    char data[INST_WORD_SIZE];
-+  } stepbreaks[2];
-+ int ii;
-+
-+  if (1)
-+    {
-+      CORE_ADDR pc;
-+      std::vector<CORE_ADDR> *next_pcs = NULL;
-+      long insn;
-+      enum microblaze_instr minstr;
-+      bfd_boolean isunsignednum;
-+      enum microblaze_instr_type insn_type;
-+      short delay_slots;
-+      int imm;
-+      bfd_boolean immfound = FALSE;
-+
-+     /* Set a breakpoint at the next instruction */
-+      /* If the current instruction is an imm, set it at the inst after */
-+      /* If the instruction has a delay slot, skip the delay slot */
-+      pc = regcache_read_pc (regcache);
-+      insn = microblaze_fetch_instruction (pc);
-+      minstr = get_insn_microblaze (insn, &isunsignednum, &insn_type, &delay_slots);
-+      if (insn_type == immediate_inst)
-+       {
-+         int rd, ra, rb;
-+         immfound = TRUE;
-+         minstr = microblaze_decode_insn (insn, &rd, &ra, &rb, &imm);
-+         pc = pc + INST_WORD_SIZE;
-+         insn = microblaze_fetch_instruction (pc);
-+         minstr = get_insn_microblaze (insn, &isunsignednum, &insn_type, &delay_slots);
-+       }
-+      stepbreaks[0].address = pc + (delay_slots * INST_WORD_SIZE) + INST_WORD_SIZE;
-+      if (insn_type != return_inst) {
-+       stepbreaks[0].valid = TRUE;
-+      } else {
-+       stepbreaks[0].valid = FALSE;
-+      }
-+
-+      microblaze_debug ("single-step insn_type=%x insn=%x\n", insn_type, insn);
-+      /* Now check for branch or return instructions */
-+      if (insn_type == branch_inst || insn_type == return_inst) {
-+       int limm;
-+       int lrd, lra, lrb;
-+       int ra, rb;
-+       bfd_boolean targetvalid;
-+       bfd_boolean unconditionalbranch;
-+       microblaze_decode_insn(insn, &lrd, &lra, &lrb, &limm);
-+       if (lra >= 0 && lra < MICROBLAZE_NUM_REGS)
-+         ra = regcache_raw_get_unsigned(regcache, lra);
-+       else
-+         ra = 0;
-+       if (lrb >= 0 && lrb < MICROBLAZE_NUM_REGS)
-+         rb = regcache_raw_get_unsigned(regcache, lrb);
-+       else
-+         rb = 0;
-+       stepbreaks[1].address = microblaze_get_target_address (insn, immfound, imm, pc, ra, rb, &targetvalid, &unconditionalbranch);
-+        microblaze_debug ("single-step uncondbr=%d targetvalid=%d target=%x\n", unconditionalbranch, targetvalid, stepbreaks[1].address);
-+       if (unconditionalbranch)
-+         stepbreaks[0].valid = FALSE; /* This is a unconditional branch: will not come to the next address */
-+       if (targetvalid && (stepbreaks[0].valid == FALSE ||
-+                           (stepbreaks[0].address != stepbreaks[1].address))
-+                       && (stepbreaks[1].address != pc)) {
-+         stepbreaks[1].valid = TRUE;
-+       } else {
-+         stepbreaks[1].valid = FALSE;
-+       }
-+      } else {
-+       stepbreaks[1].valid = FALSE;
-+      }
-+
-+      /* Insert the breakpoints */
-+      for (ii = 0; ii < 2; ++ii)
-+        {
-+
-+          /* ignore invalid breakpoint. */
-+          if (stepbreaks[ii].valid) {
-+            VEC_safe_push (CORE_ADDR, next_pcs, stepbreaks[ii].address);;
-+//            insert_single_step_breakpoint (arch, aspace, stepbreaks[ii].address);
-+            ret = next_pcs;
-+         }
-+       }
-+    }
-+    return ret;
-+}
-+#endif
-+
-+static void
-+microblaze_write_pc (struct regcache *regcache, CORE_ADDR pc)
-+{
-+  regcache_cooked_write_unsigned (regcache, MICROBLAZE_PC_REGNUM, pc);
-+}
-+
- static int dwarf2_to_reg_map[78] =
- { 0  /* r0  */,   1  /* r1  */,   2  /* r2  */,   3  /* r3  */,  /*  0- 3 */
-   4  /* r4  */,   5  /* r5  */,   6  /* r6  */,   7  /* r7  */,  /*  4- 7 */
-@@ -682,13 +799,14 @@ microblaze_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int reg)
- static void
- microblaze_register_g_packet_guesses (struct gdbarch *gdbarch)
- {
-+
-   register_remote_g_packet_guess (gdbarch,
--                                  4 * MICROBLAZE_NUM_CORE_REGS,
--                                  tdesc_microblaze);
-+                                  4 * MICROBLAZE_NUM_REGS,
-+                                  tdesc_microblaze64);
- 
-   register_remote_g_packet_guess (gdbarch,
-                                   4 * MICROBLAZE_NUM_REGS,
--                                  tdesc_microblaze_with_stack_protect);
-+                                  tdesc_microblaze64_with_stack_protect);
- }
- 
- void
-@@ -696,15 +814,15 @@ microblaze_supply_gregset (const struct microblaze_gregset *gregset,
-                         struct regcache *regcache,
-                         int regnum, const void *gregs)
- {
--  unsigned int *regs = gregs;
-+  const gdb_byte *regs = (const gdb_byte *) gregs;
-   if (regnum >= 0)
--    regcache_raw_supply (regcache, regnum, regs + regnum);
-+    regcache->raw_supply (regnum, regs + regnum);
- 
-   if (regnum == -1) {
-     int i;
- 
-     for (i = 0; i < 50; i++) {
--      regcache_raw_supply (regcache, i, regs + i);
-+      regcache->raw_supply (regnum, regs + i);
-     }
-   }
- }
-@@ -755,6 +873,17 @@ microblaze_regset_from_core_section (struct gdbarch *gdbarch,
- }
- 
- 
-+static void
-+make_regs (struct gdbarch *arch)
-+{
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (arch);
-+  int mach = gdbarch_bfd_arch_info (arch)->mach;
-+  
-+  if (mach == bfd_mach_microblaze64)
-+    {
-+      set_gdbarch_ptr_bit (arch, 64);
-+    }
-+}
- 
- static struct gdbarch *
- microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-@@ -769,8 +898,15 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-   if (arches != NULL)
-     return arches->gdbarch;
-   if (tdesc == NULL)
--    tdesc = tdesc_microblaze;
--
-+    {
-+      if (info.bfd_arch_info->mach == bfd_mach_microblaze64) 
-+        {
-+         tdesc = tdesc_microblaze64;
-+          reg_size = 8;
-+       }
-+      else
-+       tdesc = tdesc_microblaze;
-+    }
-   /* Check any target description for validity.  */
-   if (tdesc_has_registers (tdesc))
-     {
-@@ -778,27 +914,35 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-       int valid_p;
-       int i;
- 
--      feature = tdesc_find_feature (tdesc,
-+      if (info.bfd_arch_info->mach == bfd_mach_microblaze64)
-+        feature = tdesc_find_feature (tdesc,
-+                                    "org.gnu.gdb.microblaze64.core");
-+      else
-+        feature = tdesc_find_feature (tdesc,
-                                     "org.gnu.gdb.microblaze.core");
-       if (feature == NULL)
-         return NULL;
-       tdesc_data = tdesc_data_alloc ();
- 
-       valid_p = 1;
--      for (i = 0; i < MICROBLAZE_NUM_CORE_REGS; i++)
-+      for (i = 0; i < MICROBLAZE_NUM_REGS; i++)
-         valid_p &= tdesc_numbered_register (feature, tdesc_data, i,
-                                             microblaze_register_names[i]);
--      feature = tdesc_find_feature (tdesc,
-+      if (info.bfd_arch_info->mach == bfd_mach_microblaze64)
-+        feature = tdesc_find_feature (tdesc,
-+                                    "org.gnu.gdb.microblaze64.stack-protect");
-+      else
-+        feature = tdesc_find_feature (tdesc,
-                                     "org.gnu.gdb.microblaze.stack-protect");
-       if (feature != NULL)
-         {
-           valid_p = 1;
-           valid_p &= tdesc_numbered_register (feature, tdesc_data,
-                                               MICROBLAZE_SLR_REGNUM,
--                                              "rslr");
-+                                              "slr");
-           valid_p &= tdesc_numbered_register (feature, tdesc_data,
-                                               MICROBLAZE_SHR_REGNUM,
--                                              "rshr");
-+                                              "shr");
-         }
- 
-       if (!valid_p)
-@@ -806,6 +950,7 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-           tdesc_data_cleanup (tdesc_data);
-           return NULL;
-         }
-+      
-     }
- 
-   /* Allocate space for the new architecture.  */
-@@ -825,7 +970,17 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-   /* Register numbers of various important registers.  */
-   set_gdbarch_sp_regnum (gdbarch, MICROBLAZE_SP_REGNUM); 
-   set_gdbarch_pc_regnum (gdbarch, MICROBLAZE_PC_REGNUM); 
-+  
-+  /* Register set.  
-+  make_regs (gdbarch); */
-+  switch (info.bfd_arch_info->mach)
-+    {
-+    case bfd_mach_microblaze64:
-+      set_gdbarch_ptr_bit (gdbarch, 64);
-+    break;
-+    }
- 
-+  
-   /* Map Dwarf2 registers to GDB registers.  */
-   set_gdbarch_dwarf2_reg_to_regnum (gdbarch, microblaze_dwarf2_reg_to_regnum);
- 
-@@ -845,13 +1000,15 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-                                       microblaze_breakpoint::kind_from_pc);
-   set_gdbarch_sw_breakpoint_from_kind (gdbarch,
-                                       microblaze_breakpoint::bp_from_kind);
--  set_gdbarch_memory_remove_breakpoint (gdbarch, microblaze_linux_memory_remove_breakpoint);
-+//  set_gdbarch_memory_remove_breakpoint (gdbarch, microblaze_linux_memory_remove_breakpoint);
-+
-+//  set_gdbarch_software_single_step (gdbarch, microblaze_software_single_step);
- 
-   set_gdbarch_frame_args_skip (gdbarch, 8);
- 
-   set_gdbarch_unwind_pc (gdbarch, microblaze_unwind_pc);
- 
--  microblaze_register_g_packet_guesses (gdbarch);
-+  //microblaze_register_g_packet_guesses (gdbarch);
- 
-   frame_base_set_default (gdbarch, &microblaze_frame_base);
- 
-@@ -866,11 +1023,11 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-     tdesc_use_registers (gdbarch, tdesc, tdesc_data);
-   //frame_base_append_sniffer (gdbarch, microblaze_frame_sniffer);
- 
--  /* If we have register sets, enable the generic core file support.  */
-+  /* If we have register sets, enable the generic core file support.  
-   if (tdep->gregset) {
-       set_gdbarch_regset_from_core_section (gdbarch,
-                                           microblaze_regset_from_core_section);
--  }
-+  }*/
- 
-   return gdbarch;
- }
-@@ -883,6 +1040,8 @@ _initialize_microblaze_tdep ()
- 
-   initialize_tdesc_microblaze_with_stack_protect ();
-   initialize_tdesc_microblaze ();
-+  initialize_tdesc_microblaze64_with_stack_protect ();
-+  initialize_tdesc_microblaze64 ();
-   /* Debug this files internals.  */
-   add_setshow_zuinteger_cmd ("microblaze", class_maintenance,
-                             &microblaze_debug_flag, _("\
-diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
-index 1234f8a36f..c0fc900733 100644
---- a/gdb/microblaze-tdep.h
-+++ b/gdb/microblaze-tdep.h
-@@ -27,7 +27,7 @@ struct microblaze_gregset
-    microblaze_gregset() {}
-    unsigned int gregs[32];
-    unsigned int fpregs[32];
--   unsigned int pregs[16];
-+   unsigned int pregs[18];
- };
- 
- struct gdbarch_tdep
-@@ -101,9 +101,9 @@ enum microblaze_regnum
-   MICROBLAZE_RTLBSX_REGNUM,
-   MICROBLAZE_RTLBLO_REGNUM,
-   MICROBLAZE_RTLBHI_REGNUM,
--  MICROBLAZE_SLR_REGNUM, MICROBLAZE_NUM_CORE_REGS = MICROBLAZE_SLR_REGNUM,
-+  MICROBLAZE_SLR_REGNUM,
-   MICROBLAZE_SHR_REGNUM,
--  MICROBLAZE_NUM_REGS
-+  MICROBLAZE_NUM_REGS, MICROBLAZE_NUM_CORE_REGS = MICROBLAZE_NUM_REGS
- };
- 
- struct microblaze_frame_cache
-@@ -128,7 +128,7 @@ struct microblaze_frame_cache
-   struct trad_frame_saved_reg *saved_regs;
- };
- /* All registers are 32 bits.  */
--#define MICROBLAZE_REGISTER_SIZE 4
-+//#define MICROBLAZE_REGISTER_SIZE 8
- 
- /* MICROBLAZE_BREAKPOINT defines the breakpoint that should be used.
-    Only used for native debugging.  */
-diff --git a/gdb/regformats/microblaze-with-stack-protect.dat b/gdb/regformats/microblaze-with-stack-protect.dat
-index 8040a7b3fd..450e321d49 100644
---- a/gdb/regformats/microblaze-with-stack-protect.dat
-+++ b/gdb/regformats/microblaze-with-stack-protect.dat
-@@ -60,5 +60,5 @@ expedite:r1,rpc
- 32:rtlbsx
- 32:rtlblo
- 32:rtlbhi
--32:rslr
--32:rshr
-+32:slr
-+32:shr
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0042-porting-GDB-for-linux.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0042-porting-GDB-for-linux.patch
deleted file mode 100644
index e115666c..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0042-porting-GDB-for-linux.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From c810c6e2a6ae66426444580d04659e8b2d0b2daa Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Thu, 12 Dec 2019 14:56:17 +0530
-Subject: [PATCH 42/52] porting GDB for linux
-
----
- gdb/features/microblaze-linux.xml | 12 ++++++++++
- gdb/microblaze-linux-tdep.c       | 39 ++++++++++++++++++++++++-------
- gdbserver/Makefile.in             |  2 ++
- gdbserver/configure.srv           |  3 ++-
- 4 files changed, 47 insertions(+), 9 deletions(-)
- create mode 100644 gdb/features/microblaze-linux.xml
-
-diff --git a/gdb/features/microblaze-linux.xml b/gdb/features/microblaze-linux.xml
-new file mode 100644
-index 0000000000..8983e66eb3
---- /dev/null
-+++ b/gdb/features/microblaze-linux.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc.
-+
-+     Copying and distribution of this file, with or without modification,
-+     are permitted in any medium without royalty provided the copyright
-+     notice and this notice are preserved.  -->
-+
-+<!DOCTYPE target SYSTEM "gdb-target.dtd">
-+<target>
-+  <osabi>GNU/Linux</osabi>
-+  <xi:include href="microblaze-core.xml"/>
-+</target>
-diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
-index a2e858d10f..a37c4c86f4 100644
---- a/gdb/microblaze-linux-tdep.c
-+++ b/gdb/microblaze-linux-tdep.c
-@@ -41,7 +41,7 @@
- 
- #ifndef REGSET_H
- #define REGSET_H 1
--
-+int MICROBLAZE_REGISTER_SIZE=4;
- struct gdbarch;
- struct regcache;
- 
-@@ -115,7 +115,7 @@ microblaze_debug (const char *fmt, ...)
-        va_end (args);
-     }
- }
--
-+#if 0
- static int
- microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, 
-                                           struct bp_target_info *bp_tgt)
-@@ -131,7 +131,7 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
- 
-   /* Make sure we see the memory breakpoints.  */
--  cleanup = make_show_memory_breakpoints_cleanup (1);
-+  cleanup = make_scoped_restore_show_memory_breakpoints (1);
-   val = target_read_memory (addr, old_contents, bplen);
- 
-   /* If our breakpoint is no longer at the address, this means that the
-@@ -146,6 +146,7 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-   do_cleanups (cleanup);
-   return val;
- }
-+#endif
- 
- static void
- microblaze_linux_sigtramp_cache (struct frame_info *next_frame,
-@@ -248,8 +249,8 @@ microblaze_linux_init_abi (struct gdbarch_info info,
- 
-   linux_init_abi (info, gdbarch);
- 
--  set_gdbarch_memory_remove_breakpoint (gdbarch,
--                                       microblaze_linux_memory_remove_breakpoint);
-+//  set_gdbarch_memory_remove_breakpoint (gdbarch,
-+//                                     microblaze_linux_memory_remove_breakpoint);
- 
-   /* Shared library handling.  */
-   set_solib_svr4_fetch_link_map_offsets (gdbarch,
-@@ -261,10 +262,30 @@ microblaze_linux_init_abi (struct gdbarch_info info,
- 
-   /* BFD target for core files.  */
-   if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
--    set_gdbarch_gcore_bfd_target (gdbarch, "elf32-microblaze");
-+    {
-+      if (info.bfd_arch_info->mach == bfd_mach_microblaze64) {
-+          set_gdbarch_gcore_bfd_target (gdbarch, "elf64-microblaze");
-+          MICROBLAZE_REGISTER_SIZE=8;
-+        }
-+      else
-+        set_gdbarch_gcore_bfd_target (gdbarch, "elf32-microblaze");
-+    }
-   else
--    set_gdbarch_gcore_bfd_target (gdbarch, "elf32-microblazeel");
-+    {
-+      if (info.bfd_arch_info->mach == bfd_mach_microblaze64) {
-+          set_gdbarch_gcore_bfd_target (gdbarch, "elf64-microblazeel");
-+          MICROBLAZE_REGISTER_SIZE=8;
-+        }
-+      else
-+        set_gdbarch_gcore_bfd_target (gdbarch, "elf32-microblazeel");
-+    }
- 
-+  switch (info.bfd_arch_info->mach)
-+    {
-+    case bfd_mach_microblaze64:
-+      set_gdbarch_ptr_bit (gdbarch, 64);
-+    break;
-+    }
- 
-   /* Shared library handling.  */
-   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
-@@ -279,6 +300,8 @@ void _initialize_microblaze_linux_tdep ();
- void
- _initialize_microblaze_linux_tdep ()
- {
--  gdbarch_register_osabi (bfd_arch_microblaze, 0, GDB_OSABI_LINUX, 
-+  gdbarch_register_osabi (bfd_arch_microblaze, bfd_mach_microblaze, GDB_OSABI_LINUX, 
-+                         microblaze_linux_init_abi);
-+  gdbarch_register_osabi (bfd_arch_microblaze, bfd_mach_microblaze64, GDB_OSABI_LINUX, 
-                          microblaze_linux_init_abi);
- }
-diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
-index df354d636c..680f536c06 100644
---- a/gdbserver/Makefile.in
-+++ b/gdbserver/Makefile.in
-@@ -559,6 +559,8 @@ target/%.o: ../gdb/target/%.c
- 
- %-generated.cc: ../gdb/regformats/rs6000/%.dat $(regdat_sh)
-        $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
-+microblaze-linux.c : $(srcdir)/../regformats/reg-microblaze.dat $(regdat_sh)
-+       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-microblaze.dat microblaze-linux.c
- 
- #
- # Dependency tracking.
-diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv
-index 456f4b3349..ff9ada71b0 100644
---- a/gdbserver/configure.srv
-+++ b/gdbserver/configure.srv
-@@ -155,8 +155,9 @@ case "${gdbserver_host}" in
-                        srv_linux_usrregs=yes
-                        srv_linux_thread_db=yes
-                        ;;
--  microblaze*-*-linux*)        srv_regobj=microblaze-linux.o
-+  microblaze*-*-linux*)        srv_regobj="microblaze-linux.o"
-                        srv_tgtobj="$srv_linux_obj linux-microblaze-low.o "
-+                       srv_xmlfiles="microblaze-linux.xml"
-                        srv_linux_regsets=yes
-                        srv_linux_usrregs=yes
-                        srv_linux_thread_db=yes
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0043-Binutils-security-check-is-causing-build-error-for-w.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0043-Binutils-security-check-is-causing-build-error-for-w.patch
deleted file mode 100644
index 969ac2c0..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0043-Binutils-security-check-is-causing-build-error-for-w.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 27c8f7f202ea66cd0f4745ca3a77b4f33b6f5990 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 11 Mar 2019 13:57:42 +0530
-Subject: [PATCH 43/52] Binutils security check is causing build error for
- windows builds.commenting for now.
-
----
- bfd/elf-attrs.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
-index 070104c273..b135ac8f11 100644
---- a/bfd/elf-attrs.c
-+++ b/bfd/elf-attrs.c
-@@ -436,12 +436,15 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
-   bfd_byte *p_end;
-   bfd_vma len;
-   const char *std_sec;
-+#if 0
-   ufile_ptr filesize;
-+#endif
- 
-   /* PR 17512: file: 2844a11d.  */
-   if (hdr->sh_size == 0)
-     return;
- 
-+#if 0
-   filesize = bfd_get_file_size (abfd);
-   if (filesize != 0 && hdr->sh_size > filesize)
-     {
-@@ -451,6 +454,7 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
-       bfd_set_error (bfd_error_invalid_operation);
-       return;
-     }
-+#endif
- 
-   contents = (bfd_byte *) bfd_malloc (hdr->sh_size + 1);
-   if (!contents)
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0044-Correcting-the-register-names-from-slr-shr-to-rslr-r.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0044-Correcting-the-register-names-from-slr-shr-to-rslr-r.patch
deleted file mode 100644
index 48c9c2c9..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0044-Correcting-the-register-names-from-slr-shr-to-rslr-r.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From ba70b41346a8d5c9c1a4435f70edbb06e117564d Mon Sep 17 00:00:00 2001
-From: Nagaraju <nmekala@xilinx.com>
-Date: Thu, 19 Dec 2019 12:22:04 +0530
-Subject: [PATCH 44/52] Correcting the register names from slr & shr to rslr &
- rshr
-
----
- gdb/features/microblaze-core.xml               | 4 ++--
- gdb/features/microblaze-stack-protect.xml      | 4 ++--
- gdb/features/microblaze-with-stack-protect.c   | 4 ++--
- gdb/features/microblaze.c                      | 4 ++--
- gdb/features/microblaze64-core.xml             | 4 ++--
- gdb/features/microblaze64-stack-protect.xml    | 4 ++--
- gdb/features/microblaze64-with-stack-protect.c | 4 ++--
- gdb/features/microblaze64.c                    | 4 ++--
- gdb/microblaze-tdep.c                          | 2 +-
- 9 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/gdb/features/microblaze-core.xml b/gdb/features/microblaze-core.xml
-index a87f0f2319..d1f2282fd1 100644
---- a/gdb/features/microblaze-core.xml
-+++ b/gdb/features/microblaze-core.xml
-@@ -64,6 +64,6 @@
-   <reg name="rtlbsx" bitsize="32"/>
-   <reg name="rtlblo" bitsize="32"/>
-   <reg name="rtlbhi" bitsize="32"/>
--  <reg name="slr" bitsize="32"/>
--  <reg name="shr" bitsize="32"/>
-+  <reg name="rslr" bitsize="32"/>
-+  <reg name="rshr" bitsize="32"/>
- </feature>
-diff --git a/gdb/features/microblaze-stack-protect.xml b/gdb/features/microblaze-stack-protect.xml
-index 1a67f88c18..1b16223406 100644
---- a/gdb/features/microblaze-stack-protect.xml
-+++ b/gdb/features/microblaze-stack-protect.xml
-@@ -7,6 +7,6 @@
- 
- <!DOCTYPE feature SYSTEM "gdb-target.dtd">
- <feature name="org.gnu.gdb.microblaze.stack-protect">
--  <reg name="slr" bitsize="32"/>
--  <reg name="shr" bitsize="32"/>
-+  <reg name="rslr" bitsize="32"/>
-+  <reg name="rshr" bitsize="32"/>
- </feature>
-diff --git a/gdb/features/microblaze-with-stack-protect.c b/gdb/features/microblaze-with-stack-protect.c
-index 609934e2b4..ab162fd258 100644
---- a/gdb/features/microblaze-with-stack-protect.c
-+++ b/gdb/features/microblaze-with-stack-protect.c
-@@ -72,8 +72,8 @@ initialize_tdesc_microblaze_with_stack_protect (void)
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze.stack-protect");
--  tdesc_create_reg (feature, "slr", 57, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "shr", 58, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 32, "int");
- 
-   tdesc_microblaze_with_stack_protect = result;
- }
-diff --git a/gdb/features/microblaze.c b/gdb/features/microblaze.c
-index ceb98ca8b8..7919ac96e6 100644
---- a/gdb/features/microblaze.c
-+++ b/gdb/features/microblaze.c
-@@ -70,8 +70,8 @@ initialize_tdesc_microblaze (void)
-   tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
--  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze = result;
- }
-diff --git a/gdb/features/microblaze64-core.xml b/gdb/features/microblaze64-core.xml
-index 96e99e2fb2..b9adadfade 100644
---- a/gdb/features/microblaze64-core.xml
-+++ b/gdb/features/microblaze64-core.xml
-@@ -64,6 +64,6 @@
-   <reg name="rtlbsx" bitsize="32"/>
-   <reg name="rtlblo" bitsize="32"/>
-   <reg name="rtlbhi" bitsize="32"/>
--  <reg name="slr" bitsize="64"/>
--  <reg name="shr" bitsize="64"/>
-+  <reg name="rslr" bitsize="64"/>
-+  <reg name="rshr" bitsize="64"/>
- </feature>
-diff --git a/gdb/features/microblaze64-stack-protect.xml b/gdb/features/microblaze64-stack-protect.xml
-index 1bbf5fc3ce..9d7ea8b9fd 100644
---- a/gdb/features/microblaze64-stack-protect.xml
-+++ b/gdb/features/microblaze64-stack-protect.xml
-@@ -7,6 +7,6 @@
- 
- <!DOCTYPE feature SYSTEM "gdb-target.dtd">
- <feature name="org.gnu.gdb.microblaze64.stack-protect">
--  <reg name="slr" bitsize="64"/>
--  <reg name="shr" bitsize="64"/>
-+  <reg name="rslr" bitsize="64"/>
-+  <reg name="rshr" bitsize="64"/>
- </feature>
-diff --git a/gdb/features/microblaze64-with-stack-protect.c b/gdb/features/microblaze64-with-stack-protect.c
-index f448c9a749..249cb534da 100644
---- a/gdb/features/microblaze64-with-stack-protect.c
-+++ b/gdb/features/microblaze64-with-stack-protect.c
-@@ -72,8 +72,8 @@ initialize_tdesc_microblaze64_with_stack_protect (void)
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze64.stack-protect");
--  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
--  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze64_with_stack_protect = result;
- }
-diff --git a/gdb/features/microblaze64.c b/gdb/features/microblaze64.c
-index 1aa37c4512..5d3e2c8cd9 100644
---- a/gdb/features/microblaze64.c
-+++ b/gdb/features/microblaze64.c
-@@ -70,8 +70,8 @@ initialize_tdesc_microblaze64 (void)
-   tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
--  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze64 = result;
- }
-diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
-index f4ea3cc342..041ebf1fca 100644
---- a/gdb/microblaze-tdep.c
-+++ b/gdb/microblaze-tdep.c
-@@ -77,7 +77,7 @@ static const char *microblaze_register_names[] =
-   "rpvr0", "rpvr1", "rpvr2", "rpvr3", "rpvr4", "rpvr5", "rpvr6",
-   "rpvr7", "rpvr8", "rpvr9", "rpvr10", "rpvr11",
-   "redr", "rpid", "rzpr", "rtlbx", "rtlbsx", "rtlblo", "rtlbhi",
--  "slr", "shr"
-+  "rslr", "rshr"
- };
- 
- #define MICROBLAZE_NUM_REGS ARRAY_SIZE (microblaze_register_names)
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0045-Removing-the-header-gdb_assert.h-from-MB-target-file.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0045-Removing-the-header-gdb_assert.h-from-MB-target-file.patch
deleted file mode 100644
index 46124c12..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0045-Removing-the-header-gdb_assert.h-from-MB-target-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5fac707a9894ec9d0fcac14bbf0eb3ff631d0499 Mon Sep 17 00:00:00 2001
-From: Nagaraju <nmekala@xilinx.com>
-Date: Fri, 17 Jan 2020 15:45:48 +0530
-Subject: [PATCH 45/52] Removing the header "gdb_assert.h" from MB target file
-
----
- gdb/microblaze-linux-tdep.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
-index a37c4c86f4..68e73d2e56 100644
---- a/gdb/microblaze-linux-tdep.c
-+++ b/gdb/microblaze-linux-tdep.c
-@@ -37,7 +37,6 @@
- #include "linux-tdep.h"
- #include "glibc-tdep.h"
- 
--#include "gdb_assert.h"
- 
- #ifndef REGSET_H
- #define REGSET_H 1
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0046-bfd-cpu-microblaze.c-Enhance-disassembler.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0046-bfd-cpu-microblaze.c-Enhance-disassembler.patch
deleted file mode 100644
index 46d51dd6..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0046-bfd-cpu-microblaze.c-Enhance-disassembler.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1751b6fbc3170d29a3e2873b4394d058f8cb7d36 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Thu, 3 Dec 2020 10:08:53 -0800
-Subject: [PATCH 46/52] bfd/cpu-microblaze.c: Enhance disassembler
-
-See commit aebcfb76fc165795e67917cb67cf985c4dfdc577 for why this is needed.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- bfd/cpu-microblaze.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c
-index f3e8bbda75..f3501df0e2 100644
---- a/bfd/cpu-microblaze.c
-+++ b/bfd/cpu-microblaze.c
-@@ -39,7 +39,8 @@ const bfd_arch_info_type bfd_microblaze_arch[] =
-   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.  */
-+  &bfd_microblaze_arch[1],     /* Next in list.  */
-+  0 /* Maximum offset of a reloc from the start of an insn.  */
- },
- {
-   32,                          /* Bits in a word.  */
-@@ -71,7 +72,8 @@ const bfd_arch_info_type bfd_microblaze_arch[] =
-   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.  */
-+  &bfd_microblaze_arch[1],     /* Next in list.  */
-+  0 /* Maximum offset of a reloc from the start of an insn.  */
- },
- {
-   64,                          /* 32 bits in a word.  */
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0047-bfd-elf64-microblaze.c-Fix-build-failures.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0047-bfd-elf64-microblaze.c-Fix-build-failures.patch
deleted file mode 100644
index 423b224b..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0047-bfd-elf64-microblaze.c-Fix-build-failures.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 4500a281317093e78b7029e3dcb0037e7c628347 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Thu, 3 Dec 2020 11:02:11 -0800
-Subject: [PATCH 47/52] bfd/elf64-microblaze.c: Fix build failures
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- bfd/elf64-microblaze.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 338f16eeee..cf84e0db4e 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1572,7 +1572,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-                          {
-                            BFD_FAIL ();
-                            (*_bfd_error_handler)
--                             (_("%B: probably compiled without -fPIC?"),
-+                             (_("%pB: probably compiled without -fPIC?"),
-                               input_bfd);
-                            bfd_set_error (bfd_error_bad_value);
-                            return FALSE;
-@@ -2911,7 +2911,7 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
- 
-   /* 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;
-@@ -3096,7 +3096,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
-@@ -3113,7 +3113,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-        {
-          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;
-@@ -3124,7 +3124,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-            }
-        }
-       else if (UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
--       h->dyn_relocs = NULL;
-+       eh->dyn_relocs = NULL;
-     }
-   else
-     {
-@@ -3154,13 +3154,13 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
-            goto keep;
-        }
- 
--      h->dyn_relocs = NULL;
-+      eh->dyn_relocs = NULL;
- 
-     keep: ;
-     }
- 
-   /* Finally, allocate space.  */
--  for (p = h->dyn_relocs; p != NULL; p = p->next)
-+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
-     {
-       asection *sreloc = elf_section_data (p->sec)->sreloc;
-       sreloc->size += p->count * sizeof (Elf64_External_Rela);
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0048-bfd-elf-microblaze.c-Remove-obsolete-entries.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0048-bfd-elf-microblaze.c-Remove-obsolete-entries.patch
deleted file mode 100644
index 7feaceb9..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0048-bfd-elf-microblaze.c-Remove-obsolete-entries.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2f07425ca330dd357c374acdc30a27c6647454c9 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Thu, 3 Dec 2020 11:23:26 -0800
-Subject: [PATCH 48/52] bfd/elf*-microblaze.c: Remove obsolete entries
-
-Replace microblaze_elf_merge_private_bfd_data with a direct call to
-_bfd_generic_verify_endian_match, this simplifies the implementation.
-
-Remove microblaze_elf_gc_sweep_hook, removed in 2017.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- bfd/elf64-microblaze.c | 29 +----------------------------
- 1 file changed, 1 insertion(+), 28 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index cf84e0db4e..786f659232 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1690,21 +1690,6 @@ 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 bfd_boolean
--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.  */
- 
- static int
-@@ -2427,17 +2412,6 @@ 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 bfd_boolean
--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
-@@ -3704,11 +3678,10 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
- #define bfd_elf64_bfd_is_local_label_name       microblaze_elf_is_local_label_name
- #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    microblaze_elf_merge_private_bfd_data
-+#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_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
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0049-bfd-elf64-microblaze.c-Resolve-various-compiler-warn.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0049-bfd-elf64-microblaze.c-Resolve-various-compiler-warn.patch
deleted file mode 100644
index 5f4a2714..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0049-bfd-elf64-microblaze.c-Resolve-various-compiler-warn.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a86506136a738c3ab64d42a876fbfdfa1d46ad64 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Thu, 3 Dec 2020 12:02:25 -0800
-Subject: [PATCH 49/52] bfd/elf64-microblaze.c: Resolve various compiler
- warnings
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- bfd/elf64-microblaze.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 786f659232..70cd80cdf2 100644
---- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -1258,6 +1258,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
-              goto dogot;
-            case (int) R_MICROBLAZE_TLSLD:
-              tls_type = (TLS_TLS | TLS_LD);
-+              /* Fall through. */
-            dogot:
-            case (int) R_MICROBLAZE_GOT_64:
-              {
-@@ -2569,6 +2570,7 @@ microblaze_elf_check_relocs (bfd * abfd,
-           tls_type |= (TLS_TLS | TLS_LD);
-         dogottls:
-           sec->has_tls_reloc = 1;
-+          /* Fall through. */
-         case R_MICROBLAZE_GOT_64:
-           if (htab->sgot == NULL)
-             {
-@@ -2802,10 +2804,8 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
-   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)
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0050-opcodes-microblaze-dis.c-Fix-compile-warnings.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0050-opcodes-microblaze-dis.c-Fix-compile-warnings.patch
deleted file mode 100644
index 475a53ba..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0050-opcodes-microblaze-dis.c-Fix-compile-warnings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From de38a354e40a9dcc486c93faf02bee4b059fa34a Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Thu, 3 Dec 2020 12:30:09 -0800
-Subject: [PATCH 50/52] opcodes/microblaze-dis.c: Fix compile warnings
-
-Two compiler warnings were evident, it appears both are likely real bugs.
-
-Missing type declaration for a function, and a case statement without a break.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- opcodes/microblaze-dis.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index 90d2328659..f1c33dca14 100644
---- a/opcodes/microblaze-dis.c
-+++ b/opcodes/microblaze-dis.c
-@@ -130,6 +130,7 @@ get_field_imm15 (struct string_buf *buf, long instr)
-   return p;
- }
- 
-+static char *
- get_field_imm16 (struct string_buf *buf, long instr)
- {
-   char *p = strbuf (buf);
-@@ -329,6 +330,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
-          print_func (stream, "\t%s, %s, %s", get_field_rd (&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));
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0051-gdb-microblaze-tdep.c-Remove-unused-functions.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0051-gdb-microblaze-tdep.c-Remove-unused-functions.patch
deleted file mode 100644
index 263f0a9b..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0051-gdb-microblaze-tdep.c-Remove-unused-functions.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f1686db8735972637d2bbcc6e2fbf391c1e848d9 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@xilinx.com>
-Date: Thu, 3 Dec 2020 14:51:37 -0800
-Subject: [PATCH 51/52] gdb/microblaze-tdep.c: Remove unused functions
-
-Compiler warns the removed functions are not referenced anywhere.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
----
- gdb/microblaze-tdep.c | 45 -------------------------------------------
- 1 file changed, 45 deletions(-)
-
-diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
-index 041ebf1fca..28f79f9ffc 100644
---- a/gdb/microblaze-tdep.c
-+++ b/gdb/microblaze-tdep.c
-@@ -140,14 +140,6 @@ microblaze_fetch_instruction (CORE_ADDR pc)
- constexpr gdb_byte microblaze_break_insn[] = MICROBLAZE_BREAKPOINT;
- 
- typedef BP_MANIPULATION (microblaze_break_insn) microblaze_breakpoint;
--static CORE_ADDR
--microblaze_store_arguments (struct regcache *regcache, int nargs,
--                           struct value **args, CORE_ADDR sp,
--                           int struct_return, CORE_ADDR struct_addr)
--{
--  error (_("store_arguments not implemented"));
--  return sp;
--}
- #if 0
- static int
- microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
-@@ -555,12 +547,6 @@ microblaze_frame_base_address (struct frame_info *next_frame,
-   return cache->base;
- }
- 
--static const struct frame_unwind *
--microblaze_frame_sniffer (struct frame_info *next_frame)
--{
--  return &microblaze_frame_unwind;
--}
--
- static const struct frame_base microblaze_frame_base =
- {
-   &microblaze_frame_unwind,
-@@ -759,12 +745,6 @@ microblaze_software_single_step (struct regcache *regcache)
- }
- #endif
- 
--static void
--microblaze_write_pc (struct regcache *regcache, CORE_ADDR pc)
--{
--  regcache_cooked_write_unsigned (regcache, MICROBLAZE_PC_REGNUM, pc);
--}
--
- static int dwarf2_to_reg_map[78] =
- { 0  /* r0  */,   1  /* r1  */,   2  /* r2  */,   3  /* r3  */,  /*  0- 3 */
-   4  /* r4  */,   5  /* r5  */,   6  /* r6  */,   7  /* r7  */,  /*  4- 7 */
-@@ -796,19 +776,6 @@ microblaze_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int reg)
-   return -1;
- }
- 
--static void
--microblaze_register_g_packet_guesses (struct gdbarch *gdbarch)
--{
--
--  register_remote_g_packet_guess (gdbarch,
--                                  4 * MICROBLAZE_NUM_REGS,
--                                  tdesc_microblaze64);
--
--  register_remote_g_packet_guess (gdbarch,
--                                  4 * MICROBLAZE_NUM_REGS,
--                                  tdesc_microblaze64_with_stack_protect);
--}
--
- void
- microblaze_supply_gregset (const struct microblaze_gregset *gregset,
-                         struct regcache *regcache,
-@@ -873,18 +840,6 @@ microblaze_regset_from_core_section (struct gdbarch *gdbarch,
- }
- 
- 
--static void
--make_regs (struct gdbarch *arch)
--{
--  struct gdbarch_tdep *tdep = gdbarch_tdep (arch);
--  int mach = gdbarch_bfd_arch_info (arch)->mach;
--  
--  if (mach == bfd_mach_microblaze64)
--    {
--      set_gdbarch_ptr_bit (arch, 64);
--    }
--}
--
- static struct gdbarch *
- microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
- {
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0052-sim-Allow-microblaze-architecture.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0052-sim-Allow-microblaze-architecture.patch
deleted file mode 100644
index ee5caf0a..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0052-sim-Allow-microblaze-architecture.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5fa859e73662f96c9cfaf21bd2cf01b92afc9c1c Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@kernel.crashing.org>
-Date: Thu, 6 Aug 2020 15:37:52 -0500
-Subject: [PATCH 52/52] sim: Allow microblaze* architecture
-
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
----
- sim/configure     | 2 +-
- sim/configure.tgt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sim/configure b/sim/configure
-index 72f95cd5c7..9e28cc7868 100755
---- a/sim/configure
-+++ b/sim/configure
-@@ -3795,7 +3795,7 @@ subdirs="$subdirs aarch64"
- 
- 
-        ;;
--   microblaze-*-*)
-+   microblaze*-*-*)
- 
-   sim_arch=microblaze
-   subdirs="$subdirs microblaze"
-diff --git a/sim/configure.tgt b/sim/configure.tgt
-index 8a8e03d96f..f6743fe8d4 100644
---- a/sim/configure.tgt
-+++ b/sim/configure.tgt
-@@ -59,7 +59,7 @@ case "${target}" in
-    mcore-*-*)
-        SIM_ARCH(mcore)
-        ;;
--   microblaze-*-*)
-+   microblaze*-*-*)
-        SIM_ARCH(microblaze)
-        ;;
-    mips*-*-*)
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0053-gdb-Fix-microblaze-target-compilation.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0053-gdb-Fix-microblaze-target-compilation.patch
deleted file mode 100644
index af0e3268..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0053-gdb-Fix-microblaze-target-compilation.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-From efa3750ffda1ae16caf071b8b8ea31f752a3324a Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@kernel.crashing.org>
-Date: Mon, 7 Dec 2020 12:03:25 -0600
-Subject: [PATCH] gdb: Fix microblaze target compilation
-
-Add microblaze-linux-nat.c to configure.nat
-
-Transition microblaze-linux-nat.c to use the new gdb C++ style functions.
-
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
----
- gdb/configure.nat          |  5 ++
- gdb/microblaze-linux-nat.c | 96 ++++++++++++++------------------------
- gdb/microblaze-tdep.h      |  3 ++
- 3 files changed, 43 insertions(+), 61 deletions(-)
-
-diff --git a/gdb/configure.nat b/gdb/configure.nat
-index 6ea2583495..1fba80f6c9 100644
---- a/gdb/configure.nat
-+++ b/gdb/configure.nat
-@@ -261,6 +261,11 @@ case ${gdb_host} in
-                # Host: Motorola m68k running GNU/Linux.
-                NATDEPFILES="${NATDEPFILES} m68k-linux-nat.o"
-                ;;
-+           microblaze)
-+               # Host: Microblaze running GNU/Linux.
-+               NATDEPFILES="${NATDEPFILES} microblaze-linux-nat.o"
-+               NAT_CDEPS=
-+               ;;
-            mips)
-                # Host: Linux/MIPS
-                NATDEPFILES="${NATDEPFILES} linux-nat-trad.o \
-diff --git a/gdb/microblaze-linux-nat.c b/gdb/microblaze-linux-nat.c
-index e9b8c9c522..bac4697e1e 100644
---- a/gdb/microblaze-linux-nat.c
-+++ b/gdb/microblaze-linux-nat.c
-@@ -36,13 +36,14 @@
- #include "dwarf2-frame.h"
- #include "osabi.h"
- 
--#include "gdb_assert.h"
--#include "gdb_string.h"
-+#include "gdbsupport/gdb_assert.h"
-+#include <string.h>
- #include "target-descriptions.h"
- #include "opcodes/microblaze-opcm.h"
- #include "opcodes/microblaze-dis.h"
- 
- #include "linux-nat.h"
-+#include "linux-tdep.h"
- #include "target-descriptions.h"
- 
- #include <sys/user.h>
-@@ -61,22 +62,17 @@
- /* Defines ps_err_e, struct ps_prochandle.  */
- #include "gdb_proc_service.h"
- 
--/* On GNU/Linux, threads are implemented as pseudo-processes, in which
--   case we may be tracing more than one process at a time.  In that
--   case, inferior_ptid will contain the main process ID and the
--   individual thread (process) ID.  get_thread_id () is used to get
--   the thread id if it's available, and the process id otherwise.  */
--
--int
--get_thread_id (ptid_t ptid)
-+class microblaze_linux_nat_target final : public linux_nat_target
- {
--  int tid = TIDGET (ptid);
--  if (0 == tid)
--    tid = PIDGET (ptid);
--  return tid;
--}
-+public:
-+  /* Add our register access methods.  */
-+  void fetch_registers (struct regcache *, int) override;
-+  void store_registers (struct regcache *, int) override;
-+
-+  const struct target_desc *read_description () override;
-+};
- 
--#define GET_THREAD_ID(PTID)    get_thread_id (PTID)
-+static microblaze_linux_nat_target the_microblaze_linux_nat_target;
- 
- /* Non-zero if our kernel may support the PTRACE_GETREGS and
-    PTRACE_SETREGS requests, for reading and writing the
-@@ -88,7 +84,6 @@ static int
- microblaze_register_u_addr (struct gdbarch *gdbarch, int regno)
- {
-   int u_addr = -1;
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-   /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
-      interface, and not the wordsize of the program's ABI.  */
-   int wordsize = sizeof (long);
-@@ -105,18 +100,16 @@ microblaze_register_u_addr (struct gdbarch *gdbarch, int regno)
- static void
- fetch_register (struct regcache *regcache, int tid, int regno)
- {
--  struct gdbarch *gdbarch = get_regcache_arch (regcache);
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  struct gdbarch *gdbarch = regcache->arch ();
-   /* This isn't really an address.  But ptrace thinks of it as one.  */
-   CORE_ADDR regaddr = microblaze_register_u_addr (gdbarch, regno);
-   int bytes_transferred;
--  unsigned int offset;         /* Offset of registers within the u area.  */
--  char buf[MAX_REGISTER_SIZE];
-+  char buf[MICROBLAZE_MAX_REGISTER_SIZE];
- 
-   if (regaddr == -1)
-   {
-     memset (buf, '\0', register_size (gdbarch, regno));   /* Supply zeroes */
--    regcache_raw_supply (regcache, regno, buf);
-+    regcache->raw_supply (regno, buf);
-     return;
-   }
- 
-@@ -149,14 +142,14 @@ fetch_register (struct regcache *regcache, int tid, int regno)
-   {
-     /* Little-endian values are always found at the left end of the
-        bytes transferred.  */
--    regcache_raw_supply (regcache, regno, buf);
-+    regcache->raw_supply (regno, buf);
-   }
-   else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
-   {
-     /* Big-endian values are found at the right end of the bytes
-        transferred.  */
-     size_t padding = (bytes_transferred - register_size (gdbarch, regno));
--    regcache_raw_supply (regcache, regno, buf + padding);
-+    regcache->raw_supply (regno, buf + padding);
-   }
-   else
-     internal_error (__FILE__, __LINE__,
-@@ -175,8 +168,6 @@ fetch_register (struct regcache *regcache, int tid, int regno)
- static int
- fetch_all_gp_regs (struct regcache *regcache, int tid)
- {
--  struct gdbarch *gdbarch = get_regcache_arch (regcache);
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-   gdb_gregset_t gregset;
- 
-   if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0)
-@@ -204,8 +195,6 @@ fetch_all_gp_regs (struct regcache *regcache, int tid)
- static void
- fetch_gp_regs (struct regcache *regcache, int tid)
- {
--  struct gdbarch *gdbarch = get_regcache_arch (regcache);
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-   int i;
- 
-   if (have_ptrace_getsetregs)
-@@ -223,13 +212,12 @@ fetch_gp_regs (struct regcache *regcache, int tid)
- static void
- store_register (const struct regcache *regcache, int tid, int regno)
- {
--  struct gdbarch *gdbarch = get_regcache_arch (regcache);
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+  struct gdbarch *gdbarch = regcache->arch ();
-   /* This isn't really an address.  But ptrace thinks of it as one.  */
-   CORE_ADDR regaddr = microblaze_register_u_addr (gdbarch, regno);
-   int i;
-   size_t bytes_to_transfer;
--  char buf[MAX_REGISTER_SIZE];
-+  char buf[MICROBLAZE_MAX_REGISTER_SIZE];
- 
-   if (regaddr == -1)
-     return;
-@@ -242,13 +230,13 @@ store_register (const struct regcache *regcache, int tid, int regno)
-   if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)
-   {
-     /* Little-endian values always sit at the left end of the buffer.  */
--    regcache_raw_collect (regcache, regno, buf);
-+    regcache->raw_collect (regno, buf);
-   }
-   else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
-   {
-     /* Big-endian values sit at the right end of the buffer.  */
-     size_t padding = (bytes_to_transfer - register_size (gdbarch, regno));
--    regcache_raw_collect (regcache, regno, buf + padding);
-+    regcache->raw_collect (regno, buf + padding);
-   }
- 
-   for (i = 0; i < bytes_to_transfer; i += sizeof (long))
-@@ -281,8 +269,6 @@ store_register (const struct regcache *regcache, int tid, int regno)
- static int
- store_all_gp_regs (const struct regcache *regcache, int tid, int regno)
- {
--  struct gdbarch *gdbarch = get_regcache_arch (regcache);
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-   gdb_gregset_t gregset;
- 
-   if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0)
-@@ -319,8 +305,6 @@ store_all_gp_regs (const struct regcache *regcache, int tid, int regno)
- static void
- store_gp_regs (const struct regcache *regcache, int tid, int regno)
- {
--  struct gdbarch *gdbarch = get_regcache_arch (regcache);
--  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-   int i;
- 
-   if (have_ptrace_getsetregs)
-@@ -339,12 +323,12 @@ store_gp_regs (const struct regcache *regcache, int tid, int regno)
-    regno == -1, otherwise fetch all general registers or all floating
-    point registers depending upon the value of regno.  */
- 
--static void
--microblaze_linux_fetch_inferior_registers (struct target_ops *ops,
--                                   struct regcache *regcache, int regno)
-+void
-+microblaze_linux_nat_target::fetch_registers (struct regcache * regcache,
-+                                              int regno)
- {
-   /* Get the thread id for the ptrace call.  */
--  int tid = GET_THREAD_ID (inferior_ptid);
-+  int tid = regcache->ptid ().lwp ();
- 
-   if (regno == -1)
-     fetch_gp_regs (regcache, tid);
-@@ -356,12 +340,12 @@ microblaze_linux_fetch_inferior_registers (struct target_ops *ops,
-    regno == -1, otherwise store all general registers or all floating
-    point registers depending upon the value of regno.  */
- 
--static void
--microblaze_linux_store_inferior_registers (struct target_ops *ops,
--                                   struct regcache *regcache, int regno)
-+void
-+microblaze_linux_nat_target::store_registers (struct regcache *regcache,
-+                                              int regno)
- {
-   /* Get the thread id for the ptrace call.  */
--  int tid = GET_THREAD_ID (inferior_ptid);
-+  int tid = regcache->ptid ().lwp ();
- 
-   if (regno >= 0)
-     store_register (regcache, tid, regno);
-@@ -398,12 +382,12 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
-   /* FIXME. */
- }
- 
--static const struct target_desc *
--microblaze_linux_read_description (struct target_ops *ops)
-+const struct target_desc *
-+microblaze_linux_nat_target::read_description ()
- {
--  CORE_ADDR microblaze_hwcap = 0;
-+  CORE_ADDR microblaze_hwcap = linux_get_hwcap (this);
- 
--  if (target_auxv_search (ops, AT_HWCAP, &microblaze_hwcap) != 1)
-+  if (microblaze_hwcap != 1)
-     return NULL;
- 
-   return NULL;
-@@ -415,17 +399,7 @@ void _initialize_microblaze_linux_nat (void);
- void
- _initialize_microblaze_linux_nat (void)
- {
--  struct target_ops *t;
--
--  /* Fill in the generic GNU/Linux methods.  */
--  t = linux_target ();
--
--  /* Add our register access methods.  */
--  t->to_fetch_registers = microblaze_linux_fetch_inferior_registers;
--  t->to_store_registers = microblaze_linux_store_inferior_registers;
--
--  t->to_read_description = microblaze_linux_read_description;
--
-   /* Register the target.  */
--  linux_nat_add_target (t);
-+  linux_target = &the_microblaze_linux_nat_target;
-+  add_inf_child_target (&the_microblaze_linux_nat_target);
- }
-diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
-index c0fc900733..c777d93a95 100644
---- a/gdb/microblaze-tdep.h
-+++ b/gdb/microblaze-tdep.h
-@@ -106,6 +106,9 @@ enum microblaze_regnum
-   MICROBLAZE_NUM_REGS, MICROBLAZE_NUM_CORE_REGS = MICROBLAZE_NUM_REGS
- };
- 
-+/* Big enough to hold the size of the largest register in bytes.  */
-+#define MICROBLAZE_MAX_REGISTER_SIZE   64
-+
- struct microblaze_frame_cache
- {
-   /* Base address.  */
--- 
-2.17.1
-
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0054-Patch-MicroBlaze.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0054-Patch-MicroBlaze.patch
deleted file mode 100644
index d5cf929a..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0054-Patch-MicroBlaze.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 75272152884a0cb003a8e45f8ca9ffa0ac43eea2 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Thu, 15 Apr 2021 16:16:11 +0530
-Subject: [PATCH 54] [Patch,MicroBlaze]: 1. set BFD machine to
- bfd_mach_microblaze64 for 64 bit elf. 2. XSDB and QEMU : agreed to append r
- to all special registers except slr/shr
-
----
- bfd/elf64-microblaze.c                         | 11 +++++++++++
- gdb/features/microblaze-core.xml               |  4 ++--
- gdb/features/microblaze-stack-protect.xml      |  4 ++--
- gdb/features/microblaze-with-stack-protect.c   |  4 ++--
- gdb/features/microblaze.c                      |  4 ++--
- gdb/features/microblaze64-core.xml             |  4 ++--
- gdb/features/microblaze64-stack-protect.xml    |  4 ++--
- gdb/features/microblaze64-with-stack-protect.c |  4 ++--
- gdb/features/microblaze64.c                    |  4 ++--
- gdb/microblaze-tdep.c                          |  2 +-
- 10 files changed, 28 insertions(+), 17 deletions(-)
-
-Index: gdb-9.2/bfd/elf64-microblaze.c
-===================================================================
---- gdb-9.2.orig/bfd/elf64-microblaze.c
-+++ gdb-9.2/bfd/elf64-microblaze.c
-@@ -3631,6 +3631,16 @@ microblaze_elf_finish_dynamic_sections (
-   return TRUE;
- }
- 
-+static bfd_boolean
-+microblaze_elf64_object_p (bfd *abfd)
-+{
-+  bfd_default_set_arch_mach (abfd, bfd_arch_microblaze,
-+                            bfd_mach_microblaze64);
-+  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.  */
- 
-@@ -3698,5 +3708,6 @@ microblaze_elf_add_symbol_hook (bfd *abf
- #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
-+/* #define elf_backend_object_p                        microblaze_elf64_object_p */
- 
- #include "elf64-target.h"
-Index: gdb-9.2/gdb/features/microblaze-core.xml
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze-core.xml
-+++ gdb-9.2/gdb/features/microblaze-core.xml
-@@ -64,6 +64,6 @@
-   <reg name="rtlbsx" bitsize="32"/>
-   <reg name="rtlblo" bitsize="32"/>
-   <reg name="rtlbhi" bitsize="32"/>
--  <reg name="rslr" bitsize="32"/>
--  <reg name="rshr" bitsize="32"/>
-+  <reg name="slr" bitsize="32"/>
-+  <reg name="shr" bitsize="32"/>
- </feature>
-Index: gdb-9.2/gdb/features/microblaze-stack-protect.xml
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze-stack-protect.xml
-+++ gdb-9.2/gdb/features/microblaze-stack-protect.xml
-@@ -7,6 +7,6 @@
- 
- <!DOCTYPE feature SYSTEM "gdb-target.dtd">
- <feature name="org.gnu.gdb.microblaze.stack-protect">
--  <reg name="rslr" bitsize="32"/>
--  <reg name="rshr" bitsize="32"/>
-+  <reg name="slr" bitsize="32"/>
-+  <reg name="shr" bitsize="32"/>
- </feature>
-Index: gdb-9.2/gdb/features/microblaze-with-stack-protect.c
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze-with-stack-protect.c
-+++ gdb-9.2/gdb/features/microblaze-with-stack-protect.c
-@@ -72,8 +72,8 @@ initialize_tdesc_microblaze_with_stack_p
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze.stack-protect");
--  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 32, "int");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 32, "int");
- 
-   tdesc_microblaze_with_stack_protect = result;
- }
-Index: gdb-9.2/gdb/features/microblaze.c
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze.c
-+++ gdb-9.2/gdb/features/microblaze.c
-@@ -70,8 +70,8 @@ initialize_tdesc_microblaze (void)
-   tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 64, "uint64");
--  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze = result;
- }
-Index: gdb-9.2/gdb/features/microblaze64-core.xml
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze64-core.xml
-+++ gdb-9.2/gdb/features/microblaze64-core.xml
-@@ -64,6 +64,6 @@
-   <reg name="rtlbsx" bitsize="32"/>
-   <reg name="rtlblo" bitsize="32"/>
-   <reg name="rtlbhi" bitsize="32"/>
--  <reg name="rslr" bitsize="64"/>
--  <reg name="rshr" bitsize="64"/>
-+  <reg name="slr" bitsize="64"/>
-+  <reg name="shr" bitsize="64"/>
- </feature>
-Index: gdb-9.2/gdb/features/microblaze64-stack-protect.xml
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze64-stack-protect.xml
-+++ gdb-9.2/gdb/features/microblaze64-stack-protect.xml
-@@ -7,6 +7,6 @@
- 
- <!DOCTYPE feature SYSTEM "gdb-target.dtd">
- <feature name="org.gnu.gdb.microblaze64.stack-protect">
--  <reg name="rslr" bitsize="64"/>
--  <reg name="rshr" bitsize="64"/>
-+  <reg name="slr" bitsize="64"/>
-+  <reg name="shr" bitsize="64"/>
- </feature>
-Index: gdb-9.2/gdb/features/microblaze64-with-stack-protect.c
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze64-with-stack-protect.c
-+++ gdb-9.2/gdb/features/microblaze64-with-stack-protect.c
-@@ -72,8 +72,8 @@ initialize_tdesc_microblaze64_with_stack
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
- 
-   feature = tdesc_create_feature (result, "org.gnu.gdb.microblaze64.stack-protect");
--  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 64, "uint64");
--  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze64_with_stack_protect = result;
- }
-Index: gdb-9.2/gdb/features/microblaze64.c
-===================================================================
---- gdb-9.2.orig/gdb/features/microblaze64.c
-+++ gdb-9.2/gdb/features/microblaze64.c
-@@ -70,8 +70,8 @@ initialize_tdesc_microblaze64 (void)
-   tdesc_create_reg (feature, "rtlbsx", 54, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlblo", 55, 1, NULL, 32, "int");
-   tdesc_create_reg (feature, "rtlbhi", 56, 1, NULL, 32, "int");
--  tdesc_create_reg (feature, "rslr", 57, 1, NULL, 64, "uint64");
--  tdesc_create_reg (feature, "rshr", 58, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "slr", 57, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "shr", 58, 1, NULL, 64, "uint64");
- 
-   tdesc_microblaze64 = result;
- }
-Index: gdb-9.2/gdb/microblaze-tdep.c
-===================================================================
---- gdb-9.2.orig/gdb/microblaze-tdep.c
-+++ gdb-9.2/gdb/microblaze-tdep.c
-@@ -77,7 +77,7 @@ static const char *microblaze_register_n
-   "rpvr0", "rpvr1", "rpvr2", "rpvr3", "rpvr4", "rpvr5", "rpvr6",
-   "rpvr7", "rpvr8", "rpvr9", "rpvr10", "rpvr11",
-   "redr", "rpid", "rzpr", "rtlbx", "rtlbsx", "rtlblo", "rtlbhi",
--  "rslr", "rshr"
-+  "slr", "shr"
- };
- 
- #define MICROBLAZE_NUM_REGS ARRAY_SIZE (microblaze_register_names)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0055-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0055-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch
deleted file mode 100644
index 320d6ecb..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0055-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6b29e1a8ff62e01299ee07840b4443cbda5b8c61 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 19 Apr 2021 14:33:27 +0530
-Subject: [PATCH 55] [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
-
----
- bfd/config.bfd | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: gdb-9.2/bfd/config.bfd
-===================================================================
---- gdb-9.2.orig/bfd/config.bfd
-+++ gdb-9.2/bfd/config.bfd
-@@ -838,7 +838,15 @@ case "${targ}" in
-     targ_defvec=metag_elf32_vec
-     targ_underscore=yes
-     ;;
-+  microblazeel*-*64)
-+    targ_defvec=microblaze_elf64_le_vec
-+    targ_selvecs=microblaze_elf64_vec
-+    ;;
- 
-+  microblaze*-*64)
-+    targ_defvec=microblaze_elf64_vec
-+    targ_selvecs=microblaze_elf64_le_vec
-+    ;;
-   microblazeel*-*)
-     targ_defvec=microblaze_elf32_le_vec
-     targ_selvecs=microblaze_elf32_vec