Add linkage attribute

Author: redstar

llvm/include/llvm/MC/MCDirectives.h

@@ -48,10 +48,10 @@ enum MCSymbolAttr {
   MCSA_WeakDefAutoPrivate,      ///< .weak_def_can_be_hidden (MachO)
   MCSA_WeakAntiDep,             ///< .weak_anti_dep (COFF)
   MCSA_Memtag,                  ///< .memtag (ELF)
-
-  // Attributes specific for HLASM.
   MCSA_Code,                    ///< symbol is code (GOFF)
   MCSA_Data,                    ///< symbol is data (GOFF)
+  MCSA_OSLinkage,               ///< symbol uses OS linkage (GOFF)
+  MCSA_XPLinkage,               ///< symbol uses XP linkage (GOFF)
 };
 
 enum MCDataRegionType {

llvm/include/llvm/MC/MCSymbolGOFF.h

@@ -34,6 +34,7 @@ class MCSymbolGOFF : public MCSymbol {
   GOFF::ERAttr ERAttributes;
 
   GOFF::ESDExecutable CodeData = GOFF::ESDExecutable::ESD_EXE_Unspecified;
+  GOFF::ESDLinkageType Linkage = GOFF::ESDLinkageType::ESD_LT_XPLink;
 
   enum SymbolFlags : uint16_t {
     SF_LD = 0x01,     // LD attributes are set.
@@ -86,6 +87,9 @@ class MCSymbolGOFF : public MCSymbol {
   void setCodeData(GOFF::ESDExecutable Value) { CodeData = Value; }
   GOFF::ESDExecutable getCodeData() const { return CodeData; }
 
+  void setLinkage(GOFF::ESDLinkageType Value) { Linkage = Value; }
+  GOFF::ESDLinkageType getLinkage() const { return Linkage; }
+
   void initAttributes();
 };
 } // end namespace llvm

llvm/lib/MC/MCELFStreamer.cpp

@@ -18,6 +18,7 @@
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCDirectives.h"
 #include "llvm/MC/MCELFObjectWriter.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCFixup.h"
@@ -153,6 +154,8 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
   case MCSA_WeakAntiDep:
   case MCSA_Code:
   case MCSA_Data:
+  case MCSA_OSLinkage:
+  case MCSA_XPLinkage:
     return false;
 
   case MCSA_NoDeadStrip:

llvm/lib/MC/MCGOFFStreamer.cpp

@@ -82,6 +82,12 @@ bool MCGOFFStreamer::emitSymbolAttribute(MCSymbol *Sym,
   case MCSA_Data:
     Symbol->setCodeData(GOFF::ESDExecutable::ESD_EXE_DATA);
     break;
+  case MCSA_OSLinkage:
+    Symbol->setLinkage(GOFF::ESDLinkageType::ESD_LT_OS);
+    break;
+  case MCSA_XPLinkage:
+    Symbol->setLinkage(GOFF::ESDLinkageType::ESD_LT_XPLink);
+    break;
   case MCSA_Global:
     Symbol->setExternal(true);
     break;

llvm/lib/MC/MCMachOStreamer.cpp

@@ -301,6 +301,8 @@ bool MCMachOStreamer::emitSymbolAttribute(MCSymbol *Sym,
   case MCSA_WeakAntiDep:
   case MCSA_Code:
   case MCSA_Data:
+  case MCSA_OSLinkage:
+  case MCSA_XPLinkage:
     return false;
 
   case MCSA_Global:

llvm/lib/MC/MCSymbolGOFF.cpp

@@ -32,16 +32,15 @@ void MCSymbolGOFF::initAttributes() {
   if (isDefined()) {
     MCSectionGOFF &Section = static_cast<MCSectionGOFF &>(getSection());
     if (Section.isED()) {
-      setLDAttributes(GOFF::LDAttr{false, CodeData, BindingStrength,
-                                   GOFF::ESD_LT_XPLink, GOFF::ESD_AMODE_64,
-                                   BindingScope});
+      setLDAttributes(GOFF::LDAttr{false, CodeData, BindingStrength, Linkage,
+                                   GOFF::ESD_AMODE_64, BindingScope});
     } else if (Section.isPR()) {
       // For data symbols, the attributes are already determind in TLOFI.
       // TODO Does it make sense to it to here?
     } else
       llvm_unreachable("Unexpected section type for label");
   } else {
-    setERAttributes(GOFF::ERAttr{CodeData, BindingStrength, GOFF::ESD_LT_XPLink,
+    setERAttributes(GOFF::ERAttr{CodeData, BindingStrength, Linkage,
                                  GOFF::ESD_AMODE_64, BindingScope});
   }
 }

llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp

@@ -1589,7 +1589,7 @@ void SystemZAsmPrinter::emitPPA2(Module &M) {
   const char *StartSymbolName = "CELQSTRT";
   MCSymbol *CELQSTRT = OutContext.getOrCreateSymbol(StartSymbolName);
   OutStreamer->emitSymbolAttribute(CELQSTRT, MCSA_Code);
-  // TODO Mark as OS linkage.
+  OutStreamer->emitSymbolAttribute(CELQSTRT, MCSA_OSLinkage);
   OutStreamer->emitSymbolAttribute(CELQSTRT, MCSA_Global);
 
   // Create symbol and assign to class field for use in PPA1.

llvm/test/CodeGen/SystemZ/zos-section-1.ll

@@ -110,7 +110,7 @@ entry:
 ; CHECK-NEXT: 000330 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 ; CHECK-NEXT: 000340 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00
 ; CHECK-NEXT: 000350 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 02
-; CHECK-NEXT: 000360 00 04 20 00 00 00 00 08 c3 c5 d3 d8 e2 e3 d9 e3
+; CHECK-NEXT: 000360 00 04 00 00 00 00 00 08 c3 c5 d3 d8 e2 e3 d9 e3
 
 ; ESD record, type LD.
 ; The name is me.

llvm/test/CodeGen/SystemZ/zos-section-2.ll

@@ -153,7 +153,7 @@ source_filename = "test.ll"
 ; CHECK-NEXT: 000510 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 ; CHECK-NEXT: 000520 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00
 ; CHECK-NEXT: 000530 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 02
-; CHECK-NEXT: 000540 00 04 20 00 00 00 00 08 c3 c5 d3 d8 e2 e3 d9 e3
+; CHECK-NEXT: 000540 00 04 00 00 00 00 00 08 c3 c5 d3 d8 e2 e3 d9 e3
 
 ; Text record for the code section C_CODE64.
 ; The regular expression matches the lower byte of the length.