binutils-microblaze: Update to new version of the port

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
author: Mark Hatle <mark.hatle@amd.com> 2022-11-04 15:07:16 -0500
committer: Mark Hatle <mark.hatle@amd.com> 2022-11-07 08:05:23 -0600
commit: 75c67a6c15fed677378ab52ed90b6ca0e5125936 (patch)
tree: b72dde036d0881b263b92707e4f457b7873d2f50 /meta-microblaze
parent: 675cc3174baed5028c647eb829570501c34eddb9 (diff)
download: meta-xilinx-75c67a6c15fed677378ab52ed90b6ca0e5125936.tar.gz
40 files changed, 792 insertions, 2769 deletions
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
index 24702838..2aecd24d 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
@@ -4,39 +4,36 @@ SRC_URI:append = " \
     file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
     file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \
     file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
-     file://0004-Fix-relaxation-of-assembler-resolved-references-Fixu.patch \
+     file://0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch \
     file://0005-upstream-change-to-garbage-collection-sweep-causes-m.patch \
     file://0006-Fix-bug-in-TLSTPREL-Relocation.patch \
     file://0007-Added-Address-extension-instructions.patch \
-     file://0008-fixing-the-MAX_OPCODES-to-correct-value.patch \
+     file://0008-Add-new-bit-field-instructions.patch \
-     file://0009-Add-new-bit-field-instructions.patch \
+     file://0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch \
-     file://0010-fixing-the-imm-bug.-with-relax-option-imm-1-is-also-.patch \
+     file://0010-fixing-the-constant-range-check-issue.patch \
-     file://0011-fixed-bug-in-GCC-so-that-It-will-support-.long-0U-an.patch \
+     file://0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch \
-     file://0012-fixing-the-constant-range-check-issue-sample-error-n.patch \
+     file://0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch \
-     file://0013-Compiler-will-give-error-messages-in-more-detail-for.patch \
+     file://0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch \
-     file://0014-initial-support-for-MicroBlaze-64-bit-m64.patch \
+     file://0014-Added-relocations-for-MB-X.patch \
-     file://0015-negl-instruction-is-overriding-rsubl-fixed-it-by-cha.patch \
+     file://0015-Fixed-MB-x-relocation-issues.patch \
-     file://0016-Added-relocations-for-MB-X.patch \
+     file://0016-Fixing-the-branch-related-issues.patch \
-     file://0017-Fixed-MB-x-relocation-issues-Added-imml-for-required.patch \
+     file://0017-Fixed-address-computation-issues-with-64bit-address.patch \
-     file://0018-Fixing-the-branch-related-issues.patch \
+     file://0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch \
-     file://0019-Fixed-address-computation-issues-with-64bit-address-.patch \
+     file://0019-fixing-the-.bss-relocation-issue.patch \
-     file://0020-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch \
+     file://0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch \
-     file://0021-fixing-the-.bss-relocation-issue.patch \
+     file://0021-Revert-ld-Remove-unused-expression-state.patch \
-     file://0022-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch \
+     file://0022-fixing-the-long-long-long-mingw-toolchain-issue.patch \
-     file://0023-Revert-ld-Remove-unused-expression-state-defsym-symb.patch \
+     file://0023-Added-support-to-new-arithmetic-single-register-inst.patch \
-     file://0024-fixing-the-long-long-long-mingw-toolchain-issue.patch \
+     file://0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch \
-     file://0025-Added-support-to-new-arithmetic-single-register-inst.patch \
+     file://0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch \
-     file://0026-double-imml-generation-for-64-bit-values.patch \
+     file://0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch \
-     file://0027-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch \
+     file://0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch \
-     file://0028-This-patch-will-remove-imml-0-and-imml-1-instruction.patch \
+     file://0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch \
-     file://0029-improper-address-mapping-of-PROVIDE-directive-symbol.patch \
+     file://0029-gas-revert-moving-of-md_pseudo_table-from-const.patch \
-     file://0030-Changing-the-long-to-long-long-as-in-Windows-long-is.patch \
+     file://0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch \
-     file://0031-gas-revert-moving-of-md_pseudo_table-from-const.patch \
+     file://0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch \
-     file://0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch \
+     file://0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch \
-     file://0033-Add-initial-port-of-linux-gdbserver-add-gdb_proc_ser.patch \
+     file://0033-Patch-MB-MB-binutils-Upstream-port-issues.patch \
-     file://0034-Initial-port-of-core-reading-support-Added-support-f.patch \
+     file://0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch \
-     file://0035-MB-binutils-Upstream-port-issues.patch \
-     file://0036-Double-free-with-ld-no-keep-memory.-Proposed-patches.patch \
-     file://0037-Fixing-the-imm-imml-generation-for-16-bit-argument-C.patch \
-     file://0038-Invalid-data-offsets-pointer-after-relaxation.-Propo.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 53416280..d5fa21ce 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 fd654b0c7b88cd55fa659e0acea91296c7ed8e80 Mon Sep 17 00:00:00 2001
+From 38ae9c3ae1270b9873e1cfa4397bae4a5269d1aa Mon Sep 17 00:00:00 2001
 From: David Holsgrove <david.holsgrove@xilinx.com>
 Date: Wed, 8 May 2013 11:03:36 +1000
-Subject: [PATCH 01/38] Add wdc.ext.clear and wdc.ext.flush insns
+Subject: [PATCH 01/34] Add wdc.ext.clear and wdc.ext.flush insns
 Added two new instructions, wdc.ext.clear and wdc.ext.flush,
 to enable MicroBlaze to flush an external cache, which is
@@ -9,7 +9,6 @@ used with the new coherency support for multiprocessing.
 Signed-off-by:nagaraju <nmekala@xilix.com>
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 opcodes/microblaze-opc.h  | 5 ++++-
 opcodes/microblaze-opcm.h | 4 ++--
@@ -62,5 +61,5 @@ index 8e293465fec..e56c1d2d47c 100644
   imm, rtsd, rtid, rtbd, rted, bri, brid, brlid, brai, braid, bralid,
   brki, beqi, beqid, bnei, bneid, blti, bltid, blei, bleid, bgti,
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0002-Add-mlittle-endian-and-mbig-endian-flags.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0002-Add-mlittle-endian-and-mbig-endian-flags.patch
index ace172b6..836d5b08 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 2daa3e3863ee052020ad07ac59c49b7f82f7a9d1 Mon Sep 17 00:00:00 2001
+From d5645c82ce39b1950a6d0ee279088d10af390642 Mon Sep 17 00:00:00 2001
 From: nagaraju <nmekala@xilix.com>
 Date: Tue, 19 Mar 2013 17:18:23 +0530
-Subject: [PATCH 02/38] Add mlittle-endian and mbig-endian flags
+Subject: [PATCH 02/34] Add mlittle-endian and mbig-endian flags
 Added support in gas for mlittle-endian and mbig-endian flags
 as options.
@@ -11,7 +11,6 @@ to include new entries.
 Signed-off-by:nagaraju <nmekala@xilix.com>
 Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 gas/config/tc-microblaze.c | 9 +++++++++
 1 file changed, 9 insertions(+)
@@ -61,5 +60,5 @@ index 3db17a76ee7..c927331ea0a 100644
 
 
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0003-Disable-the-warning-message-for-eh_frame_hdr.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0003-Disable-the-warning-message-for-eh_frame_hdr.patch
index 09af3e82..156f5c78 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,13 +1,12 @@
-From 7982c0bdd92531bca3b829255324a769df9521e1 Mon Sep 17 00:00:00 2001
+From 6f53d25f9817f4d9fbc8d838b36d7026d184e63f Mon Sep 17 00:00:00 2001
 From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
 Date: Fri, 22 Jun 2012 01:20:20 +0200
-Subject: [PATCH 03/38] Disable the warning message for eh_frame_hdr
+Subject: [PATCH 03/34] Disable the warning message for eh_frame_hdr
 Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 Conflicts:
        bfd/elf-eh-frame.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/elf-eh-frame.c | 3 +++
 1 file changed, 3 insertions(+)
@@ -31,5 +30,5 @@ index 2e22d0c9215..db470ed43c3 100644
   free (sec_info);
  success:
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0004-Fix-relaxation-of-assembler-resolved-references-Fixu.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch
index adb6e213..e0bd25b9 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0004-Fix-relaxation-of-assembler-resolved-references-Fixu.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch
@@ -1,10 +1,11 @@
-From 1b47ecbc256f807b239f3f275fefd53bba0f0cde Mon Sep 17 00:00:00 2001
+From f7c540994e73e430e73d220109e911dff5961f16 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 8 Nov 2016 11:54:08 +0530
-Subject: [PATCH 04/38] Fix relaxation of assembler resolved references,Fixup
+Subject: [PATCH 04/34] [LOCAL]: Fix relaxation of assembler resolved
- debug_loc sections after linker relaxation Adds a new reloctype
+ references,Fixup debug_loc sections after linker relaxation Adds a new
- R_MICROBLAZE_32_NONE, used for passing reloc info from the assembler to the
+ reloctype R_MICROBLAZE_32_NONE, used for passing reloc info from the
- linker when the linker manages to fully resolve a local symbol reference.
+ assembler to the linker when the linker manages to fully resolve a local
+ symbol reference.
 This is a workaround for design flaws in the assembler to
 linker interface with regards to linker relaxation.
@@ -19,16 +20,18 @@ Conflicts:
 Conflicts:
        binutils/readelf.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        bfd/elf32-microblaze.c
 ---
 bfd/bfd-in2.h              |   5 ++
- bfd/elf32-microblaze.c     | 118 +++++++++++++++++++++++++++++--------
+ bfd/elf32-microblaze.c     | 126 ++++++++++++++++++++++++++++---------
 bfd/libbfd.h               |   1 +
 bfd/reloc.c                |   6 ++
 binutils/readelf.c         |   4 ++
 gas/config/tc-microblaze.c |   4 ++
 include/elf/microblaze.h   |   2 +
- 7 files changed, 115 insertions(+), 25 deletions(-)
+ 7 files changed, 119 insertions(+), 29 deletions(-)
 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
 index 1f0f18a7e75..26e3bb2b34b 100644
@@ -47,7 +50,7 @@ index 1f0f18a7e75..26e3bb2b34b 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 013c32a1e51..e36cd102bd2 100644
+index 013c32a1e51..7cf1b6eab5b 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
 @@ -175,6 +175,20 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
@@ -58,15 +61,15 @@ index 013c32a1e51..e36cd102bd2 100644
 +          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?  */
 +
    HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
          0,                    /* Rightshift.  */
@@ -83,7 +86,7 @@ index 013c32a1e51..e36cd102bd2 100644
       microblaze_reloc = R_MICROBLAZE_64_NONE;
       break;
     case BFD_RELOC_32:
-@@ -1954,14 +1971,22 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1954,18 +1971,26 @@ microblaze_elf_relax_section (bfd *abfd,
                }
              break;
            case R_MICROBLAZE_NONE:
@@ -92,20 +95,28 @@ index 013c32a1e51..e36cd102bd2 100644
                /* This was a PC-relative instruction that was
                   completely resolved.  */
                size_t sfix, efix;
-+               unsigned int val;
+                unsigned int val;
                bfd_vma target_address;
                target_address = irel->r_addend + irel->r_offset;
                sfix = calc_fixup (irel->r_offset, 0, sec);
                efix = calc_fixup (target_address, 0, sec);
+-               irel->r_addend -= (efix - sfix);
+-               /* Should use HOWTO.  */
+-               microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset,
+-                                                  irel->r_addend);
 +
-+               /* Validate the in-band val.  */
+                /* Validate the in-band val.  */
-+               val = bfd_get_32 (abfd, contents + irel->r_offset);
+                val = bfd_get_32 (abfd, contents + irel->r_offset);
-+               if (val != irel->r_addend && ELF32_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
+                if (val != irel->r_addend && ELF32_R_TYPE (irel->r_info) == R_MICROBLAZE_32_NONE) {
-+                   fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
+                    fprintf(stderr, "%d: CORRUPT relax reloc %x %lx\n", __LINE__, val, irel->r_addend);
-+               }
+                }
-                irel->r_addend -= (efix - sfix);
+               irel->r_addend -= (efix - sfix);
-                /* Should use HOWTO.  */
+               /* Should use HOWTO.  */
-                microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset,
+               microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset,
+                                                  irel->r_addend);
+              }
+              break;
+            case R_MICROBLAZE_64_NONE:
 @@ -2009,30 +2034,73 @@ microblaze_elf_relax_section (bfd *abfd,
          irelscanend = irelocs + o->reloc_count;
          for (irelscan = irelocs; irelscan < irelscanend; irelscan++)
@@ -295,5 +306,5 @@ index 43ad3ad3904..a2e1ce4580f 100644
 
 /* Global base address names.  */
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0005-upstream-change-to-garbage-collection-sweep-causes-m.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0005-upstream-change-to-garbage-collection-sweep-causes-m.patch
index ec2a898f..20dd1859 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 318f98ea7f4271b3dd6e364d751415410a4076ac Mon Sep 17 00:00:00 2001
+From 5f27701e5c8bd1784e1c814fb527a1f8f7755ad9 Mon Sep 17 00:00:00 2001
 From: David Holsgrove <david.holsgrove@xilinx.com>
 Date: Wed, 27 Feb 2013 13:56:11 +1000
-Subject: [PATCH 05/38] upstream change to garbage collection sweep causes mb
+Subject: [PATCH 05/34] upstream change to garbage collection sweep causes mb
 regression
 Upstream change for PR13177 now clears the def_regular during gc_sweep of a
@@ -21,7 +21,6 @@ Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
 Conflicts:
        bfd/elflink.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/elflink.c | 1 -
 1 file changed, 1 deletion(-)
@@ -39,5 +38,5 @@ index 2b1450fa4e1..c50919060b3 100644
       h->ref_regular_nonweak = 0;
     }
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0006-Fix-bug-in-TLSTPREL-Relocation.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0006-Fix-bug-in-TLSTPREL-Relocation.patch
index 5d42170b..68a5d684 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,21 +1,19 @@
-From 8cfdaf2c7c3b3e8572588e6749f688f6b702fe35 Mon Sep 17 00:00:00 2001
+From 63c56c953483dd62a2c2ac8e750947a4673f9e86 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 15 Jun 2015 16:50:30 +0530
-Subject: [PATCH 06/38] Fix bug in TLSTPREL Relocation
+Subject: [PATCH 06/34] Fix bug in TLSTPREL Relocation
 Fixed the problem related to the fixup/relocations TLSTPREL.
 When the fixup is applied the addend is not added at the correct offset
 of the instruction. The offset is hard coded considering its big endian
 and it fails for Little endian. This patch allows support for both
 big & little-endian compilers
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/elf32-microblaze.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index e36cd102bd2..c66f4ffef36 100644
+index 7cf1b6eab5b..edde04bafe4 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
 @@ -1484,9 +1484,9 @@ microblaze_elf_relocate_section (bfd *output_bfd,
@@ -31,5 +29,5 @@ index e36cd102bd2..c66f4ffef36 100644
            case (int) R_MICROBLAZE_TEXTREL_64:
            case (int) R_MICROBLAZE_TEXTREL_32_LO:
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0007-Added-Address-extension-instructions.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0007-Added-Address-extension-instructions.patch
index b60c9085..ffaf6236 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 be2ecb2dd73901484995c39d6c7375be6b8dd545 Mon Sep 17 00:00:00 2001
+From 7e1cbc2f96a1905eecf3a211153735ed915a5ad5 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 18 Jan 2016 12:28:21 +0530
-Subject: [PATCH 07/38] Added Address extension instructions
+Subject: [PATCH 07/34] Added Address extension instructions
 This patch adds the support of new instructions which are required
 for supporting Address extension feature.
@@ -18,8 +18,6 @@ ChangeLog:
 Conflicts:
        opcodes/microblaze-opcm.h
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 opcodes/microblaze-opc.h  | 11 +++++++++++
 opcodes/microblaze-opcm.h | 10 +++++-----
@@ -99,5 +97,5 @@ index e56c1d2d47c..ad964560c17 100644
   fcmp_lt, fcmp_eq, fcmp_le, fcmp_gt, fcmp_ne, fcmp_ge, fcmp_un, flt,
   /* 'fsqrt' is a glibc:math.h symbol.  */
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Add-new-bit-field-instructions.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0008-Add-new-bit-field-instructions.patch
index 85f0bfcf..3966566d 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0009-Add-new-bit-field-instructions.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0008-Add-new-bit-field-instructions.patch
@@ -1,7 +1,7 @@
-From 3f45718e99e09679472366a2c7e454c75f0383e3 Mon Sep 17 00:00:00 2001
+From c02813b6a27e6eed281609e5d696bb67ac74c804 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 18 Jul 2016 12:24:28 +0530
-Subject: [PATCH 09/38] Add new bit-field instructions
+Subject: [PATCH 08/34] Add new bit-field instructions
 This patches adds new bsefi and bsifi instructions.
 BSEFI- The instruction shall extract a bit field from a
@@ -15,7 +15,10 @@ Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
 Conflicts:
        opcodes/microblaze-dis.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        gas/config/tc-microblaze.c
+        opcodes/microblaze-opc.h
 ---
 gas/config/tc-microblaze.c | 71 +++++++++++++++++++++++++++++++++++++-
 opcodes/microblaze-dis.c   | 20 +++++++++--
@@ -152,7 +155,7 @@ index b057492ba93..f57b98fc9f7 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 3b3cdbe710c..825c639a41e 100644
+index d3f8e36199e..825c639a41e 100644
 --- a/opcodes/microblaze-opc.h
 +++ b/opcodes/microblaze-opc.h
 @@ -59,6 +59,9 @@
@@ -179,7 +182,7 @@ index 3b3cdbe710c..825c639a41e 100644
 #define DELAY_SLOT 1
 #define NO_DELAY_SLOT 0
 
-#define MAX_OPCODES 299
+-#define MAX_OPCODES 291
 +#define MAX_OPCODES 301
 
 const struct op_code_struct
@@ -234,5 +237,5 @@ index ad964560c17..aa3401610d9 100644
 #define  RFSL_MASK 0x000000F
 
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
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
deleted file mode 100644
index d6faee70..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0008-fixing-the-MAX_OPCODES-to-correct-value.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ba9dde9e1068bb282bb0695d1159cd100bcae54f 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/38] fixing the MAX_OPCODES to correct value
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
- 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 d3f8e36199e..3b3cdbe710c 100644
--- a/opcodes/microblaze-opc.h
-+++ b/opcodes/microblaze-opc.h
-@@ -102,7 +102,7 @@
- #define DELAY_SLOT 1
- #define NO_DELAY_SLOT 0
- 
-#define MAX_OPCODES 291
-+#define MAX_OPCODES 299
- 
- const struct op_code_struct
- {
-- 
-2.25.1
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0011-fixed-bug-in-GCC-so-that-It-will-support-.long-0U-an.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
index 9ab38bbb..47caf9ed 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0011-fixed-bug-in-GCC-so-that-It-will-support-.long-0U-an.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0009-Patch-Microblaze-fixed-bug-in-GCC-so-that-It-will-su.patch
@@ -1,10 +1,9 @@
-From 6d52004e565699474956e8eaf4f11c32b1c2a64a Mon Sep 17 00:00:00 2001
+From 81fc7ef231ca2890dfa827b4e8f3d0da107f9be2 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Fri, 29 Sep 2017 18:00:23 +0530
-Subject: [PATCH 11/38] fixed bug in GCC so that It will support .long 0U and
+Subject: [PATCH 09/34] [Patch,Microblaze]: fixed bug in GCC so that It will
- .long 0u
+ support .long 0U and .long 0u
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 gas/expr.c | 9 +++++++++
 1 file changed, 9 insertions(+)
@@ -30,5 +29,5 @@ index 6ad8bee2733..a1281ef71a8 100644
       switch (c)
        {
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0012-fixing-the-constant-range-check-issue-sample-error-n.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-constant-range-check-issue.patch
index 9f296ab9..1b279f7e 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0012-fixing-the-constant-range-check-issue-sample-error-n.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-constant-range-check-issue.patch
@@ -1,10 +1,9 @@
-From 855b983d270911c35c52b181426e9771f0851979 Mon Sep 17 00:00:00 2001
+From adfa8ca9782799670d87d03a01414aca5d9cc9e5 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Mon, 16 Oct 2017 15:44:23 +0530
-Subject: [PATCH 12/38] fixing the constant range check issue sample error: not
+Subject: [PATCH 10/34] fixing the constant range check issue sample error: not
 in range ffffffff80000000..7fffffff, not ffffffff70000000
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 gas/config/tc-microblaze.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -23,5 +22,5 @@ index 1cb9b2519c3..086f8704156 100644
          as_fatal (_("operand must be absolute in range %lx..%lx, not %lx"),
                    (long) min, (long) max, (long) e->X_add_number);
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.-with-relax-option-imm-1-is-also-.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.-with-relax-option-imm-1-is-also-.patch
deleted file mode 100644
index 7cde8147..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0010-fixing-the-imm-bug.-with-relax-option-imm-1-is-also-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 248b0c67ed37bdc2ab0ba1d2c42a4ce200bbc237 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/38] fixing the imm bug. with relax option imm -1 is also
- getting removed this is corrected now.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
- bfd/elf32-microblaze.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index c66f4ffef36..8c89bdcaeeb 100644
--- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -1905,8 +1905,7 @@ microblaze_elf_relax_section (bfd *abfd,
-       else
-        symval += irel->r_addend;
- 
-      if ((symval & 0xffff8000) == 0
-         || (symval & 0xffff8000) == 0xffff8000)
-+      if ((symval & 0xffff8000) == 0)
-        {
-          /* We can delete this instruction.  */
-          sdata->relax[sdata->relax_count].addr = irel->r_offset;
-- 
-2.25.1
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Compiler-will-give-error-messages-in-more-detail-for.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
index e76ef442..81949e66 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0013-Compiler-will-give-error-messages-in-more-detail-for.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0011-Patch-Microblaze-Compiler-will-give-error-messages-i.patch
@@ -1,19 +1,18 @@
-From a1169180250097b012ed69e3181ea0b4e22ae022 Mon Sep 17 00:00:00 2001
+From 3efcb580af783ace64a9485af6bfee6dc18499ba Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 21 Feb 2018 12:32:02 +0530
-Subject: [PATCH 13/38] Compiler will give error messages in more detail for
+Subject: [PATCH 11/34] [Patch,Microblaze]: Compiler will give error messages
- mxl-gp-opt flag..
+ in more detail for mxl-gp-opt flag..
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 ld/ldmain.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 diff --git a/ld/ldmain.c b/ld/ldmain.c
-index 545f6a0f31a..d4502e7f3b0 100644
+index ea72b14a301..4e63b8fdf3b 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -1566,6 +1566,18 @@ reloc_overflow (struct bfd_link_info *info,
+@@ -1564,6 +1564,18 @@ reloc_overflow (struct bfd_link_info *info,
          break;
        case bfd_link_hash_defined:
        case bfd_link_hash_defweak:
@@ -33,5 +32,5 @@ index 545f6a0f31a..d4502e7f3b0 100644
                   "%s against symbol `%pT' defined in %pA section in %pB"),
                 reloc_name, entry->root.string,
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0014-initial-support-for-MicroBlaze-64-bit-m64.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch
index 90563dc5..e0166274 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0014-initial-support-for-MicroBlaze-64-bit-m64.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0012-Patch-MicroBlaze-initial-support-for-MicroBlaze-64-b.patch
@@ -1,9 +1,16 @@
-From fb0b2c799f37daba8aca5d64966f426d16e07cf8 Mon Sep 17 00:00:00 2001
+From 6d3b976c0f75225614d299faca766f9043bbd2d0 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 1 Nov 2021 19:06:53 +0530
-Subject: [PATCH 14/38] initial support for MicroBlaze 64 bit [-m64]
+Subject: [PATCH 12/34] [Patch,MicroBlaze] : initial support for MicroBlaze 64
+ bit [-m64]
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        bfd/elf32-microblaze.c
+        include/elf/common.h
+        ld/Makefile.am
+        ld/Makefile.in
+signed-off-by:Nagaraju Mekala<nmekala@xilinx.com>
+              Mahesh Bodapati<mbodapat@xilinx.com>
 ---
 bfd/Makefile.am                    |    2 +
 bfd/Makefile.in                    |    3 +
@@ -11,9 +18,9 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 bfd/config.bfd                     |    4 +
 bfd/configure                      |    2 +
 bfd/configure.ac                   |    2 +
- bfd/cpu-microblaze.c               |   55 +-
+ bfd/cpu-microblaze.c               |   53 +-
- bfd/elf32-microblaze.c             |   65 +-
+ bfd/elf32-microblaze.c             |   59 +-
- bfd/elf64-microblaze.c             | 3622 ++++++++++++++++++++++++++++
+ bfd/elf64-microblaze.c             | 3612 ++++++++++++++++++++++++++++
 bfd/libbfd.h                       |    2 +
 bfd/reloc.c                        |   12 +
 bfd/targets.c                      |    6 +
@@ -26,10 +33,10 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ld/configure.tgt                   |    3 +
 ld/emulparams/elf64microblaze.sh   |   23 +
 ld/emulparams/elf64microblazeel.sh |   23 +
- opcodes/microblaze-dis.c           |   35 +-
+ opcodes/microblaze-dis.c           |   36 +-
 opcodes/microblaze-opc.h           |  162 +-
 opcodes/microblaze-opcm.h          |   24 +-
- 24 files changed, 4422 insertions(+), 69 deletions(-)
+ 24 files changed, 4408 insertions(+), 66 deletions(-)
 create mode 100644 bfd/elf64-microblaze.c
 create mode 100644 ld/emulparams/elf64microblaze.sh
 create mode 100644 ld/emulparams/elf64microblazeel.sh
@@ -55,10 +62,10 @@ index 670e0598f55..c76adec960a 100644
        elf64-tilegx.c \
        elf64-x86-64.c \
 diff --git a/bfd/Makefile.in b/bfd/Makefile.in
-index 6edacdfeb0e..e2721f43391 100644
+index a26f74d7199..b0420bd440f 100644
 --- a/bfd/Makefile.in
 +++ b/bfd/Makefile.in
-@@ -1030,6 +1030,7 @@ BFD64_BACKENDS = \
+@@ -1027,6 +1027,7 @@ BFD64_BACKENDS = \
        elf64-riscv.lo \
        elfxx-riscv.lo \
        elf64-s390.lo \
@@ -66,7 +73,7 @@ index 6edacdfeb0e..e2721f43391 100644
        elf64-sparc.lo \
        elf64-tilegx.lo \
        elf64-x86-64.lo \
-@@ -1067,6 +1068,7 @@ BFD64_BACKENDS_CFILES = \
+@@ -1064,6 +1065,7 @@ BFD64_BACKENDS_CFILES = \
        elf64-nfp.c \
        elf64-ppc.c \
        elf64-s390.c \
@@ -74,7 +81,7 @@ index 6edacdfeb0e..e2721f43391 100644
        elf64-sparc.c \
        elf64-tilegx.c \
        elf64-x86-64.c \
-@@ -1650,6 +1652,7 @@ distclean-compile:
+@@ -1647,6 +1649,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-ppc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-riscv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-s390.Plo@am__quote@
@@ -129,10 +136,10 @@ index a4c6c8e8854..49208534de3 100644
 
 #ifdef BFD64
 diff --git a/bfd/configure b/bfd/configure
-index d90db11744b..08e33cf64cd 100755
+index 4f591b750d8..efeb1c2d717 100755
 --- a/bfd/configure
 +++ b/bfd/configure
-@@ -14196,6 +14196,8 @@ do
+@@ -13546,6 +13546,8 @@ do
     s390_elf64_vec)             tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
     score_elf32_be_vec)                 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo elf64.lo $elf"; want64=true; target_size=64 ;;
     score_elf32_le_vec)                 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo elf64.lo $elf"; want64=true; target_size=64 ;;
@@ -142,7 +149,7 @@ index d90db11744b..08e33cf64cd 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 73e5e03d016..20a50d0f308 100644
+index 6146efb5ae3..387a0af3703 100644
 --- a/bfd/configure.ac
 +++ b/bfd/configure.ac
 @@ -603,6 +603,8 @@ do
@@ -155,10 +162,10 @@ index 73e5e03d016..20a50d0f308 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 0c1d2b1aa69..f64f659cf44 100644
+index 0c1d2b1aa69..a9abb9166cc 100644
 --- a/bfd/cpu-microblaze.c
 +++ b/bfd/cpu-microblaze.c
-@@ -23,7 +23,25 @@
+@@ -23,7 +23,24 @@
 #include "bfd.h"
 #include "libbfd.h"
 
@@ -177,35 +184,33 @@ index 0c1d2b1aa69..f64f659cf44 100644
 +  3,                           /* Section align power.  */
 +  false,                               /* Is this the default architecture ?  */
 +  bfd_default_compatible,      /* Architecture comparison function.  */
-+  bfd_default_scan,            /* String to architecture conversion.  */
+  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.  */
   32,                          /* Bits in an address.  */
-@@ -39,4 +57,39 @@ const bfd_arch_info_type bfd_microblaze_arch =
+@@ -39,4 +56,38 @@ const bfd_arch_info_type bfd_microblaze_arch =
   bfd_arch_default_fill,       /* Default fill.  */
   NULL,                                /* Next in list.  */
   0 /* Maximum offset of a reloc from the start of an insn.  */
 +}
 +#else
 +{
-+  32,                          /* 32 bits in a word.  */
+  32,                          /* 32 bits in a word.  */
-+  32,                          /* 32 bits in an address.  */
+  32,                          /* 32 bits in an address.  */
-+  8,                           /* 8 bits in a byte.  */
+  8,                           /* 8 bits in a byte.  */
 +  bfd_arch_microblaze,                 /* Architecture.  */
-+  0,                           /* Machine number - 0 for now.  */
+  0,                           /* Machine number - 0 for now.  */
-+  "microblaze",                        /* Architecture name.  */
+  "microblaze",                        /* Architecture name.  */
-+  "MicroBlaze",                        /* Printable name.  */
+  "MicroBlaze",                        /* Printable name.  */
-+  3,                           /* Section align power.  */
+  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_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.  */
@@ -226,7 +231,7 @@ index 0c1d2b1aa69..f64f659cf44 100644
 +#endif
 };
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 8c89bdcaeeb..71ff973573c 100644
+index edde04bafe4..f20adb6fd73 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
 @@ -114,6 +114,20 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
@@ -250,25 +255,6 @@ index 8c89bdcaeeb..71ff973573c 100644
    /* 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?  */
@@ -316,7 +302,7 @@ index 8c89bdcaeeb..71ff973573c 100644
                      bfd_put_32 (input_bfd, relocation, contents + offset);
                    else
                      {
-@@ -1969,6 +2004,28 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1970,6 +2005,28 @@ microblaze_elf_relax_section (bfd *abfd,
                    irel->r_addend -= calc_fixup (irel->r_addend, 0, sec);
                }
              break;
@@ -347,10 +333,10 @@ index 8c89bdcaeeb..71ff973573c 100644
              {
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
 new file mode 100644
-index 00000000000..7434bef393b
+index 00000000000..0faa8de73c8
 --- /dev/null
 +++ b/bfd/elf64-microblaze.c
-@@ -0,0 +1,3622 @@
+@@ -0,0 +1,3612 @@
 +/* Xilinx MicroBlaze-specific support for 32-bit ELF
 +
 +   Copyright (C) 2009-2021 Free Software Foundation, Inc.
@@ -394,80 +380,79 @@ index 00000000000..7434bef393b
 +{
 +   /* This reloc does nothing.  */
 +   HOWTO (R_MICROBLAZE_NONE,   /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          3,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         0,                    /* Size.  */
-+          0,                   /* Bitsize.  */
+         0,                    /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont,  /* Complain on overflow.  */
+         complain_overflow_dont,  /* Complain on overflow.  */
-+          NULL,                  /* Special Function.  */
+         NULL,                  /* Special Function.  */
-+          "R_MICROBLAZE_NONE",         /* Name.  */
+         "R_MICROBLAZE_NONE",  /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0,                   /* Dest Mask.  */
+         0,                    /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
+         false),               /* PC relative offset?  */
 +
 +   /* A standard 32 bit relocation.  */
-+   HOWTO (R_MICROBLAZE_32,             /* Type.  */
+   HOWTO (R_MICROBLAZE_32,     /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          32,                  /* Bitsize.  */
+         32,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_bitfield, /* Complain on overflow.  */
+         complain_overflow_bitfield, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_32",           /* Name.  */
+         "R_MICROBLAZE_32",    /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0xffffffff,          /* Dest 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.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          32,                  /* Bitsize.  */
+         32,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_bitfield, /* Complain on overflow.  */
+         complain_overflow_bitfield, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_32_PCREL",     /* Name.  */
+         "R_MICROBLAZE_32_PCREL",      /* Name.  */
-+          true,                        /* Partial Inplace.  */
+         true,                 /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0xffffffff,          /* Dest 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.  */
+         0,                    /* Rightshift.  */
-+          4,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          64,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_64_PCREL",     /* Name.  */
+         "R_MICROBLAZE_64_PCREL",      /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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.  */
+   HOWTO (R_MICROBLAZE_32_PCREL_LO,    /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_signed, /* Complain on overflow.  */
+         complain_overflow_signed, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,       /* Special Function.  */
+         bfd_elf_generic_reloc,        /* Special Function.  */
-+          "R_MICROBLAZE_32_PCREL_LO",  /* Name.  */
+         "R_MICROBLAZE_32_PCREL_LO",   /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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).  */
@@ -480,7 +465,7 @@ index 00000000000..7434bef393b
 +          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0x0000ffff,          /* Dest Mask.  */
-+          true),               /* PC relative offset?  */
+          false),              /* PC relative offset?  */
 +
 +   /* A 64 bit relocation.  Table entry not really used.  */
 +   HOWTO (R_MICROBLAZE_64,             /* Type.  */
@@ -498,139 +483,139 @@ index 00000000000..7434bef393b
 +          false),              /* PC relative offset?  */
 +
 +   /* The low half of a 32 bit relocation.  */
-+   HOWTO (R_MICROBLAZE_32_LO,   /* Type.  */
+   HOWTO (R_MICROBLAZE_32_LO,  /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_signed, /* Complain on overflow.  */
+         complain_overflow_signed, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_32_LO", /* Name.  */
+         "R_MICROBLAZE_32_LO", /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
+         0x0000ffff,           /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
+         false),               /* PC relative offset?  */
 +
 +   /* Read-only small data section relocation.  */
-+   HOWTO (R_MICROBLAZE_SRO32,   /* Type.  */
+   HOWTO (R_MICROBLAZE_SRO32,  /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_bitfield, /* Complain on overflow.  */
+         complain_overflow_bitfield, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_SRO32", /* Name.  */
+         "R_MICROBLAZE_SRO32", /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
+         0x0000ffff,           /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
+         false),               /* PC relative offset?  */
 +
 +   /* Read-write small data area relocation.  */
-+   HOWTO (R_MICROBLAZE_SRW32,   /* Type.  */
+   HOWTO (R_MICROBLAZE_SRW32,  /* Type.  */
+         0,                    /* Rightshift.  */
+         4,                    /* Size.  */
+         16,                   /* Bitsize.  */
+         false,                /* PC_relative.  */
+         0,                    /* Bitpos.  */
+         complain_overflow_bitfield, /* Complain on overflow.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
+         "R_MICROBLAZE_SRW32", /* Name.  */
+         false,                /* Partial Inplace.  */
+         0,                    /* Source Mask.  */
+         0x0000ffff,           /* Dest Mask.  */
+         false),               /* PC relative offset?  */
+
+   /* This reloc does nothing. Used for relaxation.  */
+   HOWTO (R_MICROBLAZE_32_NONE,        /* Type.  */
 +          0,                   /* Rightshift.  */
 +          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          16,                  /* Bitsize.  */
+          32,                  /* Bitsize.  */
-+          false,               /* PC_relative.  */
+          true,                        /* PC_relative.  */
 +          0,                   /* Bitpos.  */
-+          complain_overflow_bitfield, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_SRW32", /* Name.  */
-+          false,               /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
-+
-+   HOWTO (R_MICROBLAZE_32_NONE,   /* Type.  */
-+          0,         /* Rightshift.  */
-+          2,            /* Size (0 = byte, 1 = short, 2 = long).  */
-+          32,           /* Bitsize.  */
-+          true,         /* PC_relative.  */
-+          0,           /* Bitpos.  */
 +          complain_overflow_bitfield,  /* Complain on overflow.  */
 +          NULL,                  /* Special Function.  */
 +          "R_MICROBLAZE_32_NONE",/* Name.  */
-+          false,       /* Partial Inplace.  */
-+          0,          /* Source Mask.  */
-+          0,         /* Dest Mask.  */
-+          false),       /* PC relative offset?  */
-+
-+   /* This reloc does nothing.  Used for relaxation.  */
-+   HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
-+          0,                   /* Rightshift.  */
-+          3,                   /* Size (0 = byte, 1 = short, 2 = long).  */
-+          0,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
-+          0,                   /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
-+          NULL,                  /* Special Function.  */
-+          "R_MICROBLAZE_64_NONE",/* Name.  */
 +          false,               /* Partial Inplace.  */
 +          0,                   /* Source Mask.  */
 +          0,                   /* Dest Mask.  */
 +          false),              /* PC relative offset?  */
 +
+   /* This reloc does nothing.  Used for relaxation.  */
+   HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
+         0,                    /* Rightshift.  */
+         0,                    /* Size.  */
+         0,                    /* Bitsize.  */
+         true,                 /* PC_relative.  */
+         0,                    /* Bitpos.  */
+         complain_overflow_dont, /* Complain on overflow.  */
+         NULL,                  /* Special Function.  */
+         "R_MICROBLAZE_64_NONE",/* Name.  */
+         false,                /* Partial Inplace.  */
+         0,                    /* Source Mask.  */
+         0,                    /* Dest Mask.  */
+         false),               /* PC relative offset?  */
+
 +   /* Symbol Op Symbol relocation.  */
-+   HOWTO (R_MICROBLAZE_32_SYM_OP_SYM,          /* Type.  */
+   HOWTO (R_MICROBLAZE_32_SYM_OP_SYM,          /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          32,                  /* Bitsize.  */
+         32,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_bitfield, /* Complain on overflow.  */
+         complain_overflow_bitfield, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_32_SYM_OP_SYM",        /* Name.  */
+         "R_MICROBLAZE_32_SYM_OP_SYM",         /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0xffffffff,          /* Dest 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.  */
+         0,                     /* Rightshift.  */
-+          2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                     /* Size.  */
-+          0,                     /* Bitsize.  */
+         0,                     /* Bitsize.  */
-+          false,                 /* PC_relative.  */
+         false,                 /* PC_relative.  */
-+          0,                     /* Bitpos.  */
+         0,                     /* Bitpos.  */
-+          complain_overflow_dont,/* Complain on overflow.  */
+         complain_overflow_dont,/* Complain on overflow.  */
-+          NULL,                  /* Special Function.  */
+         NULL,                  /* Special Function.  */
-+          "R_MICROBLAZE_GNU_VTINHERIT", /* Name.  */
+         "R_MICROBLAZE_GNU_VTINHERIT", /* Name.  */
-+          false,                 /* Partial Inplace.  */
+         false,                 /* Partial Inplace.  */
-+          0,                     /* Source Mask.  */
+         0,                     /* Source Mask.  */
-+          0,                
+         0,                     /* Dest Mask.  */
-+                      /* Dest Mask.  */
+         false),                /* PC relative offset?  */
-+          false),                /* PC relative offset?  */
 +
 +   /* GNU extension to record C++ vtable member usage.  */
 +   HOWTO (R_MICROBLAZE_GNU_VTENTRY,   /* Type.  */
-+          0,                     /* Rightshift.  */
+         0,                     /* Rightshift.  */
-+          2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                     /* Size.  */
-+          0,                     /* Bitsize.  */
+         0,                     /* Bitsize.  */
-+          false,                 /* PC_relative.  */
+         false,                 /* PC_relative.  */
-+          0,                     /* Bitpos.  */
+         0,                     /* Bitpos.  */
-+          complain_overflow_dont,/* Complain on overflow.  */
+         complain_overflow_dont,/* Complain on overflow.  */
-+          _bfd_elf_rel_vtable_reloc_fn,  /* Special Function.  */
+         _bfd_elf_rel_vtable_reloc_fn,  /* Special Function.  */
-+          "R_MICROBLAZE_GNU_VTENTRY", /* Name.  */
+         "R_MICROBLAZE_GNU_VTENTRY", /* Name.  */
-+          false,                 /* Partial Inplace.  */
+         false,                 /* Partial Inplace.  */
-+          0,                     /* Source Mask.  */
+         0,                     /* Source Mask.  */
-+          0,                     /* Dest 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.  */
+   HOWTO (R_MICROBLAZE_GOTPC_64,       /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,       /* Special Function.  */
+         bfd_elf_generic_reloc,        /* Special Function.  */
-+          "R_MICROBLAZE_GOTPC_64",     /* Name.  */
+         "R_MICROBLAZE_GOTPC_64",      /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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.  */
@@ -694,108 +679,108 @@ index 00000000000..7434bef393b
 +
 +   /* A 64 bit PLT relocation.  Table-entry not really used.  */
 +   HOWTO (R_MICROBLAZE_PLT_64,  /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_PLT_64",/* Name.  */
+         "R_MICROBLAZE_PLT_64",/* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
+         0x0000ffff,           /* Dest Mask.  */
-+          true),               /* PC relative offset?  */
+         true),                /* PC relative offset?  */
 +
 +   /*  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_REL,    /* Type.  */
+   HOWTO (R_MICROBLAZE_REL,    /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_REL",  /* Name.  */
+         "R_MICROBLAZE_REL",   /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_JUMP_SLOT",    /* Name.  */
+         "R_MICROBLAZE_JUMP_SLOT",     /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          true,                        /* PC_relative.  */
+         true,                 /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_GLOB_DAT",     /* Name.  */
+         "R_MICROBLAZE_GLOB_DAT",      /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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.  */
+   HOWTO (R_MICROBLAZE_GOTOFF_64,      /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_GOTOFF_64",    /* Name.  */
+         "R_MICROBLAZE_GOTOFF_64",     /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest 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.  */
+   HOWTO (R_MICROBLAZE_GOTOFF_32,      /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,       /* Special Function.  */
+         bfd_elf_generic_reloc,        /* Special Function.  */
-+          "R_MICROBLAZE_GOTOFF_32",    /* Name.  */
+         "R_MICROBLAZE_GOTOFF_32",     /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
+         0x0000ffff,           /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
+         false),               /* PC relative offset?  */
 +
 +   /* COPY relocation.  Table-entry not really used.  */
-+   HOWTO (R_MICROBLAZE_COPY,           /* Type.  */
+   HOWTO (R_MICROBLAZE_COPY,   /* Type.  */
-+          0,                   /* Rightshift.  */
+         0,                    /* Rightshift.  */
-+          2,                   /* Size (0 = byte, 1 = short, 2 = long).  */
+         4,                    /* Size.  */
-+          16,                  /* Bitsize.  */
+         16,                   /* Bitsize.  */
-+          false,               /* PC_relative.  */
+         false,                /* PC_relative.  */
-+          0,                   /* Bitpos.  */
+         0,                    /* Bitpos.  */
-+          complain_overflow_dont, /* Complain on overflow.  */
+         complain_overflow_dont, /* Complain on overflow.  */
-+          bfd_elf_generic_reloc,/* Special Function.  */
+         bfd_elf_generic_reloc,/* Special Function.  */
-+          "R_MICROBLAZE_COPY",         /* Name.  */
+         "R_MICROBLAZE_COPY",  /* Name.  */
-+          false,               /* Partial Inplace.  */
+         false,                /* Partial Inplace.  */
-+          0,                   /* Source Mask.  */
+         0,                    /* Source Mask.  */
-+          0x0000ffff,          /* Dest Mask.  */
+         0x0000ffff,           /* Dest Mask.  */
-+          false),              /* PC relative offset?  */
+         false),               /* PC relative offset?  */
 +
 +   /* Marker relocs for TLS.  */
 +   HOWTO (R_MICROBLAZE_TLS,
@@ -814,7 +799,7 @@ index 00000000000..7434bef393b
 +
 +   HOWTO (R_MICROBLAZE_TLSGD,
 +        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        4,                     /* size */
 +        32,                    /* bitsize */
 +        false,                 /* pc_relative */
 +        0,                     /* bitpos */
@@ -861,7 +846,7 @@ index 00000000000..7434bef393b
 +      contains the definition of sym, minus 0x8000.  Used for initializing GOT */
 +   HOWTO (R_MICROBLAZE_TLSDTPREL32,
 +        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        4,                     /* size */
 +        32,                    /* bitsize */
 +        false,                 /* pc_relative */
 +        0,                     /* bitpos */
@@ -878,7 +863,7 @@ index 00000000000..7434bef393b
 +      contains the definition of sym, minus 0x8000.  */
 +   HOWTO (R_MICROBLAZE_TLSDTPREL64,
 +        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        4,                     /* size */
 +        32,                    /* bitsize */
 +        false,                 /* pc_relative */
 +        0,                     /* bitpos */
@@ -894,7 +879,7 @@ index 00000000000..7434bef393b
 +      sym+add and the value of the thread pointer (r13).  */
 +   HOWTO (R_MICROBLAZE_TLSGOTTPREL32,
 +        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        4,                     /* size */
 +        32,                    /* bitsize */
 +        false,                 /* pc_relative */
 +        0,                     /* bitpos */
@@ -910,7 +895,7 @@ index 00000000000..7434bef393b
 +      sym+add and the value of the thread pointer (r13).  */
 +   HOWTO (R_MICROBLAZE_TLSTPREL32,
 +        0,                     /* rightshift */
-+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        4,                     /* size */
 +        32,                    /* bitsize */
 +        false,                 /* pc_relative */
 +        0,                     /* bitpos */
@@ -1138,7 +1123,7 @@ index 00000000000..7434bef393b
 +
 +      sdata = bfd_zalloc (abfd, amt);
 +      if (sdata == NULL)
-+        return false;
+       return false;
 +      sec->used_by_bfd = sdata;
 +    }
 +
@@ -1271,15 +1256,15 @@ index 00000000000..7434bef393b
 +  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_section->vma
-+                             + h->u.def.section->output_offset);
+                            + h->u.def.section->output_offset);
 +
 +  h = bfd_link_hash_lookup (info->hash, RW_SDA_ANCHOR_NAME, false, false, true);
 +  if (h != (struct bfd_link_hash_entry *) NULL
 +      && h->type == bfd_link_hash_defined)
 +    rw_small_data_pointer = (h->u.def.value
-+                             + h->u.def.section->output_section->vma
+                            + h->u.def.section->output_section->vma
-+                             + h->u.def.section->output_offset);
+                            + h->u.def.section->output_offset);
 +}
 +
 +static bfd_vma
@@ -1623,9 +1608,9 @@ index 00000000000..7434bef393b
 +                            + offset + INST_WORD_SIZE);
 +             relocation += addend;
 +             bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                         contents + offset + endian);
+                         contents + offset + endian);
 +             bfd_put_16 (input_bfd, relocation & 0xffff,
-+                         contents + offset + endian + INST_WORD_SIZE);
+                         contents + offset + endian + INST_WORD_SIZE);
 +             break;
 +
 +           case (int) R_MICROBLAZE_PLT_64:
@@ -1642,9 +1627,9 @@ index 00000000000..7434bef393b
 +                                             + input_section->output_offset
 +                                             + offset + INST_WORD_SIZE);
 +                   bfd_put_16 (input_bfd, (immediate >> 16) & 0xffff,
-+                               contents + offset + endian);
+                               contents + offset + endian);
 +                   bfd_put_16 (input_bfd, immediate & 0xffff,
-+                               contents + offset + endian + INST_WORD_SIZE);
+                               contents + offset + endian + INST_WORD_SIZE);
 +                 }
 +               else
 +                 {
@@ -1653,9 +1638,9 @@ index 00000000000..7434bef393b
 +                                  + offset + INST_WORD_SIZE);
 +                   immediate = relocation;
 +                   bfd_put_16 (input_bfd, (immediate >> 16) & 0xffff,
-+                               contents + offset + endian);
+                               contents + offset + endian);
 +                   bfd_put_16 (input_bfd, immediate & 0xffff,
-+                               contents + offset + endian + INST_WORD_SIZE);
+                               contents + offset + endian + INST_WORD_SIZE);
 +                 }
 +               break;
 +             }
@@ -1665,6 +1650,7 @@ index 00000000000..7434bef393b
 +             goto dogot;
 +           case (int) R_MICROBLAZE_TLSLD:
 +             tls_type = (TLS_TLS | TLS_LD);
+             /* Fall through.  */
 +           dogot:
 +           case (int) R_MICROBLAZE_GOT_64:
 +             {
@@ -1694,7 +1680,7 @@ index 00000000000..7434bef393b
 +                       && h->got.offset != (bfd_vma) -1)
 +                     offp = &h->got.offset;
 +                   else
-+                       abort ();
+                     abort ();
 +                 }
 +               else
 +                 {
@@ -1834,9 +1820,9 @@ index 00000000000..7434bef393b
 +
 +               /* Apply Current Relocation */
 +               bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
-+                           contents + offset + endian);
+                           contents + offset + endian);
 +               bfd_put_16 (input_bfd, relocation & 0xffff,
-+                           contents + offset + endian + INST_WORD_SIZE);
+                           contents + offset + endian + INST_WORD_SIZE);
 +
 +               unresolved_reloc = false;
 +               break;
@@ -2094,7 +2080,7 @@ index 00000000000..7434bef393b
 +
 +/* Calculate fixup value for reference.  */
 +
-+static int
+static size_t
 +calc_fixup (bfd_vma start, bfd_vma size, asection *sec)
 +{
 +  bfd_vma end = start + size;
@@ -2108,9 +2094,9 @@ index 00000000000..7434bef393b
 +  for (i = 0; i < sdata->relax_count; i++)
 +    {
 +      if (end <= sdata->relax[i].addr)
-+        break;
+       break;
 +      if (end != start && start > sdata->relax[i].addr)
-+        continue;
+       continue;
 +      fixup += sdata->relax[i].size;
 +    }
 +  return fixup;
@@ -2160,13 +2146,13 @@ index 00000000000..7434bef393b
 +  bfd_byte *free_contents = NULL;
 +  int rel_count;
 +  unsigned int shndx;
-+  int i, sym_index;
+  size_t i, sym_index;
 +  asection *o;
 +  struct elf_link_hash_entry *sym_hash;
 +  Elf_Internal_Sym *isymbuf, *isymend;
 +  Elf_Internal_Sym *isym;
-+  int symcount;
+  size_t symcount;
-+  int offset;
+  size_t offset;
 +  bfd_vma src, dest;
 +  struct _microblaze_elf_section_data *sdata;
 +
@@ -2206,7 +2192,7 @@ index 00000000000..7434bef393b
 +
 +  sdata->relax_count = 0;
 +  sdata->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
-+                                                    * sizeof (*sdata->relax));
+                                                   * sizeof (*sdata->relax));
 +  if (sdata->relax == NULL)
 +    goto error_return;
 +
@@ -2294,12 +2280,13 @@ index 00000000000..7434bef393b
 +      else
 +       symval += irel->r_addend;
 +
-+      if ((symval & 0xffff8000) == 0)
+      if ((symval & 0xffff8000) == 0
+         || (symval & 0xffff8000) == 0xffff8000)
 +       {
-+          /* We can delete this instruction.  */
+         /* We can delete this instruction.  */
-+          sdata->relax[sdata->relax_count].addr = irel->r_offset;
+         sdata->relax[sdata->relax_count].addr = irel->r_offset;
-+          sdata->relax[sdata->relax_count].size = INST_WORD_SIZE;
+         sdata->relax[sdata->relax_count].size = INST_WORD_SIZE;
-+          sdata->relax_count++;
+         sdata->relax_count++;
 +
 +         /* Rewrite relocation type.  */
 +          switch ((enum elf_microblaze_reloc_type) ELF64_R_TYPE (irel->r_info))
@@ -2381,14 +2368,14 @@ index 00000000000..7434bef393b
 +           case R_MICROBLAZE_NONE:
 +           case R_MICROBLAZE_32_NONE:
 +             {
-+               /* This was a PC-relative instruction that was
+               /* This was a PC-relative instruction that was
-+                  completely resolved.  */
+                  completely resolved.  */
-+               int sfix, efix;
+               size_t sfix, efix;
-+            unsigned int val;
+                unsigned int val;
-+               bfd_vma target_address;
+               bfd_vma target_address;
-+               target_address = irel->r_addend + irel->r_offset;
+               target_address = irel->r_addend + irel->r_offset;
-+               sfix = calc_fixup (irel->r_offset, 0, sec);
+               sfix = calc_fixup (irel->r_offset, 0, sec);
-+               efix = calc_fixup (target_address, 0, sec);
+               efix = calc_fixup (target_address, 0, sec);
 +
 +            /* Validate the in-band val.  */
 +            val = bfd_get_32 (abfd, contents + irel->r_offset);
@@ -2403,16 +2390,16 @@ index 00000000000..7434bef393b
 +             break;
 +           case R_MICROBLAZE_64_NONE:
 +             {
-+               /* This was a PC-relative 64-bit instruction that was
+               /* This was a PC-relative 64-bit instruction that was
-+                  completely resolved.  */
+                  completely resolved.  */
-+               int sfix, efix;
+               size_t sfix, efix;
-+               bfd_vma target_address;
+               bfd_vma target_address;
 +               target_address = irel->r_addend + irel->r_offset + INST_WORD_SIZE;
 +               sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, 0, sec);
 +               efix = calc_fixup (target_address, 0, sec);
 +               irel->r_addend -= (efix - sfix);
 +    microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset
-+                                       + INST_WORD_SIZE, irel->r_addend);
+                                      + INST_WORD_SIZE, irel->r_addend);
 +             }
 +             break;
 +           }
@@ -2549,9 +2536,11 @@ index 00000000000..7434bef393b
 +                                                       sec);
 +                   }
 +               }
-+             else if ((ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_PCREL_LO)
+             else if ((ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_PCREL_LO)
-+                      || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_LO)
+                      || (ELF32_R_TYPE (irelscan->r_info)
-+               || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_TEXTREL_32_LO))
+                                  == (int) R_MICROBLAZE_32_LO)
+                      || (ELF32_R_TYPE (irelscan->r_info)
+                                  == (int) R_MICROBLAZE_TEXTREL_32_LO))
 +               {
 +                 isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 +
@@ -2604,8 +2593,6 @@ index 00000000000..7434bef393b
 +                 if (isym->st_shndx == shndx
 +                     && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
 +                   {
-+                     bfd_vma immediate;
-+
 +                     if (ocontents == NULL)
 +                       {
 +                         if (elf_section_data (o)->this_hdr.contents != NULL)
@@ -2628,15 +2615,7 @@ index 00000000000..7434bef393b
 +                             elf_section_data (o)->this_hdr.contents = ocontents;
 +                           }
 +                       }
-+          unsigned long instr_hi =  bfd_get_32 (abfd, ocontents
-+                                                + irelscan->r_offset);
-+          unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
-+                                                + irelscan->r_offset
-+                                                + INST_WORD_SIZE);
-+          immediate = (instr_hi & 0x0000ffff) << 16;
-+          immediate |= (instr_lo & 0x0000ffff);
 +                     offset = calc_fixup (irelscan->r_addend, 0, sec);
-+                     immediate -= offset;
 +                     irelscan->r_addend -= offset;
 +                   }
 +               }
@@ -2723,16 +2702,16 @@ index 00000000000..7434bef393b
 +      /* Physically move the code and change the cooked size.  */
 +      dest = sdata->relax[0].addr;
 +      for (i = 0; i < sdata->relax_count; i++)
-+        {
+       {
-+          size_t len;
+         size_t len;
-+          src = sdata->relax[i].addr + sdata->relax[i].size;
+         src = sdata->relax[i].addr + sdata->relax[i].size;
-+          len = (sdata->relax[i+1].addr - sdata->relax[i].addr
+         len = (sdata->relax[i+1].addr - sdata->relax[i].addr
-+                 - sdata->relax[i].size);
+                - sdata->relax[i].size);
-+
+
-+          memmove (contents + dest, contents + src, len);
+         memmove (contents + dest, contents + src, len);
-+          sec->size -= sdata->relax[i].size;
+         sec->size -= sdata->relax[i].size;
-+          dest += len;
+         dest += len;
-+        }
+       }
 +
 +      elf_section_data (sec)->relocs = internal_relocs;
 +      free_relocs = NULL;
@@ -3101,12 +3080,8 @@ index 00000000000..7434bef393b
 +                                     struct elf_link_hash_entry *h)
 +{
 +  struct elf64_mb_link_hash_table *htab;
-+  struct elf64_mb_link_hash_entry * eh;
-+  struct elf64_mb_dyn_relocs *p;
-+  asection *sdynbss;
 +  asection *s, *srel;
 +  unsigned int power_of_two;
-+  bfd *dynobj;
 +
 +  htab = elf64_mb_hash_table (info);
 +  if (htab == NULL)
@@ -3823,8 +3798,8 @@ index 00000000000..7434bef393b
 +      asection *splt;
 +      Elf64_External_Dyn *dyncon, *dynconend;
 +
-+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
-+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
 +      for (; dyncon < dynconend; dyncon++)
 +       {
 +         Elf_Internal_Dyn dyn;
@@ -3947,6 +3922,7 @@ index 00000000000..7434bef393b
 +
 +#define bfd_elf64_bfd_reloc_type_lookup                microblaze_elf_reloc_type_lookup
 +#define bfd_elf64_bfd_is_local_label_name       microblaze_elf_is_local_label_name
+#define bfd_elf64_new_section_hook             microblaze_elf_new_section_hook
 +#define elf_backend_relocate_section           microblaze_elf_relocate_section
 +#define bfd_elf64_bfd_relax_section             microblaze_elf_relax_section
 +#define bfd_elf64_bfd_merge_private_bfd_data    _bfd_generic_verify_endian_match
@@ -3955,7 +3931,7 @@ index 00000000000..7434bef393b
 +#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 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
@@ -4760,18 +4736,18 @@ index a2e1ce4580f..79799b86a49 100644
 END_RELOC_NUMBERS (R_MICROBLAZE_max)
 
 diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 05c7630073d..256a95a2219 100644
+index d31021c13e2..bd1a2e5a625 100644
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -445,6 +445,8 @@ ALL_64_EMULATION_SOURCES = \
+@@ -418,6 +418,8 @@ ALL_64_EMULATION_SOURCES = \
-        eelf64lriscv_lp64f.c \
+        eelf32ltsmipn32.c \
-        eelf64ltsmip.c \
+        eelf32ltsmipn32_fbsd.c \
-        eelf64ltsmip_fbsd.c \
+        eelf32mipswindiss.c \
-+       eelf64microblazeel.c \
+        eelf64microblazeel.c \
-+       eelf64microblaze.c \
+        eelf64microblaze.c \
-        eelf64mmix.c \
+        eelf64_aix.c \
-        eelf64ppc.c \
+        eelf64_ia64.c \
-        eelf64ppc_fbsd.c \
+        eelf64_ia64_fbsd.c \
 @@ -906,6 +908,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32_fbsd.Pc@am__quote@
@@ -4782,19 +4758,19 @@ index 05c7630073d..256a95a2219 100644
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64_ia64_fbsd.Pc@am__quote@
 diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 05d0ff5e122..a7f7e841acb 100644
+index ee0c98f65b0..f4b7ee0623e 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -944,6 +944,8 @@ ALL_64_EMULATION_SOURCES = \
+@@ -914,6 +914,8 @@ ALL_64_EMULATION_SOURCES = \
-        eelf64lriscv_lp64f.c \
+        eelf32ltsmipn32.c \
-        eelf64ltsmip.c \
+        eelf32ltsmipn32_fbsd.c \
-        eelf64ltsmip_fbsd.c \
+        eelf32mipswindiss.c \
 +       eelf64microblazeel.c \
 +       eelf64microblaze.c \
-        eelf64mmix.c \
+        eelf64_aix.c \
-        eelf64ppc.c \
+        eelf64_ia64.c \
-        eelf64ppc_fbsd.c \
+        eelf64_ia64_fbsd.c \
-@@ -1410,6 +1412,8 @@ distclean-compile:
+@@ -1407,6 +1409,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Po@am__quote@
@@ -4803,7 +4779,7 @@ index 05d0ff5e122..a7f7e841acb 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@
-@@ -2575,6 +2579,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+@@ -2572,6 +2576,8 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ltsmipn32_fbsd.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32mipswindiss.Pc@am__quote@
@@ -4885,7 +4861,7 @@ index 00000000000..9c7b0eb7080
 +TEMPLATE_NAME=elf32
 +#GENERATE_SHLIB_SCRIPT=yes
 diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index f57b98fc9f7..f71589d714d 100644
+index f57b98fc9f7..921adce04ea 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
 @@ -33,6 +33,7 @@
@@ -4902,18 +4878,18 @@ index f57b98fc9f7..f71589d714d 100644
 static char *
 -get_field_imm5 (struct string_buf *buf, long instr)
 +get_field_imml (struct string_buf *buf, long instr)
- {
+{
-   char *p = strbuf (buf);
+  char *p = strbuf (buf);
 +  sprintf (p, "%d", (short)((instr & IMML_MASK) >> IMM_LOW));
 +  return p;
 +}
- 
+
-  sprintf (p, "%d", (short)((instr & IMM5_MASK) >> IMM_LOW));
 +static char *
 +get_field_imms (struct string_buf *buf, long instr)
-+{
+ {
-+  char *p = strbuf (buf);
+   char *p = strbuf (buf);
-+
+ 
+-  sprintf (p, "%d", (short)((instr & IMM5_MASK) >> IMM_LOW));
 +  sprintf (p, "%d", (short)((instr & IMM6_MASK) >> IMM_LOW));
   return p;
 }
@@ -4936,23 +4912,24 @@ index f57b98fc9f7..f71589d714d 100644
   return p;
 }
 
-@@ -308,9 +317,13 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
+@@ -308,9 +317,14 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
                }
            }
          break;
 -       case INST_TYPE_RD_R1_IMM5:
 +       case INST_TYPE_RD_R1_IMML:
-+         print_func (stream, "\t%s, %s, %s", get_field_rd (&buf, inst),
+          print_func (stream, "\t%s, %s, %s", get_field_rd (&buf, inst),
+-                     get_field_r1 (&buf, inst), get_field_imm5 (&buf, inst));
 +                     get_field_r1 (&buf, inst), get_field_imm (&buf, inst));
 +          /* TODO: Also print symbol */
+         break;
 +       case INST_TYPE_RD_R1_IMMS:
-          print_func (stream, "\t%s, %s, %s", get_field_rd (&buf, inst),
+         print_func (stream, "\t%s, %s, %s", get_field_rd (&buf, inst),
-                     get_field_r1 (&buf, inst), get_field_imm5 (&buf, inst));
 +                  get_field_r1(&buf, inst), get_field_imms (&buf, inst));
          break;
        case INST_TYPE_RD_RFSL:
          print_func (stream, "\t%s, %s", get_field_rd (&buf, inst),
-@@ -417,6 +430,10 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
+@@ -417,6 +431,10 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
        case INST_TYPE_RD_R2:
          print_func (stream, "\t%s, %s", get_field_rd (&buf, inst),
                      get_field_r2 (&buf, inst));
@@ -4963,7 +4940,7 @@ index f57b98fc9f7..f71589d714d 100644
          break;
        case INST_TYPE_R2:
          print_func (stream, "\t%s", get_field_r2 (&buf, inst));
-@@ -440,8 +457,8 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
+@@ -440,8 +458,8 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
        case INST_TYPE_NONE:
          break;
         /* For bit field insns.  */
@@ -5266,5 +5243,5 @@ index aa3401610d9..b242ea73c7b 100644
 /* FSL imm mask for get, put instructions.  */
 #define  RFSL_MASK 0x000000F
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0015-negl-instruction-is-overriding-rsubl-fixed-it-by-cha.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
index 5b3e3fc6..01aff144 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0015-negl-instruction-is-overriding-rsubl-fixed-it-by-cha.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0013-Patch-Microblaze-negl-instruction-is-overriding-rsub.patch
@@ -1,10 +1,9 @@
-From a41a5a63d4d52887f1ce5a5cab161670d033c1ce Mon Sep 17 00:00:00 2001
+From 667611ec2dfb22bf13d5c6af65ea62e9c13a68de Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 11 Sep 2018 13:48:33 +0530
-Subject: [PATCH 15/38] negl instruction is overriding rsubl,fixed it by
+Subject: [PATCH 13/34] [Patch,Microblaze] : negl instruction is overriding
- changing the instruction order...
+ rsubl,fixed it by changing the instruction order...
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 opcodes/microblaze-opc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -33,5 +32,5 @@ index ab90240d88a..5e45df995de 100644
   {"", 0, 0, 0, 0, 0, 0, 0, 0},
 };
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Added-relocations-for-MB-X.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Added-relocations-for-MB-X.patch
index 6761f01e..404081e0 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0016-Added-relocations-for-MB-X.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0014-Added-relocations-for-MB-X.patch
@@ -1,7 +1,7 @@
-From 3deb533f60bb078f8a7b3f2dde5dc2125552d310 Mon Sep 17 00:00:00 2001
+From 4e94c1683a806ac46f3a0d54bfe8f7247d5f0cbd Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Tue, 11 Sep 2018 17:30:17 +0530
-Subject: [PATCH 16/38] Added relocations for MB-X
+Subject: [PATCH 14/34] Added relocations for MB-X
 Conflicts:
        bfd/bfd-in2.h
@@ -9,8 +9,6 @@ Conflicts:
 Conflicts:
        gas/config/tc-microblaze.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/bfd-in2.h              |  9 +++-
 bfd/libbfd.h               |  4 +-
@@ -347,5 +345,5 @@ index a6f12dda54a..9d4dbc12ab3 100644
     case BFD_RELOC_MICROBLAZE_64_PLT:
     case BFD_RELOC_MICROBLAZE_64_GOTOFF:
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-MB-x-relocation-issues-Added-imml-for-required.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0015-Fixed-MB-x-relocation-issues.patch
index c4ccc057..e93e3476 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-MB-x-relocation-issues-Added-imml-for-required.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0015-Fixed-MB-x-relocation-issues.patch
@@ -1,14 +1,15 @@
-From 40702a32c685ad81803a666858b1b4133b0a9857 Mon Sep 17 00:00:00 2001
+From da36307dff05dff1eebd44aec56f9bdc196ad632 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Fri, 28 Sep 2018 12:04:55 +0530
-Subject: [PATCH 17/38] -Fixed MB-x relocation issues -Added imml for required
+Subject: [PATCH 15/34] -Fixed MB-x relocation issues -Added imml for required
 MB-x instructions
 Conflicts:
        bfd/elf64-microblaze.c
        gas/config/tc-microblaze.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        gas/config/tc-microblaze.c
 ---
 bfd/elf64-microblaze.c     |  48 ++++++++++--
 gas/config/tc-microblaze.c | 155 ++++++++++++++++++++++++++-----------
@@ -16,7 +17,7 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 3 files changed, 152 insertions(+), 53 deletions(-)
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 7434bef393b..104d7a1334f 100644
+index 0faa8de73c8..951bb36506d 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
 @@ -1552,6 +1552,14 @@ microblaze_elf_relocate_section (bfd *output_bfd,
@@ -356,5 +357,5 @@ index 4a740f9bdd9..bb9a935a353 100644
 const char * md_atof (int, char *, int *);
 int    md_parse_option (int, const char *);
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0018-Fixing-the-branch-related-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Fixing-the-branch-related-issues.patch
index 62a8e7de..f3a7267d 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0018-Fixing-the-branch-related-issues.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0016-Fixing-the-branch-related-issues.patch
@@ -1,21 +1,19 @@
-From 507032ec3840b48dfd709ef7c8f277eb0fabf5bb Mon Sep 17 00:00:00 2001
+From 3a46bc21f52c7b5ccbd408eeecd7145b856f6b1d Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Sun, 30 Sep 2018 17:06:58 +0530
-Subject: [PATCH 18/38] Fixing the branch related issues
+Subject: [PATCH 16/34] Fixing the branch related issues
 Conflicts:
        bfd/elf64-microblaze.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/elf64-microblaze.c | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 104d7a1334f..4c79bbe96c6 100644
+index 951bb36506d..6d698383404 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -2566,6 +2566,9 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2559,6 +2559,9 @@ microblaze_elf_check_relocs (bfd * abfd,
          while (h->root.type == bfd_link_hash_indirect
                 || h->root.type == bfd_link_hash_warning)
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
@@ -26,5 +24,5 @@ index 104d7a1334f..4c79bbe96c6 100644
 
       switch (r_type)
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0019-Fixed-address-computation-issues-with-64bit-address-.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-address-computation-issues-with-64bit-address.patch
index 932ecb01..4c0496c3 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0019-Fixed-address-computation-issues-with-64bit-address-.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0017-Fixed-address-computation-issues-with-64bit-address.patch
@@ -1,7 +1,7 @@
-From 31e2555754e9830192a56f1b4bc725a10fe7c300 Mon Sep 17 00:00:00 2001
+From a6003437722a8f04c1e31435eb7f9101c50cc292 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Tue, 9 Oct 2018 10:14:22 +0530
-Subject: [PATCH 19/38] - Fixed address computation issues with 64bit address -
+Subject: [PATCH 17/34] - Fixed address computation issues with 64bit address -
 Fixed imml dissassamble issue
 Conflicts:
@@ -11,13 +11,14 @@ Conflicts:
 Conflicts:
        bfd/elf64-microblaze.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        bfd/elf64-microblaze.c
 ---
 bfd/bfd-in2.h              |  5 +++
- bfd/elf64-microblaze.c     | 14 ++++----
+ bfd/elf64-microblaze.c     | 12 +++----
 gas/config/tc-microblaze.c | 74 +++++++++++++++++++++++++++++++++-----
 opcodes/microblaze-dis.c   |  2 +-
- 4 files changed, 79 insertions(+), 16 deletions(-)
+ 4 files changed, 78 insertions(+), 15 deletions(-)
 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
 index 14e228c9c0e..d4b5006902c 100644
@@ -36,10 +37,10 @@ index 14e228c9c0e..d4b5006902c 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 4c79bbe96c6..2d4820c50fe 100644
+index 6d698383404..f16b544b1fc 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -119,15 +119,15 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
+@@ -118,14 +118,14 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
           0,                   /* Rightshift.  */
           4,                   /* Size (0 = byte, 1 = short, 2 = long).  */
           64,                  /* Bitsize.  */
@@ -52,13 +53,11 @@ index 4c79bbe96c6..2d4820c50fe 100644
           false,               /* Partial Inplace.  */
           0,                   /* Source Mask.  */
 -          0x0000ffff,          /* Dest Mask.  */
-          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.  */
+@@ -613,9 +613,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;
@@ -70,7 +69,7 @@ index 4c79bbe96c6..2d4820c50fe 100644
       break;
     case BFD_RELOC_32_PCREL:
       microblaze_reloc = R_MICROBLAZE_32_PCREL;
-@@ -648,7 +648,7 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+@@ -647,7 +647,7 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
     case BFD_RELOC_VTABLE_ENTRY:
       microblaze_reloc = R_MICROBLAZE_GNU_VTENTRY;
       break;
@@ -79,7 +78,7 @@ index 4c79bbe96c6..2d4820c50fe 100644
       microblaze_reloc = R_MICROBLAZE_IMML_64;
       break;
     case BFD_RELOC_MICROBLAZE_64_GOTPC:
-@@ -2049,7 +2049,7 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2050,7 +2050,7 @@ microblaze_elf_relax_section (bfd *abfd,
                efix = calc_fixup (target_address, 0, sec);
 
             /* Validate the in-band val.  */
@@ -211,7 +210,7 @@ index a0e97231a41..d3de049e9c0 100644
         default:
           as_bad (_("unsupported BFD relocation size %u"), size);
 diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index f71589d714d..97e21a38bd2 100644
+index 921adce04ea..d837ebb38e2 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
 @@ -77,7 +77,7 @@ static char *
@@ -224,5 +223,5 @@ index f71589d714d..97e21a38bd2 100644
 }
 
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0020-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
index 135af627..6a70dbfb 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0020-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0018-Patch-MicroBlaze-Adding-new-relocation-to-support-64.patch
@@ -1,17 +1,16 @@
-From 2034e50763e51635405988d0cf67345cad1b2101 Mon Sep 17 00:00:00 2001
+From 6209a572f4ec70608564fa7aa0270d640aa421f0 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Tue, 2 Nov 2021 17:28:24 +0530
-Subject: [PATCH 20/38] [Patch,MicroBlaze : Adding new relocation to support
+Subject: [PATCH 18/34] [Patch,MicroBlaze : Adding new relocation to support
 64bit rodata.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/elf64-microblaze.c     | 11 +++++++--
 gas/config/tc-microblaze.c | 49 ++++++++++++++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 6 deletions(-)
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 2d4820c50fe..97131c352c7 100644
+index f16b544b1fc..355e9131987 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
 @@ -1529,6 +1529,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
@@ -49,7 +48,7 @@ index 2d4820c50fe..97131c352c7 100644
                    else
                      {
                        if (r_type == R_MICROBLAZE_64_PCREL)
-@@ -2165,7 +2170,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2166,7 +2171,8 @@ microblaze_elf_relax_section (bfd *abfd,
                   microblaze_bfd_write_imm_value_32 (abfd, ocontents + irelscan->r_offset,
                                                      irelscan->r_addend);
               }
@@ -59,7 +58,7 @@ index 2d4820c50fe..97131c352c7 100644
                 {
                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 
-@@ -2640,6 +2646,7 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2633,6 +2639,7 @@ microblaze_elf_check_relocs (bfd * abfd,
         case R_MICROBLAZE_64:
         case R_MICROBLAZE_64_PCREL:
         case R_MICROBLAZE_32:
@@ -164,5 +163,5 @@ index d3de049e9c0..76ce516d8aa 100644
         default:
           as_bad (_("unsupported BFD relocation size %u"), size);
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0021-fixing-the-.bss-relocation-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0019-fixing-the-.bss-relocation-issue.patch
index 848770b8..5826f0a3 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0021-fixing-the-.bss-relocation-issue.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0019-fixing-the-.bss-relocation-issue.patch
@@ -1,18 +1,19 @@
-From cec495577424c4d5c4c77949a624bc33991ac673 Mon Sep 17 00:00:00 2001
+From 35e89c09636e2ce2f5eafcf62941d15ece79a172 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Wed, 24 Oct 2018 12:34:37 +0530
-Subject: [PATCH 21/38] fixing the .bss relocation issue
+Subject: [PATCH 19/34] fixing the .bss relocation issue
 Conflicts:
        bfd/elf64-microblaze.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        bfd/elf64-microblaze.c
 ---
- bfd/elf64-microblaze.c | 32 +++++++++++++++++++-------------
+ bfd/elf64-microblaze.c | 41 +++++++++++++++++++++++++++++------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
+ 1 file changed, 29 insertions(+), 12 deletions(-)
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 97131c352c7..fe73de86659 100644
+index 355e9131987..eb7f9138884 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
 @@ -1555,14 +1555,14 @@ microblaze_elf_relocate_section (bfd *output_bfd,
@@ -65,19 +66,37 @@ index 97131c352c7..fe73de86659 100644
       {
         instr_hi &= ~0x00ffffff;
         instr_hi |= (val >> 16) & 0xffffff;
-@@ -2320,7 +2320,10 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2294,6 +2294,8 @@ microblaze_elf_relax_section (bfd *abfd,
-           unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
+                  if (isym->st_shndx == shndx
-                                                 + irelscan->r_offset
+                      && (ELF64_ST_TYPE (isym->st_info) == STT_SECTION))
-                                                 + INST_WORD_SIZE);
+                    {
-          immediate = (instr_hi & 0x0000ffff) << 16;
+                     bfd_vma immediate;
-+          if ((instr_hi & 0xff000000) == 0xb2000000)
+
-+            immediate = (instr_hi & 0x00ffffff) << 24;
+                      if (ocontents == NULL)
-+         else
+                        {
-+            immediate = (instr_hi & 0x0000ffff) << 16;
+                          if (elf_section_data (o)->this_hdr.contents != NULL)
-           immediate |= (instr_lo & 0x0000ffff);
+@@ -2316,8 +2318,20 @@ microblaze_elf_relax_section (bfd *abfd,
+                              elf_section_data (o)->this_hdr.contents = ocontents;
+                            }
+                        }
+              unsigned long instr_hi =  bfd_get_32 (abfd, ocontents
+                                                + irelscan->r_offset);
+              unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
+                                                + irelscan->r_offset
+                                                + INST_WORD_SIZE);
+              if ((instr_hi & 0xff000000) == 0xb2000000)
+                immediate = (instr_hi & 0x00ffffff) << 24;
+             else
+                immediate = (instr_hi & 0x0000ffff) << 16;
+              immediate |= (instr_lo & 0x0000ffff);
                      offset = calc_fixup (irelscan->r_addend, 0, sec);
-                      immediate -= offset;
+                     immediate -= offset;
-@@ -2364,7 +2367,10 @@ microblaze_elf_relax_section (bfd *abfd,
+                      irelscan->r_addend -= offset;
+                         
+                    }
+                }
+              else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
+@@ -2357,7 +2371,10 @@ microblaze_elf_relax_section (bfd *abfd,
           unsigned long instr_lo =  bfd_get_32 (abfd, ocontents
                                                 + irelscan->r_offset
                                                 + INST_WORD_SIZE);
@@ -90,5 +109,5 @@ index 97131c352c7..fe73de86659 100644
                      target_address = immediate;
                      offset = calc_fixup (target_address, 0, sec);
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0022-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
index 2821a1e2..21fab2de 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0022-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0020-Fixed-the-bug-in-the-R_MICROBLAZE_64_NONE-relocation.patch
@@ -1,20 +1,21 @@
-From 622b9e85bde4a88ecfe1884179f547575224b984 Mon Sep 17 00:00:00 2001
+From 6c6490ed5a5c5c00d1b18a1f446280689bb572d1 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Wed, 28 Nov 2018 14:00:29 +0530
-Subject: [PATCH 22/38] Fixed the bug in the R_MICROBLAZE_64_NONE relocation.
+Subject: [PATCH 20/34] Fixed the bug in the R_MICROBLAZE_64_NONE relocation.
 It was adjusting only lower 16bits.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        bfd/elf64-microblaze.c
 ---
 bfd/elf32-microblaze.c | 4 ++--
 bfd/elf64-microblaze.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 71ff973573c..f41b503cbb5 100644
+index f20adb6fd73..88ac730582b 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -2059,8 +2059,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2060,8 +2060,8 @@ microblaze_elf_relax_section (bfd *abfd,
                sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, 0, sec);
                efix = calc_fixup (target_address, 0, sec);
                irel->r_addend -= (efix - sfix);
@@ -26,20 +27,20 @@ index 71ff973573c..f41b503cbb5 100644
              break;
            }
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index fe73de86659..387ee0da261 100644
+index eb7f9138884..03fe9eba53a 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -2097,8 +2097,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2098,8 +2098,8 @@ microblaze_elf_relax_section (bfd *abfd,
                sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, 0, sec);
                efix = calc_fixup (target_address, 0, sec);
                irel->r_addend -= (efix - sfix);
 -    microblaze_bfd_write_imm_value_32 (abfd, contents + irel->r_offset
-                                       + INST_WORD_SIZE, irel->r_addend);
+-                                      + INST_WORD_SIZE, irel->r_addend);
 +    microblaze_bfd_write_imm_value_64 (abfd, contents + irel->r_offset,
 +                                       irel->r_addend);
              }
              break;
            }
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0023-Revert-ld-Remove-unused-expression-state-defsym-symb.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0021-Revert-ld-Remove-unused-expression-state.patch
index 7d23ee2c..ab7f2077 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0023-Revert-ld-Remove-unused-expression-state-defsym-symb.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0021-Revert-ld-Remove-unused-expression-state.patch
@@ -1,7 +1,7 @@
-From 99193a486cc44f7bb56019a10bef413f7f7d9fd7 Mon Sep 17 00:00:00 2001
+From 6238123cdc680941f3b3a253cca5be06d5c81492 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 27 Feb 2019 15:12:32 +0530
-Subject: [PATCH 23/38] Revert "ld: Remove unused expression state" --defsym
+Subject: [PATCH 21/34] Revert "ld: Remove unused expression state" --defsym
 symbol=expression Create a global symbol in the output file, containing the
 absolute address given by expression.
@@ -13,8 +13,6 @@ Conflicts:
 Conflicts:
        ld/ldexp.c
        ld/ldexp.h
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 ld/ldexp.c | 8 +++++---
 ld/ldexp.h | 1 +
@@ -80,5 +78,5 @@ index ed6fb8be715..e838b736306 100644
   } assign;
   struct {
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0024-fixing-the-long-long-long-mingw-toolchain-issue.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-long-long-long-mingw-toolchain-issue.patch
index 548d7f61..bfb68360 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0024-fixing-the-long-long-long-mingw-toolchain-issue.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0022-fixing-the-long-long-long-mingw-toolchain-issue.patch
@@ -1,9 +1,8 @@
-From f1c19a5ca7d28745cd9b28f155609eed70c1b349 Mon Sep 17 00:00:00 2001
+From 24269bd086efcd37f702b92fd25dfe45faa7dfb6 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilix.com>
 Date: Thu, 29 Nov 2018 17:59:25 +0530
-Subject: [PATCH 24/38] fixing the long & long long mingw toolchain issue
+Subject: [PATCH 22/34] fixing the long & long long mingw toolchain issue
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 gas/config/tc-microblaze.c | 10 +++++-----
 opcodes/microblaze-opc.h   |  4 ++--
@@ -54,5 +53,5 @@ index 5e45df995de..6b25d12dace 100644
 #endif /* MICROBLAZE_OPC */
 
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0025-Added-support-to-new-arithmetic-single-register-inst.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0023-Added-support-to-new-arithmetic-single-register-inst.patch
index ca61b1a6..0b8c83cd 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0025-Added-support-to-new-arithmetic-single-register-inst.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0023-Added-support-to-new-arithmetic-single-register-inst.patch
@@ -1,7 +1,7 @@
-From 16dfbc9464ebbf642cae6e45edd96f5fe14a6c0f Mon Sep 17 00:00:00 2001
+From 3c197b12c4b680a230e8350ecd9a523be804fe3c Mon Sep 17 00:00:00 2001
 From: Nagaraju <nmekala@xilinx.com>
 Date: Fri, 23 Aug 2019 16:18:43 +0530
-Subject: [PATCH 25/38] Added support to new arithmetic single register
+Subject: [PATCH 23/34] Added support to new arithmetic single register
 instructions
 Conflicts:
@@ -11,7 +11,10 @@ Conflicts:
        gas/config/tc-microblaze.c
        opcodes/microblaze-dis.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        gas/config/tc-microblaze.c
+signed-off-by:Nagaraju <nmekala@xilinx.com>
+              Mahesh <mbodapat@xilinx.com>
 ---
 gas/config/tc-microblaze.c | 147 ++++++++++++++++++++++++++++++++++++-
 opcodes/microblaze-dis.c   |  11 +++
@@ -20,7 +23,7 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 4 files changed, 200 insertions(+), 6 deletions(-)
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index a1fb6ccbd44..bca3793c2d8 100644
+index a1fb6ccbd44..27544b60ea3 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -423,12 +423,33 @@ void
@@ -72,10 +75,10 @@ index a1fb6ccbd44..bca3793c2d8 100644
   unsigned isize;
   unsigned long immed = 0, immed2 = 0, temp;
 -  expressionS exp;
-+  expressionS exp, exp1;
+  expressionS exp,exp1;
   char name[20];
   long immedl;
-+  int reg = 0;
+  int reg=0;
 
   /* Drop leading whitespace.  */
   while (ISSPACE (* str))
@@ -212,7 +215,7 @@ index a1fb6ccbd44..bca3793c2d8 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 97e21a38bd2..0814cab5bdb 100644
+index d837ebb38e2..b5a78dcfe09 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
 @@ -130,6 +130,14 @@ get_field_imm15 (struct string_buf *buf, long instr)
@@ -230,7 +233,7 @@ index 97e21a38bd2..0814cab5bdb 100644
 static char *
 get_field_special (struct string_buf *buf, long instr,
                   const struct op_code_struct *op)
-@@ -456,6 +464,9 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
+@@ -457,6 +465,9 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
          /* For mbar 16 or sleep insn.  */
        case INST_TYPE_NONE:
          break;
@@ -362,5 +365,5 @@ index b242ea73c7b..5c44a5ff0ac 100644
 
 #endif /* MICROBLAZE-OPCM */
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0026-double-imml-generation-for-64-bit-values.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
index 50ce1c4e..6d0df558 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0026-double-imml-generation-for-64-bit-values.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0024-Patch-MicroBlaze-double-imml-generation-for-64-bit-v.patch
@@ -1,19 +1,18 @@
-From 214d99aef9b21ddbb07c120495203861dfe52c43 Mon Sep 17 00:00:00 2001
+From ec5bfe546213b2cb7fe2a51f9f9571597b2c5aa9 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 26 Aug 2019 15:29:42 +0530
-Subject: [PATCH 26/38] double imml generation for 64 bit values.
+Subject: [PATCH 24/34] [Patch,MicroBlaze] : double imml generation for 64 bit
+ values.
 Conflicts:
        gas/config/tc-microblaze.c
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 gas/config/tc-microblaze.c | 321 ++++++++++++++++++++++++++++++-------
 opcodes/microblaze-opc.h   |   4 +-
 2 files changed, 262 insertions(+), 63 deletions(-)
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index bca3793c2d8..454d4875ee1 100644
+index 27544b60ea3..4c455ff02b8 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -1008,7 +1008,7 @@ md_assemble (char * str)
@@ -542,5 +541,5 @@ index 82da7f1179a..e65f4b58233 100644
 #endif /* MICROBLAZE_OPC */
 
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0027-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
index 13963265..74fcea81 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0027-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0025-Fixed-bug-in-generation-of-IMML-instruction-for-the.patch
@@ -1,17 +1,15 @@
-From 1b2e218f16714358ffc0cbffedeaa36725f56819 Mon Sep 17 00:00:00 2001
+From 0ba14f999b266406e7e86fc0e7311ebb275e7b97 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 3 Nov 2021 12:13:32 +0530
-Subject: [PATCH 27/38] Fixed bug in generation of IMML instruction for the
+Subject: [PATCH 25/34] Fixed bug in generation of IMML instruction for the
 new MB-64 instructions with single register.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 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 454d4875ee1..23c0d080d9d 100644
+index 4c455ff02b8..bccaafe296c 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -1643,12 +1643,56 @@ md_assemble (char * str)
@@ -84,5 +82,5 @@ index 454d4875ee1..23c0d080d9d 100644
               /* Needs an immediate inst.  */
          if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0028-This-patch-will-remove-imml-0-and-imml-1-instruction.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
index afc0e67b..8058c6a6 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0028-This-patch-will-remove-imml-0-and-imml-1-instruction.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0026-Patch-MicroBlaze-m64-This-patch-will-remove-imml-0-a.patch
@@ -1,16 +1,16 @@
-From 3b7579366a80e4f8585f6bd5ab22a595909f6057 Mon Sep 17 00:00:00 2001
+From 6e92cc2429ec37ced6cc70596ad7c6217d25e806 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Thu, 16 Apr 2020 18:08:58 +0530
-Subject: [PATCH 28/38] This patch will remove imml 0 and imml -1 instructions
+Subject: [PATCH 26/34]  [Patch,MicroBlaze m64] : This patch will remove imml 0
- when the offset is less than 16 bit for Type A branch EA instructions.
+ and imml -1 instructions when the offset is less than 16 bit for Type A
+ branch EA instructions.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 gas/config/tc-microblaze.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 23c0d080d9d..2378e5037a8 100644
+index bccaafe296c..85509011f8c 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -2158,9 +2158,7 @@ md_assemble (char * str)
@@ -34,5 +34,5 @@ index 23c0d080d9d..2378e5037a8 100644
           /* Generate the imm instruction.  */
            if (((long long)val) > (long long)-549755813888 && ((long long)val) < (long long)549755813887)
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0029-improper-address-mapping-of-PROVIDE-directive-symbol.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
index 80f8c526..50819300 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0029-improper-address-mapping-of-PROVIDE-directive-symbol.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0027-Patch-MicroBlaze-improper-address-mapping-of-PROVIDE.patch
@@ -1,12 +1,11 @@
-From 8124e17da0056fa6c9f650a0ee5631261e78b93e Mon Sep 17 00:00:00 2001
+From 7f4c17e26065d8194a2512f2982c245afa0e7e40 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Wed, 17 Jun 2020 21:20:26 +0530
-Subject: [PATCH 29/38] improper address mapping of PROVIDE directive
+Subject: [PATCH 27/34] [Patch,MicroBlaze] : improper address mapping of
- symbols[DTOR_END] are causing runtime loops and we don't need to override
+ PROVIDE directive symbols[DTOR_END] are causing runtime loops and we don't
- PROVIDE symbols if symbols are defined in libraries and linker so I am
+ need to override PROVIDE symbols if symbols are defined in libraries and
- disabling override for PROVIDE symbols.
+ linker so I am disabling override for PROVIDE symbols.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 ld/ldlang.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
@@ -36,5 +35,5 @@ index f12c09633a7..4a71abc7cbc 100644
          break;
        }
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0030-Changing-the-long-to-long-long-as-in-Windows-long-is.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
index 045dbbb1..c7c4f1d1 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0030-Changing-the-long-to-long-long-as-in-Windows-long-is.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0028-Patch-microblaze-Changing-the-long-to-long-long-as-i.patch
@@ -1,17 +1,19 @@
-From 6af09208c03034774aca624b50b2526878ea210e Mon Sep 17 00:00:00 2001
+From 3e308d91912ade69f914383fd9c13f934da37be4 Mon Sep 17 00:00:00 2001
 From: Nagaraju Mekala <nmekala@xilinx.com>
 Date: Tue, 20 Apr 2021 21:22:06 +0530
-Subject: [PATCH 30/38] Changing the long to long long as in Windows long is
+Subject: [PATCH 28/34] [Patch, microblaze]:Changing the long to long long as
- 32-bit but we need the variable to be 64-bit
+ in Windows long is 32-bit but we need the variable to be 64-bit
 Signed-off-by :Nagaraju Mekala <nmekala@xilix.com>
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        gas/config/tc-microblaze.c
 ---
 gas/config/tc-microblaze.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 2378e5037a8..604a8df86a2 100644
+index 85509011f8c..31677446114 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -1017,7 +1017,7 @@ md_assemble (char * str)
@@ -20,9 +22,9 @@ index 2378e5037a8..604a8df86a2 100644
   unsigned isize;
 -  unsigned long immed = 0, immed2 = 0, temp;
 +  unsigned long long immed = 0, immed2 = 0, temp;
-   expressionS exp, exp1;
+   expressionS exp,exp1;
   char name[20];
   long immedl;
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
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/0029-gas-revert-moving-of-md_pseudo_table-from-const.patch
index df7a72d4..205f04fe 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/0029-gas-revert-moving-of-md_pseudo_table-from-const.patch
@@ -1,7 +1,7 @@
-From 276d9d6138efbe27d2542f9b3dfb2a47072ec588 Mon Sep 17 00:00:00 2001
+From 24d43f5ce8746c653de7de3fad46915755ba789d Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 8 Nov 2021 21:57:13 +0530
-Subject: [PATCH 31/38] gas: revert moving of md_pseudo_table from const
+Subject: [PATCH 29/34] gas: revert moving of md_pseudo_table from const
 The base system expect md_pseudo_table to be constant, Changing the
 definition will break other architectures when compiled with a
@@ -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 604a8df86a2..123d5ba6214 100644
+index 31677446114..6b398ab5605 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -385,6 +385,17 @@ microblaze_s_weakext (int ignore ATTRIBUTE_UNUSED)
@@ -79,5 +79,5 @@ index bb9a935a353..4a740f9bdd9 100644
 const char * md_atof (int, char *, int *);
 int    md_parse_option (int, const char *);
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
index 9146144a..bfb65224 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0032-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0030-ld-emulparams-elf64microblaze-Fix-emulation-generati.patch
@@ -1,7 +1,7 @@
-From 23b792fc927b4f24eb20f841cfef6b9548c1d547 Mon Sep 17 00:00:00 2001
+From 62107ba949fe70e5ae0573147d82cbb52bd1fc08 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 8 Nov 2021 22:01:23 +0530
-Subject: [PATCH 32/38] ld/emulparams/elf64microblaze: Fix emulation generation
+Subject: [PATCH 30/34] ld/emulparams/elf64microblaze: Fix emulation generation
 Compilation fails when building ld-new with:
@@ -11,7 +11,6 @@ ldemul.o:(.data.rel+0x828): undefined reference to `ld_elf64microblaze_emulation
 The error appears to be that the elf64 files were referencing the elf32 emulation.
 Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 ld/emulparams/elf64microblaze.sh   | 2 +-
 ld/emulparams/elf64microblazeel.sh | 2 +-
@@ -40,5 +39,5 @@ index 9c7b0eb7080..7b4c7c411bd 100644
 +TEMPLATE_NAME=elf
 #GENERATE_SHLIB_SCRIPT=yes
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0038-Invalid-data-offsets-pointer-after-relaxation.-Propo.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch
index a34478f2..cb31c0d7 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0038-Invalid-data-offsets-pointer-after-relaxation.-Propo.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0031-Patch-MicroBlaze-Invalid-data-offsets-pointer-after-.patch
@@ -1,21 +1,20 @@
-From 7eddc47ff5eecc2e383c96f4712185c42347105b Mon Sep 17 00:00:00 2001
+From 7bddfaf3ad574aa738ab903f63a345ebde134f9e Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 24 Jan 2022 16:04:07 +0530
-Subject: [PATCH 38/38] Invalid data offsets (pointer) after relaxation.
+Subject: [PATCH 31/34] [Patch,MicroBlaze] : Invalid data offsets (pointer)
- Proposed patch from community member (dednev@rambler.ru) against 2021.1
+ after relaxation. Proposed patch from community member (dednev@rambler.ru)
- [CR-1115232]
+ against 2021.1 [CR-1115232]
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
 ---
 bfd/elf32-microblaze.c | 18 ++++++++++++++++++
 bfd/elf64-microblaze.c | 17 +++++++++++++++++
 2 files changed, 35 insertions(+)
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 8b947a6ec79..0655d0fe975 100644
+index 88ac730582b..588367ebcbb 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -2174,6 +2174,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2095,6 +2095,9 @@ microblaze_elf_relax_section (bfd *abfd,
                 {
                   unsigned int val;
 
@@ -25,7 +24,7 @@ index 8b947a6ec79..0655d0fe975 100644
                   isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
 
                   /* hax: We only do the following fixup for debug location lists.  */
-@@ -2215,6 +2218,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2136,6 +2139,9 @@ microblaze_elf_relax_section (bfd *abfd,
               }
               if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
                 {
@@ -35,7 +34,7 @@ index 8b947a6ec79..0655d0fe975 100644
                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
 
                   /* Look at the reloc only if the value has been resolved.  */
-@@ -2247,6 +2253,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2168,6 +2174,9 @@ microblaze_elf_relax_section (bfd *abfd,
                    }
                  else if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_SYM_OP_SYM)
                    {
@@ -45,7 +44,7 @@ index 8b947a6ec79..0655d0fe975 100644
                      isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
 
                      /* Look at the reloc only if the value has been resolved.  */
-@@ -2284,6 +2293,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2205,6 +2214,9 @@ microblaze_elf_relax_section (bfd *abfd,
                       || (ELF32_R_TYPE (irelscan->r_info)
                                   == (int) R_MICROBLAZE_TEXTREL_32_LO))
                {
@@ -55,7 +54,7 @@ index 8b947a6ec79..0655d0fe975 100644
                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
 
                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2330,6 +2342,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2251,6 +2263,9 @@ microblaze_elf_relax_section (bfd *abfd,
                  || (ELF32_R_TYPE (irelscan->r_info)
                              == (int) R_MICROBLAZE_TEXTREL_64))
                {
@@ -65,7 +64,7 @@ index 8b947a6ec79..0655d0fe975 100644
                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
 
                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2364,6 +2379,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2285,6 +2300,9 @@ microblaze_elf_relax_section (bfd *abfd,
                }
              else if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
                {
@@ -76,10 +75,10 @@ index 8b947a6ec79..0655d0fe975 100644
 
                  /* Look at the reloc only if the value has been resolved.  */
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index cecfb5506f8..c7bf5a71f08 100644
+index 03fe9eba53a..76aec43ec7a 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -2165,6 +2165,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2132,6 +2132,8 @@ microblaze_elf_relax_section (bfd *abfd,
               if (1 && ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_NONE)
                 {
                   unsigned int val;
@@ -88,7 +87,7 @@ index cecfb5506f8..c7bf5a71f08 100644
 
                   isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 
-@@ -2207,6 +2209,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2174,6 +2176,9 @@ microblaze_elf_relax_section (bfd *abfd,
               if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32 
                   || ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_IMML_64)
                 {
@@ -98,7 +97,7 @@ index cecfb5506f8..c7bf5a71f08 100644
                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 
                   /* Look at the reloc only if the value has been resolved.  */
-@@ -2239,6 +2244,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2206,6 +2211,9 @@ microblaze_elf_relax_section (bfd *abfd,
                     }
                  else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_SYM_OP_SYM)
                    {
@@ -108,9 +107,9 @@ index cecfb5506f8..c7bf5a71f08 100644
                      isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 
                      /* Look at the reloc only if the value has been resolved.  */
-@@ -2274,6 +2282,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2243,6 +2251,9 @@ microblaze_elf_relax_section (bfd *abfd,
-                       || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_LO)
+                       || (ELF32_R_TYPE (irelscan->r_info)
-                || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_TEXTREL_32_LO))
+                                   == (int) R_MICROBLAZE_TEXTREL_32_LO))
                {
 +                  if (ELF64_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
 +                    continue;
@@ -118,7 +117,7 @@ index cecfb5506f8..c7bf5a71f08 100644
                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 
                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2319,6 +2330,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2288,6 +2299,9 @@ microblaze_elf_relax_section (bfd *abfd,
              if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64
           || (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_TEXTREL_64))
                {
@@ -128,7 +127,7 @@ index cecfb5506f8..c7bf5a71f08 100644
                  isym = isymbuf + ELF64_R_SYM (irelscan->r_info);
 
                  /* Look at the reloc only if the value has been resolved.  */
-@@ -2366,6 +2380,9 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2336,6 +2350,9 @@ microblaze_elf_relax_section (bfd *abfd,
                }
              else if (ELF64_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
                {
@@ -139,5 +138,5 @@ index cecfb5506f8..c7bf5a71f08 100644
 
                  /* Look at the reloc only if the value has been resolved.  */
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0036-Double-free-with-ld-no-keep-memory.-Proposed-patches.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch
index 04a1ea67..e9556bf5 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0036-Double-free-with-ld-no-keep-memory.-Proposed-patches.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch
@@ -1,20 +1,23 @@
-From 24272469bcd56fd8f1e0095e0b2650f03c2cd962 Mon Sep 17 00:00:00 2001
+From 70268d8d38851d06bd66f9c7cc85865f2f3c0e48 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Mon, 24 Jan 2022 16:59:19 +0530
-Subject: [PATCH 36/38] Double free with ld --no-keep-memory. Proposed patches
+Subject: [PATCH 32/34] [Patch,MicroBlaze] : Double free with ld
- from the community member (dednev@rambler.ru) for 2021.1. [CR-1115233]
+ --no-keep-memory. Proposed patches from the community member
+ (dednev@rambler.ru) for 2021.1. [CR-1115233]
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+Conflicts:
+        bfd/elf32-microblaze.c
+        bfd/elf64-microblaze.c
 ---
- bfd/elf32-microblaze.c | 39 ++++++++++++++++++++------------------
+ bfd/elf32-microblaze.c | 40 ++++++++++++++++++++++------------------
- bfd/elf64-microblaze.c | 43 ++++++++++++++++++++----------------------
+ bfd/elf64-microblaze.c | 38 ++++++++++++++++++++------------------
- 2 files changed, 41 insertions(+), 41 deletions(-)
+ 2 files changed, 42 insertions(+), 36 deletions(-)
 diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index 9c6d0411420..e284b0e5398 100644
+index 588367ebcbb..28589db662f 100644
 --- a/bfd/elf32-microblaze.c
 +++ b/bfd/elf32-microblaze.c
-@@ -1881,10 +1881,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1800,10 +1800,8 @@ microblaze_elf_relax_section (bfd *abfd,
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -25,7 +28,7 @@ index 9c6d0411420..e284b0e5398 100644
   int rel_count;
   unsigned int shndx;
   size_t i, sym_index;
-@@ -1928,8 +1926,6 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1847,8 +1845,6 @@ microblaze_elf_relax_section (bfd *abfd,
   internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
   if (internal_relocs == NULL)
     goto error_return;
@@ -34,7 +37,7 @@ index 9c6d0411420..e284b0e5398 100644
 
   sdata->relax_count = 0;
   sdata->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
-@@ -1957,7 +1953,6 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1876,7 +1872,6 @@ microblaze_elf_relax_section (bfd *abfd,
              contents = (bfd_byte *) bfd_malloc (sec->size);
              if (contents == NULL)
                goto error_return;
@@ -42,7 +45,7 @@ index 9c6d0411420..e284b0e5398 100644
 
              if (!bfd_get_section_contents (abfd, sec, contents,
                                             (file_ptr) 0, sec->size))
-@@ -2458,25 +2453,26 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2396,25 +2391,26 @@ microblaze_elf_relax_section (bfd *abfd,
        }
 
       elf_section_data (sec)->relocs = internal_relocs;
@@ -80,12 +83,13 @@ index 9c6d0411420..e284b0e5398 100644
     }
 
   if (sdata->relax_count == 0)
-@@ -2490,8 +2486,15 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2428,8 +2424,16 @@ microblaze_elf_relax_section (bfd *abfd,
   return true;
 
  error_return:
 -  free (free_relocs);
 -  free (free_contents);
+ 
 +  if (isymbuf != NULL
 +      && symtab_hdr->contents != (unsigned char *) isymbuf)
 +    free (isymbuf);
@@ -99,10 +103,10 @@ index 9c6d0411420..e284b0e5398 100644
   sdata->relax = NULL;
   sdata->relax_count = 0;
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 2e42366d8d6..3b6e6aa47bd 100644
+index 76aec43ec7a..77872cef1ab 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -1877,10 +1877,8 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1840,10 +1840,8 @@ microblaze_elf_relax_section (bfd *abfd,
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -112,8 +116,8 @@ index 2e42366d8d6..3b6e6aa47bd 100644
 -  bfd_byte *free_contents = NULL;
   int rel_count;
   unsigned int shndx;
-   int i, sym_index;
+   size_t i, sym_index;
-@@ -1924,8 +1922,6 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1887,8 +1885,6 @@ microblaze_elf_relax_section (bfd *abfd,
   internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
   if (internal_relocs == NULL)
     goto error_return;
@@ -122,7 +126,7 @@ index 2e42366d8d6..3b6e6aa47bd 100644
 
   sdata->relax_count = 0;
   sdata->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
-@@ -1953,8 +1949,6 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -1916,8 +1912,6 @@ microblaze_elf_relax_section (bfd *abfd,
              contents = (bfd_byte *) bfd_malloc (sec->size);
              if (contents == NULL)
                goto error_return;
@@ -131,8 +135,8 @@ index 2e42366d8d6..3b6e6aa47bd 100644
              if (!bfd_get_section_contents (abfd, sec, contents,
                                             (file_ptr) 0, sec->size))
                goto error_return;
-@@ -2465,28 +2459,26 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2449,25 +2443,26 @@ microblaze_elf_relax_section (bfd *abfd,
-         }
+        }
 
       elf_section_data (sec)->relocs = internal_relocs;
 -      free_relocs = NULL;
@@ -143,11 +147,8 @@ index 2e42366d8d6..3b6e6aa47bd 100644
       symtab_hdr->contents = (bfd_byte *) isymbuf;
     }
 
-  if (free_relocs != NULL)
+-  free (free_relocs);
-    {
+-  free_relocs = NULL;
-      free (free_relocs);
-      free_relocs = NULL;
-    }
 +  if (internal_relocs != NULL
 +      && elf_section_data (sec)->relocs != internal_relocs)
 +    free (internal_relocs);
@@ -171,14 +172,12 @@ index 2e42366d8d6..3b6e6aa47bd 100644
     }
 
   if (sdata->relax_count == 0)
-@@ -2500,10 +2492,15 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2481,8 +2476,15 @@ microblaze_elf_relax_section (bfd *abfd,
   return true;
 
  error_return:
-  if (free_relocs != NULL)
+-  free (free_relocs);
-    free (free_relocs);
+-  free (free_contents);
-  if (free_contents != NULL)
-    free (free_contents);
 +  if (isymbuf != NULL
 +      && symtab_hdr->contents != (unsigned char *) isymbuf)
 +    free (isymbuf);
@@ -188,9 +187,9 @@ index 2e42366d8d6..3b6e6aa47bd 100644
 +  if (contents != NULL
 +      && elf_section_data (sec)->this_hdr.contents != contents)
 +    free (contents);
-   if (sdata->relax != NULL)
+   free (sdata->relax);
-     {
+   sdata->relax = NULL;
-       free (sdata->relax);
+   sdata->relax_count = 0;
 -- 
-2.25.1
+2.37.1 (Apple Git-137.1)
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 d2753fe9..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0033-Add-initial-port-of-linux-gdbserver-add-gdb_proc_ser.patch
+++ /dev/null
@@ -1,1581 +0,0 @@
-From 48166e74b46787b10073fcec3c133463504e2dbc 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
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
- 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 da71675b201..3a0c4443a93 100644
--- a/gdb/configure.host
-+++ b/gdb/configure.host
-@@ -61,6 +61,7 @@ i[34567]86*)          gdb_host_cpu=i386 ;;
- loongarch*)            gdb_host_cpu=loongarch ;;
- 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 ;;
-@@ -135,6 +136,8 @@ mips64*-*-openbsd*) gdb_host=obsd64 ;;
- 
- or1k-*-linux*)         gdb_host=linux ;;
- 
-+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 daa7ddf7e4d..5748556a556 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 3d5dd669341..3e8e8fe35b9 100644
--- a/gdb/microblaze-tdep.c
-+++ b/gdb/microblaze-tdep.c
-@@ -128,7 +128,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.  */
- 
-@@ -716,6 +747,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);
- 
-@@ -756,4 +788,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 4d90e8785dc..53fcb2297e6 100644
--- a/gdb/microblaze-tdep.h
-+++ b/gdb/microblaze-tdep.h
-@@ -118,6 +118,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.25.1
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0035-MB-binutils-Upstream-port-issues.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0033-Patch-MB-MB-binutils-Upstream-port-issues.patch
index d152334b..f70ca3f2 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0035-MB-binutils-Upstream-port-issues.patch
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0033-Patch-MB-MB-binutils-Upstream-port-issues.patch
@@ -1,21 +1,23 @@
-From 020b77092a7a86795551a97469134c1e6f72b0cd Mon Sep 17 00:00:00 2001
+From 5b79b9fe7da091664680b86e3b09bc4b926e2e61 Mon Sep 17 00:00:00 2001
 From: Mahesh Bodapati <mbodapat@xilinx.com>
 Date: Sun, 28 Nov 2021 17:17:15 +0530
-Subject: [PATCH 35/38] MB binutils Upstream port issues.
+Subject: [PATCH 33/34] [Patch,MB]: MB binutils Upstream port issues.
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+It's resolving the seg faults with ADDLIK
+Conflicts:
+        bfd/elf64-microblaze.c
 ---
- bfd/elf64-microblaze.c     | 250 +++++++++++++++++++++++++++----------
+ bfd/elf64-microblaze.c     | 248 ++++++++++++++++++++++++++++---------
 gas/config/tc-microblaze.c |   2 +-
 opcodes/microblaze-dis.c   |  12 +-
 opcodes/microblaze-opc.h   |   2 +-
- 4 files changed, 193 insertions(+), 73 deletions(-)
+ 4 files changed, 197 insertions(+), 67 deletions(-)
 diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 387ee0da261..2e42366d8d6 100644
+index 77872cef1ab..119d266f95a 100644
 --- a/bfd/elf64-microblaze.c
 +++ b/bfd/elf64-microblaze.c
-@@ -808,12 +808,35 @@ microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
+@@ -807,12 +807,35 @@ microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
   return _bfd_elf_is_local_label_name (abfd, name);
 }
 
@@ -51,7 +53,7 @@ index 387ee0da261..2e42366d8d6 100644
   /* TLS Reference Types for the symbol; Updated by check_relocs */
 #define TLS_GD     1  /* GD reloc. */
 #define TLS_LD     2  /* LD reloc. */
-@@ -837,6 +860,18 @@ struct elf64_mb_link_hash_table
+@@ -836,6 +859,18 @@ struct elf64_mb_link_hash_table
 {
   struct elf_link_hash_table elf;
 
@@ -137,51 +139,29 @@ index 387ee0da261..2e42366d8d6 100644
                    break;
                  }
              }
-@@ -1759,6 +1795,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
+@@ -1759,6 +1795,21 @@ microblaze_elf_relocate_section (bfd *output_bfd,
 
   return ret;
 }
 +
+/* Merge backend specific data from an object file to the output
+   object file when linking.
+
+   Note: We only use this hook to catch endian mismatches.  */
+static bool
+microblaze_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  /* Check if we have the same endianess.  */
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return false;
+
+  return true;
+}
+
 
 /* Calculate fixup value for reference.  */
 
-@@ -2436,8 +2473,11 @@ microblaze_elf_relax_section (bfd *abfd,
+@@ -2512,6 +2563,17 @@ microblaze_elf_gc_mark_hook (asection *sec,
-       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)
-     {
-@@ -2460,11 +2500,16 @@ microblaze_elf_relax_section (bfd *abfd,
-   return true;
- 
-  error_return:
-  free (free_relocs);
-  free (free_contents);
-  free (sdata->relax);
-  sdata->relax = NULL;
-  sdata->relax_count = 0;
-+  if (free_relocs != NULL)
-+    free (free_relocs);
-+  if (free_contents != NULL)
-+    free (free_contents);
-+  if (sdata->relax != NULL)
-+    {
-+      free (sdata->relax);
-+      sdata->relax = NULL;
-+      sdata->relax_count = 0;
-+    }
-   return false;
- }
- 
-@@ -2489,6 +2534,17 @@ microblaze_elf_gc_mark_hook (asection *sec,
   return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
 }
 
@@ -199,7 +179,7 @@ index 387ee0da261..2e42366d8d6 100644
 /* PIC support.  */
 
 #define PLT_ENTRY_SIZE 16
-@@ -2695,14 +2751,14 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2718,14 +2780,14 @@ microblaze_elf_check_relocs (bfd * abfd,
                         && (! info->symbolic
                             || h->root.type == bfd_link_hash_defweak
                             || !h->def_regular))))
@@ -222,7 +202,7 @@ index 387ee0da261..2e42366d8d6 100644
 
                 /* When creating a shared object, we must copy these
                    relocs into the output file.  We create a reloc
-@@ -2746,14 +2802,14 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2769,14 +2831,14 @@ microblaze_elf_check_relocs (bfd * abfd,
                      return false;
 
                    vpp = &elf_section_data (s)->local_dynrel;
@@ -239,7 +219,7 @@ index 387ee0da261..2e42366d8d6 100644
                         bfd_alloc (htab->elf.dynobj, amt));
                    if (p == NULL)
                      return false;
-@@ -2776,6 +2832,34 @@ microblaze_elf_check_relocs (bfd * abfd,
+@@ -2799,6 +2861,34 @@ microblaze_elf_check_relocs (bfd * abfd,
   return true;
 }
 
@@ -274,7 +254,7 @@ index 387ee0da261..2e42366d8d6 100644
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
 
 static void
-@@ -2788,6 +2872,40 @@ microblaze_elf_copy_indirect_symbol (struct bfd_link_info *info,
+@@ -2811,6 +2901,40 @@ microblaze_elf_copy_indirect_symbol (struct bfd_link_info *info,
   edir = (struct elf64_mb_link_hash_entry *) dir;
   eind = (struct elf64_mb_link_hash_entry *) ind;
 
@@ -315,7 +295,20 @@ index 387ee0da261..2e42366d8d6 100644
   edir->tls_mask |= eind->tls_mask;
 
   _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-@@ -2873,9 +2991,17 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+@@ -2821,8 +2945,12 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+                                      struct elf_link_hash_entry *h)
+ {
+   struct elf64_mb_link_hash_table *htab;
+  struct elf64_mb_link_hash_entry * eh;
+  struct elf64_mb_dyn_relocs *p;
+  asection *sdynbss;
+   asection *s, *srel;
+   unsigned int power_of_two;
+  bfd *dynobj;
+ 
+   htab = elf64_mb_hash_table (info);
+   if (htab == NULL)
+@@ -2892,9 +3020,17 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return true;
     }
 
@@ -335,7 +328,7 @@ index 387ee0da261..2e42366d8d6 100644
     {
       h->non_got_ref = 0;
       return true;
-@@ -2894,19 +3020,11 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+@@ -2913,19 +3049,11 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* We must generate a R_MICROBLAZE_COPY reloc to tell the dynamic linker
      to copy the initial value out of the dynamic object and into the
      runtime process image.  */
@@ -358,7 +351,7 @@ index 387ee0da261..2e42366d8d6 100644
       h->needs_copy = 1;
     }
 
-@@ -2916,11 +3034,12 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+@@ -2935,11 +3063,12 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (power_of_two > 3)
     power_of_two = 3;
 
@@ -374,7 +367,7 @@ index 387ee0da261..2e42366d8d6 100644
        return false;
     }
 
-@@ -2942,7 +3061,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
+@@ -2961,7 +3090,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
   struct bfd_link_info *info;
   struct elf64_mb_link_hash_table *htab;
   struct elf64_mb_link_hash_entry *eh;
@@ -383,7 +376,7 @@ index 387ee0da261..2e42366d8d6 100644
 
   if (h->root.type == bfd_link_hash_indirect)
     return true;
-@@ -2994,7 +3113,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
+@@ -3013,7 +3142,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
          htab->elf.sgotplt->size += 4;
 
          /* We also need to make an entry in the .rel.plt section.  */
@@ -392,7 +385,7 @@ index 387ee0da261..2e42366d8d6 100644
        }
       else
         {
-@@ -3060,7 +3179,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
+@@ -3079,7 +3208,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
   else
     h->got.offset = (bfd_vma) -1;
 
@@ -401,7 +394,7 @@ index 387ee0da261..2e42366d8d6 100644
     return true;
 
   /* In the shared -Bsymbolic case, discard space allocated for
-@@ -3075,9 +3194,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
+@@ -3094,9 +3223,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
          && (h->forced_local
              || info->symbolic))
        {
@@ -413,7 +406,7 @@ index 387ee0da261..2e42366d8d6 100644
            {
              p->count -= p->pc_count;
              p->pc_count = 0;
-@@ -3169,7 +3288,7 @@ microblaze_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+@@ -3188,7 +3317,7 @@ microblaze_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
        {
          struct elf_dyn_relocs *p;
 
@@ -422,13 +415,18 @@ index 387ee0da261..2e42366d8d6 100644
                    elf_section_data (s)->local_dynrel);
               p != NULL;
               p = p->next)
-@@ -3650,9 +3769,10 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
+@@ -3666,13 +3795,14 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
+ #define bfd_elf64_new_section_hook             microblaze_elf_new_section_hook
+ #define elf_backend_relocate_section           microblaze_elf_relocate_section
+ #define bfd_elf64_bfd_relax_section             microblaze_elf_relax_section
+-#define bfd_elf64_bfd_merge_private_bfd_data    _bfd_generic_verify_endian_match
+#define bfd_elf64_bfd_merge_private_bfd_data    microblaze_elf_merge_private_bfd_data
 #define bfd_elf64_bfd_reloc_name_lookup                microblaze_elf_reloc_name_lookup
 
 #define elf_backend_gc_mark_hook               microblaze_elf_gc_mark_hook
 -#define elf_backend_check_relocs               microblaze_elf_check_relocs
 -#define elf_backend_copy_indirect_symbol       microblaze_elf_copy_indirect_symbol
-#define bfd_elf32_bfd_link_hash_table_create   microblaze_elf_link_hash_table_create
+-#define bfd_elf64_bfd_link_hash_table_create   microblaze_elf_link_hash_table_create
 +#define elf_backend_gc_sweep_hook              microblaze_elf_gc_sweep_hook
 +#define elf_backend_check_relocs                microblaze_elf_check_relocs
 +#define elf_backend_copy_indirect_symbol        microblaze_elf_copy_indirect_symbol
@@ -436,7 +434,7 @@ index 387ee0da261..2e42366d8d6 100644
 #define elf_backend_can_gc_sections            1
 #define elf_backend_can_refcount               1
 #define elf_backend_want_got_plt               1
-@@ -3662,11 +3782,11 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
+@@ -3682,11 +3812,11 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
 #define elf_backend_rela_normal                        1
 #define elf_backend_dtrel_excludes_plt         1
 
@@ -454,7 +452,7 @@ index 387ee0da261..2e42366d8d6 100644
 
 #include "elf64-target.h"
 diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
-index 123d5ba6214..41d51007273 100644
+index 6b398ab5605..c4a3817bf19 100644
 --- a/gas/config/tc-microblaze.c
 +++ b/gas/config/tc-microblaze.c
 @@ -433,7 +433,7 @@ const pseudo_typeS md_pseudo_table[] =
@@ -467,7 +465,7 @@ index 123d5ba6214..41d51007273 100644
 
   opcode_hash_control = str_htab_create ();
 diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
-index 0814cab5bdb..95c2147f86e 100644
+index b5a78dcfe09..b76a5935a34 100644
 --- a/opcodes/microblaze-dis.c
 +++ b/opcodes/microblaze-dis.c
 @@ -140,7 +140,7 @@ get_field_imm16 (struct string_buf *buf, long instr)
@@ -502,7 +500,7 @@ index 0814cab5bdb..95c2147f86e 100644
   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,
+@@ -497,7 +497,7 @@ get_insn_microblaze (long inst,
                     enum microblaze_instr_type *insn_type,
                     short *delay_slots)
 {
@@ -511,7 +509,7 @@ index 0814cab5bdb..95c2147f86e 100644
   *isunsignedimm = false;
 
   /* Just a linear search of the table.  */
-@@ -538,7 +538,7 @@ microblaze_get_target_address (long inst, bool immfound, int immval,
+@@ -539,7 +539,7 @@ microblaze_get_target_address (long inst, bool immfound, int immval,
                               bool *targetvalid,
                               bool *unconditionalbranch)
 {
@@ -534,5 +532,5 @@ index e65f4b58233..4a415495113 100644
   const char * name;
   short inst_type;            /* Registers and immediate values involved.  */
 -- 
-2.25.1
+2.37.1 (Apple Git-137.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-Added-support-f.patch
deleted file mode 100644
index 18a1da90..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0034-Initial-port-of-core-reading-support-Added-support-f.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From 98f1df0f21b6c44eb8b5bac070a748c4a16d3f66 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/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
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
- bfd/elf32-microblaze.c      | 84 +++++++++++++++++++++++++++++++++++++
- gdb/configure.tgt           |  2 +-
- 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 f41b503cbb5..9c6d0411420 100644
--- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -806,6 +806,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 bool
-+microblaze_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
-+{
-+  int offset;
-+  unsigned int size;
-+
-+  switch (note->descsz)
-+    {
-+      default:
-+        return false;
-+
-+      case 228:         /* Linux/MicroBlaze */
-+        /* pr_cursig */
-+        elf_tdata (abfd)->core->signal = bfd_get_16 (abfd, note->descdata + 12);
-+
-+        /* pr_pid */
-+        elf_tdata (abfd)->core->pid = bfd_get_32 (abfd, note->descdata + 24);
-+
-+        /* pr_reg */
-+        offset = 72;
-+        size = 50 * 4;
-+
-+        break;
-+    }
-+
-+  /* Make a ".reg/999" section.  */
-+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
-+                                          size, note->descpos + offset);
-+}
-+
-+static bool
-+microblaze_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
-+{
-+  switch (note->descsz)
-+    {
-+      default:
-+        return false;
-+
-+      case 128:         /* Linux/MicroBlaze elf_prpsinfo */
-+        elf_tdata (abfd)->core->program
-+         = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16);
-+        elf_tdata (abfd)->core->command
-+         = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80);
-+    }
-+
-+  /* Note that for some reason, a spurious space is tacked
-+     onto the end of the args in some (at least one anyway)
-+     implementations, so strip it off if it exists.  */
-+
-+  {
-+    char *command = elf_tdata (abfd)->core->command;
-+    int n = strlen (command);
-+
-+    if (0 < n && command[n - 1] == ' ')
-+      command[n - 1] = '\0';
-+  }
-+
-+  return true;
-+}
-+
-+/* 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 elf32_mb_dyn_relocs
-+{
-+  struct elf32_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 elf32_mb_link_hash_entry
-@@ -3604,4 +3685,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
- 
-+#define elf_backend_grok_prstatus               microblaze_elf_grok_prstatus
-+#define elf_backend_grok_psinfo                 microblaze_elf_grok_psinfo
-+
- #include "elf32-target.h"
-diff --git a/gdb/configure.tgt b/gdb/configure.tgt
-index 0705ccf32b8..7ea186481f3 100644
--- a/gdb/configure.tgt
-+++ b/gdb/configure.tgt
-@@ -400,7 +400,7 @@ mep-*-*)
- 
- microblaze*-linux-*|microblaze*-*-linux*)
-        # Target: Xilinx MicroBlaze running Linux
-       gdb_target_obs="microblaze-tdep.o microblaze-linux-tdep.o solib-svr4.o \
-+       gdb_target_obs="microblaze-tdep.o microblaze-linux-tdep.o solib-svr4.o glibc-tdep.o \
-                        symfile-mem.o linux-tdep.o"
-        ;;
- microblaze*-*-*)
-diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
-index 5748556a556..1e1f03fc154 100644
--- a/gdb/microblaze-linux-tdep.c
-+++ b/gdb/microblaze-linux-tdep.c
-@@ -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
- };
- 
-
- static void
- microblaze_linux_init_abi (struct gdbarch_info info,
-                           struct gdbarch *gdbarch)
- {
-+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-+
-+  tdep->sizeof_gregset = 200;
-   linux_init_abi (info, gdbarch, 0);
- 
-+
-   set_gdbarch_memory_remove_breakpoint (gdbarch,
-                                        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);
- 
-+  /* BFD target for core files.  */
-+  if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
-+    set_gdbarch_gcore_bfd_target (gdbarch, "elf32-microblaze");
-+  else
-+    set_gdbarch_gcore_bfd_target (gdbarch, "elf32-microblazeel");
-+
-+
-+  /* Shared library handling.  */
-+  set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
-+  set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver);
-+
-   /* 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 3e8e8fe35b9..31005332104 100644
--- a/gdb/microblaze-tdep.c
-+++ b/gdb/microblaze-tdep.c
-@@ -666,6 +666,43 @@ microblaze_register_g_packet_guesses (struct gdbarch *gdbarch)
-                                  tdesc_microblaze_with_stack_protect);
- }
- 
-+void
-+microblaze_supply_gregset (const struct regset *regset,
-+                        struct regcache *regcache,
-+                        int regnum, const void *gregs)
-+{
-+  const unsigned int *regs = (const unsigned int *)gregs;
-+  if (regnum >= 0)
-+    regcache->raw_supply (regnum, regs + regnum);
-+
-+  if (regnum == -1) {
-+    int i;
-+
-+    for (i = 0; i < 50; i++) {
-+      regcache->raw_supply (i, regs + i);
-+    }
-+  }
-+}
-+
-+
-+/* Return the appropriate register set for the core section identified
-+   by SECT_NAME and 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);
-+
-+  cb(".reg", tdep->sizeof_gregset, tdep->sizeof_gregset, tdep->gregset, NULL, cb_data);
-+
-+  cb(".reg2", tdep->sizeof_fpregset, tdep->sizeof_fpregset, tdep->fpregset, NULL, cb_data);
-+}
-+
-+
-+
- static struct gdbarch *
- microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
- {
-@@ -718,6 +755,10 @@ microblaze_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
-   microblaze_gdbarch_tdep *tdep = new microblaze_gdbarch_tdep;
-   gdbarch = gdbarch_alloc (&info, tdep);
- 
-+  tdep->gregset = NULL;
-+  tdep->sizeof_gregset = 0;
-+  tdep->fpregset = NULL;
-+  tdep->sizeof_fpregset = 0;
-   set_gdbarch_long_double_bit (gdbarch, 128);
- 
-   set_gdbarch_num_regs (gdbarch, MICROBLAZE_NUM_REGS);
-@@ -766,6 +807,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, 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_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 53fcb2297e6..6f5bd5903a7 100644
--- a/gdb/microblaze-tdep.h
-+++ b/gdb/microblaze-tdep.h
-@@ -23,8 +23,22 @@
- #include "gdbarch.h"
- 
- /* Microblaze architecture-specific information.  */
-+struct microblaze_gregset
-+{
-+  unsigned int gregs[32];
-+  unsigned int fpregs[32];
-+  unsigned int pregs[16];
-+};
-+
- struct microblaze_gdbarch_tdep : gdbarch_tdep
- {
-+  int dummy;           // declare something.
-+
-+  /* Register sets.  */
-+  struct regset *gregset;
-+  size_t sizeof_gregset;
-+  struct regset *fpregset;
-+  size_t sizeof_fpregset;
- };
- 
- /* Register numbers.  */
-@@ -121,5 +135,18 @@ struct microblaze_frame_cache
- #define MICROBLAZE_BREAKPOINT {0xba, 0x0c, 0x00, 0x18}
- #define MICROBLAZE_BREAKPOINT_LE {0x18, 0x00, 0x0c, 0xba}
- 
-+extern void microblaze_supply_gregset (const struct regset *regset,
-+                                    struct regcache *regcache,
-+                                    int regnum, const void *gregs);
-+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,
-+                                     int regnum, const void *fpregs);
-+extern void microblaze_collect_fpregset (const struct regcache *regcache,
-+                                      int regnum, void *fpregs);
-+
-+extern const struct regset * microblaze_regset_from_core_section (struct gdbarch *gdbarch,
-+                                     const char *sect_name, size_t sect_size);
- 
- #endif /* microblaze-tdep.h */
-- 
-2.25.1
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch
new file mode 100644
index 00000000..4428823f
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/binutils/binutils/0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch
@@ -0,0 +1,27 @@
+From 652c69cca5a9da92369378674707cdc59988bcc3 Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Fri, 28 Oct 2022 13:57:48 +0530
+Subject: [PATCH 34/34] [Patch,MicroBlaze] : By default the linker will
+ generate warnings if it is creating an  executable stack or a segment with
+ all three of read, write and  execute permissions.  These settings are not
+ appropriate for all  targets
+---
+ ld/configure.tgt | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/ld/configure.tgt b/ld/configure.tgt
+index 80ffbcf23b3..198cd0f71e4 100644
+--- a/ld/configure.tgt
+++ b/ld/configure.tgt
+@@ -55,6 +55,7 @@ if test "${ac_default_ld_warn_rwx_segments}" = unset; then
+     cris-*-* | crisv32-*-* | \
+     hppa*-*-* | \
+     mips*-*-* | \
+    microblaze*-*-* | \
+     sparc*-*-*)
+       ac_default_ld_warn_rwx_segments=0
+       ;;
+-- 
+2.37.1 (Apple Git-137.1)
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0037-Fixing-the-imm-imml-generation-for-16-bit-argument-C.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0037-Fixing-the-imm-imml-generation-for-16-bit-argument-C.patch
deleted file mode 100644
index 5c69eed7..00000000
--- a/meta-microblaze/recipes-devtools/binutils/binutils/0037-Fixing-the-imm-imml-generation-for-16-bit-argument-C.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9f2319c6e32c4449604c2ec26042123a88eeb87c Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <mbodapat@xilinx.com>
-Date: Mon, 24 Jan 2022 16:21:33 +0530
-Subject: [PATCH 37/38] Fixing the imm/imml generation for 16 bit argument
- [CR-1115234].
-Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
- bfd/elf32-microblaze.c | 6 +++++-
- bfd/elf64-microblaze.c | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
-index e284b0e5398..8b947a6ec79 100644
--- a/bfd/elf32-microblaze.c
-+++ b/bfd/elf32-microblaze.c
-@@ -2016,7 +2016,11 @@ microblaze_elf_relax_section (bfd *abfd,
-       else
-        symval += irel->r_addend;
- 
-      if ((symval & 0xffff8000) == 0)
-+      /* Check for imm command argument value to decide if
-+       * we need full 32-bit value for next command */
-+      if ((symval & 0xffff8000) == 0
-+         || (symval & 0xffff8000) == 0xffff8000)
-+
-        {
-          /* We can delete this instruction.  */
-          sdata->relax[sdata->relax_count].addr = irel->r_offset;
-diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c
-index 3b6e6aa47bd..cecfb5506f8 100644
--- a/bfd/elf64-microblaze.c
-+++ b/bfd/elf64-microblaze.c
-@@ -2011,7 +2011,10 @@ microblaze_elf_relax_section (bfd *abfd,
-       else
-        symval += irel->r_addend;
- 
-      if ((symval & 0xffff8000) == 0)
-+      /* Check for imm command argument value to decide if
-+       * we need full 32-bit value for next command */
-+      if ((symval & 0xffff8000) == 0
-+         || (symval & 0xffff8000) == 0xffff8000)
-        {
-           /* We can delete this instruction.  */
-           sdata->relax[sdata->relax_count].addr = irel->r_offset;
-- 
-2.25.1
author	Mark Hatle <mark.hatle@amd.com>	2022-11-04 15:07:16 -0500
committer	Mark Hatle <mark.hatle@amd.com>	2022-11-07 08:05:23 -0600
commit	75c67a6c15fed677378ab52ed90b6ca0e5125936 (patch)
tree	b72dde036d0881b263b92707e4f457b7873d2f50 /meta-microblaze
parent	675cc3174baed5028c647eb829570501c34eddb9 (diff)
download	meta-xilinx-75c67a6c15fed677378ab52ed90b6ca0e5125936.tar.gz