diff options
| author | waffles <waffles@chromium.org> | 2016-02-23 10:57:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-23 18:58:51 +0000 |
| commit | b4cf6466ae8c9675526ac8cd70e4aae587842f0d (patch) | |
| tree | 57ae70a6662efce5f04dbb7a6d1cb73c4c09dc29 /third_party/lzma_sdk/chromium.patch | |
| parent | cc4e35df97aa6cb16ae13b10cf1cd1ab29aa690c (diff) | |
| download | chromium_src-b4cf6466ae8c9675526ac8cd70e4aae587842f0d.zip chromium_src-b4cf6466ae8c9675526ac8cd70e4aae587842f0d.tar.gz chromium_src-b4cf6466ae8c9675526ac8cd70e4aae587842f0d.tar.bz2 | |
Update patch for CpuArch.c.
The new patch matches the version we would like to upstream to lzma_sdk.
BUG=588263
Review URL: https://codereview.chromium.org/1713183002
Cr-Commit-Position: refs/heads/master@{#377034}
Diffstat (limited to 'third_party/lzma_sdk/chromium.patch')
| -rw-r--r-- | third_party/lzma_sdk/chromium.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/lzma_sdk/chromium.patch b/third_party/lzma_sdk/chromium.patch index ec15101..1c5c880 100644 --- a/third_party/lzma_sdk/chromium.patch +++ b/third_party/lzma_sdk/chromium.patch @@ -1,5 +1,5 @@ ---- a\CpuArch.c 2015-03-25 08:17:41.042711000 -0400 -+++ lzma_sdk\CpuArch.c 2016-02-12 16:32:45.484718900 -0500 +--- /usr/local/google/home/waffles/Downloads/C/CpuArch.c 2015-03-25 05:17:41.000000000 -0700 ++++ CpuArch.c 2016-02-19 12:42:20.327993932 -0800 @@ -45,7 +45,8 @@ "push %%EDX\n\t" "popf\n\t" @@ -10,12 +10,16 @@ #endif return flag; } -@@ -79,7 +80,13 @@ +@@ -78,8 +79,17 @@ + #else ++ // When built using GCC and -fPIC (until GCC 5.0), ebx points to the global ++ // offset table, so the value must be preserved before executing cpuid. ++ // Attempting to explicitly clobber ebx is a compile-time error. __asm__ __volatile__ ( - #if defined(MY_CPU_X86) && defined(__PIC__) -+ #if defined(MY_CPU_AMD64) ++ #if defined(MY_CPU_AMD64) && defined(__PIC__) + "mov %%rbx, %%rdi\n" + "cpuid\n" + "xchg %%rdi, %%rbx\n" |