Merge "Fix x86-64 __memset_chk."

am: 7d188ce0fe

* commit '7d188ce0feda07f3e0cf6bdbe4e52efe224bb39f':
  Fix x86-64 __memset_chk.
This commit is contained in:
Elliott Hughes 2016-03-04 03:21:06 +00:00 committed by android-build-merger
commit 6ac4d0a054

View file

@ -43,11 +43,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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)