From d2867f13a0252043c3d88b9d7f94b8a057579ec2 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 17 Dec 2010 02:06:08 +0000 Subject: [PATCH] MC/Target: Remove HasScatteredSymbols target hook variable, which has been superceded and was effectively dead. llvm-svn: 122024 --- llvm/include/llvm/Target/TargetAsmBackend.h | 11 ----------- llvm/lib/MC/MachObjectWriter.cpp | 5 ----- llvm/lib/MC/TargetAsmBackend.cpp | 3 +-- llvm/lib/Target/ARM/ARMAsmBackend.cpp | 8 ++------ llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp | 4 +--- llvm/lib/Target/PowerPC/PPCAsmBackend.cpp | 4 +--- llvm/lib/Target/X86/X86AsmBackend.cpp | 6 +----- 7 files changed, 6 insertions(+), 35 deletions(-) diff --git a/llvm/include/llvm/Target/TargetAsmBackend.h b/llvm/include/llvm/Target/TargetAsmBackend.h index 7ce6efc6e559..50904b135f86 100644 --- a/llvm/include/llvm/Target/TargetAsmBackend.h +++ b/llvm/include/llvm/Target/TargetAsmBackend.h @@ -33,7 +33,6 @@ protected: // Can only create subclasses. TargetAsmBackend(); unsigned HasReliableSymbolDifference : 1; - unsigned HasScatteredSymbols : 1; public: virtual ~TargetAsmBackend(); @@ -58,16 +57,6 @@ public: return HasReliableSymbolDifference; } - /// hasScatteredSymbols - Check whether this target supports scattered - /// symbols. If so, the assembler should assume that atoms can be scattered by - /// the linker. In particular, this means that the offsets between symbols - /// which are in distinct atoms is not known at link time, and the assembler - /// must generate fixups and relocations appropriately. - /// - /// Note that the assembler currently does not reason about atoms, instead it - /// assumes all temporary symbols reside in the "current atom". - bool hasScatteredSymbols() const { return HasScatteredSymbols; } - /// doesSectionRequireSymbols - Check whether the given section requires that /// all symbols (even temporaries) have symbol table entries. virtual bool doesSectionRequireSymbols(const MCSection &Section) const { diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp index b2258027b1ce..619954ca3b02 100644 --- a/llvm/lib/MC/MachObjectWriter.cpp +++ b/llvm/lib/MC/MachObjectWriter.cpp @@ -1123,15 +1123,10 @@ public: UndefinedSymbolData); } - bool IsFixupFullyResolved(const MCAssembler &Asm, const MCValue Target, bool IsPCRel, const MCFragment *DF) const { - // If we aren't using scattered symbols, the fixup is fully resolved. - if (!Asm.getBackend().hasScatteredSymbols()) - return true; - // Otherwise, determine whether this value is actually resolved; scattering // may cause atoms to move. diff --git a/llvm/lib/MC/TargetAsmBackend.cpp b/llvm/lib/MC/TargetAsmBackend.cpp index 156bf19b4369..e0653d05ef03 100644 --- a/llvm/lib/MC/TargetAsmBackend.cpp +++ b/llvm/lib/MC/TargetAsmBackend.cpp @@ -11,8 +11,7 @@ using namespace llvm; TargetAsmBackend::TargetAsmBackend() - : HasReliableSymbolDifference(false), - HasScatteredSymbols(false) + : HasReliableSymbolDifference(false) { } diff --git a/llvm/lib/Target/ARM/ARMAsmBackend.cpp b/llvm/lib/Target/ARM/ARMAsmBackend.cpp index db7e20cfc01b..9916de34652e 100644 --- a/llvm/lib/Target/ARM/ARMAsmBackend.cpp +++ b/llvm/lib/Target/ARM/ARMAsmBackend.cpp @@ -336,9 +336,7 @@ class ELFARMAsmBackend : public ARMAsmBackend { public: Triple::OSType OSType; ELFARMAsmBackend(const Target &T, Triple::OSType _OSType) - : ARMAsmBackend(T), OSType(_OSType) { - HasScatteredSymbols = true; - } + : ARMAsmBackend(T), OSType(_OSType) { } virtual const MCObjectFormat &getObjectFormat() const { return Format; @@ -376,9 +374,7 @@ void ELFARMAsmBackend::ApplyFixup(const MCFixup &Fixup, char *Data, class DarwinARMAsmBackend : public ARMAsmBackend { MCMachOObjectFormat Format; public: - DarwinARMAsmBackend(const Target &T) : ARMAsmBackend(T) { - HasScatteredSymbols = true; - } + DarwinARMAsmBackend(const Target &T) : ARMAsmBackend(T) { } virtual const MCObjectFormat &getObjectFormat() const { return Format; diff --git a/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp b/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp index 83156f5531f4..d3be2b55aec1 100644 --- a/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp +++ b/llvm/lib/Target/MBlaze/MBlazeAsmBackend.cpp @@ -105,9 +105,7 @@ class ELFMBlazeAsmBackend : public MBlazeAsmBackend { public: Triple::OSType OSType; ELFMBlazeAsmBackend(const Target &T, Triple::OSType _OSType) - : MBlazeAsmBackend(T), OSType(_OSType) { - HasScatteredSymbols = true; - } + : MBlazeAsmBackend(T), OSType(_OSType) { } virtual const MCObjectFormat &getObjectFormat() const { return Format; diff --git a/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp b/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp index bf437e3aded7..9dfc6fce9470 100644 --- a/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp +++ b/llvm/lib/Target/PowerPC/PPCAsmBackend.cpp @@ -84,9 +84,7 @@ namespace { class DarwinPPCAsmBackend : public PPCAsmBackend { MCMachOObjectFormat Format; public: - DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T) { - HasScatteredSymbols = true; - } + DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T) { } virtual const MCObjectFormat &getObjectFormat() const { return Format; diff --git a/llvm/lib/Target/X86/X86AsmBackend.cpp b/llvm/lib/Target/X86/X86AsmBackend.cpp index d137875e2cf6..3f58e43ea152 100644 --- a/llvm/lib/Target/X86/X86AsmBackend.cpp +++ b/llvm/lib/Target/X86/X86AsmBackend.cpp @@ -289,7 +289,6 @@ public: Triple::OSType OSType; ELFX86AsmBackend(const Target &T, Triple::OSType _OSType) : X86AsmBackend(T), OSType(_OSType) { - HasScatteredSymbols = true; HasReliableSymbolDifference = true; } @@ -337,7 +336,6 @@ public: WindowsX86AsmBackend(const Target &T, bool is64Bit) : X86AsmBackend(T) , Is64Bit(is64Bit) { - HasScatteredSymbols = true; } virtual const MCObjectFormat &getObjectFormat() const { @@ -354,9 +352,7 @@ class DarwinX86AsmBackend : public X86AsmBackend { public: DarwinX86AsmBackend(const Target &T) - : X86AsmBackend(T) { - HasScatteredSymbols = true; - } + : X86AsmBackend(T) { } virtual const MCObjectFormat &getObjectFormat() const { return Format;