about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-05-21 18:23:57 -0700
committerUlrich Drepper <drepper@redhat.com>2009-05-21 18:23:57 -0700
commit3533b1a6a6a6b7e350b7a9459f8152b1f9f0364a (patch)
tree337bd8d65bba4010b0cb7f711a6177adcbddceb1
parentd14eda9310125ddf8fe66df01bbe46ab7d226a5e (diff)
downloadglibc-3533b1a6a6a6b7e350b7a9459f8152b1f9f0364a.tar.gz
glibc-3533b1a6a6a6b7e350b7a9459f8152b1f9f0364a.tar.xz
glibc-3533b1a6a6a6b7e350b7a9459f8152b1f9f0364a.zip
Don't define __ASSUME_ACCEPT4 for IA-64.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a88d8e990c..5ff02794b5 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 473360a13c..4562515790 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