opencore-amr-commits

[Martin Storsjö <mst...@us...>]

    Module: vo-amrwbenc
    Branch: master
    Commit: 22ac37427c83bbc4a2db580a80c47ee7acd57f79
    Author: Nick Kralevich <nn...@go...>
 Committer: Martin Storsjo <ma...@ma...>
      Date: Fri Oct 19 22:24:35 2012 +0300
       URL: http://opencore-amr.git.sf.net/git/gitweb.cgi?p=opencore-amr/vo-amrwbenc;a=commit;h=22ac37427c83bbc4a2db580a80c47ee7acd57f79

Upstream commit "hardening: eliminate more .text relocations"

In 74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations
were cleaned up from amrwbenc. Looks like we forgot one.  Fixed.

Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5

Adapted from upstream commit c40e9b86092e67f245ba8f05244f578b26e49fe2.

---

 amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s b/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
index 183a372..a9a474c 100644
--- a/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
+++ b/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
@@ -44,7 +44,9 @@ pred_lt4_asm:
          SUBLT     r5, r5, #2                         @x--
          SUB       r5, r5, #30                        @x -= 15
          RSB       r4, r2, #3                         @k = 3 - frac
-         LDR       r6, Table
+         ADRL      r8, Table
+         LDR       r6, [r8]
+         ADD       r6, r8
 	 MOV       r8, r4, LSL #6
          @MOV       r7, #0                             @j = 0
          ADD       r8, r6, r8                         @ptr2 = &(inter4_2[k][0])
@@ -451,7 +453,7 @@ pred_lt4_end:
          LDMFD     r13!, {r4 - r12, r15}
 
 Table:
-         .word       voAWB_inter4_2
+         .word       voAWB_inter4_2-Table
 	 @ENDFUNC
 	 .END