diff -rupN llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
--- llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp	2017-03-03 15:08:54.259472831 +0000
+++ llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp	2017-03-03 15:09:29.260053078 +0000
@@ -232,18 +232,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	2017-03-03 15:08:54.223472235 +0000
+++ llvm.patched/lib/MC/MCObjectFileInfo.cpp	2017-03-03 15:09:29.260053078 +0000
@@ -269,6 +269,11 @@ void MCObjectFileInfo::initMachOMCObject
   TLSExtraDataSection = TLSTLVSection;
 }
 
+const char *bssName = ".bss";
+const char *textName = ".text";
+const char *dataName = ".data";
+const char *rodataName = ".rodata";
+
 void MCObjectFileInfo::initELFMCObjectFileInfo(const Triple &T) {
   switch (T.getArch()) {
   case Triple::mips:
@@ -455,17 +460,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	2017-03-03 15:08:52.667446419 +0000
+++ llvm.patched/tools/clang/include/clang/Driver/CC1Options.td	2017-03-03 15:09:29.268053413 +0000
@@ -715,6 +715,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/Frontend/CompilerInvocation.cpp llvm.patched/tools/clang/lib/Frontend/CompilerInvocation.cpp
--- llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp	2017-03-03 15:08:53.495460157 +0000
+++ llvm.patched/tools/clang/lib/Frontend/CompilerInvocation.cpp	2017-03-03 15:09:29.268053413 +0000
@@ -155,6 +155,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) {
   using namespace options;
@@ -842,6 +847,19 @@ static bool ParseCodeGenArgs(CodeGenOpti
   if (!Opts.OptRecordFile.empty())
     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);