ansification: remove _CONST

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

38 files changed, 78 insertions, 78 deletions

diff --git a/newlib/libc/machine/cris/sys/errno.h b/newlib/libc/machine/cris/sys/errno.h
index 310388943..dc4ffe28c 100644
--- a/newlib/libc/machine/cris/sys/errno.h
+++ b/newlib/libc/machine/cris/sys/errno.h
@@ -21,7 +21,7 @@ extern int *__errno _PARAMS ((void));
 
 /* Please don't use these variables directly.
    Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
+extern const char * const _sys_errlist[];
 extern int _sys_nerr;
 
 #define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index a2751af85..82987eade 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -82,8 +82,8 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 { 
 
 #ifndef HAVE_HW_PCMP
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index e0e1d7760..8e2dae634 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -83,7 +83,7 @@ QUICKREF
 char*
 _DEFUN (strcpy, (dst0, src0),
 	char *__restrict dst0,
-	_CONST char *__restrict src0)
+	const char *__restrict src0)
 {
 
 #ifndef HAVE_HW_PCMP
@@ -97,9 +97,9 @@ _DEFUN (strcpy, (dst0, src0),
   return s;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC or DEST is unaligned, then copy bytes.  */
   if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
index ddd9e6a82..059f4463d 100644
--- a/newlib/libc/machine/microblaze/strlen.c
+++ b/newlib/libc/machine/microblaze/strlen.c
@@ -79,20 +79,20 @@ QUICKREF
 
 size_t
 _DEFUN (strlen, (str),
-	_CONST char *str)
+	const char *str)
 {
 
 #ifndef HAVE_HW_PCMP
 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
-  _CONST char *start = str;
+  const char *start = str;
 
   while (*str)
     str++;
 
   return str - start;
 #else
-  _CONST char *start = str;
+  const char *start = str;
   unsigned long *aligned_addr;
 
   if (!UNALIGNED (str))
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index 5115c85e2..dd5e2dfd4 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -64,7 +64,7 @@ PORTABILITY
 __int16_t
 _DEFUN (_atosfix16_r, (reent, s),
 	struct _reent *reent,
-	_CONST char *s)
+	const char *s)
 {
   return _strtosfix16_r (reent, s, NULL);
 }
@@ -72,7 +72,7 @@ _DEFUN (_atosfix16_r, (reent, s),
 #ifndef _REENT_ONLY
 __int16_t
 _DEFUN (atosfix16, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtosfix16 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index 49f4cce20..fed308b65 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -10,7 +10,7 @@
 __int32_t
 _DEFUN (_atosfix32_r, (reent, s),
 	struct _reent *reent,
-	_CONST char *s)
+	const char *s)
 {
   return _strtosfix32_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atosfix32_r, (reent, s),
 #ifndef _REENT_ONLY
 __int32_t
 _DEFUN (atosfix32, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtosfix32 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index b433778e7..cfc421a3a 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -10,7 +10,7 @@
 __int64_t
 _DEFUN (_atosfix64_r, (reent, s),
 	struct _reent *reent,
-	_CONST char *s)
+	const char *s)
 {
   return _strtosfix64_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atosfix64_r, (reent, s),
 #ifndef _REENT_ONLY
 __int64_t
 _DEFUN (atosfix64, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtosfix64 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 5148acb7d..84a60b252 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -64,7 +64,7 @@ PORTABILITY
 __uint16_t
 _DEFUN (_atoufix16_r, (reent, s),
 	struct _reent *reent,
-	_CONST char *s)
+	const char *s)
 {
   return _strtoufix16_r (reent, s, NULL);
 }
@@ -72,7 +72,7 @@ _DEFUN (_atoufix16_r, (reent, s),
 #ifndef _REENT_ONLY
 __uint16_t
 _DEFUN (atoufix16, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtoufix16 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index 01919d406..fc64c75e4 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -10,7 +10,7 @@
 __uint32_t
 _DEFUN (_atoufix32_r, (reent, s),
 	struct _reent *reent,
-	_CONST char *s)
+	const char *s)
 {
   return _strtoufix32_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atoufix32_r, (reent, s),
 #ifndef _REENT_ONLY
 __uint32_t
 _DEFUN (atoufix32, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtoufix32 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index af71089a6..e8ff7773d 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -10,7 +10,7 @@
 __uint64_t
 _DEFUN (_atoufix64_r, (reent, s),
 	struct _reent *reent,
-	_CONST char *s)
+	const char *s)
 {
   return _strtoufix64_r (reent, s, NULL);
 }
@@ -18,7 +18,7 @@ _DEFUN (_atoufix64_r, (reent, s),
 #ifndef _REENT_ONLY
 __uint64_t
 _DEFUN (atoufix64, (s),
-	_CONST char *s)
+	const char *s)
 {
   return strtoufix64 (s, NULL);
 }
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index 84e1171b9..4e998db03 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -94,7 +94,7 @@ PORTABILITY
 __int16_t
 _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
 	struct _reent *rptr,
-	_CONST char *nptr,
+	const char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
 
 __int16_t
 _DEFUN (strtosfix16, (s, ptr, base),
-	_CONST char *s,
+	const char *s,
 	char **ptr)
 {
   return _strtosfix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
index 1b1487b1a..e8966808e 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -15,7 +15,7 @@
 __int32_t
 _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
 	struct _reent *rptr,
-	_CONST char *nptr,
+	const char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
 
 __int32_t
 _DEFUN (strtosfix32, (s, ptr, base),
-	_CONST char *s,
+	const char *s,
 	char **ptr)
 {
   return _strtosfix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
index 4ba718c03..f7344fc22 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -15,7 +15,7 @@
 __int64_t
 _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
 	struct _reent *rptr,
-	_CONST char *nptr,
+	const char *nptr,
 	char **endptr)
 {
   union long_double_union ldbl;
@@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
 
 __int64_t
 _DEFUN (strtosfix64, (s, ptr, base),
-	_CONST char *s,
+	const char *s,
 	char **ptr)
 {
   return _strtosfix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
index 22de506e3..0757930d4 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -93,7 +93,7 @@ PORTABILITY
 __uint16_t
 _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
 	struct _reent *rptr,
-	_CONST char *nptr,
+	const char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -161,7 +161,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
 
 __uint16_t
 _DEFUN (strtoufix16, (s, ptr, base),
-	_CONST char *s,
+	const char *s,
 	char **ptr)
 {
   return _strtoufix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
index 05e96675f..60f278daa 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -15,7 +15,7 @@
 __uint32_t
 _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
 	struct _reent *rptr,
-	_CONST char *nptr,
+	const char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -90,7 +90,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
 
 __uint32_t
 _DEFUN (strtoufix32, (s, ptr, base),
-	_CONST char *s,
+	const char *s,
 	char **ptr)
 {
   return _strtoufix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
index 5ef53846f..509f51318 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -15,7 +15,7 @@
 __uint64_t
 _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
 	struct _reent *rptr,
-	_CONST char *nptr,
+	const char *nptr,
 	char **endptr)
 {
   union long_double_union ldbl;
@@ -105,7 +105,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
 
 __uint64_t
 _DEFUN (strtoufix64, (s, ptr, base),
-	_CONST char *s,
+	const char *s,
 	char **ptr)
 {
   return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 0c1c80e1a..e926a7340 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -273,7 +273,7 @@ static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int,  int
 int 
 _DEFUN (VFPRINTF, (fp, fmt0, ap),
 	FILE * fp,
-	_CONST char *fmt0,
+	const char *fmt0,
 	va_list ap)
 {
   CHECK_INIT (_REENT, fp);
@@ -284,7 +284,7 @@ int
 _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
 	struct _reent *data,
 	FILE * fp,
-	_CONST char *fmt0,
+	const char *fmt0,
 	va_list ap)
 {
 	register char *fmt;	/* format string */
@@ -350,9 +350,9 @@ _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
 	 * below longer.
 	 */
 #define	PADSIZE	16		/* pad chunk size */
-	static _CONST char blanks[PADSIZE] =
+	static const char blanks[PADSIZE] =
 	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-	static _CONST char zeroes[PADSIZE] =
+	static const char zeroes[PADSIZE] =
 	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
 
 	/*
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index b82a14088..df5344e20 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -184,7 +184,7 @@ typedef union
 int
 _DEFUN (vfscanf, (fp, fmt, ap), 
     register FILE *__restrict fp,
-    _CONST char *__restrict fmt,
+    const char *__restrict fmt,
     va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -194,7 +194,7 @@ _DEFUN (vfscanf, (fp, fmt, ap),
 int
 __svfscanf (fp, fmt0, ap)
      register FILE *fp;
-     char _CONST *fmt0;
+     char const *fmt0;
      va_list ap;
 {
   return __svfscanf_r (_REENT, fp, fmt0, ap);
@@ -206,7 +206,7 @@ int
 _DEFUN (_vfscanf_r, (data, fp, fmt, ap),
     struct _reent *data,
     register FILE *__restrict fp,
-    _CONST char *__restrict fmt,
+    const char *__restrict fmt,
     va_list ap)
 {
   return __svfscanf_r (data, fp, fmt, ap);
@@ -217,7 +217,7 @@ int
 __svfscanf_r (rptr, fp, fmt0, ap)
      struct _reent *rptr;
      register FILE *fp;
-     char _CONST *fmt0;
+     char const *fmt0;
      va_list ap;
 {
   register u_char *fmt = (u_char *) fmt0;
@@ -262,7 +262,7 @@ __svfscanf_r (rptr, fp, fmt0, ap)
 #endif
 
   /* `basefix' is used to avoid `if' tests in the integer scanner */
-  static _CONST short basefix[17] =
+  static const short basefix[17] =
     {10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
   nassigned = 0;
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index b09ffad16..edec03cff 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 FILE *
 _DEFUN (fdopen, (fd, mode),
         int fd,
-        _CONST char *mode)
+        const char *mode)
 {
   errno = ENOSYS;
   return NULL;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index c41d33510..ffa8f6904 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -37,17 +37,17 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 typedef struct
 {
-  _CONST char* file;
+  const char* file;
   unsigned int pad0[ 3 ];
-  _CONST char* mode;
+  const char* mode;
   unsigned int pad1[ 3 ];
 } c99_fopen_t;
 
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN (fopen, (file, mode),
-	_CONST char *__restrict file,
-	_CONST char *__restrict mode)
+	const char *__restrict file,
+	const char *__restrict mode)
 {
   int ret;
   c99_fopen_t args;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 8cf84bb6e..82b72e060 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -37,7 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 typedef struct
 {
-  _CONST char* s;
+  const char* s;
   unsigned int pad0[ 3 ];
   int fp;
   unsigned int pad1[ 3 ];
@@ -47,7 +47,7 @@ typedef struct
 
 int
 _DEFUN (fputs, (s, fp),
-	char _CONST *__restrict s,
+	char const *__restrict s,
 	FILE *__restrict fp)
 {
   c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 7c52abef3..0e3f15f83 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -37,9 +37,9 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 typedef struct
 {
-  _CONST char *file;
+  const char *file;
   unsigned int pad0[ 3 ];
-  _CONST char *mode;
+  const char *mode;
   unsigned int pad1[ 3 ];
   int fp;
 } c99_freopen_t;
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index 1ebbb8f63..a92cca5a3 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -39,7 +39,7 @@ typedef struct
 {
   int fp;
   unsigned int pad0[ 3 ];
-  _CONST _fpos_t *pos;
+  const _fpos_t *pos;
 } c99_fsetpos_t;
 
 #ifndef _REENT_ONLY
@@ -47,7 +47,7 @@ typedef struct
 int
 _DEFUN (fsetpos, (iop, pos),
 	FILE * iop,
-	_CONST _fpos_t * pos)
+	const _fpos_t * pos)
 {
   c99_fsetpos_t args;
 
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 6de571069..149eb1345 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -39,7 +39,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 typedef struct
 {
-  _CONST char* buf;
+  const char* buf;
   unsigned int pad0[ 3 ];
   size_t size;
   unsigned int pad1[ 3 ];
@@ -50,7 +50,7 @@ typedef struct
 
 size_t
 _DEFUN (fwrite, (buf, size, count, fp),
-	_CONST _PTR __restrict buf,
+	const _PTR __restrict buf,
 	size_t size,
 	size_t count,
 	FILE * fp)
diff --git a/newlib/libc/machine/spu/impure.c b/newlib/libc/machine/spu/impure.c
index 5fbe0e5f5..f9c86efdc 100644
--- a/newlib/libc/machine/spu/impure.c
+++ b/newlib/libc/machine/spu/impure.c
@@ -11,4 +11,4 @@
 
 struct _reent __ATTRIBUTE_IMPURE_DATA__ _impure_data = _REENT_INIT(_impure_data);
 struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &_impure_data;
-struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data;
+struct _reent *const __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data;
diff --git a/newlib/libc/machine/spu/perror.c b/newlib/libc/machine/spu/perror.c
index 028f44a37..612467318 100644
--- a/newlib/libc/machine/spu/perror.c
+++ b/newlib/libc/machine/spu/perror.c
@@ -7,7 +7,7 @@
 
 typedef struct
 {
-  _CONST char* str;
+  const char* str;
   unsigned int pad0[ 3 ];
   int arg_errno;
   unsigned int pad1[ 3 ];
@@ -15,7 +15,7 @@ typedef struct
 
 void
 _DEFUN (perror, (s),
-	_CONST char *s)
+	const char *s)
 
 {
   c99_perror_t arg;
diff --git a/newlib/libc/machine/spu/puts.c b/newlib/libc/machine/spu/puts.c
index 06f4b87b6..427508969 100644
--- a/newlib/libc/machine/spu/puts.c
+++ b/newlib/libc/machine/spu/puts.c
@@ -6,7 +6,7 @@
 
 int
 _DEFUN (puts, (s),
-	char _CONST * s)
+	char const * s)
 {
   CHECK_STD_INIT(_REENT);
 
diff --git a/newlib/libc/machine/spu/remove.c b/newlib/libc/machine/spu/remove.c
index 930a98036..1a379dedc 100644
--- a/newlib/libc/machine/spu/remove.c
+++ b/newlib/libc/machine/spu/remove.c
@@ -36,7 +36,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 int
 remove (filename)
-     _CONST char *filename;
+     const char *filename;
 {
 
   /* The return value gets written over buf
diff --git a/newlib/libc/machine/spu/rename.c b/newlib/libc/machine/spu/rename.c
index bf58fbdc4..e60355de7 100644
--- a/newlib/libc/machine/spu/rename.c
+++ b/newlib/libc/machine/spu/rename.c
@@ -37,16 +37,16 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 typedef struct
 {
-  _CONST char *old;
+  const char *old;
   unsigned int pad0[ 3 ];
-  _CONST char *new;
+  const char *new;
   unsigned int pad1[ 3 ];
 } c99_rename_t;
 
 int
 rename (old, new)
-     _CONST char *old;
-     _CONST char *new;
+     const char *old;
+     const char *new;
 {
   c99_rename_t args;
   args.old = old;
diff --git a/newlib/libc/machine/spu/sys/errno.h b/newlib/libc/machine/spu/sys/errno.h
index 85aafcfd5..ef087bd68 100644
--- a/newlib/libc/machine/spu/sys/errno.h
+++ b/newlib/libc/machine/spu/sys/errno.h
@@ -32,7 +32,7 @@ extern struct _reent _impure_data;
 
 /* Please don't use these variables directly.
    Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
+extern const char * const _sys_errlist[];
 extern int _sys_nerr;
 
 #define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index e5ef2fa9f..90dcaef56 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -59,7 +59,7 @@ typedef struct
 int
 _DEFUN (vfprintf, (fp, fmt0, ap),
 	FILE *__restrict fp,
-	_CONST char *__restrict fmt0,
+	const char *__restrict fmt0,
 	va_list ap)
 {
   c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index a497b7ba3..c22f76db7 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -59,7 +59,7 @@ typedef struct
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
     FILE *__restrict fp,
-    _CONST char *__restrict fmt,
+    const char *__restrict fmt,
     va_list ap)
 {
   c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 35b12dfb5..e99144623 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -15,7 +15,7 @@
 
 typedef struct
 {
-  _CONST char* fmt;
+  const char* fmt;
   unsigned int pad0[ 3 ];
   va_list ap;
 } c99_vprintf_t;
@@ -24,7 +24,7 @@ typedef struct
 
 int
 _DEFUN (vprintf, (fmt, ap),
-     _CONST char *fmt,
+     const char *fmt,
      va_list ap)
 {
   c99_vprintf_t args;
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index 29b4948dd..aae6bc45b 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -56,7 +56,7 @@ typedef struct
 
 int
 _DEFUN (vscanf, (fmt, ap),
-     _CONST char *fmt,
+     const char *fmt,
      va_list ap)
 {
   c99_vscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index f952b84c1..b30770d68 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -19,7 +19,7 @@ typedef struct
   unsigned int pad0[ 3 ];
   size_t size;
   unsigned int pad1[ 3 ];
-  _CONST char* fmt;
+  const char* fmt;
   unsigned int pad2[ 3 ];
   va_list ap;
 } c99_vsnprintf_t;
@@ -30,7 +30,7 @@ int
 _DEFUN (vsnprintf, (str, size, fmt, ap),
      char *__restrict str,
      size_t size,
-     _CONST char *__restrict fmt,
+     const char *__restrict fmt,
      va_list ap)
 {
   c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 1a44de479..12461c08e 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -28,7 +28,7 @@ typedef struct
 int
 _DEFUN (vsprintf, (str, fmt, ap),
      char *__restrict str,
-     _CONST char *__restrict fmt,
+     const char *__restrict fmt,
      va_list ap)
 {
   c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 38ee1f4b9..7725e6822 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -47,9 +47,9 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
 
 typedef struct
 {
-  _CONST char *str;
+  const char *str;
   unsigned int pad0[ 3 ];
-  _CONST char *fmt;
+  const char *fmt;
   unsigned int pad1[ 3 ];
   va_list ap;
 } c99_vsscanf_t;
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vsscanf, (str, fmt, ap),
-    _CONST char *__restrict str,
-    _CONST char *__restrict fmt,
+    const char *__restrict str,
+    const char *__restrict fmt,
     va_list ap)
 {
   c99_vsscanf_t args;
diff --git a/newlib/libc/machine/xscale/strlen.c b/newlib/libc/machine/xscale/strlen.c
index a8bc0851d..70c9a3b44 100644
--- a/newlib/libc/machine/xscale/strlen.c
+++ b/newlib/libc/machine/xscale/strlen.c
@@ -10,7 +10,7 @@
 size_t
 strlen (const char *str)
 {
-  _CONST char *start = str;
+  const char *start = str;
 
   /* Skip unaligned part.  */
   if ((long)str & 3)