diff -rupN llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h llvm.patched/include/llvm/LTO/legacy/LTOCodeGenerator.h --- llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h 2020-02-25 09:53:05.434364001 +0000 +++ llvm.patched/include/llvm/LTO/legacy/LTOCodeGenerator.h 2020-02-25 09:54:10.047090870 +0000 @@ -190,6 +190,8 @@ struct LTOCodeGenerator { void resetMergedModule() { MergedModule.reset(); } void DiagnosticHandler(const DiagnosticInfo &DI); + TargetOptions &getTargetOptions() { return Options; } + private: void initializeLTOPasses(); diff -rupN llvm/include/llvm/Target/TargetOptions.h llvm.patched/include/llvm/Target/TargetOptions.h --- llvm/include/llvm/Target/TargetOptions.h 2020-02-25 09:53:05.354363101 +0000 +++ llvm.patched/include/llvm/Target/TargetOptions.h 2020-02-25 14:09:29.005676041 +0000 @@ -114,6 +114,7 @@ namespace llvm { EnableFastISel(false), EnableGlobalISel(false), UseInitArray(false), DisableIntegratedAS(false), RelaxELFRelocations(false), FunctionSections(false), DataSections(false), + NoExceptions(false), UniqueSectionNames(true), TrapUnreachable(false), NoTrapAfterNoreturn(false), TLSSize(0), EmulatedTLS(false), ExplicitEmulatedTLS(false), EnableIPRA(false), @@ -222,6 +223,9 @@ namespace llvm { /// Emit data into separate sections. unsigned DataSections : 1; + /// No Exceptions + unsigned NoExceptions : 1; + unsigned UniqueSectionNames : 1; /// Emit target-specific trap instruction for 'unreachable' IR instructions. diff -rupN llvm/lib/CodeGen/LLVMTargetMachine.cpp llvm.patched/lib/CodeGen/LLVMTargetMachine.cpp --- llvm/lib/CodeGen/LLVMTargetMachine.cpp 2020-02-25 09:53:05.998370347 +0000 +++ llvm.patched/lib/CodeGen/LLVMTargetMachine.cpp 2020-02-25 09:54:10.047090870 +0000 @@ -67,7 +67,7 @@ void LLVMTargetMachine::initAsmInfo() { TmpAsmInfo->setRelaxELFRelocations(Options.RelaxELFRelocations); - if (Options.ExceptionModel != ExceptionHandling::None) + if (Options.ExceptionModel != ExceptionHandling::None || Options.NoExceptions) TmpAsmInfo->setExceptionsType(Options.ExceptionModel); AsmInfo.reset(TmpAsmInfo); diff -rupN llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp --- llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp 2020-02-25 09:53:06.026370662 +0000 +++ llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp 2020-02-25 09:54:10.047090870 +0000 @@ -611,18 +611,20 @@ MCSection *TargetLoweringObjectFileELF:: /// Return the section prefix name used by options FunctionsSections and /// DataSections. static StringRef getSectionPrefixForGlobal(SectionKind Kind) { + extern const char *bssName, *textName, *dataName, *rodataName; + if (Kind.isText()) - return ".text"; + return textName; if (Kind.isReadOnly()) - return ".rodata"; + return rodataName; if (Kind.isBSS()) - return ".bss"; + return bssName; if (Kind.isThreadData()) return ".tdata"; if (Kind.isThreadBSS()) return ".tbss"; if (Kind.isData()) - return ".data"; + return dataName; assert(Kind.isReadOnlyWithRel() && "Unknown section kind"); return ".data.rel.ro"; } diff -rupN llvm/lib/MC/MCObjectFileInfo.cpp llvm.patched/lib/MC/MCObjectFileInfo.cpp --- llvm/lib/MC/MCObjectFileInfo.cpp 2020-02-25 09:53:06.182372418 +0000 +++ llvm.patched/lib/MC/MCObjectFileInfo.cpp 2020-02-25 09:54:10.051090916 +0000 @@ -22,6 +22,11 @@ using namespace llvm; +const char *bssName = ".bss"; +const char *textName = ".text"; +const char *dataName = ".data"; +const char *rodataName = ".rodata"; + static bool useCompactUnwind(const Triple &T) { // Only on darwin. if (!T.isOSDarwin()) @@ -342,17 +347,17 @@ void MCObjectFileInfo::initELFMCObjectFi EHSectionFlags |= ELF::SHF_WRITE; // ELF - BSSSection = Ctx->getELFSection(".bss", ELF::SHT_NOBITS, + BSSSection = Ctx->getELFSection(bssName, ELF::SHT_NOBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC); - TextSection = Ctx->getELFSection(".text", ELF::SHT_PROGBITS, + TextSection = Ctx->getELFSection(textName, ELF::SHT_PROGBITS, ELF::SHF_EXECINSTR | ELF::SHF_ALLOC); - DataSection = Ctx->getELFSection(".data", ELF::SHT_PROGBITS, + DataSection = Ctx->getELFSection(dataName, ELF::SHT_PROGBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC); ReadOnlySection = - Ctx->getELFSection(".rodata", ELF::SHT_PROGBITS, ELF::SHF_ALLOC); + Ctx->getELFSection(rodataName, ELF::SHT_PROGBITS, ELF::SHF_ALLOC); TLSDataSection = Ctx->getELFSection(".tdata", ELF::SHT_PROGBITS, diff -rupN llvm/tools/clang/include/clang/Driver/CC1Options.td llvm.patched/tools/clang/include/clang/Driver/CC1Options.td --- llvm/tools/clang/include/clang/Driver/CC1Options.td 2020-02-25 09:53:09.486409592 +0000 +++ llvm.patched/tools/clang/include/clang/Driver/CC1Options.td 2020-02-25 09:54:10.051090916 +0000 @@ -883,6 +883,19 @@ def fno_cuda_host_device_constexpr : Fla HelpText<"Don't treat unattributed constexpr functions as __host__ __device__.">; //===----------------------------------------------------------------------===// +// Section Naming Options +//===----------------------------------------------------------------------===// + +def mbss_EQ : Joined<["-"], "mbss=">, + HelpText<"name the .bss section">; +def mdata_EQ : Joined<["-"], "mdata=">, + HelpText<"name the .data section">; +def mrodata_EQ : Joined<["-"], "mrodata=">, + HelpText<"name the .rodata section">; +def mtext_EQ : Joined<["-"], "mtext=">, + HelpText<"name the .text section">; + +//===----------------------------------------------------------------------===// // OpenMP Options //===----------------------------------------------------------------------===// diff -rupN llvm/tools/clang/lib/CodeGen/BackendUtil.cpp llvm.patched/tools/clang/lib/CodeGen/BackendUtil.cpp --- llvm/tools/clang/lib/CodeGen/BackendUtil.cpp 2020-02-25 09:53:09.570410537 +0000 +++ llvm.patched/tools/clang/lib/CodeGen/BackendUtil.cpp 2020-02-25 09:56:58.624986421 +0000 @@ -463,6 +463,8 @@ static void initTargetOptions(llvm::Targ Options.ExceptionModel = llvm::ExceptionHandling::WinEH; if (LangOpts.DWARFExceptions) Options.ExceptionModel = llvm::ExceptionHandling::DwarfCFI; + if (!LangOpts.Exceptions && !LangOpts.CXXExceptions && !CodeGenOpts.UnwindTables) + Options.NoExceptions = true; if (LangOpts.WasmExceptions) Options.ExceptionModel = llvm::ExceptionHandling::Wasm; diff -rupN llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp llvm.patched/tools/clang/lib/Frontend/CompilerInvocation.cpp --- llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp 2020-02-25 09:53:09.578410627 +0000 +++ llvm.patched/tools/clang/lib/Frontend/CompilerInvocation.cpp 2020-02-25 09:54:10.055090960 +0000 @@ -201,6 +201,11 @@ static void getAllNoBuiltinFuncValues(Ar Funcs.insert(Funcs.end(), Values.begin(), Values.end()); } +extern const char *bssName; +extern const char *textName; +extern const char *dataName; +extern const char *rodataName; + static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args, DiagnosticsEngine &Diags) { bool Success = true; @@ -1306,6 +1311,19 @@ static bool ParseCodeGenArgs(CodeGenOpti NeedLocTracking = true; } + if (Arg *A = Args.getLastArg(OPT_mbss_EQ)) { + bssName = A->getValue(); + } + if (Arg *A = Args.getLastArg(OPT_mdata_EQ)) { + dataName = A->getValue(); + } + if (Arg *A = Args.getLastArg(OPT_mrodata_EQ)) { + rodataName = A->getValue(); + } + if (Arg *A = Args.getLastArg(OPT_mtext_EQ)) { + textName = A->getValue(); + } + if (Arg *A = Args.getLastArg(OPT_Rpass_EQ)) { Opts.OptimizationRemarkPattern = GenerateOptimizationRemarkRegex(Diags, Args, A); diff -rupN llvm/tools/lto/lto.cpp llvm.patched/tools/lto/lto.cpp --- llvm/tools/lto/lto.cpp 2020-02-25 09:53:11.646433894 +0000 +++ llvm.patched/tools/lto/lto.cpp 2020-02-25 09:54:10.055090960 +0000 @@ -397,7 +397,20 @@ void lto_codegen_set_assembler_path(lto_ void lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args, int nargs) { - // In here only for backwards compatibility. We use MC now. + LibLTOCodeGenerator *CG = unwrap(cg); + TargetOptions &options = CG->getTargetOptions(); + for (int i=0;i