Define __MACH__ for libc build and rtld

Also fix rtld-libc thr calls to use int tids
ravynsoft · May 8, 2024 · 5e3efe2 · 5e3efe2
1 parent 876489f
commit 5e3efe2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
@@ -26,6 +26,7 @@ LIBC_ARCH=${MACHINE_CPUARCH}
 # To include legacy CSRG SCCS ID strings, remove -DNO__SCCSID from CFLAGS.
 # To include RCS ID strings from other BSD projects, remove -DNO__RCSID from CFLAGS.
 CFLAGS+=-DNO__SCCSID -DNO__RCSID
+CFLAGS+=-D__MACH__ -D__RAVYNOS__
 
 LIB=c
 SHLIB_MAJOR= 7

diff --git a/libexec/rtld-elf/rtld-libc/rtld_libc.h b/libexec/rtld-elf/rtld-libc/rtld_libc.h
@@ -52,8 +52,8 @@ int	__sys___getcwd(char *, size_t);
 int	__sys_open(const char *, int, ...);
 int	__sys_openat(int, const char *, int, ...);
 int	__sys_sigprocmask(int, const sigset_t *, sigset_t *);
-int	__sys_thr_kill(long, int);
-int	__sys_thr_self(long *);
+int	__sys_thr_kill(int, int);
+int	__sys_thr_self(int *);
 __ssize_t	__sys_pread(int, void *, __size_t, __off_t);
 __ssize_t	__sys_read(int, void *, __size_t);
 __ssize_t	__sys_write(int, const void *, __size_t);