From: Apple <opensource@apple.com>
Date: Thu, 4 Oct 2018 22:01:49 +0000 (+0000)
Subject: Libsystem-1252.200.5.tar.gz
X-Git-Tag: macos-1014^0
X-Git-Url: https://git.saurik.com/apple/libsystem.git/commitdiff_plain/a85a94cf99b5880b6784caafe53f9b64b0efe02d

Libsystem-1252.200.5.tar.gz
---

diff --git a/.gitignore b/.gitignore
index 66ed0d4..5e74020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 
 # /Libsystem.xcodeproj/project.xcworkspace/
 /Libsystem.xcodeproj/project.xcworkspace/xcuserdata
+project.xcworkspace
diff --git a/Libsystem.xcconfig b/Libsystem.xcconfig
index b8ae8ea..7733806 100644
--- a/Libsystem.xcconfig
+++ b/Libsystem.xcconfig
@@ -51,3 +51,5 @@ PLIST_FILE_OUTPUT_FORMAT[sdk=macosx*] = xml
 DYLIB_INSTALL_NAME_EXECUTABLE_NAME = $(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_SUFFIX)
 DYLIB_INSTALL_NAME_EXECUTABLE_PATH = $(DYLIB_INSTALL_NAME_EXECUTABLE_NAME)
 LD_DYLIB_INSTALL_NAME = $(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(DYLIB_INSTALL_NAME_EXECUTABLE_PATH)
+
+IS_ZIPPERED = YES
diff --git a/Libsystem.xcodeproj/project.pbxproj b/Libsystem.xcodeproj/project.pbxproj
index be55ca6..9cdc4d6 100644
--- a/Libsystem.xcodeproj/project.pbxproj
+++ b/Libsystem.xcodeproj/project.pbxproj
@@ -300,7 +300,6 @@
 			baseConfigurationReference = C9B56C55153751A600C153A8 /* Libsystem.xcconfig */;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME).B";
-				"PRODUCT_NAME[sdk=iphonesimulator*]" = "$(TARGET_NAME)";
 				SDKROOT = macosx.internal;
 			};
 			name = Release;
diff --git a/init.c b/init.c
index dafcce2..3073ddb 100644
--- a/init.c
+++ b/init.c
@@ -97,10 +97,6 @@ extern void _libcoreservices_fork_child(void);
 extern char *_dirhelper(int, char *, size_t);
 #endif
 
-#if TARGET_OS_EMBEDDED && !TARGET_OS_WATCH && !__LP64__
-extern void _vminterpose_init(void);
-#endif
-
 // advance decls for below;
 void libSystem_atfork_prepare(void);
 void libSystem_atfork_parent(void);
@@ -185,7 +181,7 @@ libSystem_initializer(int argc,
 	_libsecinit_initializer();
 #endif
 
-#if TARGET_OS_EMBEDDED
+#if defined(HAVE_SYSTEM_CONTAINERMANAGER)
 	_container_init(apple);
 #endif
 
@@ -193,10 +189,6 @@ libSystem_initializer(int argc,
 
 	__stack_logging_early_finished();
 
-#if TARGET_OS_EMBEDDED && TARGET_OS_IOS && !__LP64__
-	_vminterpose_init();
-#endif
-
 #if !TARGET_OS_IPHONE
     /* <rdar://problem/22139800> - Preserve the old behavior of apple[] for
      * programs that haven't linked against newer SDK.
diff --git a/optionallibs b/optionallibs
index 6308f5b..0b7394a 100644
--- a/optionallibs
+++ b/optionallibs
@@ -1,7 +1,7 @@
 keymgr
 quarantine
 system_containermanager
+system_network
 system_networkextension
 system_secinit
 system_symptoms
-vminterpose
diff --git a/requiredlibs b/requiredlibs
index 15411b8..be982ac 100644
--- a/requiredlibs
+++ b/requiredlibs
@@ -19,7 +19,6 @@ system_info
 system_sim_kernel system_kernel
 system_m
 system_malloc
-system_network
 system_notify
 system_sim_platform system_platform
 system_sim_pthread system_pthread
diff --git a/xcodescripts/create_dylib_symlinks.sh b/xcodescripts/create_dylib_symlinks.sh
index cb0ef81..bb012ca 100755
--- a/xcodescripts/create_dylib_symlinks.sh
+++ b/xcodescripts/create_dylib_symlinks.sh
@@ -11,6 +11,10 @@ VARIANTS="$3"
 
 BSD_LIBS="c info m pthread dbm poll dl rpcsvc proc"
 
+if [[ "${PLATFORM_NAME}" =~ macosx ]]; then
+   BSD_LIBS="${BSD_LIBS} gcc_s.1"
+fi
+
 mkdir -p "${DSTROOT}/usr/lib" || exit 1
 
 if [ "${ACTION}" != "installhdrs" ]; then
@@ -20,11 +24,7 @@ if [ "${ACTION}" != "installhdrs" ]; then
 	    suffix="_${variant}"
 	fi
 
-        if [[ "${PLATFORM_NAME}" =~ simulator ]] ; then
-            ln -sf "libSystem${suffix}.dylib" "${DSTROOT}/usr/lib/libSystem.B${suffix}.dylib" || exit 1
-        else
-            ln -sf "libSystem.B${suffix}.dylib" "${DSTROOT}/usr/lib/libSystem${suffix}.dylib" || exit 1
-        fi
+        ln -sf "libSystem.B${suffix}.dylib" "${DSTROOT}/usr/lib/libSystem${suffix}.dylib" || exit 1
 
 	for i in ${BSD_LIBS}; do
 	    ln -sf "libSystem.dylib" "${DSTROOT}/usr/lib/lib${i}.dylib" || exit 1
diff --git a/xcodescripts/create_system_framework.sh b/xcodescripts/create_system_framework.sh
index bbc17a9..e3a99ff 100755
--- a/xcodescripts/create_system_framework.sh
+++ b/xcodescripts/create_system_framework.sh
@@ -40,10 +40,6 @@ else
 			suffix="_${variant}"
 		fi
 
-		if [[ "${PLATFORM_NAME}" =~ simulator ]] ; then
-			ln -sf "../../../../usr/lib/libSystem${suffix}.dylib" "${DSTROOT}/${FPATH}/System${suffix}" || exit 1
-		else
-			ln -sf "../../../../usr/lib/libSystem.B${suffix}.dylib" "${DSTROOT}/${FPATH}/System${suffix}" || exit 1
-		fi
+		ln -sf "../../../../usr/lib/libSystem.B${suffix}.dylib" "${DSTROOT}/${FPATH}/System${suffix}" || exit 1
 	done
 fi