* sysdeps/generic/bp-checks.h (__memchr): Remove incorrect decl.

	(__ubp_memchr): Add correct decl.
	(_CHECK_STRING): Use __ubp_memchr.
	* sysdeps/alpha/memchr.S [!__BOUNDED_POINTERS__] (__ubp_memchr):
	New alias for unbounded-pointer __memchr.
	* sysdeps/i386/memchr.S: Likewise.
	* sysdeps/ia64/memchr.S: Likewise.
	* sysdeps/m68k/memchr.S: Likewise.
	* sysdeps/sparc/sparc32/memchr.S: Likewise.
	* sysdeps/sparc/sparc64/memchr.S: Likewise.
	* sysdeps/vax/memchr.s: Likewise.

diff --git a/sysdeps/alpha/memchr.S b/sysdeps/alpha/memchr.S
index 5947a0b..c4e1d5e 100644 (file)
--- a/sysdeps/alpha/memchr.S
+++ b/sysdeps/alpha/memchr.S
@@ -67,7 +67,7 @@ ENTRY(__memchr)
        unop                    #       :
        sll     a1, 32, t1      #-e0    : t1 = chchchch00000000
        or      t1, a1, a1      # e1    : a1 = chchchchchchchch
-       extql   t0, a0, t6      # e0    : 
+       extql   t0, a0, t6      # e0    :
        beq     t3, $first_quad # .. e1 :
 
        ldq_u   t5, -1(t4)      #-e1    : eight or less bytes to search
@@ -170,3 +170,6 @@ $not_found:
         END(__memchr)
 
 weak_alias (__memchr, memchr)
+#if !__BOUNDED_POINTERS__
+weak_alias (__memchr, __ubp_memchr)
+#endif

diff --git a/sysdeps/m68k/memchr.S b/sysdeps/m68k/memchr.S
index 968c129..d69b806 100644 (file)
--- a/sysdeps/m68k/memchr.S
+++ b/sysdeps/m68k/memchr.S
@@ -226,3 +226,6 @@ L(L9:)
 END(__memchr)
 
 weak_alias (__memchr, memchr)
+#if !__BOUNDED_POINTERS__
+weak_alias (__memchr, __ubp_memchr)
+#endif

diff --git a/sysdeps/vax/memchr.s b/sysdeps/vax/memchr.s
index 22a8c2d..5c54ba8 100644 (file)
--- a/sysdeps/vax/memchr.s
+++ b/sysdeps/vax/memchr.s
@@ -69,4 +69,6 @@ ENTRY(__memchr, 0)
        brb     0b              # and loop
 
 weak_alias (__memchr, memchr)
-       
\ No newline at end of file
+#if !__BOUNDED_POINTERS__
+weak_alias (__memchr, __ubp_memchr)
+#endif