diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
@@ -891,8 +891,10 @@
      << format(" %0*" PRIx64, IsDWARF64 && !IsEH ? 16 : 8,
                getCIEId(IsDWARF64, IsEH))
      << " CIE\n"
-     << "  Format:                " << FormatString(IsDWARF64) << "\n"
-     << format("  Version:               %d\n", Version)
+     << "  Format:                " << FormatString(IsDWARF64) << "\n";
+  if (IsEH && Version != 1)
+    OS << "WARNING: unsupported CIE version\n";
+  OS << format("  Version:               %d\n", Version)
      << "  Augmentation:          \"" << Augmentation << "\"\n";
   if (Version >= 4) {
     OS << format("  Address size:          %u\n", (uint32_t)AddressSize);
@@ -1012,11 +1014,6 @@
       uint8_t Version = Data.getU8(&Offset);
       const char *Augmentation = Data.getCStr(&Offset);
       StringRef AugmentationString(Augmentation ? Augmentation : "");
-      // TODO: we should provide a way to report a warning and continue dumping.
-      if (IsEH && Version != 1)
-        return createStringError(errc::not_supported,
-                                 "unsupported CIE version: %" PRIu8, Version);
-
       uint8_t AddressSize = Version < 4 ? Data.getAddressSize() :
                                           Data.getU8(&Offset);
       Data.setAddressSize(AddressSize);
diff --git a/llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s b/llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s
--- a/llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s
+++ b/llvm/test/DebugInfo/X86/eh-frame-invalid-version-zero.s
@@ -1,9 +1,9 @@
 ## Check we do not support .eh_frame sections of version 0.
 
 # RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t
-# RUN: not llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
+# RUN: llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
 
-# CHECK: unsupported CIE version: 0
+# CHECK: unsupported CIE version
 
 .section .eh_frame,"a",@unwind
  .long .Lend - .LCIEptr ## Length
diff --git a/llvm/test/DebugInfo/X86/eh-frame-invalid-version.s b/llvm/test/DebugInfo/X86/eh-frame-invalid-version.s
--- a/llvm/test/DebugInfo/X86/eh-frame-invalid-version.s
+++ b/llvm/test/DebugInfo/X86/eh-frame-invalid-version.s
@@ -1,9 +1,9 @@
 ## Check we do not support .eh_frame sections of versions greater than 1.
 
 # RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t
-# RUN: not llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
+# RUN: llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
 
-# CHECK: unsupported CIE version: 2
+# CHECK: unsupported CIE version
 
 .section .eh_frame,"a",@unwind
  .long .Lend - .LCIEptr ## Length