diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-02-25 16:30:32 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-02-25 16:30:32 +0000 |
| commit | fcf51fd298650957ddb0a77cbd8c6502dbf81fe9 (patch) | |
| tree | 04a6ac30a41ba0c74fa9dd5a27a1be61ca6110f2 /llvm/lib/Target | |
| parent | f29ba48c7f9e459132032193ac4ec0450f1a4cba (diff) | |
| download | bcm5719-llvm-fcf51fd298650957ddb0a77cbd8c6502dbf81fe9.tar.gz bcm5719-llvm-fcf51fd298650957ddb0a77cbd8c6502dbf81fe9.zip | |
Roll out r126425 and r126450 to see if it fixes the failures on the buildbots.
llvm-svn: 126488
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86AsmBackend.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86FixupKinds.h | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86MCAsmInfo.cpp | 3 |
4 files changed, 1 insertions, 11 deletions
diff --git a/llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp b/llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp index da62ebf39b5..0886ba8008f 100644 --- a/llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp +++ b/llvm/lib/Target/PTX/PTXMCAsmStreamer.cpp @@ -124,7 +124,6 @@ public: virtual void EmitCOFFSymbolStorageClass(int StorageClass); virtual void EmitCOFFSymbolType(int Type); virtual void EndCOFFSymbolDef(); - virtual void EmitCOFFSecRel32(MCSymbol const *Symbol); virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value); virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment); @@ -278,8 +277,6 @@ void PTXMCAsmStreamer::EmitCOFFSymbolType (int Type) {} void PTXMCAsmStreamer::EndCOFFSymbolDef() {} -void PTXMCAsmStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) {} - void PTXMCAsmStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {} void PTXMCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, diff --git a/llvm/lib/Target/X86/X86AsmBackend.cpp b/llvm/lib/Target/X86/X86AsmBackend.cpp index 6a0b059ca5a..da5f5b182ce 100644 --- a/llvm/lib/Target/X86/X86AsmBackend.cpp +++ b/llvm/lib/Target/X86/X86AsmBackend.cpp @@ -40,7 +40,6 @@ static unsigned getFixupKindLog2Size(unsigned Kind) { case X86::reloc_riprel_4byte_movq_load: case X86::reloc_signed_4byte: case X86::reloc_global_offset_table: - case X86::reloc_coff_secrel32: case FK_Data_4: return 2; case FK_PCRel_8: case FK_Data_8: return 3; @@ -70,8 +69,7 @@ public: { "reloc_riprel_4byte", 0, 4 * 8, MCFixupKindInfo::FKF_IsPCRel }, { "reloc_riprel_4byte_movq_load", 0, 4 * 8, MCFixupKindInfo::FKF_IsPCRel}, { "reloc_signed_4byte", 0, 4 * 8, 0}, - { "reloc_global_offset_table", 0, 4 * 8, 0}, - { "reloc_coff_secrel32", 0, 4 * 8, 0} + { "reloc_global_offset_table", 0, 4 * 8, 0} }; if (Kind < FirstTargetFixupKind) diff --git a/llvm/lib/Target/X86/X86FixupKinds.h b/llvm/lib/Target/X86/X86FixupKinds.h index d6cb39ae9a7..17d242ab761 100644 --- a/llvm/lib/Target/X86/X86FixupKinds.h +++ b/llvm/lib/Target/X86/X86FixupKinds.h @@ -23,8 +23,6 @@ enum Fixups { reloc_global_offset_table, // 32-bit, relative to the start // of the instruction. Used only // for _GLOBAL_OFFSET_TABLE_. - reloc_coff_secrel32, // PE-COFF section relative 32 - // (only valid for win32 COFF) // Marker LastTargetFixupKind, NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind diff --git a/llvm/lib/Target/X86/X86MCAsmInfo.cpp b/llvm/lib/Target/X86/X86MCAsmInfo.cpp index 75bc1ed2bee..6686214e06f 100644 --- a/llvm/lib/Target/X86/X86MCAsmInfo.cpp +++ b/llvm/lib/Target/X86/X86MCAsmInfo.cpp @@ -113,7 +113,4 @@ X86MCAsmInfoCOFF::X86MCAsmInfoCOFF(const Triple &Triple) { AssemblerDialect = AsmWriterFlavor; TextAlignFillValue = 0x90; - - // Debug Information - SupportsDebugInformation = true; } |
