summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2012-10-18 16:52:53 -0700
committerNick Kralevich <nnk@google.com>2012-10-18 16:52:53 -0700
commitc40e9b86092e67f245ba8f05244f578b26e49fe2 (patch)
treead4e9a13850e36024ac27f7a86034efae8eef98c
parent6a2d62c1a972da25de53b1718c165f2b7df85a0e (diff)
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
-rw-r--r--media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
index e0b338d5..ac2dd136 100644
--- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
+++ b/media/libstagefright/codecs/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 inter4_2
+ .word inter4_2-Table
@ENDFUNC
.END