Bug 1453061: Merge libaom code size fix. r=drno
authorDavid Major <dmajor@mozilla.com>
Thu, 12 Apr 2018 10:22:16 -0400
changeset 413010 0543a3f29a74dd6f99cc6df7ae99e8826d708dfb
parent 413009 e3e46d91668a35c8b283cc6bcd7262347fbbb1ca
child 413011 4d3b94d04760e92d66b447c98421feb2415cef7e
push id33829
push userarchaeopteryx@coole-files.de
push dateThu, 12 Apr 2018 19:20:32 +0000
treeherdermozilla-central@17dda59473c3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdrno
bugs1453061, 39401
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 libaom code size fix. r=drno https://aomedia-review.googlesource.com/c/aom/+/39401
media/libaom/config/win/ia32/aom_config.h
media/libaom/config/win/x64/aom_config.h
third_party/aom/configure
--- a/media/libaom/config/win/ia32/aom_config.h
+++ b/media/libaom/config/win/ia32/aom_config.h
@@ -5,17 +5,17 @@
 /* was not distributed with this source code in the LICENSE file, you can */
 /* obtain it at www.aomedia.org/license/software. If the Alliance for Open */
 /* Media Patent License 1.0 was not distributed with this source code in the */
 /* PATENTS file, you can obtain it at www.aomedia.org/license/patent. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef AOM_CONFIG_H
 #define AOM_CONFIG_H
 #define RESTRICT    
-#define INLINE      __forceinline
+#define INLINE      __inline
 #define ARCH_ARM 0
 #define ARCH_MIPS 0
 #define ARCH_X86 1
 #define ARCH_X86_64 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0
 #define HAVE_DSPR2 0
--- a/media/libaom/config/win/x64/aom_config.h
+++ b/media/libaom/config/win/x64/aom_config.h
@@ -5,17 +5,17 @@
 /* was not distributed with this source code in the LICENSE file, you can */
 /* obtain it at www.aomedia.org/license/software. If the Alliance for Open */
 /* Media Patent License 1.0 was not distributed with this source code in the */
 /* PATENTS file, you can obtain it at www.aomedia.org/license/patent. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef AOM_CONFIG_H
 #define AOM_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/third_party/aom/configure
+++ b/third_party/aom/configure
@@ -887,17 +887,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"