[mips][microMIPS] Relocate with symbol for micromips function symbols

[zoran.jovanovic]

Summary

Section name is not marked as microMIPS, thus for function symbols relocations should use symbol - not section name.

[zoran.jovanovic]

Labels also relocated with the symbol.

[sstankovic]

test/MC/Mips/micromips-func-addr.s

12

You can reorder instructions and rename foo to L1 so that it is more obvious that two symbols in the test are function and label. For example (I also marked .4byte directives with .data):

  .set    micromips
  .type   bar,@function
bar:
L1:
  nop

  .data
  .4byte bar
  .4byte L1

[zoran.jovanovic]

Test case modified according to review.

[sstankovic]

LGTM, with a change.

lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp

14

Place MCELF.h before MCELFObjectWriter.h because it precedes in alphabetical order.

lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp

 //===-- MipsELFObjectWriter.cpp - Mips ELF Writer -------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/MipsBaseInfo.h"
 #include "MCTargetDesc/MipsFixupKinds.h"
 #include "MCTargetDesc/MipsMCTargetDesc.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCELFObjectWriter.h"
+#include "llvm/MC/MCELF.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCValue.h"
 #include "llvm/Support/ErrorHandling.h"
 #include <list>
 
 using namespace llvm;
 
MipsELFObjectWriter::needsRelocateWithSymbol(const MCSymbolData &SD,
   case ELF::R_MIPS_HI16:
   case ELF::R_MIPS16_HI16:
   case ELF::R_MICROMIPS_HI16:
   case ELF::R_MIPS_LO16:
   case ELF::R_MIPS16_LO16:
   case ELF::R_MICROMIPS_LO16:
     return true;
 
-  case ELF::R_MIPS_26:
   case ELF::R_MIPS_32:
+    if (MCELF::getOther(SD) & (ELF::STO_MIPS_MICROMIPS >> 2))
+      return true;
+    // falltrough
+  case ELF::R_MIPS_26:
   case ELF::R_MIPS_64:
   case ELF::R_MIPS_GPREL16:
     return false;
   }
 }
 
 MCObjectWriter *llvm::createMipsELFObjectWriter(raw_ostream &OS,
                                                 uint8_t OSABI,
                                                 bool IsLittleEndian,
                                                 bool Is64Bit) {
   MCELFObjectTargetWriter *MOTW = new MipsELFObjectWriter(Is64Bit, OSABI,
                                                 (Is64Bit) ? true : false,
                                                 IsLittleEndian);
   return createELFObjectWriter(MOTW, OS, IsLittleEndian);
 }

test/MC/Mips/micromips-func-addr.s

+# RUN: llvm-mc %s -filetype=obj -triple=mipsel-unknown-linux \
+# RUN: -mattr=micromips | llvm-readobj -r \
+# RUN: | FileCheck %s -check-prefix=CHECK
+# CHECK: Relocations [
+# CHECK:     0x0 R_MIPS_32 bar 0x0
+# CHECK:     0x4 R_MIPS_32 L1 0x0
+
+  .set    micromips
+  .type   bar,@function
+bar:
+L1:
+  nop
+  .data
+  .4byte bar 
+  .4byte L1 
+