Remove use of S_PLT

Author: redstar

llvm/include/llvm/MC/MCGOFFObjectWriter.h

@@ -27,11 +27,11 @@ class MCGOFFObjectTargetWriter : public MCObjectTargetWriter {
 
 public:
   enum RLDRelocationType {
-    Reloc_Type_ACon = 0x1,   // General address.
-    Reloc_Type_RelImm = 0x2, // Relative-immediate address.
-    Reloc_Type_QCon = 0x3,   // Offset of symbol in class.
-    Reloc_Type_VCon = 0x4,   // Address of external symbol.
-    Reloc_Type_RCon = 0x5,   // PSECT of symbol.
+    Reloc_Type_ACon = 0x1,  // General address.
+    Reloc_Type_RICon = 0x2, // Relative-immediate address.
+    Reloc_Type_QCon = 0x3,  // Offset of symbol in class.
+    Reloc_Type_VCon = 0x4,  // Address of external symbol.
+    Reloc_Type_RCon = 0x5,  // PSECT of symbol.
   };
 
   ~MCGOFFObjectTargetWriter() override = default;

llvm/lib/MC/GOFFObjectWriter.cpp

@@ -692,7 +692,7 @@ void GOFFObjectWriter::recordRelocation(const MCFragment &F,
   const MCSectionGOFF *PSection = static_cast<MCSectionGOFF *>(F.getParent());
   const auto &A = *static_cast<const MCSymbolGOFF *>(Target.getAddSym());
   const MCSymbolGOFF *B = static_cast<const MCSymbolGOFF *>(Target.getSubSym());
-  if (RelocType == MCGOFFObjectTargetWriter::Reloc_Type_RelImm) {
+  if (RelocType == MCGOFFObjectTargetWriter::Reloc_Type_RICon) {
     if (A.isUndefined()) {
       Asm->reportError(
           Fixup.getLoc(),

llvm/lib/Target/SystemZ/MCTargetDesc/SystemZGOFFObjectWriter.cpp

@@ -29,8 +29,6 @@ SystemZGOFFObjectWriter::SystemZGOFFObjectWriter()
 unsigned SystemZGOFFObjectWriter::getRelocType(const MCValue &Target,
                                                const MCFixup &Fixup) const {
   switch (Target.getSpecifier()) {
-  case SystemZ::S_PLT: // TODO This doen't make sense.
-    return Reloc_Type_RelImm;
   case SystemZ::S_RCon:
     return Reloc_Type_RCon;
   case SystemZ::S_VCon:
@@ -39,7 +37,7 @@ unsigned SystemZGOFFObjectWriter::getRelocType(const MCValue &Target,
     return Reloc_Type_QCon;
   case SystemZ::S_None:
     if (Fixup.isPCRel())
-      return Reloc_Type_RelImm;
+      return Reloc_Type_RICon;
     return Reloc_Type_ACon;
   }
   llvm_unreachable("Modifier not supported");

llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp

@@ -65,6 +65,9 @@ void SystemZMCAsmInfoGOFF::printSpecifierExpr(
   case SystemZ::S_None:
     OS << "A";
     break;
+  case SystemZ::S_QCon:
+    OS << "Q";
+    break;
   case SystemZ::S_RCon:
     OS << "R";
     break;

llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.h

@@ -49,9 +49,9 @@ enum {
 
   // HLASM docs for address constants:
   // https://www.ibm.com/docs/en/hla-and-tf/1.6?topic=value-address-constants
-  S_RCon, // Address of ADA of symbol.
-  S_VCon, // Address of external function symbol.
-  S_QCon, // Class-based offset.
+  S_RCon,  // Address of ADA of symbol.
+  S_VCon,  // Address of external function symbol.
+  S_QCon,  // Class-based offset.
 };
 } // namespace SystemZ
 

llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp

@@ -325,7 +325,7 @@ void SystemZAsmPrinter::emitInstruction(const MachineInstr *MI) {
     EmitToStreamer(*OutStreamer, MCInstBuilder(SystemZ::BRASL)
                                      .addReg(SystemZ::R7D)
                                      .addExpr(Lower.getExpr(MI->getOperand(0),
-                                                            SystemZ::S_PLT)));
+                                                            SystemZ::S_None)));
     emitCallInformation(CallType::BRASL7);
     return;
 

llvm/test/CodeGen/SystemZ/call-zos-02.ll

@@ -9,8 +9,8 @@ entry:
 define hidden signext i32 @caller2() {
 entry:
 ; CHECK-LABEL:   caller2:
-; CHECK:         brasl 7,caller@PLT   * encoding: [0xc0,0x75,A,A,A,A]
-; CHECK-NEXT:    * fixup A - offset: 2, value: caller@PLT+2, kind: FK_390_PC32DBL
+; CHECK:         brasl 7,caller       * encoding: [0xc0,0x75,A,A,A,A]
+; CHECK-NEXT:    * fixup A - offset: 2, value: caller+2, kind: FK_390_PC32DBL
 ; CHECK-NEXT:    bcr     0,3          * encoding: [0x07,0x03]
   %call = call signext i32 @caller()
   ret i32 %call

llvm/test/CodeGen/SystemZ/zos-ada.ll

@@ -6,7 +6,7 @@
 ; CHECK:         stmg 6,8,1872(4)
 ; CHECK-NEXT:    aghi 4,-192
 ; CHECK-NEXT:    lgr 8,5
-; CHECK-NEXT:    brasl 7,callee_internal@PLT
+; CHECK-NEXT:    brasl 7,callee_internal
 ; CHECK-NEXT:    bcr 0,3
 ; CHECK-NEXT:    lg 6,8(8)
 ; CHECK-NEXT:    lg 5,0(8)