Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp6578285rwd; Mon, 19 Jun 2023 09:08:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7m/i81VoAvmpVlw2YQSNuokmew5o7p/5+K5tMWxgj4t6YHrOCoYbKDaNMxt4vFb/xQyZqg X-Received: by 2002:a17:902:a38f:b0:1b3:a928:18e8 with SMTP id x15-20020a170902a38f00b001b3a92818e8mr9429794pla.52.1687190916368; Mon, 19 Jun 2023 09:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687190916; cv=none; d=google.com; s=arc-20160816; b=dOUadibC069MjNZT0Xpb83ogUSkhmANOutCc5EoSIs5CFd5kgNrIj3G08rwHOkhjzJ PCubosqry/Za522qw6AZVpoBE0Nvu1CKxwRYMzgzWjJ+8RvXk8L8n1Mc3QOiJFS2homD D4JOOWwFzA33vg5YndnQmxNCu37e1GuI2mdFiaQKaCvfJcn/bd9xZYn5DdPGvYHttLdz PYfvY+tLiQrIvXtolXKx02AmLp8UQq487zdtScIdCpRvsLwpxdohjZQvmZ6EotQlTPAx R3zfajod6/ZCA4h/gB9UUBJBPBujgf3c85r6ux+rsxqLw8q8L7tGPdA/bu+3WDHuIQdu 3rNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=rZ66qxF22pG0Ry+PL9fQZ9KIjZ2M/KWZ+sr6gpCONeY=; b=wUb/m7Vx5WdSpNIOQ9rZZs7aQsLK7wIIXELoUfaw+Nb2Zjay5SDsOwOUl/ioezbrk8 zksIfhYaHyM9Sd7/bH+cK3wl+PuKbhYmArNay9S+LD3Eghhj4kUu9uDx/IxR2xr74Ag1 TiQY5KhSp55I+dPnC8e2u3kaOieSZt0hehoYiswPdHqz9zrVWr8YH4Io7UEkevOF16tE waOlIYMb7BbUJuxhcyoQbxAOg3NZxCHPxrK4ZQKIo/6cPYJzrZ3E4H9jmO4e/AvxVuy2 GVTu8JdliFQtcP6j5R9a8za7uZXvvExgMnh4uZ/r2ANHThlPmHhw473BsMMhz8zVgPUn XnIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kv14-20020a17090328ce00b001ac82e60516si66365plb.323.2023.06.19.09.08.20; Mon, 19 Jun 2023 09:08:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230305AbjFSPq0 (ORCPT + 99 others); Mon, 19 Jun 2023 11:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229905AbjFSPqY (ORCPT ); Mon, 19 Jun 2023 11:46:24 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53FBF183; Mon, 19 Jun 2023 08:46:23 -0700 (PDT) X-QQ-mid: bizesmtp74t1687189569t7m7jpj5 Received: from linux-lab-host.localdomain ( [116.30.126.60]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 19 Jun 2023 23:46:08 +0800 (CST) X-QQ-SSF: 01200000000000D0V000000A0000000 X-QQ-FEAT: 6/K5pWSRdGohZNUvm+E+aBmN22HnnFyRXuRHvnGIbTDVz3MMHAcfAkZHut/22 oBZEiw0bdSq3fdy8TZ1wLcWNbBv6BS5Qkib2Uf/E07s/XKnsvEdfPyIeyfdcmGQ6iaEekGP wdGVwIuoFAS/GmCNoaZGs0BE23z2/9ssANxofiDOaUMK8Q7LUyJZt3nZLNQ0BTE+xWG91mO 1CqBoQCuXORCxllYiYYSKCPE9I3aJbD3ryi9WUUHv34iJKJthT6220tPZBmICcgArJqXJZb JaMq/mVg+AInXb433YehYBPwUtAehkvYfqnYiWAMbukF2h8Ph9i9NRvCK3jVSr7od41o5YK kjrCWk+7LIYzRIw/YRYGUaX+gcdvt1WqvCfNx7SdcYexpWQ7yYQ3liuAHlGfg== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 6480484968202464133 From: Zhangjin Wu To: w@1wt.eu Cc: david.laight@aculab.com, arnd@arndb.de, falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, thomas@t-8ch.de Subject: [PATCH v4 04/10] tools/nolibc: unistd.h: reorder the syscall macros Date: Mon, 19 Jun 2023 23:45:56 +0800 Message-Id: <1bd84b8adfa209f89a04e6beadb412385af7859b.1687187451.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tune the macros in the using order and align most of them. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/unistd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/nolibc/unistd.h b/tools/include/nolibc/unistd.h index fabc846f797b..e38f3660c051 100644 --- a/tools/include/nolibc/unistd.h +++ b/tools/include/nolibc/unistd.h @@ -56,9 +56,9 @@ int tcsetpgrp(int fd, pid_t pid) return ioctl(fd, TIOCSPGRP, &pid); } -#define _syscall(N, ...) __sysret(my_syscall##N(__VA_ARGS__)) -#define _syscall_narg(...) __syscall_narg(__VA_ARGS__, 6, 5, 4, 3, 2, 1, 0) #define __syscall_narg(_0, _1, _2, _3, _4, _5, _6, N, ...) N +#define _syscall_narg(...) __syscall_narg(__VA_ARGS__, 6, 5, 4, 3, 2, 1, 0) +#define _syscall(N, ...) __sysret(my_syscall##N(__VA_ARGS__)) #define _syscall_n(N, ...) _syscall(N, __VA_ARGS__) #define syscall(...) _syscall_n(_syscall_narg(__VA_ARGS__), ##__VA_ARGS__) -- 2.25.1