bfd: microblaze: Add 32_NONE reloc type

This patch adds the R_MICROBLAZE_32_NONE relocation type.
This is a 32-bit reloc that stores the 32-bit pc relative
value in two words (with an imm instruction).

Add test case to gas test suite.

Signed-off-by: Neal Frager <neal.frager@amd.com>
Signed-off-by: Michael J. Eager <eager@eagercon.com>

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index c1fe48bb2f1083547f38aacd9d0f66436368b199..3d7dbf66638c635562293992c570f48177fcaa2f 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -6463,6 +6463,11 @@ value relative to the read-write small data area anchor  */
 expressions of the form "Symbol Op Symbol"  */
   BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM,
 
+/* This is a 32 bit reloc that stores the 32 bit pc relative
+value in two words (with an imm instruction).No relocation is
+done here - only used for relaxing  */
+  BFD_RELOC_MICROBLAZE_32_NONE,
+
 /* This is a 64 bit reloc that stores the 32 bit pc relative
 value in two words (with an imm instruction).  No relocation is
 done here - only used for relaxing  */

diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index a7e81c70fc8e6b3bc91ed5d100987167ecd1ee8a..57c02ed3d003b6d28b5b0836e4d6bc01a64cfe1a 100644 (file)
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -174,6 +174,21 @@ static reloc_howto_type microblaze_elf_howto_raw[] =
          0x0000ffff,           /* Dest Mask.  */
          false),               /* PC relative offset?  */
 
+   /* This reloc does nothing. Used for relaxation.  */
+   HOWTO (R_MICROBLAZE_32_NONE,        /* Type.  */
+       0,                      /* Rightshift.  */
+       2,                      /* Size (0 = byte, 1 = short, 2 = long).  */
+       32,                     /* Bitsize.  */
+       true,                   /* PC_relative.  */
+       0,                      /* Bitpos.  */
+       complain_overflow_bitfield, /* Complain on overflow.  */
+       NULL,                   /* Special Function.  */
+       "R_MICROBLAZE_32_NONE", /* Name.  */
+       false,                  /* Partial Inplace.  */
+       0,                      /* Source Mask.  */
+       0,                      /* Dest Mask.  */
+       false),         /* PC relative offset?  */
+
    /* This reloc does nothing. Used for relaxation.  */
    HOWTO (R_MICROBLAZE_64_NONE,        /* Type.  */
          0,                    /* Rightshift.  */
@@ -560,6 +575,9 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
     case BFD_RELOC_NONE:
       microblaze_reloc = R_MICROBLAZE_NONE;
       break;
+    case BFD_RELOC_MICROBLAZE_32_NONE:
+      microblaze_reloc = R_MICROBLAZE_32_NONE;
+      break;
     case BFD_RELOC_MICROBLAZE_64_NONE:
       microblaze_reloc = R_MICROBLAZE_64_NONE;
       break;
@@ -1954,6 +1972,7 @@ microblaze_elf_relax_section (bfd *abfd,
                }
              break;
            case R_MICROBLAZE_NONE:
+           case R_MICROBLAZE_32_NONE:
              {
                /* This was a PC-relative instruction that was
                   completely resolved.  */
@@ -2009,7 +2028,8 @@ microblaze_elf_relax_section (bfd *abfd,
          irelscanend = irelocs + o->reloc_count;
          for (irelscan = irelocs; irelscan < irelscanend; irelscan++)
            {
-             if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
+             if ((ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32) ||
+                 (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_NONE))
                {
                  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
 
@@ -2068,7 +2088,7 @@ microblaze_elf_relax_section (bfd *abfd,
                              elf_section_data (o)->this_hdr.contents = ocontents;
                            }
                        }
-                     irelscan->r_addend -= calc_fixup (irel->r_addend
+                     irelscan->r_addend -= calc_fixup (irelscan->r_addend
                                                        + isym->st_value,
                                                        0,
                                                        sec);

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index d5f42f22c085d4c963c3fa660cfcf87ffebd3c38..d729dc48e7c670310b7bab6d71368c20fdfc0e93 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -3010,6 +3010,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MICROBLAZE_32_ROSDA",
   "BFD_RELOC_MICROBLAZE_32_RWSDA",
   "BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM",
+  "BFD_RELOC_MICROBLAZE_32_NONE",
   "BFD_RELOC_MICROBLAZE_64_NONE",
   "BFD_RELOC_MICROBLAZE_64_GOTPC",
   "BFD_RELOC_MICROBLAZE_64_GOT",

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 2ac883d0eacaf000010d45815e048aa0c7f4825f..3ea2afc0d4eecc1e6df4ec93e6dc6904440ad1ce 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6694,6 +6694,12 @@ ENUM
 ENUMDOC
   This is a 32 bit reloc for the microblaze to handle
   expressions of the form "Symbol Op Symbol"
+ENUM
+  BFD_RELOC_MICROBLAZE_32_NONE
+ENUMDOC
+  This is a 32 bit reloc that stores the 32 bit pc relative
+  value in two words (with an imm instruction).  No relocation is
+  done here - only used for relaxing
 ENUM
   BFD_RELOC_MICROBLAZE_64_NONE
 ENUMDOC

diff --git a/binutils/readelf.c b/binutils/readelf.c
index c9b6210e229dab30154e88ca244aab6227d8c245..701ca73a7c229720b6f6485e392004d03806dd99 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -15279,6 +15279,10 @@ is_8bit_abs_reloc (Filedata * filedata, unsigned int reloc_type)
       return reloc_type == 54; /* R_RISCV_SET8.  */
     case EM_Z80:
       return reloc_type == 1;  /* R_Z80_8.  */
+    case EM_MICROBLAZE:
+      return (reloc_type == 33 /* R_MICROBLAZE_32_NONE.  */
+             || reloc_type == 0 /* R_MICROBLAZE_NONE.  */
+             || reloc_type == 9 /* R_MICROBLAZE_64_NONE.  */);
     default:
       return false;
     }

diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
index b510da950244c74d0d1cc8ee22426ecabddf0cb7..604cc935da9629653c1202aa6b42c457129229b8 100644 (file)
--- a/gas/config/tc-microblaze.c
+++ b/gas/config/tc-microblaze.c
@@ -2290,6 +2290,8 @@ md_apply_fix (fixS *   fixP,
         moves code around due to relaxing.  */
       if (fixP->fx_r_type == BFD_RELOC_64_PCREL)
        fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE;
+      else if (fixP->fx_r_type == BFD_RELOC_32)
+       fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE;
       else
        fixP->fx_r_type = BFD_RELOC_NONE;
       fixP->fx_addsy = section_symbol (absolute_section);
@@ -2513,6 +2515,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp)
   switch (fixp->fx_r_type)
     {
     case BFD_RELOC_NONE:
+    case BFD_RELOC_MICROBLAZE_32_NONE:
     case BFD_RELOC_MICROBLAZE_64_NONE:
     case BFD_RELOC_32:
     case BFD_RELOC_MICROBLAZE_32_LO:

diff --git a/gas/testsuite/gas/microblaze/reloc_sym.d b/gas/testsuite/gas/microblaze/reloc_sym.d
index 571ffe1bba87a90923b08269939fab74b5c95589..cbc55633a2f54a902aa0ac643fc2e8de3b26e400 100644 (file)
--- a/gas/testsuite/gas/microblaze/reloc_sym.d
+++ b/gas/testsuite/gas/microblaze/reloc_sym.d
@@ -30,6 +30,11 @@ Disassembly of section .text:
 100000a8:      30210020        addik   r1, r1, 32
 100000ac:      b60f0008        rtsd    r15, 8
 100000b0:      80000000        or      r0, r0, r0
+100000b4:      14422003        cmpu    r2, r2, r4
+100000b8:      be220004        bneid   r2, 4   // 100000bc <reloc_none_test>
+
+100000bc <reloc_none_test>:
+100000bc:      a0630001        ori     r3, r3, 1
 
 Disassembly of section .testsection:
 

diff --git a/gas/testsuite/gas/microblaze/reloc_weaksym.s b/gas/testsuite/gas/microblaze/reloc_weaksym.s
index 7dd9b981462c4902c199fa5a619d377e490b5079..4425809337617ff17c77f5f33b76ed23721cc7b4 100644 (file)
--- a/gas/testsuite/gas/microblaze/reloc_weaksym.s
+++ b/gas/testsuite/gas/microblaze/reloc_weaksym.s
@@ -42,7 +42,8 @@ main:
        addik   r1,r1,32
        rtsd    r15,8
        nop             # Unfilled delay slot
-
+       cmpu    r2,r2,r4
+       BNEID   r2,reloc_none_test
        .end    main
 $Lfe2:
        .size   main,$Lfe2-main
@@ -50,3 +51,5 @@ $Lfe2:
        test_start = __def_start
        .globl  test_start_strong
        test_start_strong = __def_start
+reloc_none_test:
+       ori     r3,r3,1

diff --git a/include/elf/microblaze.h b/include/elf/microblaze.h
index fecdd7e4831cc2722c9549c26d6385f8be121282..164b36d09780e854a677281d77d17f017683bf3d 100644 (file)
--- a/include/elf/microblaze.h
+++ b/include/elf/microblaze.h
@@ -61,6 +61,7 @@ START_RELOC_NUMBERS (elf_microblaze_reloc_type)
   RELOC_NUMBER (R_MICROBLAZE_TEXTPCREL_64, 30)  /* PC-relative TEXT offset.  */
   RELOC_NUMBER (R_MICROBLAZE_TEXTREL_64, 31)    /* TEXT Entry offset 64-bit.  */
   RELOC_NUMBER (R_MICROBLAZE_TEXTREL_32_LO, 32) /* TEXT Entry offset 32-bit.  */
+  RELOC_NUMBER (R_MICROBLAZE_32_NONE, 33)
 END_RELOC_NUMBERS (R_MICROBLAZE_max)
 
 /* Global base address names.  */