Cancelable code variants · overby.me/darling-nix@f2613e0

+8 -2

libc/CMakeLists.txt

··· 23 23 add_definitions(-DHAVE_STDINT_H=1) 24 24 add_definitions(-D__APPLE__) 25 25 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 26 - add_definitions("'-D__weak_reference(sym,alias)=__asm__(\".weak alias\");__asm__(\".equ alias, sym\")'") 26 + add_definitions(-D__LIBC__ -D__DARWIN_UNIX03=1 -D__DARWIN_64_BIT_INO_T=1 -D__DARWIN_NON_CANCELABLE=1 -D__DARWIN_VERS_1050=1) 27 + # add_definitions("'-D__weak_reference(sym,alias)=__asm__(\".weak \" \\\#alias );__asm__(\".equ \" \\\#alias \", \" \\\#sym)'") 28 + add_definitions("'-D__weak_reference(sym,alias)='") 27 29 add_definitions("'-D__warn_references(name,warning)='") 28 30 29 31 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") ··· 60 62 add_library(system_c SHARED 61 63 $<TARGET_OBJECTS:libc-db> 62 64 $<TARGET_OBJECTS:libc-compat> 65 + $<TARGET_OBJECTS:libc-compat_cancelable> 63 66 $<TARGET_OBJECTS:libc-emulated> 64 67 $<TARGET_OBJECTS:libc-gen> 68 + $<TARGET_OBJECTS:libc-gen_cancelable> 65 69 $<TARGET_OBJECTS:libc-gmon> 66 70 $<TARGET_OBJECTS:libc-uuid> 67 71 $<TARGET_OBJECTS:libc-util> ··· 69 73 $<TARGET_OBJECTS:libc-stdtime> 70 74 $<TARGET_OBJECTS:libc-sys> 71 75 $<TARGET_OBJECTS:libc-stdlib> 76 + $<TARGET_OBJECTS:libc-stdlib_cancelable> 72 77 $<TARGET_OBJECTS:libc-stdio> 73 78 $<TARGET_OBJECTS:libc-secure> 74 79 $<TARGET_OBJECTS:libc-regex> 75 - $<TARGET_OBJECTS:libc-pthreads>) 80 + $<TARGET_OBJECTS:libc-pthreads> 81 + $<TARGET_OBJECTS:libc-pthreads_cancelable>) 76 82 77 83 # TODO: see ./xcodescripts/variants.xcconfig 78 84

+12 -1

libc/compat-43/CMakeLists.txt

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89") 5 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -include ${CMAKE_CURRENT_SOURCE_DIR}/../fbsdcompat/_fbsd_compat_.h") 6 6 7 7 set(compat_sources setregid.c setreuid.c sigaltstk.c sigcompat.c) 8 8 ··· 18 18 19 19 SET_SOURCE_FILES_PROPERTIES(FreeBSD/creat.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_CREAT") 20 20 SET_SOURCE_FILES_PROPERTIES(FreeBSD/killpg.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_KILLPG") 21 + SET_SOURCE_FILES_PROPERTIES(sigcompat.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_SIGPAUSE") 21 22 22 23 add_library(libc-compat OBJECT ${compat_sources}) 24 + 25 + # *** 26 + # Cancelable variants 27 + # *** 28 + 29 + set(compat-cancelable_sources sigcompat.c FreeBSD/creat.c) 30 + 31 + add_library(libc-compat_cancelable OBJECT ${compat-cancelable_sources}) 32 + SET_TARGET_PROPERTIES(libc-compat_cancelable PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_CANCELABLE") 33 +

+13

libc/gen/CMakeLists.txt

··· 155 155 SET_SOURCE_FILES_PROPERTIES(FreeBSD/usleep.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_USLEEP") 156 156 SET_SOURCE_FILES_PROPERTIES(FreeBSD/wait.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_WAIT") 157 157 SET_SOURCE_FILES_PROPERTIES(FreeBSD/waitpid.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_WAITPID") 158 + SET_SOURCE_FILES_PROPERTIES(FreeBSD/lockf.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_LOCKF") 159 + SET_SOURCE_FILES_PROPERTIES(nanosleep.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_NANOSLEEP") 160 + SET_SOURCE_FILES_PROPERTIES(FreeBSD/termios.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_TCDRAIN") 161 + SET_SOURCE_FILES_PROPERTIES(FreeBSD/wait.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_WAIT") 162 + SET_SOURCE_FILES_PROPERTIES(FreeBSD/waitpid.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_WAITPID") 158 163 159 164 #set(gen_sources ${gen_sources} 160 165 # NetBSD/utmpx.c) 161 166 162 167 add_library(libc-gen OBJECT ${gen_sources}) 168 + 169 + # *** 170 + # Cancelable variants 171 + # *** 172 + set(gen-cancelable_sources FreeBSD/lockf.c nanosleep.c FreeBSD/pause.c FreeBSD/pselect.c FreeBSD/sleep.c FreeBSD/termios.c FreeBSD/usleep.c FreeBSD/wait.c FreeBSD/waitpid.c) 173 + add_library(libc-gen_cancelable OBJECT ${gen-cancelable_sources}) 174 + SET_TARGET_PROPERTIES(libc-gen_cancelable PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_CANCELABLE") 175 +

+7 -1

libc/pthreads/CMakeLists.txt

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/../../duct/include/commpage.h -include ${CMAKE_CURRENT_SOURCE_DIR}/../../platform-include/sys/time.h") 5 + set(CMAKE_C_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_C_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/../../duct/include/commpage.h -include ${CMAKE_CURRENT_SOURCE_DIR}/../../platform-include/sys/time.h") 6 6 7 7 set(pthreads_sources 8 8 pthread.c ··· 20 20 21 21 add_library(libc-pthreads OBJECT ${pthreads_sources}) 22 22 23 + set(pthreads-cancelable_sources 24 + pthread_cancelable.c) 25 + 26 + add_library(libc-pthreads_cancelable OBJECT ${pthreads-cancelable_sources}) 27 + SET_TARGET_PROPERTIES(libc-pthreads_cancelable PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_CANCELABLE") 28 +

+7 -2

libc/stdlib/CMakeLists.txt

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D__DYNAMIC__ -D__BLOCKS__ -fblocks") 5 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D__DYNAMIC__ -D__BLOCKS__ -fblocks -include ${CMAKE_CURRENT_SOURCE_DIR}/../fbsdcompat/_fbsd_compat_.h") 6 6 7 7 set(stdlib_sources a64l.c grantpt.c l64a.c qsort_b-fbsd.c) 8 8 ··· 74 74 NetBSD/strfmon.c 75 75 ) 76 76 77 - #SET_SOURCE_FILES_PROPERTIES(FreeBSD/killpg.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_KILLPG") 77 + SET_SOURCE_FILES_PROPERTIES(FreeBSD/system.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_SYSTEM") 78 78 79 79 add_library(libc-stdlib OBJECT ${stdlib_sources}) 80 + 81 + # Cancelable variant 82 + set(stdlib-cancelable_sources FreeBSD/system.c) 83 + add_library(libc-stdlib_cancelable OBJECT ${stdlib-cancelable_sources}) 84 + SET_TARGET_PROPERTIES(libc-stdlib_cancelable PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_CANCELABLE")

+4

platform-include/sys/fcntl.h

··· 469 469 #if __DARWIN_C_LEVEL >= 200809L 470 470 int openat(int, const char *, int, ...) __DARWIN_NOCANCEL(openat) __OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_8_0); 471 471 #endif 472 + #ifndef LIBC_ALIAS_CREAT 472 473 int creat(const char *, mode_t) __DARWIN_ALIAS_C(creat); 474 + #else 475 + int creat(const char *, mode_t) LIBC_ALIAS_C(creat); 476 + #endif 473 477 int fcntl(int, int, ...) __DARWIN_ALIAS_C(fcntl); 474 478 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE) 475 479

+6

platform-include/sys/termios.h

··· 334 334 int cfsetospeed(struct termios *, speed_t); 335 335 int tcgetattr(int, struct termios *); 336 336 int tcsetattr(int, int, const struct termios *); 337 + 338 + #ifndef LIBC_ALIAS_TCDRAIN 337 339 int tcdrain(int) __DARWIN_ALIAS_C(tcdrain); 340 + #else 341 + int tcdrain(int) LIBC_ALIAS_C(tcdrain); 342 + #endif 343 + 338 344 int tcflow(int, int); 339 345 int tcflush(int, int); 340 346 int tcsendbreak(int, int);

+10

platform-include/sys/wait.h

··· 245 245 #endif /* !__DARWIN_UNIX03 */ 246 246 247 247 __BEGIN_DECLS 248 + #ifndef LIBC_ALIAS_WAIT 248 249 pid_t wait(int *) __DARWIN_ALIAS_C(wait); 250 + #else 251 + pid_t wait(int *) LIBC_ALIAS_C(wait); 252 + #endif 253 + 254 + #ifndef LIBC_ALIAS_WAITPID 249 255 pid_t waitpid(pid_t, int *, int) __DARWIN_ALIAS_C(waitpid); 256 + #else 257 + pid_t waitpid(pid_t, int *, int) LIBC_ALIAS_C(waitpid); 258 + #endif 259 + 250 260 #ifndef _ANSI_SOURCE 251 261 int waitid(idtype_t, id_t, siginfo_t *, int) __DARWIN_ALIAS_C(waitid); 252 262 #endif /* !_ANSI_SOURCE */

Configure Feed

Configure Feed