Remove constants.

Author: redstar

llvm/include/llvm/MC/MCGOFFAttributes.h

@@ -80,25 +80,12 @@ struct PRAttr {
   uint32_t SortKey = 0;
 };
 
-// Class names and other values depending on AMODE64 or AMODE31, and other
-// environment properties. For now, only the 64 bit XPLINK case is defined.
-
-// GOFF classes.
+// Predefined GOFF class names.
 constexpr StringLiteral CLASS_CODE = "C_CODE64";
 constexpr StringLiteral CLASS_WSA = "C_WSA64";
 constexpr StringLiteral CLASS_DATA = "C_DATA64";
 constexpr StringLiteral CLASS_PPA2 = "C_@@QPPA2";
 
-// Addres and residency mode.
-constexpr GOFF::ESDAmode AMODE = GOFF::ESD_AMODE_64;
-constexpr GOFF::ESDRmode RMODE = GOFF::ESD_RMODE_64;
-
-// Linkage.
-constexpr GOFF::ESDLinkageType LINKAGE = GOFF::ESD_LT_XPLink;
-
-// Loadding behavior.
-constexpr GOFF::ESDLoadingBehavior LOADBEHAVIOR = GOFF::ESD_LB_Initial;
-
 } // namespace GOFF
 } // namespace llvm
 

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

@@ -2795,9 +2795,9 @@ void TargetLoweringObjectFileGOFF::getModuleMetadata(Module &M) {
   // Initialize the label for the text section.
   MCSymbolGOFF *TextLD = static_cast<MCSymbolGOFF *>(
       getContext().getOrCreateSymbol(RootSD->getName()));
-  TextLD->setLDAttributes(GOFF::LDAttr{false, GOFF::ESD_EXE_CODE,
-                                       GOFF::ESD_BST_Strong, GOFF::LINKAGE,
-                                       GOFF::AMODE, GOFF::ESD_BSC_Section});
+  TextLD->setLDAttributes(GOFF::LDAttr{
+      false, GOFF::ESD_EXE_CODE, GOFF::ESD_BST_Strong, GOFF::ESD_LT_XPLink,
+      GOFF::ESD_AMODE_64, GOFF::ESD_BSC_Section});
   TextLD->setADA(ADAPR);
   TextSection->setBeginSymbol(TextLD);
 }
@@ -2813,14 +2813,14 @@ MCSection *TargetLoweringObjectFileGOFF::getSectionForLSDA(
 
   MCSectionGOFF *WSA = getContext().getGOFFSection(
       SectionKind::getMetadata(), GOFF::CLASS_WSA,
-      GOFF::EDAttr{false, GOFF::RMODE, GOFF::ESD_NS_Parts,
+      GOFF::EDAttr{false, GOFF::ESD_RMODE_64, GOFF::ESD_NS_Parts,
                    GOFF::ESD_TS_ByteOriented, GOFF::ESD_BA_Merge,
-                   GOFF::LOADBEHAVIOR, GOFF::ESD_RQ_0, GOFF::ESD_ALIGN_Fullword,
-                   0},
+                   GOFF::ESD_LB_Initial, GOFF::ESD_RQ_0,
+                   GOFF::ESD_ALIGN_Fullword, 0},
       static_cast<MCSectionGOFF *>(TextSection)->getParent());
   return getContext().getGOFFSection(SectionKind::getData(), Name,
                                      GOFF::PRAttr{true, GOFF::ESD_EXE_DATA,
-                                                  GOFF::LINKAGE,
+                                                  GOFF::ESD_LT_XPLink,
                                                   GOFF::ESD_BSC_Section, 0},
                                      WSA);
 }
@@ -2846,13 +2846,13 @@ MCSection *TargetLoweringObjectFileGOFF::SelectSectionForGlobal(
         GOFF::SDAttr{GOFF::ESD_TA_Unspecified, SDBindingScope});
     MCSectionGOFF *ED = getContext().getGOFFSection(
         SectionKind::getMetadata(), GOFF::CLASS_WSA,
-        GOFF::EDAttr{false, GOFF::RMODE, GOFF::ESD_NS_Parts,
+        GOFF::EDAttr{false, GOFF::ESD_RMODE_64, GOFF::ESD_NS_Parts,
                      GOFF::ESD_TS_ByteOriented, GOFF::ESD_BA_Merge,
                      GOFF::ESD_LB_Deferred, GOFF::ESD_RQ_0, Align, 0},
         SD);
     return getContext().getGOFFSection(Kind, Symbol->getName(),
                                        GOFF::PRAttr{false, GOFF::ESD_EXE_DATA,
-                                                    GOFF::LINKAGE,
+                                                    GOFF::ESD_LT_XPLink,
                                                     PRBindingScope, 0},
                                        ED);
   }

llvm/lib/MC/MCObjectFileInfo.cpp

@@ -553,7 +553,7 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
 
   MCSectionGOFF *ADAEDSection = Ctx->getGOFFSection(
       SectionKind::getMetadata(), GOFF::CLASS_WSA,
-      GOFF::EDAttr{false, GOFF::RMODE, GOFF::ESD_NS_Parts,
+      GOFF::EDAttr{false, GOFF::ESD_RMODE_64, GOFF::ESD_NS_Parts,
                    GOFF::ESD_TS_ByteOriented, GOFF::ESD_BA_Merge,
                    GOFF::ESD_LB_Deferred, GOFF::ESD_RQ_1,
                    GOFF::ESD_ALIGN_Quadword, 0},
@@ -566,15 +566,15 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
 
   TextSection = Ctx->getGOFFSection(
       SectionKind::getText(), GOFF::CLASS_CODE,
-      GOFF::EDAttr{true, GOFF::RMODE, GOFF::ESD_NS_NormalName,
+      GOFF::EDAttr{true, GOFF::ESD_RMODE_64, GOFF::ESD_NS_NormalName,
                    GOFF::ESD_TS_ByteOriented, GOFF::ESD_BA_Concatenate,
                    GOFF::ESD_LB_Initial, GOFF::ESD_RQ_0,
                    GOFF::ESD_ALIGN_Doubleword, 0},
       RootSDSection);
 
   MCSectionGOFF *PPA2ListEDSection = Ctx->getGOFFSection(
       SectionKind::getMetadata(), GOFF::CLASS_PPA2,
-      GOFF::EDAttr{true, GOFF::RMODE, GOFF::ESD_NS_Parts,
+      GOFF::EDAttr{true, GOFF::ESD_RMODE_64, GOFF::ESD_NS_Parts,
                    GOFF::ESD_TS_ByteOriented, GOFF::ESD_BA_Merge,
                    GOFF::ESD_LB_Initial, GOFF::ESD_RQ_0,
                    GOFF::ESD_ALIGN_Doubleword, 0},
@@ -587,7 +587,7 @@ void MCObjectFileInfo::initGOFFMCObjectFileInfo(const Triple &T) {
 
   IDRLSection = Ctx->getGOFFSection(
       SectionKind::getData(), "B_IDRL",
-      GOFF::EDAttr{true, GOFF::RMODE, GOFF::ESD_NS_NormalName,
+      GOFF::EDAttr{true, GOFF::ESD_RMODE_64, GOFF::ESD_NS_NormalName,
                    GOFF::ESD_TS_Structured, GOFF::ESD_BA_Concatenate,
                    GOFF::ESD_LB_NoLoad, GOFF::ESD_RQ_0,
                    GOFF::ESD_ALIGN_Doubleword, 0},