aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h4
-rw-r--r--string/test-ffs.c32
-rw-r--r--sysdeps/powerpc/ffs.c5
5 files changed, 33 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 88bd97f927..c63a5bd95f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-04-03 Ulrich Drepper <drepper@redhat.com>
+ * string/test-ffs.c: Also test ffsl and ffsll.
+
+ * sysdeps/powerpc/ffs.c: Don't define ffsl for ppc64.
+
* sysdeps/powerpc/powerpc64/bits/atomic.h: Never use matching
constraints for asm mem parameters.
* sysdeps/powerpc/bits/atomic.h: Likewise.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 860e5a4148..2475f1bb45 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2004-04-03 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Never use
+ matching constraints for asm mem parameters.
+
* tst-clock2.c (tf): Don't define unless needed.
2004-03-30 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
index e107ef5975..8e3f46d534 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
@@ -93,7 +93,7 @@
" bne- 1b\n" \
"2: " __lll_acq_instr \
: "=&r" (__val), "=m" (*futex) \
- : "r" (futex), "r" (1), "1" (*futex) \
+ : "r" (futex), "r" (1), "m" (*futex) \
: "cr0", "memory"); \
__val; \
})
@@ -110,7 +110,7 @@
" bne- 1b\n" \
"2: " __lll_acq_instr \
: "=&r" (__val), "=m" (*futex) \
- : "r" (futex), "r" (2), "1" (*futex) \
+ : "r" (futex), "r" (2), "m" (*futex) \
: "cr0", "memory"); \
__val; \
})
diff --git a/string/test-ffs.c b/string/test-ffs.c
index 8317794d2a..ad2a4cd374 100644
--- a/string/test-ffs.c
+++ b/string/test-ffs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 2000, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
On-Line Applications Research Corporation.
@@ -28,24 +28,32 @@ main (void)
int failures = 0;
int i;
- auto void try (int value, int expected);
+ auto void try (const char *name, long long int param, int value,
+ int expected);
- void try (int value, int expected)
+ void try (const char *name, long long int param, int value, int expected)
{
- if (ffs (value) != expected)
+ if (value != expected)
{
- fprintf (stderr, "%#x expected %d got %d\n",
- value, expected, ffs (value));
+ printf ("%s(%#llx) expected %d got %d\n",
+ name, param, expected, value);
++failures;
}
+ else
+ printf ("%s(%#llx) as expected %d\n", name, param, value);
}
- try (0, 0);
- for (i=0 ; i<32 ; i++)
- try (1<<i, i+1);
- for (i=0 ; i<32 ; i++)
- try ((~0 >> i) << i, i+1);
- try (0x80008000, 16);
+#define TEST(fct, type) \
+ try (#fct, 0, fct ((type) 0), 0); \
+ for (i=0 ; i < 8 * sizeof (type); i++) \
+ try (#fct, 1ll << i, fct (((type) 1) << i), i + 1); \
+ for (i=0 ; i < 8 * sizeof (type) ; i++) \
+ try (#fct, (~0ll >> i) << i, fct ((~((type) 0) >> i) << i), i + 1); \
+ try (#fct, 0x80008000, fct ((type) 0x80008000), 16)
+
+ TEST (ffs, int);
+ TEST (ffsl, long int);
+ TEST (ffsll, long long int);
if (failures)
printf ("Test FAILED! %d failure%s.\n", failures, &"s"[failures == 1]);
diff --git a/sysdeps/powerpc/ffs.c b/sysdeps/powerpc/ffs.c
index 60f7460886..b2b7b7c071 100644
--- a/sysdeps/powerpc/ffs.c
+++ b/sysdeps/powerpc/ffs.c
@@ -1,6 +1,6 @@
/* Find first set bit in a word, counted from least significant end.
For PowerPC.
- Copyright (C) 1991, 1992, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1992, 1997, 1998, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
@@ -20,6 +20,7 @@
02111-1307 USA. */
#define ffsl __something_else
+#include <limits.h>
#include <string.h>
#undef ffs
@@ -35,8 +36,10 @@ __ffs (int x)
return 32 - cnt;
}
weak_alias (__ffs, ffs)
+#if ULONG_MAX == UINT_MAX
#undef ffsl
weak_alias (__ffs, ffsl)
+#endif
#else
#include <sysdeps/generic/ffs.c>