diff --git a/llvm/lib/LTO/LTOBackend.cpp b/llvm/lib/LTO/LTOBackend.cpp
--- a/llvm/lib/LTO/LTOBackend.cpp
+++ b/llvm/lib/LTO/LTOBackend.cpp
@@ -350,7 +350,9 @@
     "lto-embed-bitcode", cl::init(false),
     cl::desc("Embed LLVM bitcode in object files produced by LTO"));
 
-static void EmitBitcodeSection(Module &M, const Config &Conf) {
+static void
+EmitBitcodeSection(Module &M,
+                   const std::vector<uint8_t> *CmdLineOpts = nullptr) {
   if (!EmbedBitcode)
     return;
   SmallVector<char, 0> Buffer;
@@ -359,8 +361,8 @@
 
   std::unique_ptr<MemoryBuffer> Buf(
       new SmallVectorMemoryBuffer(std::move(Buffer)));
-  llvm::EmbedBitcodeInModule(M, Buf->getMemBufferRef(), /*EmbedBitcode*/ true,
-                             /*EmbedMarker*/ false, /*CmdArgs*/ nullptr);
+  llvm::EmbedBitcodeInModule(M, llvm::MemoryBufferRef(), /*EmbedBitcode*/ true,
+                             /*EmbedMarker*/ false, /*CmdArgs*/ CmdLineOpts);
 }
 
 void codegen(const Config &Conf, TargetMachine *TM, AddStreamFn AddStream,
@@ -369,7 +371,7 @@
   if (Conf.PreCodeGenModuleHook && !Conf.PreCodeGenModuleHook(Task, Mod))
     return;
 
-  EmitBitcodeSection(Mod, Conf);
+  EmitBitcodeSection(Mod);
 
   std::unique_ptr<ToolOutputFile> DwoOut;
   SmallString<1024> DwoFile(Conf.SplitDwarfOutput);