this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Various fixes for libsystem_kernel on i386

+13 -8
+1 -1
src/kernel/CMakeLists.txt
··· 35 35 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 36 36 37 37 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") 38 - set (extra_objs $<TARGET_OBJECTS:libsyscall_legacy_extra>) 38 + # set (extra_objs $<TARGET_OBJECTS:libsyscall_legacy_extra>) 39 39 endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") 40 40 41 41 add_library(system_kernel SHARED
+7 -7
src/kernel/libsyscall/CMakeLists.txt
··· 58 58 wrappers/legacy/open.c 59 59 wrappers/legacy/recvfrom.c 60 60 wrappers/legacy/recvmsg.c 61 - #wrappers/legacy/select.c 61 + wrappers/legacy/select.c 62 62 #wrappers/legacy/select-pre1050.c 63 63 wrappers/legacy/sendmsg.c 64 64 wrappers/legacy/sendto.c ··· 98 98 wrappers/unlink.c 99 99 wrappers/kill.c 100 100 101 - wrappers/legacy/select.c 101 + #wrappers/legacy/select.c 102 102 wrappers/legacy/select-pre1050.c 103 103 104 104 wrappers/cancelable/fcntl.c ··· 968 968 mig(mach/vm_map.defs) 969 969 970 970 set_source_files_properties(custom/errno.c PROPERTIES COMPILE_FLAGS "-no-integrated-as") 971 - set_source_files_properties(${syscall_legacy_sources} PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE") 971 + set_source_files_properties(${syscall_legacy_sources} PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_C_LEVEL") 972 972 set_source_files_properties(wrappers/legacy/select-pre1050.c PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE -DSYSCALL_PRE1050") 973 973 set_source_files_properties(wrappers/cancelable/select-cancel.c PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE") 974 974 set_source_files_properties(wrappers/cancelable/select.c PROPERTIES COMPILE_FLAGS "-U_DARWIN_C_SOURCE") 975 975 976 976 foreach (file IN ITEMS ${syscall_legacy_sources}) 977 - set_source_files_properties(${file} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE -U__DARWIN_UNIX03") 977 + set_source_files_properties(${file} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_C_LEVEL") 978 978 endforeach(file) 979 979 980 980 add_library(libsyscall OBJECT ${syscall_sources}) 981 981 982 982 # For i386 983 - add_library(libsyscall_legacy_extra OBJECT wrappers/legacy/select.c) 984 - set_target_properties(libsyscall_legacy_extra PROPERTIES COMPILE_FLAGS 985 - "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE -U__DARWIN_UNIX03") 983 + #add_library(libsyscall_legacy_extra OBJECT wrappers/legacy/select.c) 984 + #set_target_properties(libsyscall_legacy_extra PROPERTIES COMPILE_FLAGS 985 + # "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_C_LEVEL") 986 986 987 987 988 988
+5
src/kernel/libsyscall/sys_i386/SYS.h
··· 82 82 UNIX_SYSCALL_SYSENTER ;\ 83 83 cmpl $-4095, %eax ;\ 84 84 jb 3f ;\ 85 + negl %eax ;\ 85 86 BRANCH_EXTERN(tramp_cerror) ;\ 86 87 3: 87 88 ··· 92 93 UNIX_SYSCALL_TRAP ;\ 93 94 cmpl $-4095, %eax ;\ 94 95 jb 3f ;\ 96 + negl %eax ;\ 95 97 BRANCH_EXTERN(tramp_cerror) ;\ 96 98 3: 97 99 ··· 101 103 UNIX_SYSCALL_SYSENTER ;\ 102 104 cmpl $-4095, %eax ;\ 103 105 jb 3f ;\ 106 + negl %eax ;\ 104 107 BRANCH_EXTERN(tramp_##cerror) ;\ 105 108 3: 106 109 #else /* __SYSCALL_32BIT_ARG_BYTES < 4 || > 20 */ ··· 109 112 UNIX_SYSCALL_SYSENTER ;\ 110 113 cmpl $-4095, %eax ;\ 111 114 jb 3f ;\ 115 + negl %eax ;\ 112 116 BRANCH_EXTERN(tramp_##cerror) ;\ 113 117 3: 114 118 #endif ··· 119 123 UNIX_SYSCALL_TRAP ;\ 120 124 cmpl $-4095, %eax ;\ 121 125 jb 3f ;\ 126 + negl %eax ;\ 122 127 BRANCH_EXTERN(tramp_cerror_nocancel) ;\ 123 128 3: 124 129