BA2BD8FF136D27FE00FF78C0 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 8;
- dstPath = /System/Library/Frameworks/System.framework/Versions/B/Resources;
+ dstPath = "$(INSTALL_PATH_PREFIX)/System/Library/Frameworks/System.framework/Versions/B/Resources";
dstSubfolderSpec = 0;
files = (
BA2BD900136D282200FF78C0 /* Info.plist in CopyFiles */,
BA5511B3136C9D780012B9B5 /* APPLE_LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = APPLE_LICENSE; sourceTree = "<group>"; };
BA5511B4136C9D780012B9B5 /* CompatibilityHacks.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = CompatibilityHacks.c; sourceTree = "<group>"; };
BA5511B6136C9D780012B9B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- BA5511B7136C9D780012B9B5 /* init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = "<group>"; };
+ BA5511B7136C9D780012B9B5 /* init.c */ = {isa = PBXFileReference; indentWidth = 8; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
BA5511B9136C9D780012B9B5 /* optionallibs */ = {isa = PBXFileReference; lastKnownFileType = text; path = optionallibs; sourceTree = "<group>"; };
BA5511BA136C9D780012B9B5 /* requiredlibs */ = {isa = PBXFileReference; lastKnownFileType = text; path = requiredlibs; sourceTree = "<group>"; };
BA5511C4136C9E2E0012B9B5 /* libSystem.B.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSystem.B.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
C64EE1D7136F644700676C52 /* create_dylib_symlinks.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = create_dylib_symlinks.sh; sourceTree = "<group>"; };
C64EE1D8136F644700676C52 /* create_system_framework.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = create_system_framework.sh; sourceTree = "<group>"; };
C64EE1D9136F644700676C52 /* linker_arguments.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = linker_arguments.sh; sourceTree = "<group>"; };
- C9A43CAB15374DB200388D0C /* alloc_once_private.h */ = {isa = PBXFileReference; fileEncoding = 4; path = alloc_once_private.h; sourceTree = "<group>"; };
+ C9A43CAB15374DB200388D0C /* alloc_once_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = alloc_once_private.h; sourceTree = "<group>"; };
C9B56C55153751A600C153A8 /* Libsystem.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Libsystem.xcconfig; sourceTree = "<group>"; };
/* End PBXFileReference section */
baseConfigurationReference = C9B56C55153751A600C153A8 /* Libsystem.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME).B";
+ "PRODUCT_NAME[sdk=iphonesimulator*]" = "$(TARGET_NAME)";
};
name = Release;
};
/*
- * Copyright (c) 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2007, 2008, 2011-2013 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <TargetConditionals.h> // for TARGET_OS_EMBEDDED
+#include <stddef.h>
+#include <stdlib.h>
+#include <libc_private.h>
#include <pthread.h>
#include <pthread/private.h>
-#include <_libkernel_init.h>
-#include <stdlib.h>
#include <dlfcn.h>
#include <errno.h>
-#include <TargetConditionals.h>
-
-struct ProgramVars; /* forward reference */
+#include <_libkernel_init.h> // Must be after voucher_private.h
// system library initialisers
-extern void bootstrap_init(void); // from liblaunch.dylib
extern void mach_init(void); // from libsystem_kernel.dylib
extern void __libplatform_init(void *future_use, const char *envp[], const char *apple[], const struct ProgramVars *vars);
extern void __pthread_init(const struct _libpthread_functions *libpthread_funcs, const char *envp[], const char *apple[], const struct ProgramVars *vars); // from libsystem_pthread.dylib
-extern void __libc_init(const struct ProgramVars *vars, void (*atfork_prepare)(void), void (*atfork_parent)(void), void (*atfork_child)(void), const char *apple[]); // from libsystem_c.dylib
extern void __malloc_init(const char *apple[]); // from libsystem_malloc.dylib
extern void __keymgr_initializer(void); // from libkeymgr.dylib
extern void _dyld_initializer(void); // from libdyld.dylib
extern void libdispatch_init(void); // from libdispatch.dylib
extern void _libxpc_initializer(void); // from libxpc.dylib
+extern void _libsecinit_initializer(void); // from libsecinit.dylib
+
// signal malloc stack logging that initialisation has finished
extern void __stack_logging_early_finished(void); // form libsystem_c.dylib
+// clear qos tsd (from pthread)
+extern void _pthread_clear_qos_tsd(mach_port_t) __attribute__((weak_import));
+
// system library atfork handlers
extern void _pthread_fork_prepare(void);
extern void _pthread_fork_parent(void);
extern void _pthread_fork_child(void);
extern void _pthread_fork_child_postinit(void);
+extern void _pthread_exit_if_canceled(int);
extern void dispatch_atfork_prepare(void);
extern void dispatch_atfork_parent(void);
extern void _malloc_fork_child(void);
extern void _mach_fork_child(void);
-extern void _libc_fork_child(void);
extern void _notify_fork_child(void);
extern void _dyld_fork_child(void);
extern void xpc_atfork_prepare(void);
extern void _libSC_info_fork_child(void);
extern void _asl_fork_child(void);
+#if defined(HAVE_SYSTEM_CORESERVICES)
+// libsystem_coreservices.dylib
+extern void _libcoreservices_fork_child(void);
+extern char *_dirhelper(int, char *, size_t);
+#endif
+
+#if TARGET_IPHONE_SIMULATOR
+// no-op _pthread_clear_qos_tsd in the simulator, as its an upcall from libsyscall
+#define _pthread_clear_qos_tsd NULL
+#endif
+
// advance decls for below;
void libSystem_atfork_prepare(void);
void libSystem_atfork_parent(void);
void libSystem_atfork_child(void);
-void _pthread_exit_if_canceled(int);
-
-/*
- * libsyscall_initializer() initializes all of libSystem.dylib <rdar://problem/4892197>
- */
-static __attribute__((constructor))
-void libSystem_initializer(int argc, const char* argv[], const char* envp[], const char* apple[], const struct ProgramVars* vars)
+// libsyscall_initializer() initializes all of libSystem.dylib
+// <rdar://problem/4892197>
+__attribute__((constructor))
+static void
+libSystem_initializer(int argc,
+ const char* argv[],
+ const char* envp[],
+ const char* apple[],
+ const struct ProgramVars* vars)
{
static const struct _libkernel_functions libkernel_funcs = {
- .version = 1,
+ .version = 3,
+ // V1 functions
.dlsym = dlsym,
.malloc = malloc,
.free = free,
.realloc = realloc,
._pthread_exit_if_canceled = _pthread_exit_if_canceled,
+ // V2 functions (removed)
+ // V3 functions
+ .pthread_clear_qos_tsd = _pthread_clear_qos_tsd,
};
static const struct _libpthread_functions libpthread_funcs = {
- .version = 1,
+ .version = 2,
.exit = exit,
+ .malloc = malloc,
+ .free = free,
+ };
+
+ static const struct _libc_functions libc_funcs = {
+ .version = 1,
+ .atfork_prepare = libSystem_atfork_prepare,
+ .atfork_parent = libSystem_atfork_parent,
+ .atfork_child = libSystem_atfork_child,
+#if defined(HAVE_SYSTEM_CORESERVICES)
+ .dirhelper = _dirhelper,
+#endif
};
__libkernel_init(&libkernel_funcs, envp, apple, vars);
- bootstrap_init();
__libplatform_init(NULL, envp, apple, vars);
-
__pthread_init(&libpthread_funcs, envp, apple, vars);
- __libc_init(vars, libSystem_atfork_prepare, libSystem_atfork_parent, libSystem_atfork_child, apple);
+ _libc_initializer(&libc_funcs, envp, apple, vars);
// TODO: Move __malloc_init before __libc_init after breaking malloc's upward link to Libc
__malloc_init(apple);
+#if !TARGET_IPHONE_SIMULATOR
+ /* <rdar://problem/9664631> */
+ __keymgr_initializer();
+#endif
+
_dyld_initializer();
libdispatch_init();
_libxpc_initializer();
+#if !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+ _libsecinit_initializer();
+#endif
+
__stack_logging_early_finished();
+
/* <rdar://problem/11588042>
* C99 standard has the following in section 7.5(3):
* "The value of errno is zero at program startup, but is never set
}
/*
- * libSystem_atfork_{prepare,parent,child}() are called by libc when we fork, then we deal with running fork handlers
- * for everyone else.
+ * libSystem_atfork_{prepare,parent,child}() are called by libc during fork(2).
+ * They call the corresponding atfork handlers for other libsystem components.
*/
-void libSystem_atfork_prepare(void)
+void
+libSystem_atfork_prepare(void)
{
_libSC_info_fork_prepare();
xpc_atfork_prepare();
_malloc_fork_prepare();
}
-void libSystem_atfork_parent(void)
+void
+libSystem_atfork_parent(void)
{
_malloc_fork_parent();
_pthread_fork_parent();
_libSC_info_fork_parent();
}
-void libSystem_atfork_child(void)
+void
+libSystem_atfork_child(void)
{
_dyld_fork_child();
_pthread_fork_child();
_malloc_fork_child();
dispatch_atfork_child();
- bootstrap_init();
_mach_fork_child();
_libc_fork_child();
+
+#if defined(HAVE_SYSTEM_CORESERVICES)
+ _libcoreservices_fork_child();
+#endif
+
_asl_fork_child();
_notify_fork_child();
xpc_atfork_child();
-#!/bin/sh -x
+#!/bin/bash -x
if [ $# -ne 5 ]; then
echo "Usage: $0 <archs> <variants> <outputdir> <sdkroot> <srcroot>" 1>&2
for arch in ${ARCHS}; do
for variant in ${VARIANTS}; do
OUTPUTFILE="${OUTPUTDIR}/linker_arguments.${arch}.${variant}.txt"
+ OUTPUTCONFIG="${OUTPUTDIR}/config.${arch}.${variant}.h"
TEMPDIR="${OUTPUTDIR}/linker_arguments_tmp"
mkdir -p "${TEMPDIR}"
echo "${l}"
fi
done | sed -E -e 's/^lib//' -e 's/\..*$$//' | sort -u > ${INUSRLOCALLIBSYSTEM}
- comm -12 ${ALLLIBS} ${INUSRLIBSYSTEM} > ${FROMUSRLIBSYSTEM}
- comm -12 ${ALLLIBS} ${INUSRLOCALLIBSYSTEM} > ${POSSIBLEUSRLOCALLIBSYSTEM}
+
+ while read line ; do
+ for lib in ${line} ; do
+ egrep "^${lib}$" ${INUSRLIBSYSTEM} && break
+ done
+ done < ${ALLLIBS} > ${FROMUSRLIBSYSTEM}
+
+ while read line ; do
+ for lib in ${line} ; do
+ egrep "^${lib}$" ${INUSRLOCALLIBSYSTEM} && break
+ done
+ done < ${ALLLIBS} > ${POSSIBLEUSRLOCALLIBSYSTEM}
+
comm -13 ${FROMUSRLIBSYSTEM} ${POSSIBLEUSRLOCALLIBSYSTEM} > ${FROMUSRLOCALLIBSYSTEM}
cat ${FROMUSRLIBSYSTEM} ${FROMUSRLOCALLIBSYSTEM} | sort > ${ACTUALLIBS}
- comm -23 ${REQUIREDLIBS} ${ACTUALLIBS} > ${MISSINGLIBS}
+
+ while read line ; do
+ found=0
+ for lib in ${line} ; do
+ egrep -q "^${lib}$" ${ACTUALLIBS} && found=1
+ done
+ [[ $found == 0 ]] && echo ${line}
+ done < ${REQUIREDLIBS} > ${MISSINGLIBS}
if [ -s ${MISSINGLIBS} ]; then
echo '*** missing required libs ***'
exit 1
fi
+ cat ${FROMUSRLIBSYSTEM} | while read lib; do
+ echo "#define HAVE_"$(echo "${lib/_sim/}" | tr 'a-z' 'A-Z')" 1"
+ done >> "${OUTPUTCONFIG}"
+
cat ${FROMUSRLIBSYSTEM} | while read lib; do
echo "-Wl,-reexport-l${lib}"
done >> "${OUTPUTFILE}"
projects / apple / libsystem.git / commitdiff
