From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-7589-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 15995 invoked by alias); 4 May 2004 12:06:07 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 15978 invoked from network); 4 May 2004 12:06:07 -0000
Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26)
  by sources.redhat.com with SMTP; 4 May 2004 12:06:07 -0000
Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i449rn3j001932;
	Tue, 4 May 2004 11:53:49 +0200
Received: (from jakub@localhost)
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i449rm9l001928;
	Tue, 4 May 2004 11:53:48 +0200
Date: Tue, 04 May 2004 12:06:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] IA-64 build fix
Message-ID: <20040504095348.GL5191@sunsite.ms.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.4i
X-SW-Source: 2004-05/txt/msg00011.txt.bz2

Hi!

Seems I posted 10 days ago a wrong version of the IA64 errno patch, sorry.
Here is the incremental version to fix it up, now glibc build/make check
for both LT and NPTL is ok.

2004-05-04  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/sysdep.S (USE___THREAD): Remove
	defined.
nptl/
	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (USE___THREAD):
	Change conditional from ifdef to if.

--- libc/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h.jj	2004-05-03 18:39:19.000000000 -0400
+++ libc/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h	2004-05-04 05:49:43.000000000 -0400
@@ -27,7 +27,7 @@
 
 # undef PSEUDO
 
-# ifdef USE___THREAD
+# if USE___THREAD
 #  ifndef NOT_IN_libc
 #   define SYSDEP_CANCEL_ERRNO __libc_errno
 #  else
--- libc/sysdeps/unix/sysv/linux/ia64/sysdep.S.jj	2004-05-03 18:38:55.000000000 -0400
+++ libc/sysdeps/unix/sysv/linux/ia64/sysdep.S	2004-05-04 05:31:11.000000000 -0400
@@ -34,7 +34,7 @@ ENTRY(__syscall_error)
 	;;
 	st4	[r2]=r8
 	mov	r8=-1
-#elif defined USE___THREAD
+#elif USE___THREAD
 # ifndef NOT_IN_libc
 #  define SYSCALL_ERROR_ERRNO __libc_errno
 # else


	Jakub