Index: llvm/docs/CommandGuide/llvm-objdump.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-objdump.rst
+++ llvm/docs/CommandGuide/llvm-objdump.rst
@@ -167,6 +167,11 @@
 
   When disassembling, do not print the raw bytes of each instruction.
 
+.. option:: --prefix=<prefix>
+
+  When disassembling with the :option:`--source` option, prepend ``prefix`` to
+  GNU absolute paths.
+
 .. option:: --print-imm-hex
 
   Use hex format when printing immediate values in disassembly output.
Index: llvm/docs/llvm-objdump.1
===================================================================
--- llvm/docs/llvm-objdump.1
+++ llvm/docs/llvm-objdump.1
@@ -105,6 +105,10 @@
 Print no leading headers.
 .It Fl -no-show-raw-insn
 When disassembling instructions, do not print the instruction bytes.
+.It Fl -prefix Ns = Ns Ar PREFIX
+When disassembling, add
+.Ar PREFIX
+to GNU absolute paths.
 .It Fl -print-imm-hex
 Use hex format for immediate values.
 .It Fl -private-header
Index: llvm/test/tools/llvm-objdump/X86/source-interleave-absolute-paths-all.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-objdump/X86/source-interleave-absolute-paths-all.test
@@ -0,0 +1,35 @@
+;; Test --prefix option.
+
+; RUN: sed -e "s,SRC_COMPDIR,/Inputs,g" %p/Inputs/source-interleave.ll > %t.ll
+; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
+
+; RUN: sed -e "s,SRC_COMPDIR,%/p/Inputs,g" %p/Inputs/source-interleave.ll > %t2.ll
+; RUN: llc -o %t2.o -filetype=obj -mtriple=x86_64-pc-linux %t2.ll
+
+; RUN: sed -e "s,SRC_COMPDIR,,g" %p/Inputs/source-interleave.ll | sed -e "s,filename: \"source-interleave-x86_64.c\",filename: \"\",g"> %t3.ll
+; RUN: llc -o %t3.o -filetype=obj -mtriple=x86_64-pc-linux %t3.ll
+
+;; Test invalid source interleave fixed by adding the correct prefix.
+
+; RUN: llvm-objdump --prefix %p --source %t.o 2>&1 | FileCheck %s --check-prefix CHECK-MISS-PREFIX-FIX
+; CHECK-MISS-PREFIX-FIX: ; int foo() {
+
+;; Test valid source interleave being broken by adding an incorrect prefix.
+
+; RUN: llvm-objdump --prefix myprefix --source %t2.o 2>&1 | FileCheck %s --check-prefix CHECK-BROKEN-PREFIX -DFILE=%t2.o -DROOT=%/p
+; CHECK-BROKEN-PREFIX: warning: '[[FILE]]': failed to find source myprefix[[ROOT]]/Inputs/source-interleave-x86_64.c
+
+;; Test malformed input.
+
+; RUN: llvm-objdump --prefix myprefix --source %t3.o 2>&1 | FileCheck %s --check-prefix CHECK-MALFORMED -DFILE=%t3.o -DROOT=%/p
+; CHECK-MALFORMED: warning: '[[FILE]]': failed to parse debug information for [[FILE]]
+
+;; Using only a prefix separator is the same as not using the `--prefix` option.
+
+; RUN: llvm-objdump --prefix / --source %t.o 2>&1 | FileCheck %s --check-prefix CHECK-TRAILING -DFILE=%t.o -DPREFIX=''
+; CHECK-TRAILING: warning: '[[FILE]]': failed to find source [[PREFIX]]/Inputs/source-interleave-x86_64.c
+
+;; Trailing separators on the prefix are discarded.
+;; The prefix 'myprefix///' is converted to 'myprefix'.
+
+; RUN: llvm-objdump --prefix myprefix/// --source %t.o 2>&1 | FileCheck %s --check-prefix CHECK-TRAILING -DFILE=%t.o -DPREFIX=myprefix
Index: llvm/test/tools/llvm-objdump/X86/source-interleave-absolute-paths-non-windows.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-objdump/X86/source-interleave-absolute-paths-non-windows.test
@@ -0,0 +1,11 @@
+;; Test --prefix option non Windows specific behavior.
+; UNSUPPORTED: system-windows
+
+; RUN: sed -e "s,SRC_COMPDIR,/Inputs,g" %p/Inputs/source-interleave.ll > %t.ll
+; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
+
+;; Test removal of trailing separators (only '/').
+;; The prefix 'myprefix/\' is not changed.
+
+; RUN: llvm-objdump --prefix 'myprefix/\' --source %t.o 2>&1 | FileCheck %s -DFILE=%t.o -DPREFIX='myprefix/\'
+; CHECK: warning: '[[FILE]]': failed to find source [[PREFIX]]/Inputs/source-interleave-x86_64.c
Index: llvm/test/tools/llvm-objdump/X86/source-interleave-absolute-paths-windows.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-objdump/X86/source-interleave-absolute-paths-windows.test
@@ -0,0 +1,11 @@
+;; Test --prefix option Windows specific behavior.
+; REQUIRES: system-windows
+
+; RUN: sed -e "s,SRC_COMPDIR,/Inputs,g" %p/Inputs/source-interleave.ll > %t.ll
+; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
+
+;; Test removal of trailing separators (both '/' and '\').
+;; The prefix 'myprefix/\' is changed to 'myprefix'.
+
+; RUN: llvm-objdump --prefix 'myprefix/\' --source %t.o 2>&1 | FileCheck %s -DFILE=%t.o -DPREFIX='myprefix'
+; CHECK: warning: '[[FILE]]': failed to find source [[PREFIX]]/Inputs/source-interleave-x86_64.c
Index: llvm/tools/llvm-objdump/llvm-objdump.h
===================================================================
--- llvm/tools/llvm-objdump/llvm-objdump.h
+++ llvm/tools/llvm-objdump/llvm-objdump.h
@@ -48,6 +48,7 @@
 extern cl::opt<bool> SymbolTable;
 extern cl::opt<std::string> TripleName;
 extern cl::opt<bool> UnwindInfo;
+extern cl::opt<std::string> Prefix;
 
 extern StringSet<> FoundSectionSet;
 
Index: llvm/tools/llvm-objdump/llvm-objdump.cpp
===================================================================
--- llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -353,6 +353,10 @@
          cl::cat(ObjdumpCat));
 static cl::alias WideShort("w", cl::Grouping, cl::aliasopt(Wide));
 
+cl::opt<std::string>
+    objdump::Prefix("prefix", cl::desc("Add prefix to GNU absolute paths"),
+                    cl::cat(ObjdumpCat));
+
 enum DebugVarsFormat {
   DVDisabled,
   DVUnicode,
@@ -1031,6 +1035,15 @@
     }
   }
 
+  if (!Prefix.empty()) {
+    if (sys::path::is_absolute_gnu(LineInfo.FileName)) {
+      SmallString<128> FilePath;
+      sys::path::append(FilePath, Prefix, LineInfo.FileName);
+
+      LineInfo.FileName = std::string(FilePath);
+    }
+  }
+
   if (PrintLines)
     printLines(OS, LineInfo, Delimiter, LVP);
   if (PrintSource)
@@ -2978,6 +2991,10 @@
   if (InputFilenames.empty())
     InputFilenames.push_back("a.out");
 
+  // Removes trailing separators from prefix.
+  while (!Prefix.empty() && sys::path::is_separator(Prefix.back()))
+    Prefix.pop_back();
+
   if (AllHeaders)
     ArchiveHeaders = FileHeaders = PrivateHeaders = Relocations =
         SectionHeaders = SymbolTable = true;