Libsystem-1252.tar.gz

diff --git a/init.c b/init.c
index c3a3d3c6838f40f2462868082ea3a611651d9cb6..b62772f8853df27a2132db74a376dd26eb12d3fa 100644 (file)
--- a/init.c
+++ b/init.c
@@ -51,6 +51,7 @@ extern void _libxpc_initializer(void);                // from libxpc.dylib
 extern void _libsecinit_initializer(void);        // from libsecinit.dylib
 extern void _libtrace_init(void);              // from libsystem_trace.dylib
 extern void _container_init(const char *apple[]); // from libsystem_containermanager.dylib
+extern void __libdarwin_init(void);            // from libsystem_darwin.dylib
 
 
 // signal malloc stack logging that initialisation has finished
@@ -155,7 +156,7 @@ libSystem_initializer(int argc,
        // TODO: Move __malloc_init before __libc_init after breaking malloc's upward link to Libc
        __malloc_init(apple);
 
-#if !TARGET_OS_SIMULATOR && !TARGET_OS_TV && !TARGET_OS_WATCH
+#if TARGET_OS_OSX
        /* <rdar://problem/9664631> */
        __keymgr_initializer();
 #endif
@@ -176,9 +177,11 @@ libSystem_initializer(int argc,
        _container_init(apple);
 #endif
 
+       __libdarwin_init();
+
        __stack_logging_early_finished();
 
-#if TARGET_OS_EMBEDDED && !TARGET_OS_WATCH && !__LP64__
+#if TARGET_OS_EMBEDDED && TARGET_OS_IOS && !__LP64__
        _vminterpose_init();
 #endif
 

diff --git a/requiredlibs b/requiredlibs
index 5343f7c4b91f4ceb771339a298aad3570c622af7..15411b8bb175fe0dffda79a6d2a8a2e781e10e9f 100644 (file)
--- a/requiredlibs
+++ b/requiredlibs
@@ -13,17 +13,17 @@ system_blocks
 system_c
 system_configuration
 system_coreservices
-system_coretls
+system_darwin
 system_dnssd
 system_info
-system_kernel system_sim_kernel
+system_sim_kernel system_kernel
 system_m
 system_malloc
 system_network
 system_notify
-system_platform system_sim_platform
-system_pthread system_sim_pthread
+system_sim_platform system_platform
+system_sim_pthread system_pthread
 system_sandbox
 system_trace
-unwind unwind_sim
+unwind
 xpc

diff --git a/xcodescripts/linker_arguments.sh b/xcodescripts/linker_arguments.sh
index ea75f9fef30e60a83e85e24ecc2b6c7cdebbe361..6be6cd70b3abd4a7ee328f4135fe3a54b3cc5de8 100755 (executable)
--- a/xcodescripts/linker_arguments.sh
+++ b/xcodescripts/linker_arguments.sh
@@ -47,11 +47,15 @@ for arch in ${ARCHS}; do
 
        # Strip away variant information to do presence checks
        # non-normal variants can always link against normal clients
-       cd ${LSYS} && ls lib*.dylib | sed -E -e 's/_(debug|profile|static)\././' | while read l; do
-           xcrun -sdk "${SDKROOT}" lipo "${LSYS}/${l}" -verify_arch "${arch}" 2>/dev/null
-           if [ $? -eq 0 ]; then
-               echo "${l}"
-           fi
+       cd ${LSYS} && ls lib*.{dylib,tbd,api,spi} | sed -E -e 's/_(debug|profile|static)\././' | while read l; do
+               if [ "${l: -6}" == ".dylib" ]; then
+                       xcrun -sdk "${SDKROOT}" lipo "${LSYS}/${l}" -verify_arch "${arch}" 2>/dev/null
+               else
+                       xcrun -sdk "${SDKROOT}" tapi archive "${LSYS}/${l}" --verify-arch "${arch}" 2>/dev/null
+               fi
+               if [ $? -eq 0 ]; then
+                         echo "${l}"
+               fi
        done | sed -E -e 's/^lib//' -e 's/\..*$$//'  | sort -u > ${INUSRLIBSYSTEM}
        cd ${LIBSYS} && ls lib*.a | sed -E -e 's/_(debug|profile|static)\././' | while read l; do
            xcrun -sdk "${SDKROOT}" lipo "${LIBSYS}/${l}" -verify_arch "${arch}" 2>/dev/null
@@ -68,6 +72,7 @@ for arch in ${ARCHS}; do
 
        while read line ; do
            for lib in ${line} ; do
+               egrep -q "^${lib}$" ${INUSRLIBSYSTEM} && break
                egrep "^${lib}$" ${INUSRLOCALLIBSYSTEM} && break
            done
        done < ${ALLLIBS} > ${POSSIBLEUSRLOCALLIBSYSTEM}