commit 7d188ce0feda07f3e0cf6bdbe4e52efe224bb39f
author Elliott Hughes <enh@google.com> Fri Mar 04 03:12:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 03:12:35 2016 +0000
tree b641c58067a39ed439b3e6c76fd535402c51ccaa
parent 5f67f8ae9ded09b1eb68e54a1b3a226c35e10166
parent a80ddc8a34b913f0fdbb2c5febe61b8a9f0e6015

Merge "Fix x86-64 __memset_chk."

libc/arch-x86_64/string/sse2-memset-slm.S

diff --git a/libc/arch-x86_64/string/sse2-memset-slm.S b/libc/arch-x86_64/string/sse2-memset-slm.S
index 1cf9f4b..fc502c0 100644
--- a/libc/arch-x86_64/string/sse2-memset-slm.S
+++ b/libc/arch-x86_64/string/sse2-memset-slm.S
@@ -43,11 +43,9 @@
 
 ENTRY(__memset_chk)
   # %rdi = dst, %rsi = byte, %rdx = n, %rcx = dst_len
-  cmp %rdx, %rcx
-  jl memset
-
-  # TODO: include __memset_chk_fail in the backtrace?
-  call PIC_PLT(__memset_chk_fail)
+  cmp %rcx, %rdx
+  ja __memset_chk_fail
+  // Fall through to memset...
 END(__memset_chk)