From patchwork Wed Mar 12 17:47:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 54 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id E66CE3600F3 for ; Wed, 12 Mar 2014 10:47:50 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id 83883C43243; Wed, 12 Mar 2014 10:47:50 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 5224EC4324A for ; Wed, 12 Mar 2014 10:47:50 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=rbbnv5o2NCt+XjV/XX7hIIvo2oou+ wkNn8Mhv32YYS64zsK65LCgk4pNisM7Dg1KSGBaCvtwX0PEWWh6KZuxMlfTZR3Hh OAO3QB5E6/XGsjMa/3WhVv3EVIOCCzS3isd/6xvkQNciEBoAAqEVPWsOov4s57SK JtBZldysXDvZmQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=AriSODadnLUmDwp95k5Trkp1Ves=; b=nTN vf/ukQwRY30oPrUS8Yx1C+wUgZwVDFnyHUfpjsNupvOFn5I4RtwhnuOdk6iH95Om c/AUGoQeIEDE1BB63lmyNxFGtRasVBIn4zgYIw5WfOzgqe++M7RrOC6RQm3ndp+/ DKb9in2klzivZzVkcpZqDcKvj5yB0F57Beq1icLc= Received: (qmail 31420 invoked by alias); 12 Mar 2014 17:47:47 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31410 invoked by uid 89); 12 Mar 2014 17:47:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Wed, 12 Mar 2014 17:47:37 +0000 From: "Joseph S. Myers" To: , David Holsgrove , Richard Henderson Subject: Fix __ASSUME_PREADV and __ASSUME_PWRITEV for Alpha and MicroBlaze (bug 16649) Message-ID: MIME-Version: 1.0 X-DH-Original-To: glibc@patchwork.siddhesh.in Reviewing (for all architectures, with a baseline kernel version of 2.6.32) the kernel support for features for which __ASSUME_* macros would be affected by a move to 2.6.32 as minimum kernel version showed up that __ASSUME_PREADV and __ASSUME_PWRITEV were wrongly defined for MicroBlaze (despite the corresponding syscall table entries not being wired up in the kernel) and Alpha for 2.6.30 and above (although the support on Alpha was added in 2.6.33). This patch makes the kernel-features.h files undefine those macros for appropriate versions. 2014-03-12 Joseph Myers [BZ #16649] * sysdeps/unix/sysv/linux/alpha/kernel-features.h [__LINUX_KERNEL_VERSION < 0x020621] (__ASSUME_PREADV): Undefine. [__LINUX_KERNEL_VERSION < 0x020621] (__ASSUME_PWRITEV): Likewise. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__ASSUME_PREADV): Undefine. (__ASSUME_PWRITEV): Likewise. diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h index e691bb0..f3a7a55 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h @@ -93,4 +93,10 @@ # define __ASSUME_FDATASYNC 1 #endif +/* Support for preadv and pwritev was added for alpha in 2.6.33. */ +#if __LINUX_KERNEL_VERSION < 0x020621 +# undef __ASSUME_PREADV +# undef __ASSUME_PWRITEV +#endif + #endif /* _KERNEL_FEATURES_H */ diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index dfb8344..f9a61a9 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -43,5 +43,8 @@ #include_next -/* The MicroBlaze kernel does not support the pselect6 syscall. */ +/* The MicroBlaze kernel does not support the pselect6, preadv and + pwritev syscalls. */ #undef __ASSUME_PSELECT +#undef __ASSUME_PREADV +#undef __ASSUME_PWRITEV