FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-02-24 00:32:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Syscalls: Renamed fstatat64 to fstatat_64

Browse Source 
Similar to our other syscall conflicts, musl/Alpine Linux has a global
define that is conflicting with our name here
This commit is contained in:
Ryan Houdek 2023-02-05 18:13:45 -08:00
parent 1089987a29
commit c54c568fef
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Scripts/GenerateSyscallNumbers.py
View File

@ -66,6 +66,9 @@ DefinitionRenameDict = {
"shmctl": "_shmctl",
"shmat": "_shmat",
"shmdt": "_shmdt",
# musl/Alpine Linux defines `fstatat64` as a define that points to `fstatat`.
# Rename it to avoid global define conflicts.
"fstatat64": "fstatat_64",
}
Definitions_x64 = []

2
Source/Tests/LinuxSyscalls/Arm64/SyscallsEnum.h
View File

@ -454,7 +454,7 @@ enum Syscalls_Arm64 {
SYSCALL_Arm64_vserver = ~0,
SYSCALL_Arm64_inotify_init = ~0,
SYSCALL_Arm64_futimesat = ~0,
SYSCALL_Arm64_fstatat64 = ~0,
SYSCALL_Arm64_fstatat_64 = ~0,
SYSCALL_Arm64_signalfd = ~0,
SYSCALL_Arm64_eventfd = ~0,
SYSCALL_Arm64_arch_prctl = ~0,

2
Source/Tests/LinuxSyscalls/x32/FD.cpp
View File

@ -571,7 +571,7 @@ namespace FEX::HLE::x32 {
SYSCALL_ERRNO();
});
REGISTER_SYSCALL_IMPL_X32(fstatat64, [](FEXCore::Core::CpuStateFrame *Frame, int dirfd, const char *pathname, stat64_32 *buf, int flag) -> uint64_t {
REGISTER_SYSCALL_IMPL_X32(fstatat_64, [](FEXCore::Core::CpuStateFrame *Frame, int dirfd, const char *pathname, stat64_32 *buf, int flag) -> uint64_t {
struct stat64 host_stat;
uint64_t Result = FEX::HLE::_SyscallHandler->FM.NewFSStatAt64(dirfd, pathname, &host_stat, flag);
if (Result != -1) {

2
Source/Tests/LinuxSyscalls/x32/SyscallsEnum.h
View File

@ -321,7 +321,7 @@ enum Syscalls_x86 {
SYSCALL_x86_mknodat = 297,
SYSCALL_x86_fchownat = 298,
SYSCALL_x86_futimesat = 299,
SYSCALL_x86_fstatat64 = 300,
SYSCALL_x86_fstatat_64 = 300,
SYSCALL_x86_unlinkat = 301,
SYSCALL_x86_renameat = 302,
SYSCALL_x86_linkat = 303,

2
Source/Tests/LinuxSyscalls/x64/SyscallsEnum.h
View File

@ -453,7 +453,7 @@ enum Syscalls_x64 {
SYSCALL_x64_statfs64 = ~0,
SYSCALL_x64_fstatfs64 = ~0,
SYSCALL_x64_fadvise64_64 = ~0,
SYSCALL_x64_fstatat64 = ~0,
SYSCALL_x64_fstatat_64 = ~0,
SYSCALL_x64_clock_gettime64 = ~0,
SYSCALL_x64_clock_settime64 = ~0,
SYSCALL_x64_clock_adjtime64 = ~0,