Permalink
Browse files

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.
  • Loading branch information...
1 parent 8445673 commit 22ac37427c83bbc4a2db580a80c47ee7acd57f79 @nickkral nickkral committed with Oct 19, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 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

0 comments on commit 22ac374

Please sign in to comment.