From: Nick Clifton <nickc@redhat.com>
Date: Tue, 10 Sep 2013 16:19:08 +0000 (+0000)
Subject: 	* dwarf.c (display_debug_frames): Check for DW64_CIE_ID when
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=846a11e4207a3365045d8482d4686d0dce5762f5;p=binutils-gdb.git

	* dwarf.c (display_debug_frames): Check for DW64_CIE_ID when
	parsing 64-bit frames.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5a4872cbd3a..89f354d5aa7 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-10  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_frames): Check for DW64_CIE_ID when
+	parsing 64-bit frames.
+
 2013-08-27  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/15796
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 05bc483abfa..00dad397f45 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -5188,7 +5188,8 @@ display_debug_frames (struct dwarf_section *section,
 
       SAFE_BYTE_GET_AND_INC (cie_id, start, offset_size, end);
 
-      if (is_eh ? (cie_id == 0) : (cie_id == DW_CIE_ID))
+      if (is_eh ? (cie_id == 0) : ((offset_size == 4 && cie_id == DW_CIE_ID)
+				   || (offset_size == 8 && cie_id == DW64_CIE_ID)))
 	{
 	  int version;