summaryrefslogtreecommitdiffstats
path: root/libvpx/build/make/thumb.pm
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2013-11-13 18:48:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-13 18:48:14 -0800
commita1b7a7bb1ccf3f479bbca69a52a76eb05789dbaf (patch)
tree098e8b4772cb24cf53e3430f5a28ea1b80e875bd /libvpx/build/make/thumb.pm
parent60f286339b17c89a358efbc94fb18d322faf4552 (diff)
parent5ae7ac49f08a179e4f054d99fcfc9dce78d26e58 (diff)
downloadandroid_external_libvpx-a1b7a7bb1ccf3f479bbca69a52a76eb05789dbaf.tar.gz
android_external_libvpx-a1b7a7bb1ccf3f479bbca69a52a76eb05789dbaf.tar.bz2
android_external_libvpx-a1b7a7bb1ccf3f479bbca69a52a76eb05789dbaf.zip
am 5ae7ac49: Roll latest libvpx into Android.
* commit '5ae7ac49f08a179e4f054d99fcfc9dce78d26e58': Roll latest libvpx into Android.
Diffstat (limited to 'libvpx/build/make/thumb.pm')
-rw-r--r--libvpx/build/make/thumb.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvpx/build/make/thumb.pm b/libvpx/build/make/thumb.pm
index f347287..e1f34c1 100644
--- a/libvpx/build/make/thumb.pm
+++ b/libvpx/build/make/thumb.pm
@@ -47,7 +47,7 @@ sub FixThumbInstructions($$)
# this is used, it's used for two subsequent load instructions,
# where a hand-written version of it could merge two subsequent
# add and sub instructions.
- s/^(\s*)((ldr|str)(ne)?)(\s+)(r\d+),\s*\[(\w+), -([^\]]+)\]/$1sub$4$5$7, $7, $8\n$1$2$5$6, [$7]\n$1add$4$5$7, $7, $8/g;
+ s/^(\s*)((ldr|str|pld)(ne)?)(\s+)(r\d+,\s*)?\[(\w+), -([^\]]+)\]/$1sub$4$5$7, $7, $8\n$1$2$5$6\[$7\]\n$1add$4$5$7, $7, $8/g;
# Convert register post indexing to a separate add instruction.
# This converts "ldrneb r9, [r0], r2" into "ldrneb r9, [r0]",