Commit eea4064a authored by Johann's avatar Johann Committed by Commit Bot

libaom: use PIC on 32bit linux builds

BUG=chromium:911658
R=dalecurtis@chromium.org

Change-Id: I14ba3e2ec67b2cfb0349507dfbf65480ef1b08ba
Reviewed-on: https://chromium-review.googlesource.com/c/1481119Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#634459}
parent 67bf8b98
...@@ -127,6 +127,7 @@ cp config/aom_version.h "${CFG}/config/" ...@@ -127,6 +127,7 @@ cp config/aom_version.h "${CFG}/config/"
reset_dirs linux/ia32 reset_dirs linux/ia32
gen_config_files linux/ia32 "${toolchain}/x86-linux.cmake ${all_platforms} \ gen_config_files linux/ia32 "${toolchain}/x86-linux.cmake ${all_platforms} \
-DCONFIG_PIC=1 \
-DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2"
reset_dirs linux/x64 reset_dirs linux/x64
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
%define CONFIG_NORMAL_TILE_MODE 1 %define CONFIG_NORMAL_TILE_MODE 1
%define CONFIG_ONE_PASS_SVM 0 %define CONFIG_ONE_PASS_SVM 0
%define CONFIG_OS_SUPPORT 1 %define CONFIG_OS_SUPPORT 1
%define CONFIG_PIC 0 %define CONFIG_PIC 1
%define CONFIG_RD_DEBUG 0 %define CONFIG_RD_DEBUG 0
%define CONFIG_RUNTIME_CPU_DETECT 1 %define CONFIG_RUNTIME_CPU_DETECT 1
%define CONFIG_SHARED 0 %define CONFIG_SHARED 0
......
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include "aom/aom_codec.h" #include "aom/aom_codec.h"
static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=0 -DCONFIG_LOWBITDEPTH=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384"; static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=0 -DCONFIG_PIC=1 -DCONFIG_LOWBITDEPTH=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
const char *aom_codec_build_config(void) {return cfg;} const char *aom_codec_build_config(void) {return cfg;}
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_NORMAL_TILE_MODE 1
#define CONFIG_ONE_PASS_SVM 0 #define CONFIG_ONE_PASS_SVM 0
#define CONFIG_OS_SUPPORT 1 #define CONFIG_OS_SUPPORT 1
#define CONFIG_PIC 0 #define CONFIG_PIC 1
#define CONFIG_RD_DEBUG 0 #define CONFIG_RD_DEBUG 0
#define CONFIG_RUNTIME_CPU_DETECT 1 #define CONFIG_RUNTIME_CPU_DETECT 1
#define CONFIG_SHARED 0 #define CONFIG_SHARED 0
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
%define CONFIG_NORMAL_TILE_MODE 1 %define CONFIG_NORMAL_TILE_MODE 1
%define CONFIG_ONE_PASS_SVM 0 %define CONFIG_ONE_PASS_SVM 0
%define CONFIG_OS_SUPPORT 1 %define CONFIG_OS_SUPPORT 1
%define CONFIG_PIC 0 %define CONFIG_PIC 1
%define CONFIG_RD_DEBUG 0 %define CONFIG_RD_DEBUG 0
%define CONFIG_RUNTIME_CPU_DETECT 1 %define CONFIG_RUNTIME_CPU_DETECT 1
%define CONFIG_SHARED 0 %define CONFIG_SHARED 0
......
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include "aom/aom_codec.h" #include "aom/aom_codec.h"
static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=0 -DCONFIG_LOWBITDEPTH=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384"; static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/x86-linux.cmake\" -DAOM_RTCD_FLAGS=--require-mmx;--require-sse;--require-sse2 -DCONFIG_AV1_ENCODER=0 -DCONFIG_PIC=1 -DCONFIG_LOWBITDEPTH=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
const char *aom_codec_build_config(void) {return cfg;} const char *aom_codec_build_config(void) {return cfg;}
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define CONFIG_NORMAL_TILE_MODE 1 #define CONFIG_NORMAL_TILE_MODE 1
#define CONFIG_ONE_PASS_SVM 0 #define CONFIG_ONE_PASS_SVM 0
#define CONFIG_OS_SUPPORT 1 #define CONFIG_OS_SUPPORT 1
#define CONFIG_PIC 0 #define CONFIG_PIC 1
#define CONFIG_RD_DEBUG 0 #define CONFIG_RD_DEBUG 0
#define CONFIG_RUNTIME_CPU_DETECT 1 #define CONFIG_RUNTIME_CPU_DETECT 1
#define CONFIG_SHARED 0 #define CONFIG_SHARED 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment