From patchwork Wed Aug 19 15:38:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1347899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=yGLHd3qg; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BWsdw6s0hz9sTb for ; Thu, 20 Aug 2020 01:49:08 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2D4523842438; Wed, 19 Aug 2020 15:48:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D4523842438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1597852136; bh=GNBNdF7rvmLNKmb9EkGTlxY+a2MyMZg41WH3+3elGc4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=yGLHd3qgEaEDxUNsmCDuYNJqtt4s2cVErIUKhMSCRujvZo4rtAsud4GMQO2ojEPmE T7HzyvEWcrQlMH0cYyEN99pLu5VnFFZ6OEaawoRXwdZ4zznUnu7O4xVQL/7fTAEPe1 nYAFpGYcSXq0eAP//NBEk71CbQxTUrQg1QSx0kE8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by sourceware.org (Postfix) with ESMTPS id 3DEA83857C42 for ; Wed, 19 Aug 2020 15:48:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3DEA83857C42 IronPort-SDR: At6WtHJjcrFo84TE59hyqdYWrtgrhDqvKx0Kg/blCk3+ImrBdjta61KqaLv0e/jysRxK4ewnqo k8l0tVoiW/yEgqIJjCe/7Uph13rFdofff/cUIHf4fDqojsNKM5SrFmN/v8RQI3ZyZiAvblrA/S YdAMQ4DyLz8VjRT7kzNFsx98C7G8savNBD9ccSZDfHn8P8HQO7Cu+JaetRTApKhb/e/uBmA0cQ ZyQAruzQt/KkMtIxVIIL3tNd4W+6DU0t5oR3gDFSPwaPNIFN6MoQOaXST8l8kQ5hfLZQkITTBd oFg= X-IronPort-AV: E=Sophos;i="5.76,331,1592841600"; d="scan'208";a="254766925" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 19 Aug 2020 23:48:52 +0800 IronPort-SDR: OWAiyJA6tTAhq49ibGxCvt++UkxoMcljSJVDvId9E7mBsBngghrZldwJRQCTl19zByaPUKXpl2 i0XVXsp5GNWA== Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2020 08:35:50 -0700 IronPort-SDR: jxnzMzI9Az+tdaoG1mR4k6KcyJO6OWLHdRBmFET6kNk3pzTH4emJvSDjQOm1ol7EJ07PzMmatm cjAghyAZCvoA== WDCIronportException: Internal Received: from lpt-kalia-a.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.58]) by uls-op-cesaip01.wdc.com with ESMTP; 19 Aug 2020 08:48:52 -0700 To: libc-alpha@sourceware.org Subject: [PATCH v5 02/17] RISC-V: Cleanup some of the sysdep.h code Date: Wed, 19 Aug 2020 08:38:44 -0700 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alistair Francis via Libc-alpha From: Alistair Francis Reply-To: Alistair Francis Cc: alistair.francis@wdc.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Remove a duplicate inclusion of which is already pulled via , and the inclusion of whose definition of `__set_errno' is not needed here. Reviewed-by: Maciej W. Rozycki --- sysdeps/unix/sysv/linux/riscv/sysdep.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h index 83e4adf6a2..fbb3a02bbd 100644 --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h @@ -22,6 +22,9 @@ #include #include +#undef SYS_ify +#define SYS_ify(syscall_name) __NR_##syscall_name + #ifdef __ASSEMBLER__ # include @@ -107,19 +110,7 @@ # undef ret_ERRVAL # define ret_ERRVAL ret -#endif /* __ASSEMBLER__ */ - -/* In order to get __set_errno() definition in INLINE_SYSCALL. */ -#ifndef __ASSEMBLER__ -# include -#endif - -#include - -#undef SYS_ify -#define SYS_ify(syscall_name) __NR_##syscall_name - -#ifndef __ASSEMBLER__ +#else /* !__ASSEMBLER__ */ # define VDSO_NAME "LINUX_4.15" # define VDSO_HASH 182943605