Move the large common indicator; Rename SHN_AMD64_LCOMMON; Undo the ELFDumper change from this PR

Author: ssijaric-nv

llvm/include/llvm/BinaryFormat/ELF.h

@@ -591,7 +591,7 @@ enum {
 
 // x86-64 speciifc section index
 enum {
-  SHN_AMD64_LCOMMON = 0xff02, // Large FORTRAN COMMON variables
+  SHN_X86_64_LCOMMON = 0xff02, // Large FORTRAN COMMON variables
 };
 
 // ELF Relocation types for Mips

llvm/include/llvm/MC/MCSymbolELF.h

@@ -17,7 +17,6 @@ class MCSymbolELF : public MCSymbol {
   /// An expression describing how to calculate the size of a symbol. If a
   /// symbol has no size this field will be NULL.
   const MCExpr *SymbolSize = nullptr;
-  bool IsLargeCommon = false;
 
 public:
   MCSymbolELF(const MCSymbolTableEntry *Name, bool isTemporary)
@@ -49,8 +48,8 @@ class MCSymbolELF : public MCSymbol {
   void setMemtag(bool Tagged);
   bool isMemtag() const;
 
-  bool isLargeCommon() const { return IsLargeCommon; }
-  void setIsLargeCommon(bool V) { IsLargeCommon = V; }
+  void setIsLargeCommon();
+  bool isLargeCommon() const;
 
 private:
   void setIsBindingSet() const;

llvm/include/llvm/Object/ELFTypes.h

@@ -252,7 +252,7 @@ struct Elf_Sym_Impl : Elf_Sym_Base<ELFT> {
     return getType() == ELF::STT_COMMON || st_shndx == ELF::SHN_COMMON;
   }
 
-  bool isLargeCommon() const { return st_shndx == ELF::SHN_AMD64_LCOMMON; }
+  bool isLargeCommon() const { return st_shndx == ELF::SHN_X86_64_LCOMMON; }
 
   bool isDefined() const { return !isUndefined(); }
 

llvm/lib/MC/ELFObjectWriter.cpp

@@ -546,7 +546,7 @@ void ELFWriter::computeSymbolTable(const RevGroupMapTy &RevGroupMap) {
       if (!Shndx) {
         assert(!Local);
         if (Symbol.isLargeCommon())
-          Shndx = ELF::SHN_AMD64_LCOMMON;
+          Shndx = ELF::SHN_X86_64_LCOMMON;
         else
           Shndx = ELF::SHN_COMMON;
       }

llvm/lib/MC/MCELFStreamer.cpp

@@ -257,7 +257,7 @@ void MCELFStreamer::emitLargeCommonSymbol(MCSymbol *S, uint64_t Size,
   if (Symbol->declareCommon(Size, ByteAlignment))
     report_fatal_error(Twine("Symbol: ") + Symbol->getName() +
                        " redeclared as different type");
-  Symbol->setIsLargeCommon(true);
+  Symbol->setIsLargeCommon();
   Symbol->setSize(MCConstantExpr::create(Size, getContext()));
 }
 

llvm/lib/MC/MCSymbolELF.cpp

@@ -37,6 +37,9 @@ enum {
 
   // One bit.
   ELF_IsMemoryTagged_Shift = 13,
+
+  // One bit.
+  ELF_LargeCommon_Shift = 14,
 };
 }
 
@@ -206,4 +209,13 @@ void MCSymbolELF::setMemtag(bool Tagged) {
   else
     setFlags(OtherFlags);
 }
+
+bool MCSymbolELF::isLargeCommon() const {
+  return getFlags() & (0x1 << ELF_LargeCommon_Shift);
+}
+
+void MCSymbolELF::setIsLargeCommon() {
+  uint32_t OtherFlags = getFlags() & ~(0x1 << ELF_LargeCommon_Shift);
+  setFlags(OtherFlags | (1 << ELF_LargeCommon_Shift));
+}
 }

llvm/test/MC/X86/largecomm.ll

@@ -1,7 +1,5 @@
 ; RUN: llc -filetype=asm -code-model=medium %s --large-data-threshold=65636 -o - | FileCheck %s --check-prefix=CHECKASM-MEDIUM
 ; RUN: llc -filetype=asm -code-model=large %s -o - | FileCheck %s --check-prefix=CHECKASM-LARGE
-; RUN: llc -filetype=asm -code-model=medium %s --large-data-threshold=65636 -o - | llvm-mc -triple x86_64-linux-gnu -filetype=obj - | llvm-readelf -s - | FileCheck %s --check-prefix=CHECKOBJ-MEDIUM
-; RUN: llc -filetype=asm -code-model=large %s -o - | llvm-mc -triple x86_64-linux-gnu -filetype=obj - | llvm-readelf -s - | FileCheck %s --check-prefix=CHECKOBJ-LARGE
 
 ; CHECKASM-MEDIUM:       .section	.lbss,"awl",@nobits
 ; CHECKASM-MEDIUM-NEXT:	 .type	__BLNK__,@object                # @__BLNK__
@@ -15,12 +13,6 @@
 ; CHECKASM-LARGE-NEXT:  .type	ccc_,@object                    # @ccc_
 ; CHECKASM-LARGE-NEXT:  .largecomm	ccc_,8,8
 
-; CHECKOBJ-MEDIUM:       8 OBJECT  GLOBAL DEFAULT   COM ccc_
-; CHECKOBJ-MEDIUM:       48394093832 OBJECT GLOBAL DEFAULT LARGE_COMMON __BLNK
-
-; CHECKOBJ-LARGE:        8 OBJECT  GLOBAL DEFAULT   LARGE_COMMON ccc_
-; CHECKOBJ-LARGE:        48394093832 OBJECT GLOBAL DEFAULT LARGE_COMMON __BLNK__
-
 source_filename = "FIRModule"
 target triple = "x86_64-unknown-linux-gnu"
 

llvm/tools/llvm-readobj/ELFDumper.cpp

@@ -1052,8 +1052,6 @@ ELFDumper<ELFT>::getSymbolSectionIndex(const Elf_Sym &Symbol, unsigned SymIndex,
     return CreateErr("SHN_ABS");
   if (Ndx == ELF::SHN_COMMON)
     return CreateErr("SHN_COMMON");
-  if (Ndx == ELF::SHN_AMD64_LCOMMON)
-    return CreateErr("SHN_AMD64_LCOMMON");
   return CreateErr("SHN_LORESERVE", Ndx - SHN_LORESERVE);
 }
 
@@ -4310,9 +4308,6 @@ std::string GNUELFDumper<ELFT>::getSymbolSectionNdx(
   default:
     // Find if:
     // Processor specific
-    if (this->Obj.getHeader().e_machine == EM_X86_64 &&
-        SectionIndex == ELF::SHN_AMD64_LCOMMON)
-      return "LARGE_COMMON";
     if (SectionIndex >= ELF::SHN_LOPROC && SectionIndex <= ELF::SHN_HIPROC)
       return std::string("PRC[0x") +
              to_string(format_hex_no_prefix(SectionIndex, 4)) + "]";