17 files changed, 39 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 70a44080eb..a7791b2f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-09-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* include/string.h (__ffs): Declare as hidden.
+	* string/ffs.c (__ffs): Define as hidden.
+	* sysdeps/i386/ffs.c (__ffs): Likewise.
+	* sysdeps/i386/i686/ffs.c (__ffs): Likewise.
+	* sysdeps/powerpc/ffs.c (__ffs): Likewise.
+	* sysdeps/s390/ffs.c (__ffs): Likewise.
+	* sysdeps/x86_64/ffs.c (__ffs): Likewise.
+
 2013-09-20  Alexandre Oliva <aoliva@redhat.com>
 
 	* NEWS: Mention malloc probes.
diff --git a/include/string.h b/include/string.h
index d6d859491e..8323412240 100644
--- a/include/string.h
+++ b/include/string.h
@@ -90,6 +90,7 @@ extern char *__strsep_g (char **__stringp, const char *__delim);
 libc_hidden_proto (__strsep_g)
 libc_hidden_proto (strnlen)
 libc_hidden_proto (memmem)
+libc_hidden_proto (__ffs)
 
 libc_hidden_builtin_proto (memchr)
 libc_hidden_builtin_proto (memcpy)
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index e47d46f12b..1b58cb8670 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2013-09-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/alpha/alphaev67/ffs.S (__ffs): Define as hidden.
+	* sysdeps/alpha/ffs.S (__ffs): Likewise.
+
 2013-09-11  Andreas Schwab  <schwab@suse.de>
 
 	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (__O_TMPFILE):
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index bff557c732..d7b29e5f97 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,7 @@
+2013-09-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/arm/armv6t2/ffs.S (__ffs): Define as hidden.
+
 2013-09-18  Dinar Temirbulatov  <dtemirbulatov@gmail.com>
 
 	[BZ #15640]
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index ba9865a9da..4f933c6f92 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,7 @@
+2013-09-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/m68k/ffs.c (__ffs): Define as hidden.
+
 2013-09-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/m68k/mmap64.c: New file.
diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index 5ad254c5ff..79d15b464c 100644
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -1,3 +1,7 @@
+2013-09-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/tile/ffs.c (__ffs): Define as hidden.
+
 2013-08-21   Ondřej Bílka  <neleai@seznam.cz>
 
 	* sysdeps/tile/jmpbuf-offsets.h: Fix typos.
diff --git a/ports/sysdeps/alpha/alphaev67/ffs.S b/ports/sysdeps/alpha/alphaev67/ffs.S
index e4531525a7..9b3463cbc6 100644
--- a/ports/sysdeps/alpha/alphaev67/ffs.S
+++ b/ports/sysdeps/alpha/alphaev67/ffs.S
@@ -47,4 +47,5 @@ ENTRY(__ffs)
 END(__ffs)
 
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
diff --git a/ports/sysdeps/alpha/ffs.S b/ports/sysdeps/alpha/ffs.S
index def0f25d77..d1f0c83719 100644
--- a/ports/sysdeps/alpha/ffs.S
+++ b/ports/sysdeps/alpha/ffs.S
@@ -85,6 +85,7 @@ $ffsl..ng:
 END(ffsl)
 
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 weak_extern (ffsl)
 weak_alias (ffsl, ffsll)
diff --git a/ports/sysdeps/arm/armv6t2/ffs.S b/ports/sysdeps/arm/armv6t2/ffs.S
index b2c88b9460..9f999306ff 100644
--- a/ports/sysdeps/arm/armv6t2/ffs.S
+++ b/ports/sysdeps/arm/armv6t2/ffs.S
@@ -32,4 +32,5 @@ END (__ffs)
 
 weak_alias (__ffs, ffs)
 weak_alias (__ffs, ffsl)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
diff --git a/ports/sysdeps/m68k/ffs.c b/ports/sysdeps/m68k/ffs.c
index fd4e5ffaed..a3c1a0d02b 100644
--- a/ports/sysdeps/m68k/ffs.c
+++ b/ports/sysdeps/m68k/ffs.c
@@ -36,6 +36,7 @@ __ffs (x)
   return 32 - cnt;
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 #undef ffsl
 weak_alias (__ffs, ffsl)
diff --git a/ports/sysdeps/tile/ffs.c b/ports/sysdeps/tile/ffs.c
index 93ad9801bd..eb982a6dd3 100644
--- a/ports/sysdeps/tile/ffs.c
+++ b/ports/sysdeps/tile/ffs.c
@@ -27,6 +27,7 @@ __ffs (int x)
   return __builtin_ffs (x);
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 
 #undef ffsll
diff --git a/string/ffs.c b/string/ffs.c
index a645224f07..916c5c3483 100644
--- a/string/ffs.c
+++ b/string/ffs.c
@@ -46,6 +46,7 @@ __ffs (i)
   return table[x >> a] + a;
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 
 #if ULONG_MAX == UINT_MAX
diff --git a/sysdeps/i386/ffs.c b/sysdeps/i386/ffs.c
index 47496dcf79..77d2e60b76 100644
--- a/sysdeps/i386/ffs.c
+++ b/sysdeps/i386/ffs.c
@@ -41,6 +41,7 @@ __ffs (x)
   return cnt;
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 #undef ffsl
 weak_alias (__ffs, ffsl)
diff --git a/sysdeps/i386/i686/ffs.c b/sysdeps/i386/i686/ffs.c
index 5c97050e87..cde1c99566 100644
--- a/sysdeps/i386/i686/ffs.c
+++ b/sysdeps/i386/i686/ffs.c
@@ -39,6 +39,7 @@ __ffs (x)
   return cnt + 1;
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 #undef ffsl
 weak_alias (__ffs, ffsl)
diff --git a/sysdeps/powerpc/ffs.c b/sysdeps/powerpc/ffs.c
index e0fee46b32..deba0cdd09 100644
--- a/sysdeps/powerpc/ffs.c
+++ b/sysdeps/powerpc/ffs.c
@@ -35,6 +35,7 @@ __ffs (int x)
   return 32 - cnt;
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 #if ULONG_MAX == UINT_MAX
 #undef ffsl
diff --git a/sysdeps/s390/ffs.c b/sysdeps/s390/ffs.c
index 807441da64..2dbb7430e2 100644
--- a/sysdeps/s390/ffs.c
+++ b/sysdeps/s390/ffs.c
@@ -63,6 +63,7 @@ __ffs (x)
 }
 
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)
 #if ULONG_MAX == UINT_MAX
 #undef ffsl
diff --git a/sysdeps/x86_64/ffs.c b/sysdeps/x86_64/ffs.c
index 27013d6ae6..07ee7dd4ab 100644
--- a/sysdeps/x86_64/ffs.c
+++ b/sysdeps/x86_64/ffs.c
@@ -35,4 +35,5 @@ __ffs (int x)
   return cnt + 1;
 }
 weak_alias (__ffs, ffs)
+libc_hidden_def (__ffs)
 libc_hidden_builtin_def (ffs)