From 0e036f35e545b187f4ee71bb48cffb8e9cc855b9 Mon Sep 17 00:00:00 2001
From: Liubov Dmitrieva <ldmitrie@sourceware.org>
Date: Thu, 29 Aug 2013 19:25:35 +0400
Subject: [PATCH] Inappropriate code style for Intel MPX in debug/wcscpy_chk.c.
 Fix the code if MPX is enabled.

---
 debug/wcscpy_chk.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/debug/wcscpy_chk.c b/debug/wcscpy_chk.c
index 61092c3d96..3e6d18574c 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