summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2013-09-29 13:57:04 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-09-29 13:57:04 -0700
commita88f3110f862f3cca64db6894d24282e508e565a (patch)
treeeeac77de8b2cba1b55b2022e137bd8af8e029a06
parentb927620231a07ba81a86c6d8d30665892373f0fb (diff)
parente81a3ede4c18153df675a72637973a5c1e53b428 (diff)
downloadlibvpx-a88f3110f862f3cca64db6894d24282e508e565a.tar
libvpx-a88f3110f862f3cca64db6894d24282e508e565a.tar.gz
libvpx-a88f3110f862f3cca64db6894d24282e508e565a.tar.bz2
libvpx-a88f3110f862f3cca64db6894d24282e508e565a.zip
Merge "thumb: Keep whitespace between arguments as before"
-rw-r--r--build/make/thumb.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/make/thumb.pm b/build/make/thumb.pm
index 545f59f43..e1f34c1ec 100644
--- a/build/make/thumb.pm
+++ b/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|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;
+ 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]",