2013-11-26 Julio Gutierrez <jgutleyva@gmail.com>

	*libc/include/wchar.h: Add restrict keyword.
	*libc/stdio/fgetws.c (fgetws): ditto.
	*libc/stdio/fputws.c (fputws): ditto.
	*libc/stdio/fwprintf.c (fwprintf): ditto.
	*libc/stdio/fwscanf.c (fwscanf): ditto.
	*libc/stdio/swprintf.c (swprintf): ditto.
	*libc/stdio/swscanf.c (swscanf): ditto.
	*libc/stdio/vfwprintf.c (vfwprintf): ditto.
	*libc/stdio/vfwscanf.c (vfwscanf): ditto.
	*libc/stdio/vswprintf.c (vswprintf): ditto.
	*libc/stdio/vswscanf.c (vswscanf): ditto.
	*libc/stdio/vwprintf.c (vwprintf): ditto.
	*libc/stdio/vwscanf.c (vwscanf): ditto.
	*libc/stdio/wprintf.c (wprintf): ditto.
	*libc/stdio/wscanf.c (wscanf): ditto.
	*libc/stdlib/mbrlen.c (mbrlen): ditto.
	*libc/stdlib/mbrtowc.c (mbrtowc): ditto.
	*libc/stdlib/mbsnrtowcs.c (mbsnrtowcs): ditto.
	*libc/stdlib/mbsrtowcs.c (mbsrtowcs): ditto.
	*libc/stdlib/wcrtomb.c (wcrtomb): ditto.
	*libc/stdlib/wcsnrtombs.c (wcsnrtombs): ditto.
	*libc/stdlib/wcsrtombs.c (wcsrtombs): ditto.
	*libc/stdlib/wcstod.c (wcstod): ditto.
	*libc/stdlib/wcstol.c (wcstol): ditto.
	*libc/stdlib/wcstold.c (wcstold): ditto.
	*libc/stdlib/wcstoll.c (wcstoll): ditto.
	*libc/stdlib/wcstoul.c (wcstoul): ditto.
	*libc/stdlib/wcstoull.c (cstoull): ditto.
	*libc/string/wcpcpy.c (wcpcpy): ditto.
	*libc/string/wcpncpy.c (wcpncpy): ditto.
	*libc/string/wcscat.c (wcscat): ditto.
	*libc/string/wcscpy.c (wcscpy): ditto.
	*libc/string/wcsncat.c (wcsncat): ditto.
	*libc/string/wcsncpy.c (wcsncpy): ditto.
	*libc/string/wcsstr.c (wcsstr): ditto.
	*libc/string/wcstok.c (wcstok): ditto.
	*libc/string/wcsxfrm.c (wcsxfrm): ditto.
	*libc/string/wmemcpy.c (wmemcpy): ditto.

13 files changed, 84 insertions, 70 deletions

diff --git a/newlib/libc/stdlib/mbrlen.c b/newlib/libc/stdlib/mbrlen.c
index 4319875a1..57a733fed 100644
--- a/newlib/libc/stdlib/mbrlen.c
+++ b/newlib/libc/stdlib/mbrlen.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 
 size_t
-mbrlen(const char *s, size_t n, mbstate_t *ps)
+mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps)
 {
 #ifdef _MB_CAPABLE
   if (ps == NULL)
diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c
index 0a8c23a9d..550aaff99 100644
--- a/newlib/libc/stdlib/mbrtowc.c
+++ b/newlib/libc/stdlib/mbrtowc.c
@@ -43,10 +43,10 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (mbrtowc, (pwc, s, n, ps),
-	wchar_t *pwc _AND
-	const char *s _AND
+	wchar_t *__restrict pwc _AND
+	const char *__restrict s _AND
 	size_t n _AND
-	mbstate_t *ps)
+	mbstate_t *__restrict ps)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   return _mbrtowc_r (_REENT, pwc, s, n, ps);
diff --git a/newlib/libc/stdlib/mbsnrtowcs.c b/newlib/libc/stdlib/mbsnrtowcs.c
index 6729df951..7ab384721 100644
--- a/newlib/libc/stdlib/mbsnrtowcs.c
+++ b/newlib/libc/stdlib/mbsnrtowcs.c
@@ -13,8 +13,10 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
-	size_t mbsrtowcs(wchar_t *<[dst]>, const char **<[src]>, size_t <[len]>,
-			 mbstate_t *<[ps]>);
+	size_t mbsrtowcs(wchar_t *__restrict <[dst]>,
+			 const char **__restrict <[src]>,
+			 size_t <[len]>,
+			 mbstate_t *__restrict <[ps]>);
 
 	#include <wchar.h>
 	size_t _mbsrtowcs_r(struct _reent *<[ptr]>, wchar_t *<[dst]>,
@@ -22,8 +24,9 @@ ANSI_SYNOPSIS
 			    mbstate_t *<[ps]>);
 
 	#include <wchar.h>
-	size_t mbsnrtowcs(wchar_t *<[dst]>, const char **<[src]>,
-			  size_t <[nms]>, size_t <[len]>, mbstate_t *<[ps]>);
+	size_t mbsnrtowcs(wchar_t *__ restrict <[dst]>, 
+			  const char **__restrict <[src]>, size_t <[nms]>,
+			  size_t <[len]>, mbstate_t *__restrict <[ps]>);
 
 	#include <wchar.h>
 	size_t _mbsnrtowcs_r(struct _reent *<[ptr]>, wchar_t *<[dst]>,
@@ -33,10 +36,10 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <wchar.h>
 	size_t mbsrtowcs(<[dst]>, <[src]>, <[len]>, <[ps]>)
-	wchar_t *<[dst]>;
-	const char **<[src]>;
+	wchar_t *__restrict <[dst]>;
+	const char **__restrict <[src]>;
 	size_t <[len]>;
-	mbstate_t *<[ps]>;
+	mbstate_t *__restrict <[ps]>;
 
 	#include <wchar.h>
 	size_t _mbsrtowcs_r(<[ptr]>, <[dst]>, <[src]>, <[len]>, <[ps]>)
@@ -48,11 +51,11 @@ TRAD_SYNOPSIS
 
 	#include <wchar.h>
 	size_t mbsnrtowcs(<[dst]>, <[src]>, <[nms]>, <[len]>, <[ps]>)
-	wchar_t *<[dst]>;
-	const char **<[src]>;
+	wchar_t *__restrict <[dst]>;
+	const char **__restrict <[src]>;
 	size_t <[nms]>;
 	size_t <[len]>;
-	mbstate_t *<[ps]>;
+	mbstate_t *__restrict <[ps]>;
 
 	#include <wchar.h>
 	size_t _mbsnrtowcs_r(<[ptr]>, <[dst]>, <[src]>, <[nms]>, <[len]>, <[ps]>)
@@ -168,11 +171,11 @@ _DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (mbsnrtowcs, (dst, src, nms, len, ps),
-	wchar_t *dst _AND
-	const char **src _AND
+	wchar_t *__restrict dst _AND
+	const char **__restrict src _AND
 	size_t nms _AND
 	size_t len _AND
-	mbstate_t *ps)
+	mbstate_t *__restrict ps)
 {
   return _mbsnrtowcs_r (_REENT, dst, src, nms, len, ps);
 }
diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
index d5137d144..65e46d32e 100644
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ b/newlib/libc/stdlib/mbsrtowcs.c
@@ -1,3 +1,5 @@
+/* doc in mbsnrtowcs.c */
+
 #include <reent.h>
 #include <newlib.h>
 #include <wchar.h>
@@ -19,10 +21,10 @@ _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (mbsrtowcs, (dst, src, len, ps),
-	wchar_t *dst _AND
-	const char **src _AND
+	wchar_t *__restrict dst _AND
+	const char **__restrict src _AND
 	size_t len _AND
-	mbstate_t *ps)
+	mbstate_t *__restrict ps)
 {
   return _mbsnrtowcs_r (_REENT, dst, src, (size_t) -1, len, ps);
 }
diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c
index b634c23ce..4f3006814 100644
--- a/newlib/libc/stdlib/wcrtomb.c
+++ b/newlib/libc/stdlib/wcrtomb.c
@@ -42,9 +42,9 @@ _DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (wcrtomb, (s, wc, ps),
-	char *s _AND
+	char *__restrict s _AND
 	wchar_t wc _AND
-	mbstate_t *ps)
+	mbstate_t *__restrict ps)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   return _wcrtomb_r (_REENT, s, wc, ps);
diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c
index 5f885a454..fa1b2acac 100644
--- a/newlib/libc/stdlib/wcsnrtombs.c
+++ b/newlib/libc/stdlib/wcsnrtombs.c
@@ -13,8 +13,9 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
-	size_t wcsrtombs(char *<[dst]>, const wchar_t **<[src]>, size_t <[len]>,
-			 mbstate_t *<[ps]>);
+	size_t wcsrtombs(char *__restrict <[dst]>,
+			 const wchar_t **__restrict <[src]>, size_t <[len]>,
+			 mbstate_t *__restrict <[ps]>);
 
 	#include <wchar.h>
 	size_t _wcsrtombs_r(struct _reent *<[ptr]>, char *<[dst]>,
@@ -22,8 +23,10 @@ ANSI_SYNOPSIS
 			    mbstate_t *<[ps]>);
 
 	#include <wchar.h>
-	size_t wcsnrtombs(char *<[dst]>, const wchar_t **<[src]>,
-			  size_t <[nwc]>, size_t <[len]>, mbstate_t *<[ps]>);
+	size_t wcsnrtombs(char *__restrict <[dst]>,
+			  const wchar_t **__restrict <[src]>,
+			  size_t <[nwc]>, size_t <[len]>,
+			  mbstate_t *__restrict <[ps]>);
 
 	#include <wchar.h>
 	size_t _wcsnrtombs_r(struct _reent *<[ptr]>, char *<[dst]>,
@@ -33,10 +36,10 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <wchar.h>
 	size_t wcsrtombs(<[dst]>, <[src]>, <[len]>, <[ps]>)
-	char *<[dst]>;
-	const wchar_t **<[src]>;
+	char *__restrict <[dst]>;
+	const wchar_t **__restrict <[src]>;
 	size_t <[len]>;
-	mbstate_t *<[ps]>;
+	mbstate_t *__restrict <[ps]>;
 
 	#include <wchar.h>
 	size_t _wcsrtombs_r(<[ptr]>, <[dst]>, <[src]>, <[len]>, <[ps]>)
@@ -48,11 +51,11 @@ TRAD_SYNOPSIS
 
 	#include <wchar.h>
 	size_t wcsnrtombs(<[dst]>, <[src]>, <[nwc]>, <[len]>, <[ps]>)
-	char *<[dst]>;
-	const wchar_t **<[src]>;
+	char *__restrict <[dst]>;
+	const wchar_t **__restrict <[src]>;
 	size_t <[nwc]>;
 	size_t <[len]>;
-	mbstate_t *<[ps]>;
+	mbstate_t *__restrict <[ps]>;
 
 	#include <wchar.h>
 	size_t _wcsnrtombs_r(<[ptr]>, <[dst]>, <[src]>, <[nwc]>, <[len]>, <[ps]>)
@@ -174,11 +177,11 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (wcsnrtombs, (dst, src, nwc, len, ps),
-	char *dst _AND
-	const wchar_t **src _AND
+	char *__restrict dst _AND
+	const wchar_t **__restrict src _AND
 	size_t nwc _AND
 	size_t len _AND
-	mbstate_t *ps)
+	mbstate_t *__restrict ps)
 {
   return _wcsnrtombs_r (_REENT, dst, src, nwc, len, ps);
 }
diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c
index ea6bd9d43..2b6777cae 100644
--- a/newlib/libc/stdlib/wcsrtombs.c
+++ b/newlib/libc/stdlib/wcsrtombs.c
@@ -1,3 +1,5 @@
+/* Doc in wcsnrtombs.c */
+
 #include <reent.h>
 #include <newlib.h>
 #include <wchar.h>
@@ -16,10 +18,10 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
 #ifndef _REENT_ONLY
 size_t
 _DEFUN (wcsrtombs, (dst, src, len, ps),
-	char *dst _AND
-	const wchar_t **src _AND
+	char *__restrict dst _AND
+	const wchar_t **__restrict src _AND
 	size_t len _AND
-	mbstate_t *ps)
+	mbstate_t *__restrict ps)
 {
   return _wcsnrtombs_r (_REENT, dst, src, (size_t) -1, len, ps);
 }
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index d80454c8f..c91ecf2fe 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -13,8 +13,10 @@ INDEX
 
 ANSI_SYNOPSIS
         #include <stdlib.h>
-        double wcstod(const wchar_t *<[str]>, wchar_t **<[tail]>);
-        float wcstof(const wchar_t *<[str]>, wchar_t **<[tail]>);
+        double wcstod(const wchar_t *__restrict <[str]>,
+            wchar_t **__restrict <[tail]>);
+        float wcstof(const wchar_t *__restrict <[str]>,
+            wchar_t **__restrict <[tail]>);
 
         double _wcstod_r(void *<[reent]>,
                          const wchar_t *<[str]>, wchar_t **<[tail]>);
@@ -24,12 +26,12 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
         #include <stdlib.h>
         double wcstod(<[str]>,<[tail]>)
-        wchar_t *<[str]>;
-        wchar_t **<[tail]>;
+        wchar_t *__restrict <[str]>;
+        wchar_t **__restrict <[tail]>;
 
         float wcstof(<[str]>,<[tail]>)
-        wchar_t *<[str]>;
-        wchar_t **<[tail]>;
+        wchar_t *__restrict <[str]>;
+        wchar_t **__restrict <[tail]>;
 
         double _wcstod_r(<[reent]>,<[str]>,<[tail]>)
 	wchar_t *<[reent]>;
@@ -211,15 +213,15 @@ _DEFUN (_wcstof_r, (ptr, nptr, endptr),
 
 double
 _DEFUN (wcstod, (nptr, endptr),
-	_CONST wchar_t *nptr _AND wchar_t **endptr)
+	_CONST wchar_t *__restrict nptr _AND wchar_t **__restrict endptr)
 {
   return _wcstod_r (_REENT, nptr, endptr);
 }
 
 float
 _DEFUN (wcstof, (nptr, endptr),
-	_CONST wchar_t *nptr _AND
-	wchar_t **endptr)
+	_CONST wchar_t *__restrict nptr _AND
+	wchar_t **__restrict endptr)
 {
   double retval = _wcstod_r (_REENT, nptr, endptr);
   if (isnan (retval))
diff --git a/newlib/libc/stdlib/wcstol.c b/newlib/libc/stdlib/wcstol.c
index e23254dc2..adda9c296 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -9,7 +9,8 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
-        long wcstol(const wchar_t *<[s]>, wchar_t **<[ptr]>,int <[base]>);
+        long wcstol(const wchar_t *__restrict <[s]>,
+        	wchar_t **__restrict <[ptr]>,int <[base]>);
 
         long _wcstol_r(void *<[reent]>, 
                        const wchar_t *<[s]>, wchar_t **<[ptr]>,int <[base]>);
@@ -17,8 +18,8 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <stdlib.h>
 	long wcstol (<[s]>, <[ptr]>, <[base]>)
-        wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
+        wchar_t *__restrict <[s]>;
+        wchar_t **__restrict <[ptr]>;
         int <[base]>;
 
 	long _wcstol_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
@@ -216,8 +217,8 @@ _DEFUN (_wcstol_r, (rptr, nptr, endptr, base),
 
 long
 _DEFUN (wcstol, (s, ptr, base),
-	_CONST wchar_t *s _AND
-	wchar_t **ptr _AND
+	_CONST wchar_t *__restrict s _AND
+	wchar_t **__restrict ptr _AND
 	int base)
 {
 	return _wcstol_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/wcstold.c b/newlib/libc/stdlib/wcstold.c
index 8b0ba2440..0ed0e5a5f 100644
--- a/newlib/libc/stdlib/wcstold.c
+++ b/newlib/libc/stdlib/wcstold.c
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
 long double
-wcstold (const wchar_t *nptr, wchar_t **endptr)
+wcstold (const wchar_t *__restrict nptr, wchar_t **__restrict endptr)
 {
   return wcstod(nptr, endptr);
 }
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index 75eda9f6c..2c36d6d00 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -9,7 +9,8 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
-        long long wcstoll(const wchar_t *<[s]>, wchar_t **<[ptr]>,int <[base]>);
+        long long wcstoll(const wchar_t *__restrict <[s]>,
+        	wchar_t **__restrict <[ptr]>,int <[base]>);
 
         long long _wcstoll_r(void *<[reent]>, 
                        const wchar_t *<[s]>, wchar_t **<[ptr]>,int <[base]>);
@@ -17,8 +18,8 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <stdlib.h>
 	long long wcstoll (<[s]>, <[ptr]>, <[base]>)
-        const wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
+        const wchar_t *__restrict <[s]>;
+        wchar_t **__restrict <[ptr]>;
         int <[base]>;
 
 	long long _wcstoll_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
@@ -128,8 +129,8 @@ No supporting OS subroutines are required.
 
 long long
 _DEFUN (wcstoll, (s, ptr, base),
-	_CONST wchar_t *s _AND
-	wchar_t **ptr _AND
+	_CONST wchar_t *__restrict s _AND
+	wchar_t **__restrict ptr _AND
 	int base)
 {
 	return _wcstoll_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index 44dfca399..4b0a95031 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -9,8 +9,8 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
-        unsigned long wcstoul(const wchar_t *<[s]>, wchar_t **<[ptr]>,
-                              int <[base]>);
+        unsigned long wcstoul(const wchar_t *__restrict <[s]>,
+        		      wchar_t **__restrict <[ptr]>, int <[base]>);
 
         unsigned long _wcstoul_r(void *<[reent]>, const wchar_t *<[s]>,
                               wchar_t **<[ptr]>, int <[base]>);
@@ -18,8 +18,8 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <wchar.h>
         unsigned long wcstoul(<[s]>, <[ptr]>, <[base]>)
-        wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
+        wchar_t *__restrict <[s]>;
+        wchar_t **__restrict <[ptr]>;
         int <[base]>;
 
         unsigned long _wcstoul_r(<[reent]>, <[s]>, <[ptr]>, <[base]>)
@@ -197,8 +197,8 @@ _DEFUN (_wcstoul_r, (rptr, nptr, endptr, base),
 
 unsigned long
 _DEFUN (wcstoul, (s, ptr, base),
-	_CONST wchar_t *s _AND
-	wchar_t **ptr _AND
+	_CONST wchar_t *__restrict s _AND
+	wchar_t **__restrict ptr _AND
 	int base)
 {
 	return _wcstoul_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 76caadf23..206bb3428 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -9,8 +9,8 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
-        unsigned long long wcstoull(const wchar_t *<[s]>, wchar_t **<[ptr]>,
-                              int <[base]>);
+        unsigned long long wcstoull(const wchar_t *__restrict <[s]>,
+                              wchar_t **__restrict <[ptr]>, int <[base]>);
 
         unsigned long long _wcstoull_r(void *<[reent]>, const wchar_t *<[s]>,
                               wchar_t **<[ptr]>, int <[base]>);
@@ -18,8 +18,8 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <wchar.h>
         unsigned long long wcstoull(<[s]>, <[ptr]>, <[base]>)
-        wchar_t *<[s]>;
-        wchar_t **<[ptr]>;
+        wchar_t *__restrict <[s]>;
+        wchar_t **__restrict <[ptr]>;
         int <[base]>;
 
         unsigned long long _wcstoull_r(<[reent]>, <[s]>, <[ptr]>, <[base]>)
@@ -130,8 +130,8 @@ PORTABILITY
 
 unsigned long long
 _DEFUN (wcstoull, (s, ptr, base),
-	_CONST wchar_t *s _AND
-	wchar_t **ptr _AND
+	_CONST wchar_t *__restrict s _AND
+	wchar_t **__restrict ptr _AND
 	int base)
 {
 	return _wcstoull_r (_REENT, s, ptr, base);