diff -rupN llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h llvm.patched/include/llvm/LTO/legacy/LTOCodeGenerator.h
--- llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h 2021-07-12 11:11:01.846357613 +0100
+++ llvm.patched/include/llvm/LTO/legacy/LTOCodeGenerator.h 2021-07-12 11:11:44.002933921 +0100
@@ -95,6 +95,10 @@ struct LTOCodeGenerator {
void setCpu(StringRef MCpu) { this->MCpu = std::string(MCpu); }
void setAttrs(std::vector<std::string> MAttrs) { this->MAttrs = MAttrs; }
void setOptLevel(unsigned OptLevel);
+ void setFunctionSections(bool Value) { this->Options.FunctionSections = Value; }
+ void setDataSections(bool Value) { this->Options.DataSections = Value; }
+ void setFloatingABIType(FloatABI::ABIType Value) { this->Options.FloatABIType = Value; }
+ void setNoExceptions(bool Value) { this->Options.NoExceptions = Value; }
void setShouldInternalize(bool Value) { ShouldInternalize = Value; }
void setShouldEmbedUselists(bool Value) { ShouldEmbedUselists = Value; }
diff -rupN llvm/include/llvm/Target/TargetOptions.h llvm.patched/include/llvm/Target/TargetOptions.h
--- llvm/include/llvm/Target/TargetOptions.h 2021-07-12 11:11:01.882358106 +0100
+++ llvm.patched/include/llvm/Target/TargetOptions.h 2021-07-12 11:11:44.006933976 +0100
@@ -131,6 +131,7 @@ namespace llvm {
DisableIntegratedAS(false), RelaxELFRelocations(false),
FunctionSections(false), DataSections(false),
IgnoreXCOFFVisibility(false), XCOFFTracebackTable(true),
+ NoExceptions(false),
UniqueSectionNames(true), UniqueBasicBlockSectionNames(false),
TrapUnreachable(false), NoTrapAfterNoreturn(false), TLSSize(0),
EmulatedTLS(false), ExplicitEmulatedTLS(false), EnableIPRA(false),
@@ -254,6 +255,9 @@ namespace llvm {
/// Emit XCOFF traceback table.
unsigned XCOFFTracebackTable : 1;
+ /// No Exceptions
+ unsigned NoExceptions : 1;
+
unsigned UniqueSectionNames : 1;
/// Use unique names for basic block sections.
diff -rupN llvm/lib/CodeGen/LLVMTargetMachine.cpp llvm.patched/lib/CodeGen/LLVMTargetMachine.cpp
--- llvm/lib/CodeGen/LLVMTargetMachine.cpp 2021-07-12 11:11:01.946358981 +0100
+++ llvm.patched/lib/CodeGen/LLVMTargetMachine.cpp 2021-07-12 11:11:44.006933976 +0100
@@ -73,7 +73,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 2021-07-12 11:11:01.970359309 +0100
+++ llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp 2021-07-12 11:11:44.006933976 +0100
@@ -574,18 +574,20 @@ static unsigned getEntrySizeForKind(Sect
/// 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;
if (Kind.isReadOnlyWithRel())
return ".data.rel.ro";
llvm_unreachable("Unknown section kind");
diff -rupN llvm/lib/MC/MCObjectFileInfo.cpp llvm.patched/lib/MC/MCObjectFileInfo.cpp
--- llvm/lib/MC/MCObjectFileInfo.cpp 2021-07-12 11:11:02.022360020 +0100
+++ llvm.patched/lib/MC/MCObjectFileInfo.cpp 2021-07-12 11:11:44.006933976 +0100
@@ -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())
@@ -347,17 +352,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/lto/lto.cpp llvm.patched/tools/lto/lto.cpp
--- llvm/tools/lto/lto.cpp 2021-07-12 11:11:01.390351378 +0100
+++ llvm.patched/tools/lto/lto.cpp 2021-07-12 11:11:44.006933976 +0100
@@ -45,6 +45,10 @@ static cl::opt<bool> EnableFreestanding(
"lto-freestanding", cl::init(false),
cl::desc("Enable Freestanding (disable builtins / TLI) during LTO"));
+static cl::opt<bool> NoExceptions(
+ "no-exceptions", cl::init(false),
+ cl::desc("Do not generate exception tables"));
+
#ifdef NDEBUG
static bool VerifyByDefault = false;
#else
@@ -153,6 +157,11 @@ static void lto_add_attrs(lto_code_gen_t
CG->setOptLevel(OptLevel - '0');
CG->setFreestanding(EnableFreestanding);
CG->setDisableVerify(DisableVerify);
+ CG->setFunctionSections(codegen::getFunctionSections());
+ CG->setDataSections(codegen::getDataSections());
+ CG->setFloatingABIType(codegen::getFloatABIForCalls());
+ CG->setNoExceptions(NoExceptions);
+ if (auto FT = codegen::getExplicitFileType()) CG->setFileType(FT.getValue());
}
extern const char* lto_get_version() {
diff -rupN clang/include/clang/Driver/Options.td clang.patched/include/clang/Driver/Options.td
--- clang/include/clang/Driver/Options.td 2021-07-12 11:11:10.062469956 +0100
+++ clang.patched/include/clang/Driver/Options.td 2021-07-12 11:11:44.010934030 +0100
@@ -5313,6 +5313,19 @@ def fno_cuda_host_device_constexpr : Fla
MarshallingInfoNegativeFlag<LangOpts<"CUDAHostDeviceConstexpr">>;
//===----------------------------------------------------------------------===//
+// 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 clang/lib/CodeGen/BackendUtil.cpp clang.patched/lib/CodeGen/BackendUtil.cpp
--- clang/lib/CodeGen/BackendUtil.cpp 2021-07-12 11:11:10.126470831 +0100
+++ clang.patched/lib/CodeGen/BackendUtil.cpp 2021-07-12 11:11:44.010934030 +0100
@@ -506,6 +506,8 @@ static bool initTargetOptions(Diagnostic
Options.ExceptionModel = llvm::ExceptionHandling::WinEH;
if (LangOpts.hasDWARFExceptions())
Options.ExceptionModel = llvm::ExceptionHandling::DwarfCFI;
+ if (!LangOpts.Exceptions && !LangOpts.CXXExceptions && !CodeGenOpts.UnwindTables)
+ Options.NoExceptions = true;
if (LangOpts.hasWasmExceptions())
Options.ExceptionModel = llvm::ExceptionHandling::Wasm;
diff -rupN clang/lib/Frontend/CompilerInvocation.cpp clang.patched/lib/Frontend/CompilerInvocation.cpp
--- clang/lib/Frontend/CompilerInvocation.cpp 2021-07-12 11:11:10.166471378 +0100
+++ clang.patched/lib/Frontend/CompilerInvocation.cpp 2021-07-12 11:11:44.014934085 +0100
@@ -573,6 +573,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;
@@ -1254,6 +1259,19 @@ bool CompilerInvocation::ParseCodeGenArg
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);