libvpx: Update to v1.6.0

9 files changed, 61 insertions, 287 deletions

diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe
index b2c5bb96..c6668455 100644
--- a/recipes/libvpx.recipe
+++ b/recipes/libvpx.recipe
@@ -6,11 +6,11 @@ import shutil
 
 class Recipe(recipe.Recipe):
     name = 'libvpx'
-    version = 'v1.5.0'
+    version = 'v1.6.0'
     licenses = [License.BSD]
     btype = BuildType.MAKEFILE
     remotes = {'origin': 'https://github.com/webmproject/libvpx.git'}
-    commit = 'v1.5.0'
+    commit = 'v1.6.0'
     configure_tpl = "./configure --prefix=%(prefix)s "\
                     "--libdir=%(libdir)s %(options)s"
     configure_options = "--enable-pic --as=yasm --disable-unit-tests --size-limit=16384x16384 "\
@@ -24,10 +24,9 @@ class Recipe(recipe.Recipe):
     patches = ['libvpx/0001-build-Fix-the-min-version-flag-for-iOS-simulator-bui.patch',
                'libvpx/0002-Include-Android-cpu-features.c-instead-of-.h.patch',
                'libvpx/0003-configure-Add-back-the-armv5te-android-gcc-target.patch',
-               'libvpx/0005-build-Remove-broken-custom-android-toolchain-usage.patch',
-               'libvpx/0006-configure-Add-Android-ARM64-support.patch',
+               'libvpx/0004-build-Remove-broken-custom-android-toolchain-usage.patch',
+               'libvpx/0005-configure-Add-Android-ARM64-support.patch',
                'libvpx/0006-Don-t-embed-bitcode-on-iOS-until-we-support-that-pro.patch',
-               'libvpx/0009-fix-win32-crash-subpel-variance.patch',
                ]
 
     files_libs = ['libvpx']
diff --git a/recipes/libvpx/0001-build-Fix-the-min-version-flag-for-iOS-simulator-bui.patch b/recipes/libvpx/0001-build-Fix-the-min-version-flag-for-iOS-simulator-bui.patch
index e659984b..611a6a69 100644
--- a/recipes/libvpx/0001-build-Fix-the-min-version-flag-for-iOS-simulator-bui.patch
+++ b/recipes/libvpx/0001-build-Fix-the-min-version-flag-for-iOS-simulator-bui.patch
@@ -1,4 +1,4 @@
-From c5e275ae07a93b5043697a740503f2440a1c0b1c Mon Sep 17 00:00:00 2001
+From 7e378dbe1a047851a9276fbada91e3fa4aa8e145 Mon Sep 17 00:00:00 2001
 From: Arun Raghavan <arun@centricular.com>
 Date: Fri, 20 Feb 2015 16:38:58 +0530
 Subject: [PATCH 1/6] build: Fix the min version flag for iOS simulator builds
@@ -8,11 +8,11 @@ Subject: [PATCH 1/6] build: Fix the min version flag for iOS simulator builds
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 25c9f80..1b032de 100644
+index 4f0071b..d4da469 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -781,8 +781,8 @@ process_common_toolchain() {
-       add_ldflags "-mmacosx-version-min=10.10"
+@@ -847,8 +847,8 @@ process_common_toolchain() {
+       add_ldflags "-mmacosx-version-min=10.11"
        ;;
      *-iphonesimulator-*)
 -      add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -23,5 +23,5 @@ index 25c9f80..1b032de 100644
        if [ -d "${iossim_sdk_dir}" ]; then
          add_cflags  "-isysroot ${iossim_sdk_dir}"
 -- 
-2.1.4
+2.9.3
 
diff --git a/recipes/libvpx/0002-Include-Android-cpu-features.c-instead-of-.h.patch b/recipes/libvpx/0002-Include-Android-cpu-features.c-instead-of-.h.patch
index c5147f94..c7f7ccf6 100644
--- a/recipes/libvpx/0002-Include-Android-cpu-features.c-instead-of-.h.patch
+++ b/recipes/libvpx/0002-Include-Android-cpu-features.c-instead-of-.h.patch
@@ -1,4 +1,4 @@
-From 6cb011274e293be313ab86442aa9f6f629dffc04 Mon Sep 17 00:00:00 2001
+From 4becc7c54ad3e7f8e5c9d1d59ba401cd4a2c9b3c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
 Date: Tue, 9 Oct 2012 13:48:12 +0200
 Subject: [PATCH 2/6] Include Android cpu-features.c instead of .h
@@ -21,5 +21,5 @@ index 8a4b8af..60401f3 100644
  int arm_cpu_caps(void) {
    int flags;
 -- 
-2.1.4
+2.9.3
 
diff --git a/recipes/libvpx/0003-configure-Add-back-the-armv5te-android-gcc-target.patch b/recipes/libvpx/0003-configure-Add-back-the-armv5te-android-gcc-target.patch
index 4c805a49..5ecb60a3 100644
--- a/recipes/libvpx/0003-configure-Add-back-the-armv5te-android-gcc-target.patch
+++ b/recipes/libvpx/0003-configure-Add-back-the-armv5te-android-gcc-target.patch
@@ -1,4 +1,4 @@
-From 9e1a08a4ace9fdb6ad9d1fbffd7e336f0d9122cc Mon Sep 17 00:00:00 2001
+From dd6530bc04f545891ff6bb12dff9b4df73c2eaff Mon Sep 17 00:00:00 2001
 From: Arun Raghavan <arun@centricular.com>
 Date: Sun, 22 Feb 2015 21:20:50 +0530
 Subject: [PATCH 3/6] configure: Add back the armv5te-android-gcc target
@@ -9,17 +9,17 @@ We need this to be able to build for pre-armv7 Android devices.
  1 file changed, 1 insertion(+)
 
 diff --git a/configure b/configure
-index f3708f9..ef3b733 100755
+index f82ee04..ea8e015 100755
 --- a/configure
 +++ b/configure
-@@ -97,6 +97,7 @@ EOF
- 
- # all_platforms is a list of all supported target platforms. Maintain
- # alphabetically by architecture, generic-gnu last.
+@@ -111,6 +111,7 @@ all_platforms="${all_platforms} armv7-win32-vs11"
+ all_platforms="${all_platforms} armv7-win32-vs12"
+ all_platforms="${all_platforms} armv7-win32-vs14"
+ all_platforms="${all_platforms} armv7s-darwin-gcc"
 +all_platforms="${all_platforms} armv5te-android-gcc"
- all_platforms="${all_platforms} armv6-darwin-gcc"
- all_platforms="${all_platforms} armv6-linux-rvct"
- all_platforms="${all_platforms} armv6-linux-gcc"
+ all_platforms="${all_platforms} armv8-linux-gcc"
+ all_platforms="${all_platforms} mips32-linux-gcc"
+ all_platforms="${all_platforms} mips64-linux-gcc"
 -- 
-2.1.4
+2.9.3
 
diff --git a/recipes/libvpx/0005-build-Remove-broken-custom-android-toolchain-usage.patch b/recipes/libvpx/0004-build-Remove-broken-custom-android-toolchain-usage.patch
index c15405df..a7c01531 100644
--- a/recipes/libvpx/0005-build-Remove-broken-custom-android-toolchain-usage.patch
+++ b/recipes/libvpx/0004-build-Remove-broken-custom-android-toolchain-usage.patch
@@ -1,21 +1,21 @@
-From 0be5968ee2b0a2beddf1e190a1f7cd8e372443a4 Mon Sep 17 00:00:00 2001
+From 9f724884ab61061e55b9350267fb609d172114d8 Mon Sep 17 00:00:00 2001
 From: Edward Hervey <bilboed@bilboed.com>
 Date: Sat, 14 Feb 2015 15:08:37 +0100
-Subject: [PATCH 5/6] build: Remove (broken) custom android toolchain usage
+Subject: [PATCH 4/6] build: Remove (broken) custom android toolchain usage
 
 Amazed no one complained earlier, it was always picking the arm
 toolchain.
 ---
- build/make/configure.sh | 26 --------------------------
- 1 file changed, 26 deletions(-)
+ build/make/configure.sh | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
 
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 1b032de..fc653f1 100644
+index d4da469..e56108e 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -921,32 +921,6 @@ EOF
+@@ -1016,34 +1016,6 @@ EOF
+           fi
  
-         android*)
            SDK_PATH=${sdk_path}
 -          COMPILER_LOCATION=`find "${SDK_PATH}" \
 -                             -name "arm-linux-androideabi-gcc*" -print -quit`
@@ -37,8 +37,10 @@ index 1b032de..fc653f1 100644
 -                awk '{ print $1 }' | tail -1`
 -          fi
 -
--          add_cflags "--sysroot=${alt_libc}"
--          add_ldflags "--sysroot=${alt_libc}"
+-          if [ -d "${alt_libc}" ]; then
+-            add_cflags "--sysroot=${alt_libc}"
+-            add_ldflags "--sysroot=${alt_libc}"
+-          fi
 -
 -          # linker flag that routes around a CPU bug in some
 -          # Cortex-A8 implementations (NDK Dev Guide)
@@ -47,5 +49,5 @@ index 1b032de..fc653f1 100644
            enable_feature pic
            soft_enable realtime_only
 -- 
-2.1.4
+2.9.3
 
diff --git a/recipes/libvpx/0005-configure-Add-Android-ARM64-support.patch b/recipes/libvpx/0005-configure-Add-Android-ARM64-support.patch
new file mode 100644
index 00000000..7c1d9b67
--- /dev/null
+++ b/recipes/libvpx/0005-configure-Add-Android-ARM64-support.patch
@@ -0,0 +1,24 @@
+From 82debca13c31da4fced144e829bdaa102db79674 Mon Sep 17 00:00:00 2001
+From: Edward Hervey <bilboed@bilboed.com>
+Date: Sat, 14 Feb 2015 15:09:40 +0100
+Subject: [PATCH 5/6] configure: Add Android ARM64 support
+
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index ea8e015..153f095 100755
+--- a/configure
++++ b/configure
+@@ -97,6 +97,7 @@ EOF
+ 
+ # all_platforms is a list of all supported target platforms. Maintain
+ # alphabetically by architecture, generic-gnu last.
++all_platforms="${all_platforms} arm64-android-gcc"
+ all_platforms="${all_platforms} arm64-darwin-gcc"
+ all_platforms="${all_platforms} arm64-linux-gcc"
+ all_platforms="${all_platforms} armv6-linux-rvct"
+-- 
+2.9.3
+
diff --git a/recipes/libvpx/0006-Don-t-embed-bitcode-on-iOS-until-we-support-that-pro.patch b/recipes/libvpx/0006-Don-t-embed-bitcode-on-iOS-until-we-support-that-pro.patch
index 37505454..5626fda7 100644
--- a/recipes/libvpx/0006-Don-t-embed-bitcode-on-iOS-until-we-support-that-pro.patch
+++ b/recipes/libvpx/0006-Don-t-embed-bitcode-on-iOS-until-we-support-that-pro.patch
@@ -1,4 +1,4 @@
-From 67eb0bf3becf475e1c880c973bf86628a19f728a Mon Sep 17 00:00:00 2001
+From f104b6a2de3da66aab7f1771d0cc49ff9ac9c5b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
 Date: Mon, 28 Dec 2015 17:20:41 +0200
 Subject: [PATCH 6/6] Don't embed bitcode on iOS until we support that properly
@@ -8,10 +8,10 @@ Subject: [PATCH 6/6] Don't embed bitcode on iOS until we support that properly
  1 file changed, 5 deletions(-)
 
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 56c3d40..46eeab4 100644
+index e56108e..528174b 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -1019,11 +1019,6 @@ EOF
+@@ -1078,11 +1078,6 @@ EOF
  
            asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
  
@@ -24,5 +24,5 @@ index 56c3d40..46eeab4 100644
  
          linux*)
 -- 
-2.6.4
+2.9.3
 
diff --git a/recipes/libvpx/0006-configure-Add-Android-ARM64-support.patch b/recipes/libvpx/0006-configure-Add-Android-ARM64-support.patch
deleted file mode 100644
index 02427d60..00000000
--- a/recipes/libvpx/0006-configure-Add-Android-ARM64-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b6ef098991a9943dd7a40e9be6507fb171aa07ca Mon Sep 17 00:00:00 2001
-From: Edward Hervey <bilboed@bilboed.com>
-Date: Sat, 14 Feb 2015 15:09:40 +0100
-Subject: [PATCH 6/6] configure: Add Android ARM64 support
-
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index 670853d..7a821ae 100755
---- a/configure
-+++ b/configure
-@@ -102,6 +102,7 @@ all_platforms="${all_platforms} armv6-darwin-gcc"
- all_platforms="${all_platforms} armv6-linux-rvct"
- all_platforms="${all_platforms} armv6-linux-gcc"
- all_platforms="${all_platforms} armv6-none-rvct"
-+all_platforms="${all_platforms} arm64-android-gcc"   #neon Cortex-A9
- all_platforms="${all_platforms} arm64-darwin-gcc"
- all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8
- all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
--- 
-2.1.4
-
diff --git a/recipes/libvpx/0009-fix-win32-crash-subpel-variance.patch b/recipes/libvpx/0009-fix-win32-crash-subpel-variance.patch
deleted file mode 100644
index 70cf5ed0..00000000
--- a/recipes/libvpx/0009-fix-win32-crash-subpel-variance.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 5fc9688792735888731acaf5e2628cd1b3a76d1b Mon Sep 17 00:00:00 2001
-From: Sergey Kolomenkin <kolomenkin@gmail.com>
-Date: Mon, 7 Dec 2015 12:54:57 -0800
-Subject: [PATCH] fix null pointer crash in Win32 because esp register is
- broken
-
-https://bugs.chromium.org/p/webm/issues/detail?id=1105
-
-Change-Id: I304ea85ea1f6474e26f074dc39dc0748b90d4d3d
----
- vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm | 4 ++--
- vpx_dsp/x86/subpel_variance_sse2.asm             | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
-index 93df92a..5f9c963 100644
---- a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
-+++ b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
-@@ -124,7 +124,6 @@ SECTION .text
- 
-       ; Store bilin_filter and pw_8 location in stack
-       GET_GOT eax
--      add esp, 4                ; restore esp
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -132,6 +131,7 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
-+      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %else
-       cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \
-@@ -141,7 +141,6 @@ SECTION .text
- 
-       ; Store bilin_filter and pw_8 location in stack
-       GET_GOT eax
--      add esp, 4                ; restore esp
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -149,6 +148,7 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
-+      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %endif
-   %else
-diff --git a/vpx_dsp/x86/subpel_variance_sse2.asm b/vpx_dsp/x86/subpel_variance_sse2.asm
-index 05dcff7..1176a2f 100644
---- a/vpx_dsp/x86/subpel_variance_sse2.asm
-+++ b/vpx_dsp/x86/subpel_variance_sse2.asm
-@@ -140,7 +140,6 @@ SECTION .text
- 
-       ;Store bilin_filter and pw_8 location in stack
-       GET_GOT eax
--      add esp, 4                ; restore esp
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -148,6 +147,7 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
-+      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %else
-       cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \
-@@ -157,7 +157,6 @@ SECTION .text
- 
-       ;Store bilin_filter and pw_8 location in stack
-       GET_GOT eax
--      add esp, 4                ; restore esp
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -165,6 +164,7 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
-+      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %endif
-   %else
--- 
-2.7.2.windows.1
-
-From 322ea7ff5bce741e0657179f63ee1c1bb54da864 Mon Sep 17 00:00:00 2001
-From: Yunqing Wang <yunqingwang@google.com>
-Date: Thu, 10 Dec 2015 14:25:01 -0800
-Subject: [PATCH] Fix the win32 crash when GET_GOT is not defined
-
-This patch continues to fix the win32 crash issue:
-https://bugs.chromium.org/p/webm/issues/detail?id=1105
-
-Johann's patch is here:
-https://chromium-review.googlesource.com/#/c/316446/2
-
-Change-Id: I7fe191c717e40df8602e229371321efb0d689375
----
- third_party/x86inc/x86inc.asm                    |  4 ++++
- vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm | 12 ++++++++----
- vpx_dsp/x86/subpel_variance_sse2.asm             | 12 ++++++++----
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm
-index be59de3..e4cda88 100644
---- a/third_party/x86inc/x86inc.asm
-+++ b/third_party/x86inc/x86inc.asm
-@@ -119,6 +119,7 @@
- %if ABI_IS_32BIT
-     %if CONFIG_PIC=1
-         %ifidn __OUTPUT_FORMAT__,elf32
-+            %define GET_GOT_DEFINED 1
-             %define GET_GOT_SAVE_ARG 1
-             %define WRT_PLT wrt ..plt
-             %macro GET_GOT 1
-@@ -138,6 +139,7 @@
-                 %define RESTORE_GOT pop %1
-             %endmacro
-         %elifidn __OUTPUT_FORMAT__,macho32
-+            %define GET_GOT_DEFINED 1
-             %define GET_GOT_SAVE_ARG 1
-             %macro GET_GOT 1
-                 push %1
-@@ -149,6 +151,8 @@
-                 %undef RESTORE_GOT
-                 %define RESTORE_GOT pop %1
-             %endmacro
-+        %else
-+            %define GET_GOT_DEFINED 0
-         %endif
-     %endif
- 
-diff --git a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
-index 5f9c963..22d52a2 100644
---- a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
-+++ b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
-@@ -123,7 +123,10 @@ SECTION .text
-       %define sec_str sec_stridemp
- 
-       ; Store bilin_filter and pw_8 location in stack
--      GET_GOT eax
-+      %if GET_GOT_DEFINED == 1
-+        GET_GOT eax
-+        add esp, 4                ; restore esp
-+      %endif
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -131,7 +134,6 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
--      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %else
-       cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \
-@@ -140,7 +142,10 @@ SECTION .text
-       %define block_height heightd
- 
-       ; Store bilin_filter and pw_8 location in stack
--      GET_GOT eax
-+      %if GET_GOT_DEFINED == 1
-+        GET_GOT eax
-+        add esp, 4                ; restore esp
-+      %endif
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -148,7 +153,6 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
--      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %endif
-   %else
-diff --git a/vpx_dsp/x86/subpel_variance_sse2.asm b/vpx_dsp/x86/subpel_variance_sse2.asm
-index 1176a2f..c655e4b 100644
---- a/vpx_dsp/x86/subpel_variance_sse2.asm
-+++ b/vpx_dsp/x86/subpel_variance_sse2.asm
-@@ -139,7 +139,10 @@ SECTION .text
-       %define sec_str sec_stridemp
- 
-       ;Store bilin_filter and pw_8 location in stack
--      GET_GOT eax
-+      %if GET_GOT_DEFINED == 1
-+        GET_GOT eax
-+        add esp, 4                ; restore esp
-+      %endif
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -147,7 +150,6 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
--      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %else
-       cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \
-@@ -156,7 +158,10 @@ SECTION .text
-       %define block_height heightd
- 
-       ;Store bilin_filter and pw_8 location in stack
--      GET_GOT eax
-+      %if GET_GOT_DEFINED == 1
-+        GET_GOT eax
-+        add esp, 4                ; restore esp
-+      %endif
- 
-       lea ecx, [GLOBAL(bilin_filter_m)]
-       mov g_bilin_filterm, ecx
-@@ -164,7 +169,6 @@ SECTION .text
-       lea ecx, [GLOBAL(pw_8)]
-       mov g_pw_8m, ecx
- 
--      RESTORE_GOT               ; restore esp
-       LOAD_IF_USED 0, 1         ; load eax, ecx back
-     %endif
-   %else
--- 
-2.7.2.windows.1
-