From patchwork Wed Aug 12 14:40:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 40251 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C5F8384B13D; Wed, 12 Aug 2020 14:50:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C5F8384B13D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1597243853; bh=MMKSCeA6AEDnH2Cti/rA+f3er7k8tqQlG/DUDWdOwgw=; 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=ZKVWiqjeOIuxQbktEKFsvTpQK9i7Vfj2lS+rnSsrN2hQnT8WdF6WphN8wp5qcKsyb w6CeJlZcP4jJ68D+fCOoViU+fIRjsNUSI8XEyI/IE/mqFqbZnZ0UUiupM/Aflbo+p5 oQm/CilhMH0F5AvmaWQ8LvlB6bf0WL05YmuR4QwA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by sourceware.org (Postfix) with ESMTPS id EB64D3857C40 for ; Wed, 12 Aug 2020 14:50:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EB64D3857C40 IronPort-SDR: 5dAqzbU6NPWsAJyJsQVIJUmY2RJJ0AfGRGUZA1jl2g5iGs8N6G5mnL3uK0C1pOSFY2McyNbwgb XGrAupyUH2djVsOOH6BwEWWCPNPirT02TtWfHvUExBiDXKN2oh65BrgNP6hds76qYD0MVa/hEq mCuwaI+GRSSfieE7kX4dfqtkcCsCbg5vs4S9c4yJhLPVeEvUE5beOGyOQ44qbJzbk6V0B9ZCbX bUGHqjmw2pW2pHOWiHjTAZEPHfhVK/oNEWydplDHCQtGBjShDcEn1rsoj5hLkMLU1czevnXpQk Q/c= X-IronPort-AV: E=Sophos;i="5.76,304,1592841600"; d="scan'208";a="145996634" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 12 Aug 2020 22:50:52 +0800 IronPort-SDR: vKQxcNukyDrpL67kiIXLfDaxGIHZ1zEMKVTlUpiXOnvmvkx0yJ4oit9qAgFnQ7LWF3QOiQAeMi bVj3xJOlCK5w== Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2020 07:38:42 -0700 IronPort-SDR: StRXEalrT9zMFjPgjqCqCNk4LWiaZ094HQzHKaut8qu/3jFIHw7w86VuTfl37TnfqegRSltN53 66Di9JXdJs5Q== WDCIronportException: Internal Received: from jbfyk72.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.14]) by uls-op-cesaip01.wdc.com with ESMTP; 12 Aug 2020 07:50:49 -0700 To: libc-alpha@sourceware.org Subject: [PATCH v4 02/18] RISC-V: Cleanup some of the sysdep.h code Date: Wed, 12 Aug 2020 07:40:50 -0700 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 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: macro@wdc.com, 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. --- 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..fbc2436691 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 # define VDSO_NAME "LINUX_4.15" # define VDSO_HASH 182943605