diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 13:51:16 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 13:51:16 +0000 |
| commit | dc4e3cfa623ecc77c1e16b114cad23b016c59b83 (patch) | |
| tree | 837def4a87ce441dbb377068a48b36a1b56a5b2d | |
| parent | 1948ac13aa1bd8060db1443646b350ef99e892f5 (diff) | |
| download | chromium_src-dc4e3cfa623ecc77c1e16b114cad23b016c59b83.zip chromium_src-dc4e3cfa623ecc77c1e16b114cad23b016c59b83.tar.gz chromium_src-dc4e3cfa623ecc77c1e16b114cad23b016c59b83.tar.bz2 | |
Make media/ PIC-clean on 32-bit Linux.
This change sets the asm defines so that code in media/ doesn't require text
relocations on 32-bit Linux.
BUG=87704
TEST=Try running Chrome on Fedora
Review URL: http://codereview.chromium.org/8046012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102920 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/base/simd/x86inc.asm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/base/simd/x86inc.asm b/media/base/simd/x86inc.asm index 5e0ca20..223ea3d 100644 --- a/media/base/simd/x86inc.asm +++ b/media/base/simd/x86inc.asm @@ -950,10 +950,13 @@ AVX_INSTR pfmul, 1, 0 ;============================================================================= %ifdef CHROMIUM -; Always build PIC code on Mac for Chromium. +; Always build PIC code on Mac or Linux for Chromium. %ifdef MACHO %define PIC %endif +%ifdef ELF +%define PIC +%endif ; ; LOAD_SYM %1 (reg), %2 (sym) @@ -962,7 +965,7 @@ AVX_INSTR pfmul, 1, 0 %macro LOAD_SYM 2 -%ifdef MACHO +%ifdef PIC call %%geteip add %1, %2 - $ jmp %%end |