r5621 - in glibc-package/trunk/debian: . patches patches/powerpc
Author: adconrad
Date: 2013-06-04 16:04:54 +0000 (Tue, 04 Jun 2013)
New Revision: 5621
Removed:
glibc-package/trunk/debian/patches/powerpc/submitted-accept4.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Revert last commit: the fix appears to be incomplete
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-06-04 12:28:46 UTC (rev 5620)
+++ glibc-package/trunk/debian/changelog 2013-06-04 16:04:54 UTC (rev 5621)
@@ -4,10 +4,6 @@
* kfreebsd/local-sysdeps.diff: update to revision 4512 (from glibc-bsd).
Closes: #710841.
- [ Adam Conrad ]
- * powerpc/submitted-accept4.diff: The accept4 syscall wasn't defined on
- powerpc until 2.6.37, reflect that in definition of __ASSUME_ACCEPT4.
-
-- Aurelien Jarno <aurel32@debian.org> Sun, 02 Jun 2013 13:11:11 +0200
eglibc (2.17-4) unstable; urgency=low
Deleted: glibc-package/trunk/debian/patches/powerpc/submitted-accept4.diff
===================================================================
--- glibc-package/trunk/debian/patches/powerpc/submitted-accept4.diff 2013-06-04 12:28:46 UTC (rev 5620)
+++ glibc-package/trunk/debian/patches/powerpc/submitted-accept4.diff 2013-06-04 16:04:54 UTC (rev 5621)
@@ -1,22 +0,0 @@
-diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
-index ccd4c59..6a6a2dd 100644
---- a/sysdeps/unix/sysv/linux/kernel-features.h
-+++ b/sysdeps/unix/sysv/linux/kernel-features.h
-@@ -166,11 +166,16 @@
-
- /* Support for the accept4 syscall was added in 2.6.28. */
- #if __LINUX_KERNEL_VERSION >= 0x02061c \
-- && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
-+ && (defined __i386__ || defined __x86_64__ \
- || defined __sparc__ || defined __s390__)
- # define __ASSUME_ACCEPT4 1
- #endif
-
-+/* Support for the accept4 syscall was added in 2.6.37 on powerpc. */
-+#if __LINUX_KERNEL_VERSION >= 0x020625 && defined __powerpc__
-+# define __ASSUME_ACCEPT4 1
-+#endif
-+
- /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */
- #if __LINUX_KERNEL_VERSION >= 0x02061d
- # define __ASSUME_FUTEX_CLOCK_REALTIME 1
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-06-04 12:28:46 UTC (rev 5620)
+++ glibc-package/trunk/debian/patches/series 2013-06-04 16:04:54 UTC (rev 5621)
@@ -155,7 +155,6 @@
mips/submitted-wordsize-clang.diff
powerpc/local-math-logb.diff
-powerpc/submitted-accept4.diff
powerpcspe/unsubmitted-nearbyint.diff
Reply to: