summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/pthreadP.h2
-rw-r--r--sysdeps/generic/unwind-dw2.c2
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cf94f00003..d666ae3fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-07 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/generic/unwind-dw2.c (execute_cfa_program): Fix typo in
+ the last change.
+
2006-04-07 Ulrich Drepper <drepper@redhat.com>
* inet/rexec.c (rexec_af): If we have no canonical name don't
@@ -15,7 +20,7 @@
* intl/explodename.c (_nl_explode_name): Likewise.
* sysdeps/generic/unwind-dw2.c (execute_cfa_program): Don't handle
- DW_CFA_GNU_windiw_save if it obviously cannot work [Coverity CID 102].
+ DW_CFA_GNU_window_save if it obviously cannot work [Coverity CID 102].
* locale/programs/ld-address.c (address_finish): Fix conditions
for error messages [Coverity CID 104].
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 03572d8284..b48319201e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-07 Jakub Jelinek <jakub@redhat.com>
+
+ * pthreadP.h (FUTEX_TID_MASK): Sync with kernel.
+
2006-04-06 Ulrich Drepper <drepper@redhat.com>
* pthread_getattr_np.c (pthread_getattr_np): Close fp if getrlimit
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 7b3da83786..c7f57e235a 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -90,7 +90,7 @@ enum
/* Bits used in robust mutex implementation. */
#define FUTEX_WAITERS 0x80000000
#define FUTEX_OWNER_DIED 0x40000000
-#define FUTEX_TID_MASK 0x1fffffff
+#define FUTEX_TID_MASK 0x3fffffff
/* Internal variables. */
diff --git a/sysdeps/generic/unwind-dw2.c b/sysdeps/generic/unwind-dw2.c
index 3fc0d931e9..5ecf2846f3 100644
--- a/sysdeps/generic/unwind-dw2.c
+++ b/sysdeps/generic/unwind-dw2.c
@@ -900,7 +900,7 @@ execute_cfa_program (const unsigned char *insn_ptr,
/* ??? Hardcoded for SPARC register window configuration.
At least do not do anything for archs which explicitly
define a lower register number. */
-#if DWARF_FRAME_REGISTERS < 32
+#if DWARF_FRAME_REGISTERS >= 32
for (reg = 16; reg < 32; ++reg)
{
fs->regs.reg[reg].how = REG_SAVED_OFFSET;