Bug 1453061: Merge libvpx code size fix. r=drno
☠☠ backed out by 77dd8ec11ee1 ☠ ☠
authorDavid Major <dmajor@mozilla.com>
Tue, 10 Apr 2018 17:00:54 -0400
changeset 412632 6a08a924965023280eef73ee94ced91a30482575
parent 412631 1edfe06dff5bae6a97122d7c8da968bee23aa806
child 412633 34bc360b2860f9cb3bbd84b9a74696441cfeeb38
push id101974
push userdmajor@mozilla.com
push dateTue, 10 Apr 2018 20:59:05 +0000
treeherdermozilla-inbound@6a08a9249650 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdrno
bugs1453061, 841103
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1453061: Merge libvpx code size fix. r=drno https://chromium-review.googlesource.com/c/webm/libvpx/+/841103
media/libvpx/config/win/x64/vpx_config.h
media/libvpx/libvpx/configure
--- a/media/libvpx/config/win/x64/vpx_config.h
+++ b/media/libvpx/config/win/x64/vpx_config.h
@@ -4,17 +4,17 @@
 /* that can be found in the LICENSE file in the root of the source */
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
 #define RESTRICT    
-#define INLINE      __forceinline
+#define INLINE      __inline
 #define ARCH_ARM 0
 #define ARCH_MIPS 0
 #define ARCH_X86 0
 #define ARCH_X86_64 1
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0
 #define HAVE_DSPR2 0
--- a/media/libvpx/libvpx/configure
+++ b/media/libvpx/libvpx/configure
@@ -639,17 +639,17 @@ process_toolchain() {
     case "$tgt_cc" in
         vs*) enable_feature msvs
              enable_feature solution
              vs_version=${tgt_cc##vs}
              VCPROJ_SFX=vcxproj
              gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh
              enabled werror && gen_vcproj_cmd="${gen_vcproj_cmd} --enable-werror"
              all_targets="${all_targets} solution"
-             INLINE="__forceinline"
+             INLINE="__inline"
         ;;
     esac
 
     # Other toolchain specific defaults
     case $toolchain in x86*) soft_enable postproc;; esac
 
     if enabled postproc_visualizer; then
         enabled postproc || die "postproc_visualizer requires postproc to be enabled"