From nobody Tue Dec 12 22:55:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SqYqT4Nvfz53QnY; Tue, 12 Dec 2023 22:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SqYqT3xZYz3bMB; Tue, 12 Dec 2023 22:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702421733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3Y+PHu/6s9yt/5jfopJ1/OzEyQpixpPGUtlfa2cMeA=; b=L19x2/HWhvJGVimRNvRU6NEuo7h45KbLIZlfySoxc4Z/U1AZEVgSzXts8wyrjpBb95puvq bykq4FN0AtHeQdvReb44wjXk16f3h0Dcnm1i43iekb+PibwXI5Eajyc4MZQYmvnW4IpQ3F eH7onOR71QmqRZ9gQrQJwP5mG/y0vPNCT4HCreYeIVMKKvWGEXAc/1kI7fV+wWrbKLuWQj WsjYxNrp9Vpw097UlBtJrUbX1bFXxplEIiSGB7T6esgUYFYYPsUXiw+L6CKRCxXpO62wHY Hpm7n/til5ObZLM0cHwi84t57qN7hXAXDBJjw4wVbkSVJdKUaBkMPXQAl+l8Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702421733; a=rsa-sha256; cv=none; b=juv9Cjvhj2qt8GtJ4Or7AT6uIbxb5Dqb3uJI1kFR+Ud1M5fmTSstJSJ00rwpdLG6Zrlrh4 ENkEWdl/z/4FI60HB/DooAW9oRPkPmZUZwDOPJwdVPzs4dRVmU1dwQPC/EU/CemizTBTzq QlLJwXSZxcz0O9VtGKTYD2P4g6jt0S47jrlPIAdbQFlikCjvrFlunOiKVHCnFm+axno7nt HLa2V8pj5fHu5EMPNzJo2N7rVahOcLWEbCwUgVwoGiXm5lec/DrpsLQUwlqUfR4twI34V2 ZQdDT4BpQ/zusYeNEuVDUufwgt4Z6z8OFszi6ta9I7pcO+m2OB0VvNuot/9vHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702421733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3Y+PHu/6s9yt/5jfopJ1/OzEyQpixpPGUtlfa2cMeA=; b=X8aK6GY22Pr0qjzdIBqn/b2HwjgVCPWzry9ATW/9rwCafcAs+JATDeySGsGqFkbSZqU1a7 2kAP9Z5/mO8tNSGxl2fdxMlBhXccrJEore6PNYG+keJSk7zA4LUxMBQ7roRtFYmisE2cRu bhO7LdubvhA31WxiNueaVZIPi4kRLL0/fUcSbfHgNr0ieAOWlqwwMW78QIPHC11M5sYyu4 jgytYGiiwo3IJsjFDNpzl8cxL51J047Pdf3NLJajeWw0H2p5Yj1Uentj3hJlTZKOJJhCJK MYmKhbhxBxdwSUklJ4O5AEAxHEEyu/xW1nnOA7Y2YEJIoFceVZkKs4dpzGcLgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SqYqT31ZhzZKQ; Tue, 12 Dec 2023 22:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BCMtXHa055651; Tue, 12 Dec 2023 22:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BCMtXE2055648; Tue, 12 Dec 2023 22:55:33 GMT (envelope-from git) Date: Tue, 12 Dec 2023 22:55:33 GMT Message-Id: <202312122255.3BCMtXE2055648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9aaf4e3be61f - main - libc/*/SYS.h: remove SYCALL macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9aaf4e3be61fc20a84347b7c2c524256a4b93a43 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9aaf4e3be61fc20a84347b7c2c524256a4b93a43 commit 9aaf4e3be61fc20a84347b7c2c524256a4b93a43 Author: Brooks Davis AuthorDate: 2023-12-12 22:52:41 +0000 Commit: Brooks Davis CommitDate: 2023-12-12 22:52:41 +0000 libc/*/SYS.h: remove SYCALL macro This has not been a univerally available interface since it was removed from amd64 by commit efbef97de9805dec95db09953426f0b21bb2964f in 2004. I removed the last consumers in 2016 when I replaced pipe(2) with pipe2(2) in commit b60998c6331e2be21f1fc29fa6c82d94a1f72ef0. Reviewed by: imp, jhibbits Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42996 --- lib/libc/aarch64/SYS.h | 8 -------- lib/libc/arm/SYS.h | 3 --- lib/libc/i386/SYS.h | 7 +++---- lib/libc/powerpc/SYS.h | 10 ---------- lib/libc/powerpc64/SYS.h | 18 ------------------ lib/libc/riscv/SYS.h | 8 -------- 6 files changed, 3 insertions(+), 51 deletions(-) diff --git a/lib/libc/aarch64/SYS.h b/lib/libc/aarch64/SYS.h index 059ecd469650..af7f0200a0c7 100644 --- a/lib/libc/aarch64/SYS.h +++ b/lib/libc/aarch64/SYS.h @@ -34,14 +34,6 @@ mov x8, SYS_ ## name; \ svc 0 -#define SYSCALL(name) \ -ENTRY(__sys_##name); \ - WEAK_REFERENCE(__sys_##name, name); \ - WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL(name); \ - ret; \ -END(__sys_##name) - /* * Conditional jumps can only go up to one megabyte in either * direction, and cerror can be located anywhere, so we have diff --git a/lib/libc/arm/SYS.h b/lib/libc/arm/SYS.h index 9f4750a16b9f..9ac2d90104b4 100644 --- a/lib/libc/arm/SYS.h +++ b/lib/libc/arm/SYS.h @@ -59,9 +59,6 @@ it cs; \ bcs PIC_SYM(CERROR, PLT) -#define SYSCALL(x) \ - _SYSCALL(x) - #define PSEUDO(x) \ ENTRY(__CONCAT(__sys_, x)); \ .weak _C_LABEL(__CONCAT(_,x)); \ diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h index 9e8c645280bf..6ef21fb794a6 100644 --- a/lib/libc/i386/SYS.h +++ b/lib/libc/i386/SYS.h @@ -35,13 +35,12 @@ #include #include -#define SYSCALL(name) ENTRY(__sys_##name); \ +#define RSYSCALL(name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ WEAK_REFERENCE(__sys_##name, _##name); \ mov $SYS_##name,%eax; KERNCALL; \ - jb HIDENAME(cerror) - -#define RSYSCALL(name) SYSCALL(name); ret; END(__sys_##name) + jb HIDENAME(cerror); \ + ret; END(__sys_##name) #define PSEUDO(name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, _##name); \ diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h index 7fdf7c734310..8c47a65735f5 100644 --- a/lib/libc/powerpc/SYS.h +++ b/lib/libc/powerpc/SYS.h @@ -40,16 +40,6 @@ li 0,(SYS_##name); \ sc -#define SYSCALL(name) \ - .text; \ - .align 2; \ -2: b CNAME(HIDENAME(cerror)); \ -ENTRY(__sys_##name); \ - WEAK_REFERENCE(__sys_##name, name); \ - WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL(name); \ - bso 2b - #define PSEUDO(name) \ .text; \ .align 2; \ diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h index c364090a5487..dccd08b63541 100644 --- a/lib/libc/powerpc64/SYS.h +++ b/lib/libc/powerpc64/SYS.h @@ -40,24 +40,6 @@ li 0,(SYS_##name); \ sc -#define SYSCALL(name) \ - .text; \ - .align 2; \ -2: mflr %r0; \ - std %r0,16(%r1); \ - stdu %r1,-48(%r1); \ - bl CNAME(HIDENAME(cerror)); \ - nop; \ - addi %r1,%r1,48; \ - ld %r0,16(%r1); \ - mtlr %r0; \ - blr; \ -ENTRY(__sys_##name); \ - WEAK_REFERENCE(__sys_##name, name); \ - WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL(name); \ - bso 2b - #define PSEUDO(name) \ .text; \ .align 2; \ diff --git a/lib/libc/riscv/SYS.h b/lib/libc/riscv/SYS.h index 47f92467c843..1e3e67834494 100644 --- a/lib/libc/riscv/SYS.h +++ b/lib/libc/riscv/SYS.h @@ -40,14 +40,6 @@ li t0, SYS_ ## name; \ ecall -#define SYSCALL(name) \ -ENTRY(__sys_##name); \ - WEAK_REFERENCE(__sys_##name, name); \ - WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL(name); \ - ret; \ -END(__sys_##name) - #define PSEUDO(name) \ ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, _##name); \