diff --strip-trailing-cr -rupN llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
--- llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp	2015-06-30 20:10:31.000000000 +0100
+++ llvm.patched/lib/CodeGen/TargetLoweringObjectFileImpl.cpp	2015-09-02 15:51:06.177611340 +0100
@@ -222,18 +222,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.isDataNoRel())
-    return ".data";
+    return dataName;
   if (Kind.isDataRelLocal())
     return ".data.rel.local";
   if (Kind.isDataRel())
diff --strip-trailing-cr -rupN llvm/lib/MC/MCObjectFileInfo.cpp llvm.patched/lib/MC/MCObjectFileInfo.cpp
--- llvm/lib/MC/MCObjectFileInfo.cpp	2015-06-25 01:28:42.000000000 +0100
+++ llvm.patched/lib/MC/MCObjectFileInfo.cpp	2015-09-02 12:14:52.744510538 +0100
@@ -244,6 +244,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(Triple T) {
   switch (T.getArch()) {
   case Triple::mips:
@@ -404,17 +409,17 @@ void MCObjectFileInfo::initELFMCObjectFi
 
 
   // 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 --strip-trailing-cr -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	2015-07-17 21:25:46.000000000 +0100
+++ llvm.patched/tools/clang/include/clang/Driver/CC1Options.td	2015-09-03 09:19:22.466531315 +0100
@@ -649,6 +649,19 @@ def fcuda_disable_target_call_checks : F
 def fcuda_include_gpubinary : Separate<["-"], "fcuda-include-gpubinary">,
   HelpText<"Incorporate CUDA device-side binary into host object file.">;
 
+//===----------------------------------------------------------------------===//
+// 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">;
+
 } // let Flags = [CC1Option]
 
 
diff --strip-trailing-cr -rupN llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp llvm.patched/tools/clang/lib/Frontend/CompilerInvocation.cpp
--- llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-07-30 23:47:41.000000000 +0100
+++ llvm.patched/tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-09-02 13:35:58.104313101 +0100
@@ -131,6 +131,11 @@ static void addDiagnosticArgs(ArgList &A
   }
 }
 
+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;
@@ -632,6 +637,19 @@ static bool ParseCodeGenArgs(CodeGenOpti
   Opts.DependentLibraries = Args.getAllArgValues(OPT_dependent_lib);
   bool NeedLocTracking = false;
 
+  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);