From 3c474aa8ad28b43dd7be44b23db95c5cfd779c87 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sat, 11 Apr 2020 10:06:18 -0700 Subject: [PATCH] [MC] Default MCAsmInfo::UseIntegratedAssembler to true --- lib/MC/MCAsmInfo.cpp | 2 +- lib/MC/MCAsmInfoCOFF.cpp | 2 -- lib/MC/MCAsmInfoDarwin.cpp | 2 -- lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp | 2 -- lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp | 5 ----- lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp | 1 - lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp | 3 --- lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp | 1 - lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp | 1 - lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp | 2 -- lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp | 2 -- lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp | 2 -- lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp | 10 ---------- 13 files changed, 1 insertion(+), 34 deletions(-) diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp index 41f27db6a0f..9767ee6c113 100644 --- a/lib/MC/MCAsmInfo.cpp +++ b/lib/MC/MCAsmInfo.cpp @@ -64,7 +64,7 @@ MCAsmInfo::MCAsmInfo() { // - Generic_GCC toolchains enable the integrated assembler on a per // architecture basis. // - The target subclasses for AArch64, ARM, and X86 handle these cases - UseIntegratedAssembler = false; + UseIntegratedAssembler = true; PreserveAsmComments = true; } diff --git a/lib/MC/MCAsmInfoCOFF.cpp b/lib/MC/MCAsmInfoCOFF.cpp index d9971028649..0b8781c61eb 100644 --- a/lib/MC/MCAsmInfoCOFF.cpp +++ b/lib/MC/MCAsmInfoCOFF.cpp @@ -36,8 +36,6 @@ MCAsmInfoCOFF::MCAsmInfoCOFF() { SupportsDebugInformation = true; NeedsDwarfSectionOffsetDirective = true; - UseIntegratedAssembler = true; - // At least MSVC inline-asm does AShr. UseLogicalShr = false; diff --git a/lib/MC/MCAsmInfoDarwin.cpp b/lib/MC/MCAsmInfoDarwin.cpp index 62bc5b8c941..44b602984b8 100644 --- a/lib/MC/MCAsmInfoDarwin.cpp +++ b/lib/MC/MCAsmInfoDarwin.cpp @@ -91,7 +91,5 @@ MCAsmInfoDarwin::MCAsmInfoDarwin() { HasAltEntry = true; DwarfUsesRelocationsAcrossSections = false; - - UseIntegratedAssembler = true; SetDirectiveSuppressesReloc = true; } diff --git a/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp b/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp index ad52c4d1fd7..9a63e26dec1 100644 --- a/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp +++ b/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp @@ -96,8 +96,6 @@ AArch64MCAsmInfoELF::AArch64MCAsmInfoELF(const Triple &T) { // Exceptions handling ExceptionsType = ExceptionHandling::DwarfCFI; - UseIntegratedAssembler = true; - HasIdentDirective = true; } diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp index d30d15df3d0..765613cf347 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp @@ -37,8 +37,6 @@ ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin(const Triple &TheTriple) { ExceptionsType = (TheTriple.isOSDarwin() && !TheTriple.isWatchABI()) ? ExceptionHandling::SjLj : ExceptionHandling::DwarfCFI; - - UseIntegratedAssembler = true; } void ARMELFMCAsmInfo::anchor() { } @@ -73,8 +71,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple) { // foo(plt) instead of foo@plt UseParensForSymbolVariant = true; - - UseIntegratedAssembler = true; } void ARMELFMCAsmInfo::setUseIntegratedAssembler(bool Value) { @@ -116,7 +112,6 @@ ARMCOFFMCAsmInfoGNU::ARMCOFFMCAsmInfoGNU() { ExceptionsType = ExceptionHandling::DwarfCFI; UseParensForSymbolVariant = true; - UseIntegratedAssembler = true; DwarfRegNumForCFI = false; // Conditional Thumb 4-byte instructions can have an implicit IT. diff --git a/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp b/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp index 4fb6d305446..b11ee42bfcd 100644 --- a/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp +++ b/lib/Target/AVR/MCTargetDesc/AVRMCAsmInfo.cpp @@ -23,7 +23,6 @@ AVRMCAsmInfo::AVRMCAsmInfo(const Triple &TT, const MCTargetOptions &Options) { PrivateGlobalPrefix = ".L"; PrivateLabelPrefix = ".L"; UsesELFSectionDirectiveForBSS = true; - UseIntegratedAssembler = true; SupportsDebugInformation = true; } diff --git a/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp b/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp index f1c17489704..d8c7bd15aac 100644 --- a/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp +++ b/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp @@ -28,9 +28,6 @@ LanaiMCAsmInfo::LanaiMCAsmInfo(const Triple & /*TheTriple*/, // Lanai assembly requires ".section" before ".bss" UsesELFSectionDirectiveForBSS = true; - // Use the integrated assembler instead of system one. - UseIntegratedAssembler = true; - // Use '!' as comment string to correspond with old toolchain. CommentString = "!"; diff --git a/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp b/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp index cfdc44ada77..6117567dcae 100644 --- a/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp +++ b/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp @@ -24,5 +24,4 @@ MSP430MCAsmInfo::MSP430MCAsmInfo(const Triple &TT, AlignmentIsInBytes = false; UsesELFSectionDirectiveForBSS = true; - UseIntegratedAssembler = true; } diff --git a/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp b/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp index 5182205edae..9c85a39bc34 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp @@ -50,5 +50,4 @@ MipsMCAsmInfo::MipsMCAsmInfo(const Triple &TheTriple, ExceptionsType = ExceptionHandling::DwarfCFI; DwarfRegNumForCFI = true; HasMipsExpressions = true; - UseIntegratedAssembler = true; } diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp index feb7d3ff16a..8faf1bad737 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp +++ b/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp @@ -51,8 +51,6 @@ PPCELFMCAsmInfo::PPCELFMCAsmInfo(bool is64Bit, const Triple& T) { Data64bitsDirective = is64Bit ? "\t.quad\t" : nullptr; AssemblerDialect = 1; // New-Style mnemonics. LCOMMDirectiveAlignmentType = LCOMM::ByteAlignment; - - UseIntegratedAssembler = true; } void PPCXCOFFMCAsmInfo::anchor() {} diff --git a/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp b/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp index 1a2a040990a..c5cc2ea34bb 100644 --- a/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp +++ b/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp @@ -42,8 +42,6 @@ SparcELFMCAsmInfo::SparcELFMCAsmInfo(const Triple &TheTriple) { SunStyleELFSectionSwitchSyntax = true; UsesELFSectionDirectiveForBSS = true; - - UseIntegratedAssembler = true; } const MCExpr* diff --git a/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp b/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp index d6cdacfcab9..e540ff4e481 100644 --- a/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp +++ b/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp @@ -23,6 +23,4 @@ SystemZMCAsmInfo::SystemZMCAsmInfo(const Triple &TT) { UsesELFSectionDirectiveForBSS = true; SupportsDebugInformation = true; ExceptionsType = ExceptionHandling::DwarfCFI; - - UseIntegratedAssembler = true; } diff --git a/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp b/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp index 1c697a1ad63..c294da6baff 100644 --- a/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp +++ b/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp @@ -71,8 +71,6 @@ X86MCAsmInfoDarwin::X86MCAsmInfoDarwin(const Triple &T) { // (actually, must, since otherwise the non-extern relocations we produce // overwhelm ld64's tiny little mind and it fails). DwarfFDESymbolsUseAbsDiff = true; - - UseIntegratedAssembler = true; } X86_64MCAsmInfoDarwin::X86_64MCAsmInfoDarwin(const Triple &Triple) @@ -102,10 +100,6 @@ X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &T) { // Exceptions handling ExceptionsType = ExceptionHandling::DwarfCFI; - - // Always enable the integrated assembler by default. - // Clang also enabled it when the OS is Solaris but that is redundant here. - UseIntegratedAssembler = true; } const MCExpr * @@ -141,8 +135,6 @@ X86MCAsmInfoMicrosoft::X86MCAsmInfoMicrosoft(const Triple &Triple) { TextAlignFillValue = 0x90; AllowAtInName = true; - - UseIntegratedAssembler = true; } void X86MCAsmInfoMicrosoftMASM::anchor() { } @@ -174,6 +166,4 @@ X86MCAsmInfoGNUCOFF::X86MCAsmInfoGNUCOFF(const Triple &Triple) { TextAlignFillValue = 0x90; AllowAtInName = true; - - UseIntegratedAssembler = true; }