3 files changed, 5 insertions, 14 deletions
diff --git a/third_party/lzma_sdk/CpuArch.c b/third_party/lzma_sdk/CpuArch.c
index f8df6b2..260cc1f 100644
--- a/third_party/lzma_sdk/CpuArch.c
+++ b/third_party/lzma_sdk/CpuArch.c
@@ -73,11 +73,9 @@ static void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
   #else
 
   __asm__ __volatile__ (
-    "mov %%ebx, %%edi\n"
-    "cpuid\n"
-    "xchg %%edi, %%ebx\n"
+    "cpuid"
     : "=a" (*a) ,
-      "=D" (*b) ,
+      "=b" (*b) ,
       "=c" (*c) ,
       "=d" (*d)
     : "0" (function)) ;
diff --git a/third_party/lzma_sdk/README.chromium b/third_party/lzma_sdk/README.chromium
index c9ea02f..eced88a 100644
--- a/third_party/lzma_sdk/README.chromium
+++ b/third_party/lzma_sdk/README.chromium
@@ -15,5 +15,8 @@ proper file paths and generate a static lib.
 The patch in chromium.patch was applied to CpuArch.c to fix compile error on
 32bit Linux.
 
+2013-06-10: Removed chromium.patch and the associated changes, which caused a
+runtime segmentation fault.
+
 An #include <stdlib.h> needs to be added to CpuArch.h to avoid a warning on
 Win32.
diff --git a/third_party/lzma_sdk/chromium.patch b/third_party/lzma_sdk/chromium.patch
deleted file mode 100644
index 319a840..0000000
--- a/third_party/lzma_sdk/chromium.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-76,78c76
-<     "mov %%ebx, %%edi\n"
-<     "cpuid\n"
-<     "xchg %%edi, %%ebx\n"
----
->     "cpuid"
-80c78
-<       "=D" (*b) ,
----
->       "=b" (*b) ,