From 22c21c6b4e789b9013ac472c77f43c91127cf9fa Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 23 Apr 2015 14:27:10 -0700 Subject: [PATCH] Fix opcode to compile with both gcc and llvm. BUG: 17302991 Change-Id: I31febd9ad24312388068803ce247b295bd73b607 (cherry picked from commit 0a93df369cf3f44d40ca1f0cb4a58aeab42fb39c) --- libc/Android.mk | 9 --------- libc/arch-x86_64/string/ssse3-strcmp-slm.S | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index 967949451..6c2c4ae1b 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -941,9 +941,6 @@ LOCAL_SRC_FILES := $(libc_bionic_src_files) LOCAL_CFLAGS := $(libc_common_cflags) \ -Wframe-larger-than=2048 \ -# ssse3-strcmp-slm.S does not compile with Clang. -LOCAL_CLANG_ASFLAGS_x86_64 += -no-integrated-as - # memcpy.S, memchr.S, etc. do not compile with Clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as @@ -975,9 +972,6 @@ LOCAL_SRC_FILES := $(libc_bionic_ndk_src_files) LOCAL_CFLAGS := $(libc_common_cflags) \ -Wframe-larger-than=2048 \ -# ssse3-strcmp-slm.S does not compile with Clang. -LOCAL_CLANG_ASFLAGS_x86_64 += -no-integrated-as - # memcpy.S, memchr.S, etc. do not compile with Clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as @@ -1030,9 +1024,6 @@ LOCAL_SRC_FILES := $(libc_pthread_src_files) LOCAL_CFLAGS := $(libc_common_cflags) \ -Wframe-larger-than=2048 \ -# ssse3-strcmp-slm.S does not compile with Clang. -LOCAL_CLANG_ASFLAGS_x86_64 += -no-integrated-as - # memcpy.S, memchr.S, etc. do not compile with Clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as diff --git a/libc/arch-x86_64/string/ssse3-strcmp-slm.S b/libc/arch-x86_64/string/ssse3-strcmp-slm.S index 0dd8c275b..e8acd5ba4 100644 --- a/libc/arch-x86_64/string/ssse3-strcmp-slm.S +++ b/libc/arch-x86_64/string/ssse3-strcmp-slm.S @@ -1897,8 +1897,8 @@ L(strcmp_exitz): .p2align 4 L(Byte0): - movzx (%rsi), %ecx - movzx (%rdi), %eax + movzbl (%rsi), %ecx + movzbl (%rdi), %eax sub %ecx, %eax ret