aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-12-08 14:15:03 -0800
committerDan Albert <danalbert@google.com>2015-12-08 15:11:56 -0800
commit7a95a53687688b2cda9c5c87b76ea3fefb7f435d (patch)
tree415d1c537025ad9ca72d1542c9ebf51513843518 /tests
parentb22fdb670153a184e84ab0e6fe58bb4f20c28b5f (diff)
downloadndk-7a95a53687688b2cda9c5c87b76ea3fefb7f435d.tar.gz
Accept more flavors of the same instruction.
Might use rolw instead of rorw, and bswapl instead of bswap. Change-Id: Ic06fb1ceca7f7a125d1bb5fbc3c3c22a646d467b
Diffstat (limited to 'tests')
-rwxr-xr-xtests/build/issue17144-byteswap/build.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/build/issue17144-byteswap/build.sh b/tests/build/issue17144-byteswap/build.sh
index 158ff1393..47aef0d77 100755
--- a/tests/build/issue17144-byteswap/build.sh
+++ b/tests/build/issue17144-byteswap/build.sh
@@ -26,17 +26,17 @@ if [ -z "$APP_ABI" -o "$APP_ABI" = "all" -o "$APP_ABI" != "${APP_ABI%%armeabi-v7
grep -qw rev16 issue17144-byteswap.s
fail_panic "armeabi-v7a doesn't use rev16 instruction for __swap16()"
grep -qw rev issue17144-byteswap.s
- fail_panic "armeabi-v7a doesn't use rev instruciton for __swap32()"
+ fail_panic "armeabi-v7a doesn't use rev instruction for __swap32()"
fi
if [ -z "$APP_ABI" -o "$APP_ABI" = "all" -o "$APP_ABI" != "${APP_ABI%%x86*}" ]; then
# checking x86
$NDK/ndk-build -B APP_ABI=x86 APP_CFLAGS=-save-temps NDK_DEBUG=1
fail_panic "can't compile for x86"
- grep -qw rorw issue17144-byteswap.s
+ grep -qw 'ro[lr]w' issue17144-byteswap.s
fail_panic "x86 doesn't use rorw instruction for __swap16()"
- grep -qw bswap issue17144-byteswap.s
- fail_panic "x86 doesn't use bswap instruciton for __swap32()"
+ egrep -qw 'bswapl?' issue17144-byteswap.s
+ fail_panic "x86 doesn't use bswap instruction for __swap32()"
fi
if [ -z "$APP_ABI" -o "$APP_ABI" = "all" -o "$APP_ABI" != "${APP_ABI%%mips*}" ]; then
@@ -48,7 +48,7 @@ if [ -z "$APP_ABI" -o "$APP_ABI" = "all" -o "$APP_ABI" != "${APP_ABI%%mips*}" ];
grep -qw wsbh issue17144-byteswap.s
fail_panic "mips doesn't use wsbh instruction for __swap16()"
grep -w rotr issue17144-byteswap.s | grep -qw rotr
- fail_panic "mips doesn't use wsbh/rotr instruciton for __swap32()"
+ fail_panic "mips doesn't use wsbh/rotr instruction for __swap32()"
fi
-rm -rf libs obj issue17144-byteswap.* \ No newline at end of file
+rm -rf libs obj issue17144-byteswap.*