From c89ee272fbc2bd2ed244605b8f8c60fa50e9de15 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh <chh@google.com> Date: Tue, 21 Oct 2014 16:25:35 -0700 Subject: [PATCH] Replace ambiguous cmp operator with cmpl. Clang assembler rejects ambiguous cmp instruction. BUG: 17302482 Change-Id: Ie8dca7e4f46e0906c47076bba21c1941482ba6b3 --- libc/arch-x86/atom/string/ssse3-wcscat-atom.S | 8 ++++---- libc/arch-x86/atom/string/ssse3-wcscpy-atom.S | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libc/arch-x86/atom/string/ssse3-wcscat-atom.S b/libc/arch-x86/atom/string/ssse3-wcscat-atom.S index 17b0843cc..8a389a378 100644 --- a/libc/arch-x86/atom/string/ssse3-wcscat-atom.S +++ b/libc/arch-x86/atom/string/ssse3-wcscat-atom.S @@ -98,13 +98,13 @@ L(WcscpyAtom): mov STR2(%esp), %ecx lea (%edi, %eax), %edx - cmp $0, (%ecx) + cmpl $0, (%ecx) jz L(Exit4) - cmp $0, 4(%ecx) + cmpl $0, 4(%ecx) jz L(Exit8) - cmp $0, 8(%ecx) + cmpl $0, 8(%ecx) jz L(Exit12) - cmp $0, 12(%ecx) + cmpl $0, 12(%ecx) jz L(Exit16) #undef RETURN diff --git a/libc/arch-x86/atom/string/ssse3-wcscpy-atom.S b/libc/arch-x86/atom/string/ssse3-wcscpy-atom.S index 8ba84bca4..27cb61e7b 100644 --- a/libc/arch-x86/atom/string/ssse3-wcscpy-atom.S +++ b/libc/arch-x86/atom/string/ssse3-wcscpy-atom.S @@ -92,13 +92,13 @@ ENTRY (wcscpy) mov STR1(%esp), %edx mov STR2(%esp), %ecx - cmp $0, (%ecx) + cmpl $0, (%ecx) jz L(ExitTail4) - cmp $0, 4(%ecx) + cmpl $0, 4(%ecx) jz L(ExitTail8) - cmp $0, 8(%ecx) + cmpl $0, 8(%ecx) jz L(ExitTail12) - cmp $0, 12(%ecx) + cmpl $0, 12(%ecx) jz L(ExitTail16) PUSH (%edi)