diff --git a/lld/test/ELF/eh-frame-hdr-augmentation.s b/lld/test/ELF/eh-frame-hdr-augmentation.s
--- a/lld/test/ELF/eh-frame-hdr-augmentation.s
+++ b/lld/test/ELF/eh-frame-hdr-augmentation.s
@@ -5,7 +5,7 @@
 
 // CHECK: .eh_frame contents:
 
-// CHECK:      00000000 0000001c ffffffff CIE
+// CHECK:      00000000 0000001c 00000000 CIE
 // CHECK-NEXT:   Version:                       1
 // CHECK-NEXT:   Augmentation:             "zPLR"
 // CHECK-NEXT:   Code alignment factor: 1
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
@@ -287,7 +287,7 @@
 
 void CIE::dump(raw_ostream &OS, const MCRegisterInfo *MRI, bool IsEH) const {
   OS << format("%08x %08x %08x CIE", (uint32_t)Offset, (uint32_t)Length,
-               DW_CIE_ID)
+               IsEH ? 0 : DW_CIE_ID)
      << "\n";
   OS << format("  Version:               %d\n", Version);
   OS << "  Augmentation:          \"" << Augmentation << "\"\n";
diff --git a/llvm/test/DebugInfo/RISCV/eh-frame.s b/llvm/test/DebugInfo/RISCV/eh-frame.s
--- a/llvm/test/DebugInfo/RISCV/eh-frame.s
+++ b/llvm/test/DebugInfo/RISCV/eh-frame.s
@@ -8,7 +8,7 @@
   ret
   .cfi_endproc
 
-# CHECK: 00000000 00000010 ffffffff CIE
+# CHECK: 00000000 00000010 00000000 CIE
 # CHECK:   Version:               1
 # CHECK:   Augmentation:          "zR"
 # CHECK:   Code alignment factor: 1
diff --git a/llvm/test/MC/Mips/eh-frame.s b/llvm/test/MC/Mips/eh-frame.s
--- a/llvm/test/MC/Mips/eh-frame.s
+++ b/llvm/test/MC/Mips/eh-frame.s
@@ -54,7 +54,7 @@
 // PIC64-NEXT:      R_MIPS_PC32/R_MIPS_NONE/R_MIPS_NONE
 // RELOCS-NEXT:   }
 
-// DWARF32: 00000000 00000010 ffffffff CIE
+// DWARF32: 00000000 00000010 00000000 CIE
 // DWARF32-NEXT:     Version:               1
 // DWARF32-NEXT:     Augmentation:          "zR"
 // DWARF32-NEXT:     Code alignment factor: 1
@@ -73,7 +73,7 @@
 // DWARF32-NEXT:     DW_CFA_nop:
 
 
-// DWARF64: 00000000 00000010 ffffffff CIE
+// DWARF64: 00000000 00000010 00000000 CIE
 // DWARF64-NEXT:     Version:               1
 // DWARF64-NEXT:     Augmentation:          "zR"
 // DWARF64-NEXT:     Code alignment factor: 1
diff --git a/llvm/test/MC/X86/return-column.s b/llvm/test/MC/X86/return-column.s
--- a/llvm/test/MC/X86/return-column.s
+++ b/llvm/test/MC/X86/return-column.s
@@ -33,11 +33,11 @@
 // CHECK-ASM-ROUNDTRIP-NEXT: .cfi_return_column 0
 // CHECK-ASM-ROUNDTRIP: .cfi_endproc
 
-// CHECK-EH_FRAME: 00000000 00000014 ffffffff CIE
+// CHECK-EH_FRAME: 00000000 00000014 00000000 CIE
 // CHECK-EH_FRAME:   Return address column: 0
 
-// CHECK-EH_FRAME: 0000002c 00000014 ffffffff CIE
+// CHECK-EH_FRAME: 0000002c 00000014 00000000 CIE
 // CHECK-EH_FRAME:   Return address column: 65
 
-// CHECK-EH_FRAME-NOT: ........ 00000014 ffffffff CIE
+// CHECK-EH_FRAME-NOT: ........ 00000014 00000000 CIE
 
diff --git a/llvm/test/tools/llvm-dwarfdump/X86/eh-frame-return-address-reg.s b/llvm/test/tools/llvm-dwarfdump/X86/eh-frame-return-address-reg.s
--- a/llvm/test/tools/llvm-dwarfdump/X86/eh-frame-return-address-reg.s
+++ b/llvm/test/tools/llvm-dwarfdump/X86/eh-frame-return-address-reg.s
@@ -10,7 +10,7 @@
 # checks that we are able to dump it correctly.
 
 # CHECK:      .eh_frame contents:
-# CHECK:      00000000 00000010 ffffffff CIE
+# CHECK:      00000000 00000010 00000000 CIE
 # CHECK-NEXT:   Version:               1
 # CHECK-NEXT:   Augmentation:          "zR"
 # CHECK-NEXT:   Code alignment factor: 1
diff --git a/llvm/test/tools/llvm-objdump/eh_frame-arm64.test b/llvm/test/tools/llvm-objdump/eh_frame-arm64.test
--- a/llvm/test/tools/llvm-objdump/eh_frame-arm64.test
+++ b/llvm/test/tools/llvm-objdump/eh_frame-arm64.test
@@ -2,7 +2,7 @@
 
 # CHECK: .eh_frame contents:
 
-# CHECK: 00000000 00000010 ffffffff CIE
+# CHECK: 00000000 00000010 00000000 CIE
 # CHECK:   Version:               1
 # CHECK:   Augmentation:          "zR"
 # CHECK:   Code alignment factor: 1
diff --git a/llvm/test/tools/llvm-objdump/eh_frame-coff.test b/llvm/test/tools/llvm-objdump/eh_frame-coff.test
--- a/llvm/test/tools/llvm-objdump/eh_frame-coff.test
+++ b/llvm/test/tools/llvm-objdump/eh_frame-coff.test
@@ -2,7 +2,7 @@
 
 # CHECK: .eh_frame contents:
 
-# CHECK: 00000000 0000001c ffffffff CIE
+# CHECK: 00000000 0000001c 00000000 CIE
 # CHECK:   Version:               1
 # CHECK:   Augmentation:          "zPLR"
 # CHECK:   Code alignment factor: 1
diff --git a/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test b/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
--- a/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
+++ b/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
@@ -2,7 +2,7 @@
 
 # CHECK: .eh_frame contents:
 
-# CHECK: 00000000 00000018 ffffffff CIE
+# CHECK: 00000000 00000018 00000000 CIE
 # CHECK:   Version:               1
 # CHECK:   Augmentation:          "zPLR"
 # CHECK:   Code alignment factor: 1
@@ -19,7 +19,7 @@
 # CHECK:   DW_CFA_offset: reg31 -4
 # CHECK:   DW_CFA_nop:
 
-# CHECK: 00000038 00000000 ffffffff CIE
+# CHECK: 00000038 00000000 00000000 CIE
 # CHECK:   Version:               0
 # CHECK:   Augmentation:          ""
 # CHECK:   Code alignment factor: 0
diff --git a/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test b/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
--- a/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
+++ b/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
@@ -2,7 +2,7 @@
 
 # CHECK: .eh_frame contents:
 
-# CHECK: 00000000 00000000 ffffffff CIE
+# CHECK: 00000000 00000000 00000000 CIE
 # CHECK:   Version:               0
 # CHECK:   Augmentation:          ""
 # CHECK:   Code alignment factor: 0