From: Johann <johannkoenig@google.com>
Date: Tue, 28 Jun 2011 23:34:10 +0000 (-0700)
Subject: Merge "Avoid text relocations in ARM vp8 decoder"
X-Git-Tag: v0.9.7~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc004e8c17a1f330ed46eab092ca67e6f785fee1;p=libvpx

Merge "Avoid text relocations in ARM vp8 decoder"
---

dc004e8c17a1f330ed46eab092ca67e6f785fee1
diff --cc vp8/common/arm/armv6/sixtappredict8x4_v6.asm
index 3fda1cefa,c8399d2c2..e81aef53d
--- a/vp8/common/arm/armv6/sixtappredict8x4_v6.asm
+++ b/vp8/common/arm/armv6/sixtappredict8x4_v6.asm
@@@ -32,12 -32,9 +32,12 @@@
      beq         skip_firstpass_filter
  
  ;first-pass filter
-     ldr         r12, _filter8_coeff_
+     adr         r12, filter8_coeff
      sub         r0, r0, r1, lsl #1
  
 +    add         r3, r1, #10                 ; preload next low
 +    pld         [r0, r3]
 +
      add         r2, r12, r2, lsl #4         ;calculate filter location
      add         r0, r0, #3                  ;adjust src only for loading convinience