this repo has no description
1
fork

Configure Feed

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

Remove second malloc impl from libc

+21 -16
+3
.gitmodules
··· 175 175 [submodule "src/external/cctools-port"] 176 176 path = src/external/cctools-port 177 177 url = ../cctools-port.git 178 + [submodule "src/external/objc4"] 179 + path = src/external/objc4 180 + url = ../darling-objc4.git
+1 -1
src/CMakeLists.txt
··· 76 76 add_subdirectory(libstdcxx) 77 77 add_subdirectory(libffi) 78 78 add_subdirectory(dyld-apple) 79 - #add_subdirectory(external/libobjc2) 79 + #add_subdirectory(external/objc4/runtime) 80 80 add_subdirectory(external/libkqueue) 81 81 add_subdirectory(external/libdispatch) 82 82 add_subdirectory(external/zlib)
+1 -1
src/CommonCrypto/CMakeLists.txt
··· 84 84 85 85 set(DYLIB_INSTALL_NAME "/usr/lib/libcommonCrypto.dylib") 86 86 add_darling_library(CommonCrypto SHARED ${cc_SRCS}) 87 - target_link_libraries(CommonCrypto system_c system_m system_dyld) 87 + target_link_libraries(CommonCrypto system_c system_m system_dyld system_malloc) 88 88 set_target_properties(CommonCrypto PROPERTIES OUTPUT_NAME "commonCrypto") 89 89 90 90 install(TARGETS CommonCrypto DESTINATION libexec/darling/usr/lib)
+1 -1
src/copyfile/CMakeLists.txt
··· 28 28 set(DYLIB_INSTALL_NAME "/usr/lib/system/libcopyfile.dylib") 29 29 add_darling_library(system_copyfile SHARED ${copyfile_sources}) 30 30 set_target_properties(system_copyfile PROPERTIES OUTPUT_NAME "copyfile") 31 - target_link_libraries(system_copyfile PRIVATE system_kernel system_c system_blocks system_info system_dyld) 31 + target_link_libraries(system_copyfile PRIVATE system_kernel system_c system_blocks system_info system_dyld system_malloc) 32 32 33 33 install(TARGETS system_copyfile DESTINATION libexec/darling/usr/lib/system)
+1 -1
src/dyld/gdb.c
··· 71 71 memcpy(&_dyld_all_image_infos, orig_dyld_all_image_infos, sizeof(_dyld_all_image_infos)); 72 72 _dyld_all_image_infos.notification = &gdb_notifier; 73 73 74 - printf("Got notification from dyld\n"); 74 + // printf("Got notification from dyld\n"); 75 75 gdb_notifier(mode, infoCount, info); 76 76 } 77 77
+1 -1
src/keymgr/CMakeLists.txt
··· 18 18 19 19 set(DYLIB_INSTALL_NAME "/usr/lib/system/libkeymgr.dylib") 20 20 add_darling_library(keymgr SHARED ${keymgr_sources}) 21 - target_link_libraries(keymgr PRIVATE system_c system_dyld) 21 + target_link_libraries(keymgr PRIVATE system_c system_dyld system_malloc) 22 22 23 23 set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar") 24 24 set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
+1 -1
src/libc/CMakeLists.txt
··· 140 140 $<TARGET_OBJECTS:libc-darwin> 141 141 $<TARGET_OBJECTS:libc-platform> 142 142 ${extra_objs}) 143 - target_link_libraries(system_c system_kernel system_m macho) 143 + target_link_libraries(system_c system_kernel system_m macho system_malloc) 144 144 145 145 install(TARGETS system_c DESTINATION libexec/darling/usr/lib/system) 146 146
+2 -2
src/libc/gen/CMakeLists.txt
··· 34 34 getvfsbyname.c 35 35 isinf.c 36 36 isnan.c 37 - magazine_malloc.c # magazine or scalable 38 - malloc.c 37 + #magazine_malloc.c # magazine or scalable 38 + #malloc.c 39 39 nanosleep.c 40 40 nftw.c 41 41 nlist.c
+2
src/libc/gen/stack_logging_disk.c
··· 48 48 #define _malloc_printf fprintf 49 49 #undef ASL_LEVEL_INFO 50 50 #define ASL_LEVEL_INFO stderr 51 + #else 52 + #define _malloc_printf malloc_printf 51 53 #endif 52 54 53 55 #define STACK_LOGGING_MAX_STACK_SIZE 512
+2 -2
src/libc/sys/__libc_init.c
··· 34 34 extern void _program_vars_init(const struct ProgramVars *vars); 35 35 extern void _libc_fork_init(void (*prepare)(void), void (*parent)(void), void (*child)(void)); 36 36 extern void _init_clock_port(); 37 - extern pthread_lock_t _malloc_lock; 37 + //extern pthread_lock_t _malloc_lock; 38 38 extern void __xlocale_init(void); 39 39 extern void __pthread_pfz_setup(const char *apple[]); 40 40 extern void __guard_setup(const char *apple[]); ··· 58 58 { 59 59 _program_vars_init(vars); 60 60 _libc_fork_init(atfork_prepare, atfork_parent, atfork_child); 61 - LOCK_INIT(_malloc_lock); 61 + // LOCK_INIT(_malloc_lock); 62 62 __atexit_init(); 63 63 _init_clock_port(); 64 64 __xlocale_init();
+2 -2
src/libmalloc/CMakeLists.txt
··· 4 4 5 5 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3 -w -fblocks -ggdb") 6 6 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_SOURCE_DIR}/../duct/include/commpage.h -nostdinc") 7 - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib") 7 + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined,suppress") 8 8 9 9 if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 10 10 set(BITS 32) ··· 34 34 35 35 set(DYLIB_INSTALL_NAME "/usr/lib/system/libsystem_malloc.dylib") 36 36 add_darling_library(system_malloc SHARED ${libmalloc_sources}) 37 - target_link_libraries(system_malloc PRIVATE system_c system_kernel system_dyld) 37 + target_link_libraries(system_malloc PRIVATE system_kernel) 38 38 39 39 install(TARGETS system_malloc DESTINATION libexec/darling/usr/lib/system) 40 40
+1 -1
src/libnotify/CMakeLists.txt
··· 24 24 25 25 set(DYLIB_INSTALL_NAME "/usr/lib/system/libsystem_notify.dylib") 26 26 add_darling_library(system_notify SHARED ${notify_sources}) 27 - target_link_libraries(system_notify system_c system_kernel system_blocks libdispatch_shared launch system_dyld) 27 + target_link_libraries(system_notify system_c system_kernel system_blocks libdispatch_shared launch system_dyld system_malloc) 28 28 29 29 install(TARGETS system_notify DESTINATION libexec/darling/usr/lib/system) 30 30
+1 -1
src/libremovefile/CMakeLists.txt
··· 19 19 20 20 set(DYLIB_INSTALL_NAME "/usr/lib/system/libremovefile.dylib") 21 21 add_darling_library(removefile SHARED ${removefile_sources}) 22 - target_link_libraries(removefile system_c system_kernel system_dyld) 22 + target_link_libraries(removefile system_c system_kernel system_dyld system_malloc) 23 23 24 24 install(TARGETS removefile DESTINATION libexec/darling/usr/lib/system) 25 25
+1 -1
src/quarantine/CMakeLists.txt
··· 10 10 quarantine.c 11 11 ) 12 12 set_target_properties(system_quarantine PROPERTIES OUTPUT_NAME "quarantine") 13 - target_link_libraries(system_quarantine PRIVATE system_c system_dyld) 13 + target_link_libraries(system_quarantine PRIVATE system_c system_dyld system_malloc) 14 14 15 15 install(TARGETS system_quarantine DESTINATION libexec/darling/usr/lib/system) 16 16
+1 -1
src/sandbox/CMakeLists.txt
··· 20 20 21 21 set(DYLIB_INSTALL_NAME "/usr/lib/system/libsystem_sandbox.dylib") 22 22 add_darling_library(sandbox SHARED sandbox.c) 23 - target_link_libraries(sandbox PRIVATE system_c system_kernel system_dyld) 23 + target_link_libraries(sandbox PRIVATE system_c system_kernel system_dyld system_malloc) 24 24 set_target_properties(sandbox PROPERTIES OUTPUT_NAME "system_sandbox") 25 25 26 26 install(TARGETS sandbox DESTINATION libexec/darling/usr/lib/system)