Remove MCELFSymbolFlags.h. It is now internal to MCSymbolELF.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238996 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/MCELFSymbolFlags.h b/include/llvm/MC/MCELFSymbolFlags.h
deleted file mode 100644 (file)
index 98bc416..0000000
--- a/include/llvm/MC/MCELFSymbolFlags.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//===- MCELFSymbolFlags.h - ELF Symbol Flags ----------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the SymbolFlags used for the ELF target.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCELFSYMBOLFLAGS_H
-#define LLVM_MC_MCELFSYMBOLFLAGS_H
-
-#include "llvm/Support/ELF.h"
-
-// Because all the symbol flags need to be stored in the MCSymbol
-// 'flags' variable we need to provide shift constants per flag type.
-
-namespace llvm {
-  enum {
-    ELF_STT_Shift   = 0,  // Shift value for STT_* flags.
-    ELF_STB_Shift   = 4,  // Shift value for STB_* flags.
-    ELF_STV_Shift   = 8,  // Shift value for STV_* flags.
-    ELF_STO_Shift   = 10  // Shift value for STO_* flags.
-  };
-
-  enum ELFSymbolFlags {
-    ELF_STB_Local     = (ELF::STB_LOCAL     << ELF_STB_Shift),
-      ELF_STB_Global    = (ELF::STB_GLOBAL    << ELF_STB_Shift),
-      ELF_STB_Weak      = (ELF::STB_WEAK      << ELF_STB_Shift),
-      ELF_STB_Loproc    = (ELF::STB_LOPROC    << ELF_STB_Shift),
-      ELF_STB_Hiproc    = (ELF::STB_HIPROC    << ELF_STB_Shift),
-
-      ELF_STT_Notype    = (ELF::STT_NOTYPE    << ELF_STT_Shift),
-      ELF_STT_Object    = (ELF::STT_OBJECT    << ELF_STT_Shift),
-      ELF_STT_Func      = (ELF::STT_FUNC      << ELF_STT_Shift),
-      ELF_STT_Section   = (ELF::STT_SECTION   << ELF_STT_Shift),
-      ELF_STT_File      = (ELF::STT_FILE      << ELF_STT_Shift),
-      ELF_STT_Common    = (ELF::STT_COMMON    << ELF_STT_Shift),
-      ELF_STT_Tls       = (ELF::STT_TLS       << ELF_STT_Shift),
-      ELF_STT_GnuIFunc  = (ELF::STT_GNU_IFUNC << ELF_STT_Shift),
-      ELF_STT_Loproc    = (ELF::STT_LOPROC    << ELF_STT_Shift),
-      ELF_STT_Hiproc    = (ELF::STT_HIPROC    << ELF_STT_Shift),
-
-      ELF_STV_Default   = (ELF::STV_DEFAULT   << ELF_STV_Shift),
-      ELF_STV_Internal  = (ELF::STV_INTERNAL  << ELF_STV_Shift),
-      ELF_STV_Hidden    = (ELF::STV_HIDDEN    << ELF_STV_Shift),
-      ELF_STV_Protected = (ELF::STV_PROTECTED << ELF_STV_Shift)
-  };
-
-} // end namespace llvm
-
-#endif

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 6e3f9d189dda1c05b2d4a5a9ada9c8d6e74ea95f..d811cfe0ba4d92438c98cd0cddf86c5027022fb3 100644 (file)
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -21,7 +21,6 @@
 #include "llvm/MC/MCAsmLayout.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCELFSymbolFlags.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/MC/MCObjectWriter.h"
@@ -459,12 +458,12 @@ void ELFObjectWriter::writeSymbol(SymbolTableWriter &Writer,
   if (Base) {
     Type = mergeTypeForSet(Type, Base->getType());
   }
-  uint8_t Info = (Binding << ELF_STB_Shift) | (Type << ELF_STT_Shift);
+  uint8_t Info = (Binding << 4) | Type;
 
   // Other and Visibility share the same byte with Visibility using the lower
   // 2 bits
   uint8_t Visibility = Symbol.getVisibility();
-  uint8_t Other = Symbol.getOther() << (ELF_STO_Shift - ELF_STV_Shift);
+  uint8_t Other = Symbol.getOther() << 2;
   Other |= Visibility;
 
   uint64_t Value = SymbolValue(*MSD.Symbol, Layout);

diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp
index efeabbd66ea886dd7d63f54a91f80b434466ee91..1f3b8eec7e48429faf32b0a55d7bd9378e32265d 100644 (file)
--- a/lib/MC/MCELFStreamer.cpp
+++ b/lib/MC/MCELFStreamer.cpp
@@ -20,7 +20,6 @@
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCELFSymbolFlags.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCObjectFileInfo.h"
@@ -312,7 +311,7 @@ void MCELFStreamer::EmitCommonSymbol(MCSymbol *S, uint64_t Size,
 
   Symbol->setType(ELF::STT_OBJECT);
 
-  if (Symbol->getBinding() == ELF_STB_Local) {
+  if (Symbol->getBinding() == ELF::STB_LOCAL) {
     MCSection *Section = getAssembler().getContext().getELFSection(
         ".bss", ELF::SHT_NOBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC);
 

diff --git a/lib/MC/MCSymbolELF.cpp b/lib/MC/MCSymbolELF.cpp
index 458248104e082e952630b6e21ca7f89e8b77893a..f4d3d176c3affd00200a5d62eb0e297d6ee6b30f 100644 (file)
--- a/lib/MC/MCSymbolELF.cpp
+++ b/lib/MC/MCSymbolELF.cpp
@@ -9,12 +9,20 @@
 
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCSymbolELF.h"
-#include "llvm/MC/MCELFSymbolFlags.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/Support/ELF.h"
 
 namespace llvm {
 
+namespace {
+enum {
+  ELF_STT_Shift = 0, // Shift value for STT_* flags
+  ELF_STB_Shift = 4, // Shift value for STB_* flags
+  ELF_STV_Shift = 8, // Shift value for STV_* flags
+  ELF_STO_Shift = 10 // Shift value for STO_* flags
+};
+}
+
 void MCSymbolELF::setBinding(unsigned Binding) const {
   BindingSet = true;
   assert(Binding == ELF::STB_LOCAL || Binding == ELF::STB_GLOBAL ||

diff --git a/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp b/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
index 1434018fdbe57bb1fc6578eeaffc7db80c07ddfb..78837de18b9769d1012ecc081f495aa61e074934 100644 (file)
--- a/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
+++ b/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
@@ -24,7 +24,6 @@
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFStreamer.h"
-#include "llvm/MC/MCELFSymbolFlags.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCObjectStreamer.h"

diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
index 70f0cd11b3354132dac54186702c6c91df5fdf2e..251e1f561581fe86d2c04bf1b84a3d5f337f1676 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -23,7 +23,6 @@
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFStreamer.h"
-#include "llvm/MC/MCELFSymbolFlags.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
@@ -972,7 +971,7 @@ void ARMTargetELFStreamer::emitLabel(MCSymbol *Symbol) {
 
   Streamer.getAssembler().registerSymbol(*Symbol);
   unsigned Type = cast<MCSymbolELF>(Symbol)->getType();
-  if (Type == ELF_STT_Func || Type == ELF_STT_GnuIFunc)
+  if (Type == ELF::STT_FUNC || Type == ELF::STT_GNU_IFUNC)
     Streamer.EmitThumbFunc(Symbol);
 }