The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9aaf4e3be61fc20a84347b7c2c524256a4b93a43
commit 9aaf4e3be61fc20a84347b7c2c524256a4b93a43 Author: Brooks Davis <[email protected]> AuthorDate: 2023-12-12 22:52:41 +0000 Commit: Brooks Davis <[email protected]> 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 <sys/syscall.h> #include <machine/asm.h> -#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); \
