The following patch imports and adapts ffsll.c from glibc. The same
mechanism as in glibc is used to choose between ffs and ffsll to
implement ffsl.
Ok?
Bernd
Index: include/string.h
===================================================================
--- include/string.h (revision 26250)
+++ include/string.h (working copy)
@@ -378,7 +378,7 @@ libc_hidden_proto(ffs)
/* The following two functions are non-standard but necessary for non-32 bit
platforms. */
-# if 0 /*#ifdef __USE_GNU*/
+#ifdef __USE_GNU
extern int ffsl (long int __l) __THROW __attribute__ ((__const__));
# ifdef __GNUC__
__extension__ extern int ffsll (long long int __ll)
Index: libc/inet/rpc/svc.c
===================================================================
--- libc/inet/rpc/svc.c (revision 26250)
+++ libc/inet/rpc/svc.c (working copy)
@@ -46,7 +46,8 @@
#include <rpc/pmap_clnt.h>
#include <sys/poll.h>
-/* Experimentally off - libc_hidden_proto(ffs) */
+extern __typeof(ffs) __libc_ffs;
+libc_hidden_proto(__libc_ffs)
/* libc_hidden_proto(pmap_set) */
/* libc_hidden_proto(pmap_unset) */
/* libc_hidden_proto(_authenticate) */
@@ -471,7 +472,7 @@ svc_getreqset (fd_set *readfds)
setsize = _rpc_dtablesize ();
maskp = (u_int32_t *) readfds->fds_bits;
for (sock = 0; sock < setsize; sock += 32)
- for (mask = *maskp++; (bit = ffs (mask)); mask ^= (1 << (bit - 1)))
+ for (mask = *maskp++; (bit = __libc_ffs (mask)); mask ^= (1 << (bit - 1)))
svc_getreq_common (sock + bit - 1);
}
libc_hidden_def(svc_getreqset)
Index: libc/string/ffs.c
===================================================================
--- libc/string/ffs.c (revision 26250)
+++ libc/string/ffs.c (working copy)
@@ -7,11 +7,16 @@
/* ffsl,ffsll */
+#include <limits.h>
+#define ffsl __something_else
#include "_string.h"
+#undef ffsl
-/* Experimentally off - libc_hidden_proto(ffs) */
+extern __typeof(ffs) __libc_ffs;
-int ffs(int i)
+libc_hidden_proto(__libc_ffs)
+
+int __libc_ffs(int i)
{
#if 1
/* inlined binary search method */
@@ -52,4 +57,8 @@ int ffs(int i)
return n;
#endif
}
-libc_hidden_def(ffs)
+libc_hidden_def(__libc_ffs)
+weak_alias(__libc_ffs,ffs)
+#if ULONG_MAX == UINT_MAX
+weak_alias (__libc_ffs, ffsl)
+#endif
Index: libc/string/ffsll.c
===================================================================
--- libc/string/ffsll.c (revision 0)
+++ libc/string/ffsll.c (revision 0)
@@ -0,0 +1,46 @@
+/* Copyright (C) 1991, 1992, 1997, 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Torbjorn Granlund ([email protected]).
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <limits.h>
+#define ffsl __something_else
+#include "_string.h"
+#undef ffsl
+
+extern __typeof(ffsll) __libc_ffsll;
+extern __typeof(ffs) __libc_ffs;
+
+libc_hidden_proto(__libc_ffs)
+libc_hidden_proto(__libc_ffsll)
+
+/* Find the first bit set in I. */
+int __libc_ffsll (long long int i)
+{
+ unsigned long long int x = i & -i;
+
+ if (x <= 0xffffffff)
+ return __libc_ffs (i);
+ else
+ return 32 + __libc_ffs (i >> 32);
+}
+libc_hidden_def(__libc_ffsll)
+
+weak_alias (__libc_ffsll, ffsll)
+#if ULONG_MAX != UINT_MAX
+weak_alias (__libc_ffsll, ffsl)
+#endif
_______________________________________________
uClibc mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/uclibc
