1 files changed, 42 insertions, 27 deletions

diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index 60b0fde8e..e921b5db7 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -53,7 +53,7 @@ QUICKREF
 #endif
 #endif
 
-/* DETECTCHAR returns nonzero if (long)X contains the byte used 
+/* DETECTCHAR returns nonzero if (long)X contains the byte used
    to fill (long)MASK. */
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
@@ -63,46 +63,61 @@ _DEFUN (strchr, (s1, i),
 	int i)
 {
   _CONST unsigned char *s = (_CONST unsigned char *)s1;
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
-  unsigned char c = (unsigned int)i;
+  unsigned char c = i;
 
-  while (*s && *s != c)
+#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
+  unsigned long mask,j;
+  unsigned long *aligned_addr;
+
+  /* Special case for finding 0.  */
+  if (!c)
     {
-      s++;
+      while (UNALIGNED (s))
+        {
+          if (!*s)
+            return (char *) s;
+          s++;
+        }
+      /* Operate a word at a time.  */
+      aligned_addr = (unsigned long *) s;
+      while (!DETECTNULL (*aligned_addr))
+        aligned_addr++;
+      /* Found the end of string.  */
+      s = (const unsigned char *) aligned_addr;
+      while (*s)
+        s++;
+      return (char *) s;
     }
 
-  if (*s != c)
+  /* All other bytes.  Align the pointer, then search a long at a time.  */
+  while (UNALIGNED (s))
     {
-      s = NULL;
+      if (!*s)
+        return NULL;
+      if (*s == c)
+        return (char *) s;
+      s++;
     }
 
-  return (char *) s;
-#else
-  unsigned char c = (unsigned char)i;
-  unsigned long mask,j;
-  unsigned long *aligned_addr;
+  mask = c;
+  for (j = 8; j < LBLOCKSIZE * 8; j <<= 1)
+    mask = (mask << j) | mask;
 
-  if (!UNALIGNED (s))
-    {
-      mask = 0;
-      for (j = 0; j < LBLOCKSIZE; j++)
-        mask = (mask << 8) | c;
+  aligned_addr = (unsigned long *) s;
+  while (!DETECTNULL (*aligned_addr) && !DETECTCHAR (*aligned_addr, mask))
+    aligned_addr++;
 
-      aligned_addr = (unsigned long*)s;
-      while (!DETECTNULL (*aligned_addr) && !DETECTCHAR (*aligned_addr, mask))
-        aligned_addr++;
+  /* The block of bytes currently pointed to by aligned_addr
+     contains either a null or the target char, or both.  We
+     catch it using the bytewise search.  */
 
-      /* The block of bytes currently pointed to by aligned_addr
-         contains either a null or the target char, or both.  We
-         catch it using the bytewise search.  */
+  s = (unsigned char *) aligned_addr;
 
-      s = (unsigned char*)aligned_addr;
-    }
+#endif /* not PREFER_SIZE_OVER_SPEED */
 
   while (*s && *s != c)
-      s++;
+    s++;
   if (*s == c)
     return (char *)s;
   return NULL;
-#endif /* not PREFER_SIZE_OVER_SPEED */
 }