From e7e92d3b226dea1165772b10ac9e7d525024bf32 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Sep 04 2012 16:17:27 +0000
Subject: Resolves: 854108


---

diff --git a/binutils-2.22.52.0.1-OP_VEX.patch b/binutils-2.22.52.0.1-OP_VEX.patch
new file mode 100644
index 0000000..585025b
--- /dev/null
+++ b/binutils-2.22.52.0.1-OP_VEX.patch
@@ -0,0 +1,114 @@
+*** ../binutils-2.22.52.0.1.orig/opcodes/i386-dis.c	2012-09-04 16:54:43.507485429 +0100
+--- opcodes/i386-dis.c	2012-09-04 16:56:32.917480577 +0100
+*************** enum
+*** 1318,1323 ****
+--- 1318,1331 ----
+    VEX_LEN_0F3A7F_P_2,
+    VEX_LEN_0F3ADF_P_2,
+    VEX_LEN_0F3AF0_P_3,
++   VEX_LEN_0FXOP_08_CC,
++   VEX_LEN_0FXOP_08_CD,
++   VEX_LEN_0FXOP_08_CE,
++   VEX_LEN_0FXOP_08_CF,
++   VEX_LEN_0FXOP_08_EC,
++   VEX_LEN_0FXOP_08_ED,
++   VEX_LEN_0FXOP_08_EE,
++   VEX_LEN_0FXOP_08_EF,
+    VEX_LEN_0FXOP_09_80,
+    VEX_LEN_0FXOP_09_81
+  };
+*************** static const struct dis386 xop_table[][2
+*** 6885,6894 ****
+      { Bad_Opcode },
+      { Bad_Opcode },
+      { Bad_Opcode },
+!     { "vpcomb", 	{ XM, Vex128, EXx, Ib } },
+!     { "vpcomw", 	{ XM, Vex128, EXx, Ib } },
+!     { "vpcomd", 	{ XM, Vex128, EXx, Ib } },
+!     { "vpcomq", 	{ XM, Vex128, EXx, Ib } },
+      /* d0 */
+      { Bad_Opcode },
+      { Bad_Opcode },
+--- 6893,6902 ----
+      { Bad_Opcode },
+      { Bad_Opcode },
+      { Bad_Opcode },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_CC) },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_CD) },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_CE) },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_CF) },
+      /* d0 */
+      { Bad_Opcode },
+      { Bad_Opcode },
+*************** static const struct dis386 xop_table[][2
+*** 6921,6930 ****
+      { Bad_Opcode },
+      { Bad_Opcode },
+      { Bad_Opcode },
+!     { "vpcomub",	{ XM, Vex128, EXx, Ib } },
+!     { "vpcomuw",	{ XM, Vex128, EXx, Ib } },
+!     { "vpcomud",	{ XM, Vex128, EXx, Ib } },
+!     { "vpcomuq",	{ XM, Vex128, EXx, Ib } },
+      /* f0 */
+      { Bad_Opcode },
+      { Bad_Opcode },
+--- 6929,6938 ----
+      { Bad_Opcode },
+      { Bad_Opcode },
+      { Bad_Opcode },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_EC) },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_ED) },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_EE) },
+!     { VEX_LEN_TABLE (VEX_LEN_0FXOP_08_EF) },
+      /* f0 */
+      { Bad_Opcode },
+      { Bad_Opcode },
+*************** static const struct dis386 vex_len_table
+*** 8993,8998 ****
+--- 9001,9046 ----
+      { "rorxS",		{ Gdq, Edq, Ib } },
+    },
+  
++   /* VEX_LEN_0FXOP_08_CC */
++   {
++      { "vpcomb",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_CD */
++   {
++      { "vpcomw",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_CE */
++   {
++      { "vpcomd",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_CF */
++   {
++      { "vpcomq",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_EC */
++   {
++      { "vpcomub",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_ED */
++   {
++      { "vpcomuw",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_EE */
++   {
++      { "vpcomud",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
++   /* VEX_LEN_0FXOP_08_EF */
++   {
++      { "vpcomuq",	{ XM, Vex128, EXx, Ib } },
++   },
++ 
+    /* VEX_LEN_0FXOP_09_80 */
+    {
+      { "vfrczps",	{ XM, EXxmm } },
diff --git a/binutils.spec b/binutils.spec
index 017b265..854c620 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.22.52.0.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -51,6 +51,8 @@ Patch13: binutils-2.22.52.0.1-tsx.patch
 Patch14: binutils-2.22.52.0.1-hidden-ifunc.patch
 # From upstream (fix for #833355)
 Patch15: binutils-2.22.52.0.1-gold-keep.patch
+# From upstream (fix for #854108)
+Patch16: binutils-2.22.52.0.1-OP_VEX.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -158,6 +160,7 @@ using libelf instead of BFD.
 %patch13 -p0 -b .tsx~
 %patch14 -p0 -b .hidden-ifunc~
 %patch15 -p0 -b .gold-keep~
+%patch16 -p0 -b .OP_VEX~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -456,6 +459,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Tue Sep 04 2012 Nick Clifton <nickc@redhat.com> - 2.22.52.0.1-13
+- Import patch for PR14355 to fix seg-fault in objdump  (#854108)
+
 * Tue Aug 14 2012 Nick Clifton <nickc@redhat.com> - 2.22.52.0.1-12
 - Make GOLD honour KEEP directives in linker scripts  (#8333355)