From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 22 May 2009 01:23:57 +0000 (-0700)
Subject: Don't define __ASSUME_ACCEPT4 for IA-64.
X-Git-Tag: fedora/glibc-2.10.1-3~4^2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127bcb269a4f04f571c038c1cda8551c87a73500;p=thirdparty%2Fglibc.git

Don't define __ASSUME_ACCEPT4 for IA-64.
(cherry picked from commit 3533b1a6a6a6b7e350b7a9459f8152b1f9f0364a)
---

diff --git a/ChangeLog b/ChangeLog
index dd4e6721b98..c527543dbdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-21  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h: Don't define
+	__ASSUME_ACCEPT4 for IA-64.
+
 2009-05-21  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/accept4.c (__NR_accept4): Don't define.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 473360a13c9..45625157904 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -521,7 +521,7 @@
 /* Support for the accept4 syscall was added in 2.6.28.  */
 #if __LINUX_KERNEL_VERSION >= 0x02061c \
     && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
-	|| defined __ia64__ || defined __sparc__ || defined __s390__)
+	|| defined __sparc__ || defined __s390__)
 # define __ASSUME_ACCEPT4	1
 #endif