From: Douglas Leung <douglas.leung@imgtec.com>
Date: Wed, 16 Mar 2016 23:59:23 +0000 (-0700)
Subject: Fix bug where t9 is not correct when __memset_chk_fail is called.
X-Git-Tag: android-x86-8.1-r1~296^2~580^2~68^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f3b9c89d3a1fa01650e6d88e2a39909a945b066c;p=android-x86%2Fbionic.git

Fix bug where t9 is not correct when __memset_chk_fail is called.
t9 is used to calculate gp at the start of __memset_chk_fail.

Change-Id: Ief5018699e060afa691bfc1d861abd5e463ab80c
---

diff --git a/libc/arch-mips/string/memset.S b/libc/arch-mips/string/memset.S
index dd94f3b7b..6344af1b1 100644
--- a/libc/arch-mips/string/memset.S
+++ b/libc/arch-mips/string/memset.S
@@ -208,7 +208,10 @@ LEAF(__memset_chk,0)
 #else
 LEAF(__memset_chk)
 #endif
+	.set	noreorder
   bgtu   a2, a3, __memset_chk_fail
+  la     t9, __memset_chk_fail
+	.set	reorder
 
   // Fall through to memset...
 END(__memset_chk)