From: Liubov Dmitrieva <ldmitrie@sourceware.org>
Date: Thu, 29 Aug 2013 15:25:35 +0000 (+0400)
Subject: Inappropriate code style for Intel MPX in debug/wcscpy_chk.c. Fix the code if MPX... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e036f35e545b187f4ee71bb48cffb8e9cc855b9;p=thirdparty%2Fglibc.git

Inappropriate code style for Intel MPX in debug/wcscpy_chk.c. Fix the code if MPX is enabled.
---

diff --git a/debug/wcscpy_chk.c b/debug/wcscpy_chk.c
index 61092c3d969..3e6d18574c8 100644
--- a/debug/wcscpy_chk.c
+++ b/debug/wcscpy_chk.c
@@ -23,6 +23,7 @@
 /* Copy SRC to DEST.  */
 wchar_t *
 __wcscpy_chk (wchar_t *dest, const wchar_t *src, size_t n)
+#ifndef __CHKP__
 {
   wint_t c;
   wchar_t *wcp;
@@ -58,3 +59,22 @@ __wcscpy_chk (wchar_t *dest, const wchar_t *src, size_t n)
 
   return dest;
 }
+#else
+{
+  const wchar_t *result = dest;
+  dest--;
+  wint_t c;
+
+  do
+	{
+	  if (__builtin_expect (n-- == 0, 0))
+	     __chk_fail ();
+	  c = src[0];
+	  *++dest = c;
+	  ++src;
+	}
+  while (c != L'\0');
+
+  return result;
+}
+#endif