diff options
| author | Nick Kralevich <nnk@google.com> | 2012-10-19 09:00:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-19 09:00:32 -0700 |
| commit | 4ad27b11f8c883a3131d1f81d883de01b8076be1 (patch) | |
| tree | df781683ffa19300264deeb56e65bddf33200106 | |
| parent | 5ee3350785f2821a1b5aad92824ea6b380f61ece (diff) | |
| parent | 1baa01a52f24566c134313fade8b19a582654638 (diff) | |
am 1baa01a5: Merge "hardening: eliminate more .text relocations"
* commit '1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s | 6 |
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 |