2013-11-18 Sahil Patnayakuni <sahilp@oarcorp.com>

	* libc/include/stdlib.h, libc/stdlib/mbstowcs.c,
	libc/stdlib/mbstowcs_r.c, libc/stdlib/mbtowc.c,
	libc/stdlib/mbtowc_r.c, libc/stdlib/strtod.c,
	libc/stdlib/strtol.c, libc/stdlib/strtold.c,
	libc/stdlib/strtoll.c, libc/stdlib/strtoll_r.c,
	libc/stdlib/strtoul.c, libc/stdlib/strtoull.c,
	libc/stdlib/strtoull_r.c, libc/stdlib/wcstombs.c,
	libc/stdlib/wcstombs_r.c: Add restrict keyword.

14 files changed, 50 insertions, 50 deletions

diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index 334b5f54d..09543451c 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -7,7 +7,7 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-	int mbstowcs(wchar_t *<[pwc]>, const char *<[s]>, size_t <[n]>);
+	int mbstowcs(wchar_t *restrict <[pwc]>, const char *restrict <[s]>, size_t <[n]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -55,8 +55,8 @@ effects vary with the locale.
 
 size_t
 _DEFUN (mbstowcs, (pwcs, s, n),
-        wchar_t *pwcs _AND
-        const char *s _AND
+        wchar_t *__restrict pwcs _AND
+        const char *__restrict s _AND
         size_t n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c
index 3ba867711..cae1f0693 100644
--- a/newlib/libc/stdlib/mbstowcs_r.c
+++ b/newlib/libc/stdlib/mbstowcs_r.c
@@ -5,8 +5,8 @@
 size_t
 _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
         struct _reent *r    _AND         
-        wchar_t       *pwcs _AND
-        const char    *s    _AND
+        wchar_t       *__restrict pwcs _AND
+        const char    *__restrict s    _AND
         size_t         n    _AND
         mbstate_t     *state)
 {
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c
index 8da309e2d..3c7f84b9e 100644
--- a/newlib/libc/stdlib/mbtowc.c
+++ b/newlib/libc/stdlib/mbtowc.c
@@ -7,7 +7,7 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-	int mbtowc(wchar_t *<[pwc]>, const char *<[s]>, size_t <[n]>);
+	int mbtowc(wchar_t *restrict <[pwc]>, const char *restrict <[s]>, size_t <[n]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -58,8 +58,8 @@ effects vary with the locale.
 
 int
 _DEFUN (mbtowc, (pwc, s, n),
-        wchar_t *pwc _AND
-        const char *s _AND
+        wchar_t *__restrict pwc _AND
+        const char *__restrict s _AND
         size_t n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
index d84fef5a2..986595cfd 100644
--- a/newlib/libc/stdlib/mbtowc_r.c
+++ b/newlib/libc/stdlib/mbtowc_r.c
@@ -19,8 +19,8 @@ int (*__mbtowc) (struct _reent *, wchar_t *, const char *, size_t,
 int
 _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
         struct _reent *r   _AND
-        wchar_t       *pwc _AND 
-        const char    *s   _AND        
+        wchar_t       *__restrict pwc _AND 
+        const char    *__restrict s   _AND        
         size_t         n   _AND
         mbstate_t      *state)
 {
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index ee33960e3..f7cae78f7 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -11,11 +11,11 @@ INDEX
 
 ANSI_SYNOPSIS
         #include <stdlib.h>
-        double strtod(const char *<[str]>, char **<[tail]>);
-        float strtof(const char *<[str]>, char **<[tail]>);
+        double strtod(const char *restrict <[str]>, char **restrict <[tail]>);
+        float strtof(const char *restrict <[str]>, char **restrict <[tail]>);
 
         double _strtod_r(void *<[reent]>,
-                         const char *<[str]>, char **<[tail]>);
+                         const char *restrict <[str]>, char **restrict <[tail]>);
 
 TRAD_SYNOPSIS
         #include <stdlib.h>
@@ -236,8 +236,8 @@ _DEFUN (match, (sp, t),
 double
 _DEFUN (_strtod_r, (ptr, s00, se),
 	struct _reent *ptr _AND
-	_CONST char *s00 _AND
-	char **se)
+	_CONST char *__restrict s00 _AND
+	char **__restrict se)
 {
 #ifdef Avoid_Underflow
 	int scale;
@@ -1255,15 +1255,15 @@ _DEFUN (_strtod_r, (ptr, s00, se),
 
 double
 _DEFUN (strtod, (s00, se),
-	_CONST char *s00 _AND char **se)
+	_CONST char *__restrict s00 _AND char **__restrict se)
 {
   return _strtod_r (_REENT, s00, se);
 }
 
 float
 _DEFUN (strtof, (s00, se),
-	_CONST char *s00 _AND
-	char **se)
+	_CONST char *__restrict s00 _AND
+	char **__restrict se)
 {
   double retval = _strtod_r (_REENT, s00, se);
   if (isnan (retval))
diff --git a/newlib/libc/stdlib/strtol.c b/newlib/libc/stdlib/strtol.c
index 4fcce958f..7273c7d4b 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -9,10 +9,10 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-        long strtol(const char *<[s]>, char **<[ptr]>,int <[base]>);
+        long strtol(const char *restrict <[s]>, char **restrict <[ptr]>,int <[base]>);
 
         long _strtol_r(void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>,int <[base]>);
+                       const char *restrict <[s]>, char **restrict <[ptr]>,int <[base]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -133,8 +133,8 @@ No supporting OS subroutines are required.
 long
 _DEFUN (_strtol_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr _AND
+	_CONST char *__restrict nptr _AND
+	char **__restrict endptr _AND
 	int base)
 {
 	register const unsigned char *s = (const unsigned char *)nptr;
@@ -216,8 +216,8 @@ _DEFUN (_strtol_r, (rptr, nptr, endptr, base),
 
 long
 _DEFUN (strtol, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr _AND
+	_CONST char *__restrict s _AND
+	char **__restrict ptr _AND
 	int base)
 {
 	return _strtol_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/strtold.c b/newlib/libc/stdlib/strtold.c
index 94f9613d2..390ec735b 100644
--- a/newlib/libc/stdlib/strtold.c
+++ b/newlib/libc/stdlib/strtold.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
-strtold (const char *s00, char **se)
+strtold (const char *__restrict s00, char **__restrict se)
 {
   return strtod(s00, se);
 }
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 47558a8fd..3ad8199a0 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -9,10 +9,10 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-        long long strtoll(const char *<[s]>, char **<[ptr]>,int <[base]>);
+        long long strtoll(const char *restrict <[s]>, char **restrict <[ptr]>,int <[base]>);
 
         long long _strtoll_r(void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>,int <[base]>);
+                       const char *restrict <[s]>, char **restrict <[ptr]>,int <[base]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -128,8 +128,8 @@ No supporting OS subroutines are required.
 
 long long
 _DEFUN (strtoll, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr _AND
+	_CONST char *__restrict s _AND
+	char **__restrict ptr _AND
 	int base)
 {
 	return _strtoll_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/strtoll_r.c b/newlib/libc/stdlib/strtoll_r.c
index e88fbba3c..515464db1 100644
--- a/newlib/libc/stdlib/strtoll_r.c
+++ b/newlib/libc/stdlib/strtoll_r.c
@@ -58,8 +58,8 @@
 long long
 _DEFUN (_strtoll_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr _AND
+	_CONST char *__restrict nptr _AND
+	char **__restrict endptr _AND
 	int base)
 {
 	register const unsigned char *s = (const unsigned char *)nptr;
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index 7fa3a82cf..12c6834dc 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -9,11 +9,11 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-        unsigned long strtoul(const char *<[s]>, char **<[ptr]>,
+        unsigned long strtoul(const char *restrict <[s]>, char **restrict <[ptr]>,
                               int <[base]>);
 
-        unsigned long _strtoul_r(void *<[reent]>, const char *<[s]>,
-                              char **<[ptr]>, int <[base]>);
+        unsigned long _strtoul_r(void *<[reent]>, const char *restrict <[s]>,
+                              char **restrict <[ptr]>, int <[base]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -134,8 +134,8 @@ PORTABILITY
 unsigned long
 _DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr _AND
+	_CONST char *__restrict nptr _AND
+	char **__restrict endptr _AND
 	int base)
 {
 	register const unsigned char *s = (const unsigned char *)nptr;
@@ -196,8 +196,8 @@ _DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
 
 unsigned long
 _DEFUN (strtoul, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr _AND
+	_CONST char *__restrict s _AND
+	char **__restrict ptr _AND
 	int base)
 {
 	return _strtoul_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index ec168b7f9..13a54dbb4 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -9,11 +9,11 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-        unsigned long long strtoull(const char *<[s]>, char **<[ptr]>,
+        unsigned long long strtoull(const char *restrict <[s]>, char **restrict <[ptr]>,
                               int <[base]>);
 
-        unsigned long long _strtoull_r(void *<[reent]>, const char *<[s]>,
-                              char **<[ptr]>, int <[base]>);
+        unsigned long long _strtoull_r(void *<[reent]>, const char *restrict <[s]>,
+                              char **restrict <[ptr]>, int <[base]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -129,8 +129,8 @@ PORTABILITY
 
 unsigned long long
 _DEFUN (strtoull, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr _AND
+	_CONST char *__restrict s _AND
+	char **__restrict ptr _AND
 	int base)
 {
 	return _strtoull_r (_REENT, s, ptr, base);
diff --git a/newlib/libc/stdlib/strtoull_r.c b/newlib/libc/stdlib/strtoull_r.c
index da7f7f51a..d0868adf2 100644
--- a/newlib/libc/stdlib/strtoull_r.c
+++ b/newlib/libc/stdlib/strtoull_r.c
@@ -59,8 +59,8 @@
 unsigned long long
 _DEFUN (_strtoull_r, (rptr, nptr, endptr, base),
 	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr _AND
+	_CONST char *__restrict nptr _AND
+	char **__restrict endptr _AND
 	int base)
 {
 	register const unsigned char *s = (const unsigned char *)nptr;
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c
index d0ef26e53..b0123a313 100644
--- a/newlib/libc/stdlib/wcstombs.c
+++ b/newlib/libc/stdlib/wcstombs.c
@@ -7,7 +7,7 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
-	size_t wcstombs(char *<[s]>, const wchar_t *<[pwc]>, size_t <[n]>);
+	size_t wcstombs(char *restrict <[s]>, const wchar_t *restrict <[pwc]>, size_t <[n]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -56,8 +56,8 @@ effects vary with the locale.
 
 size_t
 _DEFUN (wcstombs, (s, pwcs, n),
-        char          *s    _AND
-        const wchar_t *pwcs _AND
+        char          *__restrict s    _AND
+        const wchar_t *__restrict pwcs _AND
         size_t         n)
 {
 #ifdef _MB_CAPABLE
diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c
index e74502f46..3bac8a337 100644
--- a/newlib/libc/stdlib/wcstombs_r.c
+++ b/newlib/libc/stdlib/wcstombs_r.c
@@ -5,8 +5,8 @@
 size_t
 _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
         struct _reent *r    _AND         
-        char          *s    _AND
-        const wchar_t *pwcs _AND
+        char          *__restrict s    _AND
+        const wchar_t *__restrict pwcs _AND
         size_t         n    _AND
         mbstate_t     *state)
 {