From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8945-listarch-libc-hacker=sources.redhat.com@sourceware.org>
Received: (qmail 19266 invoked by alias); 7 Apr 2006 13:55:52 -0000
Received: (qmail 19250 invoked by uid 22791); 7 Apr 2006 13:55:51 -0000
X-Spam-Check-By: sourceware.org
Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
    by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 07 Apr 2006 13:55:49 +0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k37Dtdr2021425;
	Fri, 7 Apr 2006 15:55:39 +0200
Received: (from jj@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k37DtdSm021424;
	Fri, 7 Apr 2006 15:55:39 +0200
Date: Fri, 07 Apr 2006 13:55:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] 2 tiny fixes
Message-ID: <20060407135539.GI30252@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sourceware.org>
List-Help: <mailto:libc-hacker-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: libc-hacker-owner@sourceware.org
X-SW-Source: 2006-04/txt/msg00005.txt.bz2

Hi!

Sorry for posting 2 unrelated things together:
1) there was a typo in unwind-dw2.c change
2) 2.6.17 kernel defines FUTEX_TID_MASK as 0x3fffffff,
   so NPTL should do the same

2006-04-07  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/unwind-dw2.c (execute_cfa_program): Fix typo in
	the last change.

	* pthreadP.h (FUTEX_TID_MASK): Sync with kernel.

--- libc/sysdeps/generic/unwind-dw2.c.jj	2006-04-07 12:51:01.000000000 +0200
+++ libc/sysdeps/generic/unwind-dw2.c	2006-04-07 12:56:21.000000000 +0200
@@ -900,7 +900,7 @@ execute_cfa_program (const unsigned char
 	  /* ??? 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;
--- libc/nptl/pthreadP.h.jj	2006-03-28 09:13:36.000000000 +0200
+++ libc/nptl/pthreadP.h	2006-04-07 12:57:21.000000000 +0200
@@ -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.  */

	Jakub