Remove all traces of reg_char.

	* sysdeps/generic/memcopy.h (reg_char): Delete.
	* debug/strcat_chk.c: Use char, not reg_char.
	* debug/strcpy_chk.c: Likewise.
	* debug/strncat_chk.c: Likewise.
	* debug/strncpy_chk.c: Likewise.
	* string/memchr.c: Likewise.
	* string/memrchr.c: Likewise.
	* string/rawmemchr.c: Likewise.
	* string/strcat.c: Likewise.
	* string/strchr.c: Likewise.
	* string/strchrnul.c: Likewise.
	* string/strcmp.c: Likewise.
	* string/strcpy.c: Likewise.
	* string/strncat.c: Likewise.
	* string/strncmp.c: Likewise.
	* string/strncpy.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 42508769a553eb5ea33c9a9a8b8ba9ab268e5f42..db02f02308dc9e5dc75c2cb9c8154b7012e703eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-04-18  David S. Miller  <davem@davemloft.net>
+
+       * sysdeps/generic/memcopy.h (reg_char): Delete.
+       * debug/strcat_chk.c: Use char, not reg_char.
+       * debug/strcpy_chk.c: Likewise.
+       * debug/strncat_chk.c: Likewise.
+       * debug/strncpy_chk.c: Likewise.
+       * string/memchr.c: Likewise.
+       * string/memrchr.c: Likewise.
+       * string/rawmemchr.c: Likewise.
+       * string/strcat.c: Likewise.
+       * string/strchr.c: Likewise.
+       * string/strchrnul.c: Likewise.
+       * string/strcmp.c: Likewise.
+       * string/strcpy.c: Likewise.
+       * string/strncat.c: Likewise.
+       * string/strncmp.c: Likewise.
+       * string/strncpy.c: Likewise.
+
 2012-04-18  Will Schmidt  <will_schmidt@vnet.ibm.com>
 
        * sysdeps/powerpc/memmove.c: New file based on string/memmove.c where

diff --git a/debug/strcat_chk.c b/debug/strcat_chk.c
index c930caaf0fc14227fac6ff977c5a1852b02713c5..8f842ee8556afbc6d79e99091a20fb2d4feb8c1c 100644 (file)
--- a/debug/strcat_chk.c
+++ b/debug/strcat_chk.c
@@ -28,7 +28,7 @@ __strcat_chk (dest, src, destlen)
 {
   char *s1 = dest;
   const char *s2 = src;
-  reg_char c;
+  char c;
 
   /* Find the end of the string.  */
   do

diff --git a/debug/strcpy_chk.c b/debug/strcpy_chk.c
index e867754d4add2f2d76aa0d0be475cb3fbcb068aa..ee22b11cd33afdded83841b6ca46da5a5ba8f176 100644 (file)
--- a/debug/strcpy_chk.c
+++ b/debug/strcpy_chk.c
@@ -28,7 +28,7 @@ __strcpy_chk (dest, src, destlen)
      const char *src;
      size_t destlen;
 {
-  reg_char c;
+  char c;
   char *s = (char *) src;
   const ptrdiff_t off = dest - s;
 

diff --git a/debug/strncat_chk.c b/debug/strncat_chk.c
index c88034dc4b049c9249d396cef08571c50d1690b5..c26933154398873b217cb0e4b03ce6231ee6fb96 100644 (file)
--- a/debug/strncat_chk.c
+++ b/debug/strncat_chk.c
@@ -27,7 +27,7 @@ __strncat_chk (s1, s2, n, s1len)
      size_t n;
      size_t s1len;
 {
-  reg_char c;
+  char c;
   char *s = s1;
 
   /* Find the end of S1.  */

diff --git a/debug/strncpy_chk.c b/debug/strncpy_chk.c
index 674d16033b6e9a3ed560e3087bd3c1d3e8a9ea69..e34c1e5d67f1957f51a52475ab12fdff1221de8b 100644 (file)
--- a/debug/strncpy_chk.c
+++ b/debug/strncpy_chk.c
@@ -26,7 +26,7 @@ __strncpy_chk (s1, s2, n, s1len)
      size_t n;
      size_t s1len;
 {
-  reg_char c;
+  char c;
   char *s = s1;
 
   if (__builtin_expect (s1len < n, 0))

diff --git a/string/memchr.c b/string/memchr.c
index 7de21a6acc7434a8232bb0b1d01662073502de46..22637cf3a5a6b2e97d4f27da92a30716efdbb80b 100644 (file)
--- a/string/memchr.c
+++ b/string/memchr.c
@@ -30,8 +30,6 @@
 #if defined _LIBC
 # include <string.h>
 # include <memcopy.h>
-#else
-# define reg_char char
 #endif
 
 #if HAVE_STDLIB_H || defined _LIBC
@@ -68,7 +66,7 @@ __memchr (s, c_in, n)
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
   unsigned long int longword, magic_bits, charmask;
-  unsigned reg_char c;
+  unsigned char c;
 
   c = (unsigned char) c_in;
 

diff --git a/string/memrchr.c b/string/memrchr.c
index 5a83a4a9c913f1e87e168b7ac6752b38c432e093..2826f1305626fb7c27c4ff2f77b17c2a1febd3d0 100644 (file)
--- a/string/memrchr.c
+++ b/string/memrchr.c
@@ -33,8 +33,6 @@
 #if defined _LIBC
 # include <string.h>
 # include <memcopy.h>
-#else
-# define reg_char char
 #endif
 
 #if defined HAVE_LIMITS_H || defined _LIBC
@@ -71,7 +69,7 @@ MEMRCHR
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
   unsigned long int longword, magic_bits, charmask;
-  unsigned reg_char c;
+  unsigned char c;
 
   c = (unsigned char) c_in;
 

diff --git a/string/rawmemchr.c b/string/rawmemchr.c
index e92e1b491cf957897047ee2341443c61c8391dbb..90e8c7cb0baf0c02b81ca77b487852ef81453d87 100644 (file)
--- a/string/rawmemchr.c
+++ b/string/rawmemchr.c
@@ -31,8 +31,6 @@
 # include <string.h>
 # include <memcopy.h>
 # include <stdlib.h>
-#else
-# define reg_char char
 #endif
 
 #if defined (HAVE_LIMITS_H) || defined (_LIBC)
@@ -59,7 +57,7 @@ __rawmemchr (s, c_in)
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
   unsigned long int longword, magic_bits, charmask;
-  unsigned reg_char c;
+  unsigned char c;
 
   c = (unsigned char) c_in;
 

diff --git a/string/strcat.c b/string/strcat.c
index 3967fa82d79283621484d3a562af25b3ddac0910..f9e4bc682d954b5e9ccf97fb12ab8e7216a48663 100644 (file)
--- a/string/strcat.c
+++ b/string/strcat.c
@@ -28,7 +28,7 @@ strcat (dest, src)
 {
   char *s1 = dest;
   const char *s2 = src;
-  reg_char c;
+  char c;
 
   /* Find the end of the string.  */
   do

diff --git a/string/strchr.c b/string/strchr.c
index 3d44958478e82bf5ba64811a415fe2c94a8284a5..9d18b7eeb989c678d2c2e26eb067f7050dfaa126 100644 (file)
--- a/string/strchr.c
+++ b/string/strchr.c
@@ -36,7 +36,7 @@ strchr (s, c_in)
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
   unsigned long int longword, magic_bits, charmask;
-  unsigned reg_char c;
+  unsigned char c;
 
   c = (unsigned char) c_in;
 

diff --git a/string/strchrnul.c b/string/strchrnul.c
index 523a72f3f835aca555060c4a7eafe46fcffd9782..0db5e23fa8cc03fa5e04938df58d938b6c5e9766 100644 (file)
--- a/string/strchrnul.c
+++ b/string/strchrnul.c
@@ -36,7 +36,7 @@ __strchrnul (s, c_in)
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
   unsigned long int longword, magic_bits, charmask;
-  unsigned reg_char c;
+  unsigned char c;
 
   c = (unsigned char) c_in;
 

diff --git a/string/strcmp.c b/string/strcmp.c
index e9b24c9512b6fd64e7e9f3111470e99cb27cdaa5..8229d7c773b361a1587cac2cfc5d9b12ba29255a 100644 (file)
--- a/string/strcmp.c
+++ b/string/strcmp.c
@@ -30,7 +30,7 @@ strcmp (p1, p2)
 {
   register const unsigned char *s1 = (const unsigned char *) p1;
   register const unsigned char *s2 = (const unsigned char *) p2;
-  unsigned reg_char c1, c2;
+  unsigned char c1, c2;
 
   do
     {

diff --git a/string/strcpy.c b/string/strcpy.c
index f565f34fcf5054b3ee4c30b1706563b88cf51c1a..acc580ba3edb3073ee1589ef3f82f9e8cb6e9bc8 100644 (file)
--- a/string/strcpy.c
+++ b/string/strcpy.c
@@ -28,7 +28,7 @@ strcpy (dest, src)
      char *dest;
      const char *src;
 {
-  reg_char c;
+  char c;
   char *__unbounded s = (char *__unbounded) CHECK_BOUNDS_LOW (src);
   const ptrdiff_t off = CHECK_BOUNDS_LOW (dest) - s - 1;
   size_t n;

diff --git a/string/strncat.c b/string/strncat.c
index dceadb206a5bdf4da1c22474d021e31abd920768..dcfb04d6c62cca110d639f3f742d60bb32358f76 100644 (file)
--- a/string/strncat.c
+++ b/string/strncat.c
@@ -19,8 +19,6 @@
 
 #ifdef _LIBC
 # include <memcopy.h>
-#else
-typedef char reg_char;
 #endif
 
 #ifndef STRNCAT
@@ -31,7 +29,7 @@ typedef char reg_char;
 char *
 STRNCAT (char *s1, const char *s2, size_t n)
 {
-  reg_char c;
+  char c;
   char *s = s1;
 
   /* Find the end of S1.  */

diff --git a/string/strncmp.c b/string/strncmp.c
index f586d592e697205744791d0b0d0fea441c688ef0..d79305a8718bf03714cc323a40fca8f306ca6ca8 100644 (file)
--- a/string/strncmp.c
+++ b/string/strncmp.c
@@ -31,8 +31,8 @@
 int
 STRNCMP (const char *s1, const char *s2, size_t n)
 {
-  unsigned reg_char c1 = '\0';
-  unsigned reg_char c2 = '\0';
+  unsigned char c1 = '\0';
+  unsigned char c2 = '\0';
 
   if (n >= 4)
     {

diff --git a/string/strncpy.c b/string/strncpy.c
index f6ee27832da95d9da9aef8a6fcf73f53f997c796..19d501e06b0e8e04295dbeea976b53d2ee82ef46 100644 (file)
--- a/string/strncpy.c
+++ b/string/strncpy.c
@@ -27,7 +27,7 @@
 char *
 STRNCPY (char *s1, const char *s2, size_t n)
 {
-  reg_char c;
+  char c;
   char *s = s1;
 
   --s1;

diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index ad2846682165d1cec2ea4baf60ec9be044d8d0c2..a8e5a44fe5dd9c5641b9a33dcc604f25bce4f27b 100644 (file)
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -61,9 +61,6 @@
 /* Type to use for unaligned operations.  */
 typedef unsigned char byte;
 
-/* Optimal type for storing bytes in registers.  */
-#define        reg_char        char
-
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2)))
 #endif