overby.me / darling-nix
this repo has no description
1
fork

Configure Feed

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

Build objc4 and new libdispatch

Lubos Dolezel 73cca608 9a7fc935

+341 -46
+3 -3
.gitmodules
··· 1 1 [submodule "src/external/libdispatch"] 2 2 path = src/external/libdispatch 3 3 url = ../darling-libdispatch.git 4 - [submodule "src/external/libobjc2"] 5 - path = src/external/libobjc2 6 - url = ../darling-libobjc2.git 7 4 [submodule "src/external/libcxx"] 8 5 path = src/external/libcxx 9 6 url = ../darling-libcxx.git ··· 187 184 [submodule "src/external/syslog"] 188 185 path = src/external/syslog 189 186 url = ../darling-syslog.git 187 + [submodule "src/external/libclosure"] 188 + path = src/external/libclosure 189 + url = ../darling-libclosure.git
+2 -2
compiler-include/stdatomic.h
··· 27 27 /* If we're hosted, fall back to the system's stdatomic.h. FreeBSD, for 28 28 * example, already has a Clang-compatible stdatomic.h header. 29 29 */ 30 - #if __STDC_HOSTED__ && __has_include_next(<stdatomic.h>) && 0 31 - # include_next <stdatomic.h> 30 + #ifdef __STDC_NO_ATOMICS__ 31 + 32 32 #else 33 33 34 34 #include <stddef.h>
+64
kernel-include/bank/bank_types.h
··· 1 + /* 2 + * Copyright (c) 2012-2013 Apple Inc. All rights reserved. 3 + * 4 + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ 5 + * 6 + * This file contains Original Code and/or Modifications of Original Code 7 + * as defined in and that are subject to the Apple Public Source License 8 + * Version 2.0 (the 'License'). You may not use this file except in 9 + * compliance with the License. The rights granted to you under the License 10 + * may not be used to create, or enable the creation or redistribution of, 11 + * unlawful or unlicensed copies of an Apple operating system, or to 12 + * circumvent, violate, or enable the circumvention or violation of, any 13 + * terms of an Apple operating system software license agreement. 14 + * 15 + * Please obtain a copy of the License at 16 + * http://www.opensource.apple.com/apsl/ and read it before using this file. 17 + * 18 + * The Original Code and all software distributed under the License are 19 + * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 20 + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 21 + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 22 + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 23 + * Please see the License for the specific language governing rights and 24 + * limitations under the License. 25 + * 26 + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ 27 + */ 28 + 29 + #ifndef _BANK_BANK_TYPES_H_ 30 + #define _BANK_BANK_TYPES_H_ 31 + 32 + #include <stdint.h> 33 + #include <mach/mach_types.h> 34 + 35 + #define MACH_VOUCHER_ATTR_BANK_NULL ((mach_voucher_attr_recipe_command_t)601) 36 + #define MACH_VOUCHER_ATTR_BANK_CREATE ((mach_voucher_attr_recipe_command_t)610) 37 + 38 + #define MACH_VOUCHER_BANK_CONTENT_SIZE (500) 39 + 40 + typedef uint32_t bank_action_t; 41 + #define BANK_ORIGINATOR_PID 0x1 42 + #define BANK_PERSONA_TOKEN 0x2 43 + 44 + struct proc_persona_info { 45 + uint64_t unique_pid; 46 + int32_t pid; 47 + uint32_t flags; 48 + uint32_t pidversion; 49 + uint32_t persona_id; 50 + uint32_t uid; 51 + uint32_t gid; 52 + uint8_t macho_uuid[16]; 53 + }; 54 + 55 + struct persona_token { 56 + struct proc_persona_info originator; 57 + struct proc_persona_info proximate; 58 + }; 59 + 60 + #ifdef PRIVATE 61 + #define ENTITLEMENT_PERSONA_PROPAGATE "com.apple.private.personas.propagate" 62 + #endif /* PRIVATE */ 63 + 64 + #endif /* _BANK_BANK_TYPES_H_ */
+226 -31
platform-include/mach-o/dyld_priv.h
··· 40 40 // 41 41 extern int _dyld_func_lookup(const char* dyld_func_name, void **address); 42 42 43 - 44 - // 45 - // _dyld_moninit() is a private interface between libSystem.dylib and dyld 46 - // 47 - extern void _dyld_moninit(void (*monaddition)(char *lowpc, char *highpc)); 48 - 49 43 // 50 44 // private interface between libSystem.dylib and dyld 51 45 // 52 46 extern void _dyld_fork_child(); 53 47 54 48 55 - // 56 - // Possible state changes for which you can register to be notified 57 - // 49 + // DEPRECATED 58 50 enum dyld_image_states 59 51 { 60 52 dyld_image_state_mapped = 10, // No batch notification for this ··· 66 58 dyld_image_state_terminated = 60 // Only single notification for this 67 59 }; 68 60 69 - // 70 - // Callback that provides a bottom-up array of images 71 - // For dyld_image_state_[dependents_]mapped state only, returning non-NULL will cause dyld to abort loading all those images 72 - // and append the returned string to its load failure error message. dyld does not free the string, so 73 - // it should be a literal string or a static buffer 74 - // 61 + // DEPRECATED 75 62 typedef const char* (*dyld_image_state_change_handler)(enum dyld_image_states state, uint32_t infoCount, const struct dyld_image_info info[]); 76 63 64 + 65 + 66 + typedef void (*_dyld_objc_notify_mapped)(unsigned count, const char* const paths[], const struct mach_header* const mh[]); 67 + typedef void (*_dyld_objc_notify_init)(const char* path, const struct mach_header* mh); 68 + typedef void (*_dyld_objc_notify_unmapped)(const char* path, const struct mach_header* mh); 69 + 70 + 77 71 // 78 - // Register a handler to be called when any image changes to the requested state. 79 - // If 'batch' is true, the callback is called with an array of all images that are in the requested state sorted by dependency. 80 - // If 'batch' is false, the callback is called with one image at a time as each image transitions to the the requested state. 81 - // During the call to this function, the handler may be called back with existing images and the handler should 82 - // not return a string, since there is no load to abort. In batch mode, existing images at or past the request 83 - // state supplied in the callback. In non-batch mode, the callback is called for each image exactly in the 84 - // requested state. 72 + // Note: only for use by objc runtime 73 + // Register handlers to be called when objc images are mapped, unmapped, and initialized. 74 + // Dyld will call back the "mapped" function with an array of images that contain an objc-image-info section. 75 + // Those images that are dylibs will have the ref-counts automatically bumped, so objc will no longer need to 76 + // call dlopen() on them to keep them from being unloaded. During the call to _dyld_objc_notify_register(), 77 + // dyld will call the "mapped" function with already loaded objc images. During any later dlopen() call, 78 + // dyld will also call the "mapped" function. Dyld will call the "init" function when dyld would be called 79 + // initializers in that image. This is when objc calls any +load methods in that image. 85 80 // 86 - extern void 87 - dyld_register_image_state_change_handler(enum dyld_image_states state, bool batch, dyld_image_state_change_handler handler); 81 + void _dyld_objc_notify_register(_dyld_objc_notify_mapped mapped, 82 + _dyld_objc_notify_init init, 83 + _dyld_objc_notify_unmapped unmapped); 84 + 88 85 89 86 90 87 // ··· 144 141 // Exists in Mac OS X 10.4 and later through _dyld_func_lookup() 145 142 // Exists in Mac OS X 10.6 and later through libSystem.dylib 146 143 // 147 - const struct dyld_all_image_infos* _dyld_get_all_image_infos(); 144 + const struct dyld_all_image_infos* _dyld_get_all_image_infos() __attribute__((deprecated)); 148 145 149 146 150 147 ··· 177 174 extern const char* dyld_image_path_containing_address(const void* addr); 178 175 179 176 177 + // 178 + // This is an optimized form of dladdr() that only returns the dli_fbase field. 179 + // Return NULL, if address is not in any image tracked by dyld. 180 + // 181 + // Exists in Mac OS X 10.11 and later 182 + extern const struct mach_header* dyld_image_header_containing_address(const void* addr); 183 + 184 + 185 + 186 + // Convienence constants for return values from dyld_get_sdk_version() and friends. 187 + #define DYLD_MACOSX_VERSION_10_4 0x000A0400 188 + #define DYLD_MACOSX_VERSION_10_5 0x000A0500 189 + #define DYLD_MACOSX_VERSION_10_6 0x000A0600 190 + #define DYLD_MACOSX_VERSION_10_7 0x000A0700 191 + #define DYLD_MACOSX_VERSION_10_8 0x000A0800 192 + #define DYLD_MACOSX_VERSION_10_9 0x000A0900 193 + #define DYLD_MACOSX_VERSION_10_10 0x000A0A00 194 + #define DYLD_MACOSX_VERSION_10_11 0x000A0B00 195 + #define DYLD_MACOSX_VERSION_10_12 0x000A0C00 196 + 197 + #define DYLD_IOS_VERSION_2_0 0x00020000 198 + #define DYLD_IOS_VERSION_2_1 0x00020100 199 + #define DYLD_IOS_VERSION_2_2 0x00020200 200 + #define DYLD_IOS_VERSION_3_0 0x00030000 201 + #define DYLD_IOS_VERSION_3_1 0x00030100 202 + #define DYLD_IOS_VERSION_3_2 0x00030200 203 + #define DYLD_IOS_VERSION_4_0 0x00040000 204 + #define DYLD_IOS_VERSION_4_1 0x00040100 205 + #define DYLD_IOS_VERSION_4_2 0x00040200 206 + #define DYLD_IOS_VERSION_4_3 0x00040300 207 + #define DYLD_IOS_VERSION_5_0 0x00050000 208 + #define DYLD_IOS_VERSION_5_1 0x00050100 209 + #define DYLD_IOS_VERSION_6_0 0x00060000 210 + #define DYLD_IOS_VERSION_6_1 0x00060100 211 + #define DYLD_IOS_VERSION_7_0 0x00070000 212 + #define DYLD_IOS_VERSION_7_1 0x00070100 213 + #define DYLD_IOS_VERSION_8_0 0x00080000 214 + #define DYLD_IOS_VERSION_8_1 0x00080100 215 + #define DYLD_IOS_VERSION_8_2 0x00080200 216 + #define DYLD_IOS_VERSION_8_3 0x00080300 217 + #define DYLD_IOS_VERSION_8_4 0x00080400 218 + #define DYLD_IOS_VERSION_9_0 0x00090000 219 + #define DYLD_IOS_VERSION_9_1 0x00090100 220 + #define DYLD_IOS_VERSION_9_2 0x00090200 221 + #define DYLD_IOS_VERSION_9_3 0x00090300 222 + #define DYLD_IOS_VERSION_10_0 0x000A0000 223 + 224 + 225 + #define DYLD_WATCHOS_VERSION_1_0 0x00010000 226 + #define DYLD_WATCHOS_VERSION_2_0 0x00020000 227 + #define DYLD_WATCHOS_VERSION_2_1 0x00020100 228 + #define DYLD_WATCHOS_VERSION_2_2 0x00020200 229 + #define DYLD_WATCHOS_VERSION_3_0 0x00030000 230 + 180 231 181 232 182 233 // 183 - // This is finds the SDK version a binary was built against. 234 + // This finds the SDK version a binary was built against. 184 235 // Returns zero on error, or if SDK version could not be determined. 185 236 // 186 237 // Exists in Mac OS X 10.8 and later 238 + // Exists in iOS 6.0 and later 187 239 extern uint32_t dyld_get_sdk_version(const struct mach_header* mh); 188 240 189 241 190 242 // 191 - // This is finds the SDK version the main executable was built against. 243 + // This finds the SDK version that the main executable was built against. 192 244 // Returns zero on error, or if SDK version could not be determined. 193 245 // 246 + // Note on WatchOS, this returns the equivalent iOS SDK version number 247 + // (i.e an app built against WatchOS 2.0 SDK returne 9.0). To see the 248 + // platform specific sdk version use dyld_get_program_sdk_watch_os_version(). 249 + // 194 250 // Exists in Mac OS X 10.8 and later 251 + // Exists in iOS 6.0 and later 195 252 extern uint32_t dyld_get_program_sdk_version(); 196 253 197 254 255 + // Watch OS only. 256 + // This finds the Watch OS SDK version that the main executable was built against. 257 + // Exists in Watch OS 2.0 and later 258 + extern uint32_t dyld_get_program_sdk_watch_os_version(); // __WATCHOS_AVAILABLE(2.0); 259 + 260 + 261 + // Watch OS only. 262 + // This finds the Watch min OS version that the main executable was built to run on. 263 + // Note: dyld_get_program_min_os_version() returns the iOS equivalent (e.g. 9.0) 264 + // whereas this returns the raw watchOS version (e.g. 2.0). 265 + // Exists in Watch OS 3.0 and later 266 + extern uint32_t dyld_get_program_min_watch_os_version(); // __WATCHOS_AVAILABLE(3.0); 267 + 268 + 198 269 // 199 - // This is finds the min OS version a binary was built to run on. 270 + // This finds the min OS version a binary was built to run on. 200 271 // Returns zero on error, or if no min OS recorded in binary. 201 272 // 202 273 // Exists in Mac OS X 10.8 and later 274 + // Exists in iOS 6.0 and later 203 275 extern uint32_t dyld_get_min_os_version(const struct mach_header* mh); 204 276 205 277 206 278 // 207 - // This is finds the min OS version the main executable was built to run on. 279 + // This finds the min OS version the main executable was built to run on. 208 280 // Returns zero on error, or if no min OS recorded in binary. 209 281 // 210 282 // Exists in Mac OS X 10.8 and later 283 + // Exists in iOS 6.0 and later 211 284 extern uint32_t dyld_get_program_min_os_version(); 212 285 213 286 214 287 215 288 216 - #if __IPHONE_OS_VERSION_MIN_REQUIRED 217 289 // 218 290 // Returns if any OS dylib has overridden its copy in the shared cache 219 291 // 220 292 // Exists in iPhoneOS 3.1 and later 293 + // Exists in Mac OS X 10.10 and later 221 294 extern bool dyld_shared_cache_some_image_overridden(); 222 - #endif 223 295 224 296 297 + 298 + // 299 + // Returns if the process is setuid or is code signed with entitlements. 300 + // 301 + // Exists in Mac OS X 10.9 and later 302 + extern bool dyld_process_is_restricted(); 303 + 304 + 305 + 306 + // 307 + // Returns path used by dyld for standard dyld shared cache file for the current arch. 308 + // 309 + // Exists in Mac OS X 10.11 and later 310 + extern const char* dyld_shared_cache_file_path(); 311 + 312 + 313 + 314 + // 315 + // <rdar://problem/13820686> for OpenGL to tell dyld it is ok to deallocate a memory based image when done. 316 + // 317 + // Exists in Mac OS X 10.9 and later 318 + #define NSLINKMODULE_OPTION_CAN_UNLOAD 0x20 319 + 320 + 321 + // 322 + // Update all bindings on specified image. 323 + // Looks for uses of 'replacement' and changes it to 'replacee'. 324 + // NOTE: this is less safe than using static interposing via DYLD_INSERT_LIBRARIES 325 + // because the running program may have already copy the pointer values to other 326 + // locations that dyld does not know about. 327 + // 328 + struct dyld_interpose_tuple { 329 + const void* replacement; 330 + const void* replacee; 331 + }; 332 + extern void dyld_dynamic_interpose(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count); 333 + 334 + 335 + struct dyld_shared_cache_dylib_text_info { 336 + uint64_t version; // current version 1 337 + // following fields all exist in version 1 338 + uint64_t loadAddressUnslid; 339 + uint64_t textSegmentSize; 340 + uuid_t dylibUuid; 341 + const char* path; // pointer invalid at end of iterations 342 + }; 343 + typedef struct dyld_shared_cache_dylib_text_info dyld_shared_cache_dylib_text_info; 344 + 345 + // 346 + // Given the UUID of a dyld shared cache file, this function will attempt to locate the cache 347 + // file and if found iterate all images, returning info about each one. Returns 0 on success. 348 + // 349 + // Exists in Mac OS X 10.11 and later 350 + // iOS 9.0 and later 351 + extern int dyld_shared_cache_iterate_text(const uuid_t cacheUuid, void (^callback)(const dyld_shared_cache_dylib_text_info* info)); 352 + 353 + 354 + // 355 + // Given the UUID of a dyld shared cache file, and a NULL terminated array of extra directory paths to search, 356 + // this function will scan the standard and extra directories looking for a cache file that matches the UUID 357 + // and if found iterate all images, returning info about each one. Returns 0 on success. 358 + // 359 + // Exists in Mac OS X 10.12 and later 360 + // iOS 10.0 and later 361 + extern int dyld_shared_cache_find_iterate_text(const uuid_t cacheUuid, const char* extraSearchDirs[], void (^callback)(const dyld_shared_cache_dylib_text_info* info)); 362 + 363 + 364 + // 365 + // Returns if the specified address range is in a dyld owned memory 366 + // that is mapped read-only and will never be unloaded. 367 + // 368 + // Exists in Mac OS X 10.12 and later 369 + // iOS 10.0 and later 370 + extern bool _dyld_is_memory_immutable(const void* addr, size_t length); 371 + 372 + 373 + // 374 + // Finds the UUID (from LC_UUID load command) of given image. 375 + // Returns false if LC_UUID is missing or mach_header is malformed. 376 + // 377 + // Exists in Mac OS X 10.12 and later 378 + // Exists in iOS 10.0 and later 379 + extern bool _dyld_get_image_uuid(const struct mach_header* mh, uuid_t uuid); 380 + 381 + 382 + // 383 + // Gets the UUID of the dyld shared cache in the current process. 384 + // Returns false if there is no dyld shared cache in use by the processes. 385 + // 386 + // Exists in Mac OS X 10.12 and later 387 + // Exists in iOS 10.0 and later 388 + extern bool _dyld_get_shared_cache_uuid(uuid_t uuid); 389 + 390 + 391 + 392 + // 393 + // When dyld must terminate a process because of a required dependent dylib 394 + // could not be loaded or a symbol is missing, dyld calls abort_with_reason() 395 + // using one of the following error codes. 396 + // 397 + #define DYLD_EXIT_REASON_DYLIB_MISSING 1 398 + #define DYLD_EXIT_REASON_DYLIB_WRONG_ARCH 2 399 + #define DYLD_EXIT_REASON_DYLIB_WRONG_VERSION 3 400 + #define DYLD_EXIT_REASON_SYMBOL_MISSING 4 401 + #define DYLD_EXIT_REASON_CODE_SIGNATURE 5 402 + #define DYLD_EXIT_REASON_FILE_SYSTEM_SANDBOX 6 403 + #define DYLD_EXIT_REASON_MALFORMED_MACHO 7 404 + #define DYLD_EXIT_REASON_OTHER 9 405 + 406 + // 407 + // When it has more information about the termination, dyld will use abort_with_payload(). 408 + // The payload is a dyld_abort_payload structure. The fixed fields are offsets into the 409 + // payload for the corresponding string. If the offset is zero, that string is not available. 410 + // 411 + struct dyld_abort_payload { 412 + uint32_t version; // first version is 1 413 + uint32_t flags; // 0x00000001 means dyld terminated at launch, backtrace not useful 414 + uint32_t targetDylibPathOffset; // offset in payload of path string to dylib that could not be loaded 415 + uint32_t clientPathOffset; // offset in payload of path string to image requesting dylib 416 + uint32_t symbolOffset; // offset in payload of symbol string that could not be found 417 + // string data 418 + }; 419 + typedef struct dyld_abort_payload dyld_abort_payload; 225 420 226 421 #if __cplusplus 227 422 }
+14
platform-include/mach/mach_time.h
··· 51 51 52 52 53 53 uint64_t mach_absolute_time(void); 54 + 55 + __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_8_0) 54 56 uint64_t mach_approximate_time(void); 57 + 58 + /* 59 + * like mach_absolute_time, but advances during sleep 60 + */ 61 + __OSX_AVAILABLE(10.12) __IOS_AVAILABLE(10.0) __TVOS_AVAILABLE(10.0) __WATCHOS_AVAILABLE(3.0) 62 + uint64_t mach_continuous_time(void); 63 + 64 + /* 65 + * like mach_approximate_time, but advances during sleep 66 + */ 67 + __OSX_AVAILABLE(10.12) __IOS_AVAILABLE(10.0) __TVOS_AVAILABLE(10.0) __WATCHOS_AVAILABLE(3.0) 68 + uint64_t mach_continuous_approximate_time(void); 55 69 __END_DECLS 56 70 57 71 #endif /* _MACH_MACH_TIME_H_ */
+2 -2
src/CMakeLists.txt
··· 87 87 add_subdirectory(libstdcxx) 88 88 add_subdirectory(libffi) 89 89 add_subdirectory(dyld-apple) 90 - #add_subdirectory(external/objc4/runtime) 90 + add_subdirectory(external/objc4/runtime) 91 91 add_subdirectory(external/syslog/libsystem_asl.tproj) 92 92 add_subdirectory(external/libdispatch) 93 93 add_subdirectory(external/zlib) ··· 113 113 #add_subdirectory(DebugSymbols) 114 114 add_subdirectory(xar) 115 115 add_subdirectory(libedit) 116 - add_subdirectory(external/compiler-rt/lib/BlocksRuntime) 116 + add_subdirectory(external/libclosure) 117 117 add_subdirectory(external/compiler-rt/lib/builtins) 118 118 add_subdirectory(CommonCrypto) 119 119 add_subdirectory(csu)
+1 -1
src/DiskArbitration/CMakeLists.txt
··· 23 23 include_directories(${DARLING_TOP_DIRECTORY}/src/external/corefoundation/Headers) 24 24 include_directories(${CMAKE_BINARY_DIR}/src/external/corefoundation/Headers) 25 25 include_directories(${DARLING_TOP_DIRECTORY}/src/external/foundation/Headers) 26 - include_directories(${DARLING_TOP_DIRECTORY}/src/external/libobjc2) 26 + #include_directories(${DARLING_TOP_DIRECTORY}/src/external/libobjc2) 27 27 include_directories(${DARLING_TOP_DIRECTORY}/src/libc/include/FreeBSD) 28 28 29 29 add_definitions(-DOBJC2RUNTIME=1)
+1 -1
src/IOKit/CMakeLists.txt
··· 11 11 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 12 12 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) 13 13 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../util) 14 - include_directories(${DARLING_TOP_DIRECTORY}/src/external/libobjc2) 14 + #include_directories(${DARLING_TOP_DIRECTORY}/src/external/libobjc2) 15 15 include_directories(${DARLING_TOP_DIRECTORY}/src/external/corefoundation/Headers) 16 16 include_directories(${CMAKE_BINARY_DIR}/src/external/corefoundation/Headers) 17 17 include_directories(${DARLING_TOP_DIRECTORY}/src/external/foundation/Headers)
-2
src/duct/include/Block.h
··· 1 - #include "../../external/libobjc2/objc/blocks_runtime.h" 2 -
src/duct/include/firehose/private.h

This is a binary file and will not be displayed.

+2 -1
src/dyld-apple/CMakeLists.txt
··· 28 28 include_directories(${CMAKE_SOURCE_DIR}/src/kernel/emulation/linux/misc) 29 29 include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/sandbox) 30 30 include_directories(${CMAKE_SOURCE_DIR}/src/external/libcxx/include) 31 + include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure) 31 32 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/launch-cache) 32 33 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 33 34 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include ··· 84 85 libc_static32 libc_static64 85 86 unwind_static system_kernel_static system_m_static cxxabi_static 86 87 keymgr_static compiler_rt_static32 compiler_rt_static64 system_duct_static 87 - platform_static32 platform_static64 pthread_static) 88 + platform_static32 platform_static64 pthread_static macho_static) 88 89 89 90 #make_fat(system_dyld) 90 91
+9
src/kernel/mach_server/client/mach_traps.c
··· 558 558 559 559 boolean_t voucher_mach_msg_set(mach_msg_header_t *msg) 560 560 { 561 + UNIMPLEMENTED_TRAP(); 561 562 return 0; 562 563 } 563 564 564 565 void voucher_mach_msg_revert(voucher_mach_msg_state_t state) 565 566 { 567 + UNIMPLEMENTED_TRAP(); 566 568 } 567 569 568 570 voucher_mach_msg_state_t voucher_mach_msg_adopt(mach_msg_header_t *msg) 569 571 { 572 + UNIMPLEMENTED_TRAP(); 573 + return NULL; 570 574 } 571 575 576 + kern_return_t mach_generate_activity_id(mach_port_name_t task, int i, uint64_t* id) 577 + { 578 + UNIMPLEMENTED_TRAP(); 579 + return KERN_FAILURE; 580 + }
+1
src/libc/CMakeLists.txt
··· 214 214 $<TARGET_OBJECTS:libc-string> 215 215 $<TARGET_OBJECTS:libc-gdtoa_dyld> 216 216 $<TARGET_OBJECTS:libc-secure> 217 + $<TARGET_OBJECTS:libc-uuid> 217 218 $<TARGET_OBJECTS:libc-os> 218 219 $<TARGET_OBJECTS:libc-stdio_extsn> 219 220 )
+1
src/libc/gen/CMakeLists.txt
··· 7 7 8 8 include_directories(${CMAKE_SOURCE_DIR}/src/libmalloc/include) 9 9 include_directories(${CMAKE_SOURCE_DIR}/src/libmalloc/private) 10 + include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure) 10 11 include_directories(${CMAKE_SOURCE_DIR}/src/external/libpthread/pthread) 11 12 include_directories(${CMAKE_SOURCE_DIR}/src/external/syslog/libsystem_asl.tproj/include) 12 13
+8
src/libc/include/sys/cdefs.h
··· 103 103 #define LIBC_EXTSN(sym) __asm("_" __STRING(sym) LIBC_SUF_EXTSN) 104 104 #define LIBC_EXTSN_C(sym) __asm("_" __STRING(sym) LIBC_SUF_EXTSN LIBC_SUF_NON_CANCELABLE) 105 105 106 + #ifdef __cplusplus 107 + extern "C" { 108 + #endif 109 + 106 110 extern int pthread_key_init_np(int, void (*)(void *)); 111 + 112 + #ifdef __cplusplus 113 + } 114 + #endif 107 115 108 116 #include <TargetConditionals.h> 109 117 #if TARGET_IPHONE_SIMULATOR
+1 -1
src/libc/stdlib/CMakeLists.txt
··· 4 4 5 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 - include_directories(${CMAKE_SOURCE_DIR}/src/external/compiler-rt/lib/BlocksRuntime) 7 + include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure) 8 8 include_directories(${CMAKE_SOURCE_DIR}/src/external/libpthread_workqueue-0.8.2/include) 9 9 10 10 set(stdlib_sources a64l.c grantpt.c l64a.c qsort_b-fbsd.c)
+4
src/libmacho/CMakeLists.txt
··· 41 41 #target_link_libraries(macho system_kernel) 42 42 #make_fat(macho) 43 43 44 + set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar") 45 + set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib") 46 + add_library(macho_static STATIC $<TARGET_OBJECTS:macho_obj>) 47 + 44 48 install(TARGETS macho DESTINATION libexec/darling/usr/lib/system)
+2 -2
src/libnotify/CMakeLists.txt
··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../external/libdispatch/) 6 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../external/libdispatch/private) 5 + include_directories(${CMAKE_SOURCE_DIR}/src/external/libdispatch/include) 7 6 include_directories(${DARLING_TOP_DIRECTORY}/platform-include) 8 7 include_directories(${DARLING_TOP_DIRECTORY}/src/launchd/liblaunch) 9 8 include_directories(${DARLING_TOP_DIRECTORY}/src/libc/gen) 10 9 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 11 10 include_directories(${CMAKE_CURRENT_BINARY_DIR}) 12 11 include_directories(${CMAKE_SOURCE_DIR}/src/libc/darwin) 12 + include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure) 13 13 include_directories(${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers) 14 14 15 15 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fblocks -nostdinc -include ${DARLING_TOP_DIRECTORY}/kernel-include/sys/fileport.h")