From patchwork Tue Mar 22 21:41:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 601047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3qV5l02zQzz9s5g for ; Wed, 23 Mar 2016 08:42:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=TkjWuNLL; dkim-atps=neutral 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=mKM/YpZ9zjmM4dhd8NM9CODpEOVTq MomCN3VjAQ5dgFQMBZeP4kcfQRRawvJBDwJCz31o9K+l1w/1dSJjMTKBalhLKuHx OrpUohHgiAeqG2zjzI3JWlnoaOsG8REeM+A5g3uabQTiUxNmVfAy9LxEndpKp6bn QFdufdGAfb+58Q= 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=iggkX91e3b0FoFIHNeExet331R0=; b=Tkj WuNLLIpUVpQ1bQtfwvI+M2wjFNppAVt7EQdt86kZtelKb26e+AwcvtoY86Yvx9Oj dYJsajk2XdKGtxS6g8OiBTXWvz7MLlmkSRJmwMo6msnk+HCkBsCSel03ywKaj172 6L5Eoc47/T3Unif2v6RXZVaZnVrJ2qfAXfhby2Wo= Received: (qmail 28842 invoked by alias); 22 Mar 2016 21:42:13 -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 28829 invoked by uid 89); 22 Mar 2016 21:42:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=gained, 419, 416, 41, 9 X-HELO: relay1.mentorg.com Date: Tue, 22 Mar 2016 21:41:58 +0000 From: Joseph Myers To: Subject: [microblaze] Remove __ASSUME_FUTIMESAT Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 MicroBlaze has a special version of futimesat.c because it gained the futimesat syscall later than other non-asm-generic architectures. Now the minimum kernel is recent enough that this syscall can always be assumed to be present for MicroBlaze, so this patch removes the special version and the __ASSUME_FUTIMESAT macro, resulting in the sysdeps/unix/sysv/linux/futimesat.c version being used. Untested. 2016-03-22 Joseph Myers * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__ASSUME_FUTIMESAT): Remove macro. * sysdeps/unix/sysv/linux/microblaze/futimesat.c: Remove file. diff --git a/sysdeps/unix/sysv/linux/microblaze/futimesat.c b/sysdeps/unix/sysv/linux/microblaze/futimesat.c deleted file mode 100644 index 9ce6190..0000000 --- a/sysdeps/unix/sysv/linux/microblaze/futimesat.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Implement futimesat for MicroBlaze. - Copyright (C) 2014-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* MicroBlaze always had the utimensat syscall but gained the - futimesat syscall later, so use the linux-generic implementation of - futimesat in terms of the utimensat syscall unless the futimesat - syscall is known to be available. */ - -#include - -#ifdef __ASSUME_FUTIMESAT -# include -#else -# include -#endif diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h index 3938989..a331b9f 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h @@ -41,9 +41,6 @@ /* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */ #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 -/* Support for the futimesat syscall was added in 2.6.33. */ -#define __ASSUME_FUTIMESAT 1 - #include_next /* Support for the pselect6, preadv and pwritev syscalls was added in