Skip to content

Commit 155f1ce

Browse files
swift-ciswift-ci
authored
Merge pull request #2249 from compnerd/deployment-targets
2 parents b4291ba + b3821e4 commit 155f1ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+603
-645
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,12 @@ if(FOUNDATION_ENABLE_LIBDISPATCH)
8787
endif()
8888

8989
if(CMAKE_SYSTEM_NAME STREQUAL Android OR CMAKE_SYSTEM_NAME STREQUAL Linux)
90-
set(deployment_target -DDEPLOYMENT_TARGET_LINUX)
9190
set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN")
9291
set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR})
93-
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
94-
set(deployment_target -DDEPLOYMENT_TARGET_MACOSX)
9592
elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
96-
set(deployment_target -DDEPLOYMENT_TARGET_FREEBSD)
9793
set(Foundation_RPATH -Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN")
9894
set(XDG_TEST_HELPER_RPATH -Xlinker;-rpath;-Xlinker;${CMAKE_CURRENT_BINARY_DIR})
9995
elseif(CMAKE_SYSTEM_NAME STREQUAL Windows)
100-
set(deployment_target -DDEPLOYMENT_TARGET_WINDOWS)
10196
# FIXME(SR9138) Silence "locally defined symbol '…' imported in function '…'
10297
set(WORKAROUND_SR9138 -Xlinker;-ignore:4049;-Xlinker;-ignore:4217)
10398
set(WORKAROUND_SR9995 -Xlinker;-nodefaultlib:libcmt)

‎CoreFoundation/Base.subproj/CFBase.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#if _POSIX_THREADS
1818
#include <pthread.h>
1919
#endif
20-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
20+
#if TARGET_OS_MAC
2121
#include <malloc/malloc.h>
2222
#include <mach/mach.h>
2323
#include <dlfcn.h>
@@ -29,7 +29,7 @@
2929

3030
struct __CFAllocator {
3131
CFRuntimeBase _base;
32-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
32+
#if TARGET_OS_MAC
3333
// CFAllocator structure must match struct _malloc_zone_t!
3434
// The first two reserved fields in struct _malloc_zone_t are for us with CFRuntimeBase
3535
size_t (*size)(struct _malloc_zone_t *zone, const void *ptr); /* returns the size of a block or 0 if not in this zone; must be fast, especially for negative answers */
@@ -465,7 +465,7 @@ void CFAllocatorSetDefault(CFAllocatorRef allocator) {
465465
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
466466
}
467467
#endif
468-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
468+
#if TARGET_OS_MAC
469469
if (allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
470470
return; // require allocator to this function to be an allocator
471471
}
@@ -491,7 +491,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC
491491
CFAllocatorRetainCallBack retainFunc;
492492
CFAllocatorAllocateCallBack allocateFunc;
493493
void *retainedInfo;
494-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
494+
#if TARGET_OS_MAC
495495
if (allocator && kCFAllocatorUseContext != allocator && allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
496496
return NULL; // require allocator to this function to be an allocator
497497
}
@@ -525,7 +525,7 @@ static CFAllocatorRef __CFAllocatorCreate(CFAllocatorRef allocator, CFAllocatorC
525525
memset(memory, 0, sizeof(CFRuntimeBase));
526526
__CFRuntimeSetRC(memory, 1);
527527
_CFAllocatorSetInstanceTypeIDAndIsa(memory);
528-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
528+
#if TARGET_OS_MAC
529529
memory->size = __CFAllocatorCustomSize;
530530
memory->malloc = __CFAllocatorCustomMalloc;
531531
memory->calloc = __CFAllocatorCustomCalloc;
@@ -574,15 +574,15 @@ void *CFAllocatorAllocate(CFAllocatorRef allocator, CFIndex size, CFOptionFlags
574574
allocator = __CFGetDefaultAllocator();
575575
}
576576

577-
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI)
577+
#if defined(DEBUG) && TARGET_OS_MAC
578578
if (allocator->_base._cfisa == __CFISAForCFAllocator()) {
579579
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
580580
}
581581
#else
582582
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
583583
#endif
584584
if (0 == size) return NULL;
585-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
585+
#if TARGET_OS_OSX || TARGET_IOS_IPHONE
586586
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
587587
return malloc_zone_malloc((malloc_zone_t *)allocator, size);
588588
}
@@ -605,15 +605,15 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize
605605
allocator = __CFGetDefaultAllocator();
606606
}
607607

608-
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI)
608+
#if defined(DEBUG) && TARGET_OS_MAC
609609
if (allocator->_base._cfisa == __CFISAForCFAllocator()) {
610610
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
611611
}
612612
#else
613613
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
614614
#endif
615615
if (NULL == ptr && 0 < newsize) {
616-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
616+
#if TARGET_OS_MAC
617617
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
618618
return malloc_zone_malloc((malloc_zone_t *)allocator, newsize);
619619
}
@@ -626,7 +626,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize
626626
return newptr;
627627
}
628628
if (NULL != ptr && 0 == newsize) {
629-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
629+
#if TARGET_OS_MAC
630630
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
631631
#if defined(DEBUG)
632632
size_t size = malloc_size(ptr);
@@ -643,7 +643,7 @@ void *CFAllocatorReallocate(CFAllocatorRef allocator, void *ptr, CFIndex newsize
643643
return NULL;
644644
}
645645
if (NULL == ptr && 0 == newsize) return NULL;
646-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
646+
#if TARGET_OS_MAC
647647
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
648648
return malloc_zone_realloc((malloc_zone_t *)allocator, ptr, newsize);
649649
}
@@ -661,14 +661,14 @@ void CFAllocatorDeallocate(CFAllocatorRef allocator, void *ptr) {
661661
allocator = __CFGetDefaultAllocator();
662662
}
663663

664-
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI)
664+
#if defined(DEBUG) && TARGET_OS_MAC
665665
if (allocator->_base._cfisa == __CFISAForCFAllocator()) {
666666
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
667667
}
668668
#else
669669
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
670670
#endif
671-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
671+
#if TARGET_OS_MAC
672672
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
673673
#if defined(DEBUG)
674674
size_t size = malloc_size(ptr);
@@ -691,14 +691,14 @@ CFIndex CFAllocatorGetPreferredSizeForSize(CFAllocatorRef allocator, CFIndex siz
691691
allocator = __CFGetDefaultAllocator();
692692
}
693693

694-
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI)
694+
#if defined(DEBUG) && TARGET_OS_MAC
695695
if (allocator->_base._cfisa == __CFISAForCFAllocator()) {
696696
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
697697
}
698698
#else
699699
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
700700
#endif
701-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
701+
#if TARGET_OS_MAC
702702
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
703703
return malloc_good_size(size);
704704
}
@@ -716,15 +716,15 @@ void CFAllocatorGetContext(CFAllocatorRef allocator, CFAllocatorContext *context
716716
allocator = __CFGetDefaultAllocator();
717717
}
718718

719-
#if defined(DEBUG) && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI)
719+
#if defined(DEBUG) && TARGET_OS_MAC
720720
if (allocator->_base._cfisa == __CFISAForCFAllocator()) {
721721
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
722722
}
723723
#else
724724
__CFGenericValidateType(allocator, _kCFRuntimeIDCFAllocator);
725725
#endif
726726
CFAssert1(0 == context->version, __kCFLogAssertion, "%s(): context version not initialized to 0", __PRETTY_FUNCTION__);
727-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
727+
#if TARGET_OS_MAC
728728
if (allocator->_base._cfisa != __CFISAForCFAllocator()) { // malloc_zone_t *
729729
return;
730730
}

‎CoreFoundation/Base.subproj/CFFileUtilities.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <string.h>
1818
#include <stdio.h>
1919

20-
#if DEPLOYMENT_TARGET_WINDOWS
20+
#if TARGET_OS_WIN32
2121
#include <io.h>
2222
#include <fcntl.h>
2323

@@ -46,7 +46,7 @@
4646
#endif
4747

4848
CF_INLINE int openAutoFSNoWait() {
49-
#if DEPLOYMENT_TARGET_WINDOWS
49+
#if TARGET_OS_WIN32
5050
return -1;
5151
#else
5252
return (__CFProphylacticAutofsAccess ? open("/dev/autofs_nowait", 0) : -1);
@@ -191,7 +191,7 @@ CF_PRIVATE Boolean _CFWriteBytesToFile(CFURLRef url, const void *bytes, CFIndex
191191
thread_set_errno(saveerr);
192192
return false;
193193
}
194-
#if DEPLOYMENT_TARGET_WINDOWS
194+
#if TARGET_OS_WIN32
195195
FlushFileBuffers((HANDLE)_get_osfhandle(fd));
196196
#else
197197
fsync(fd);
@@ -213,7 +213,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
213213
CFStringRef extension = (matchingAbstractType ? _CFCopyExtensionForAbstractType(matchingAbstractType) : NULL);
214214
CFIndex targetExtLen = (extension ? CFStringGetLength(extension) : 0);
215215

216-
#if DEPLOYMENT_TARGET_WINDOWS
216+
#if TARGET_OS_WIN32
217217
// This is a replacement for 'dirent' below, and also uses wchar_t to support unicode paths
218218
wchar_t extBuff[CFMaxPathSize];
219219
int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :(
@@ -342,7 +342,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
342342
FindClose(handle);
343343
pathBuf[pathLength] = '\0';
344344

345-
#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
345+
#elif TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
346346
uint8_t extBuff[CFMaxPathSize];
347347
int extBuffInteriorDotCount = 0; //people insist on using extensions like ".trace.plist", so we need to know how many dots back to look :(
348348

@@ -452,13 +452,13 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
452452
isDir = ((statBuf.st_mode & S_IFMT) == S_IFDIR);
453453
}
454454
}
455-
#if DEPLOYMENT_TARGET_LINUX
455+
#if TARGET_OS_LINUX
456456
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, namelen, isDir, dirURL);
457457
#else
458458
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase(alloc, (uint8_t *)dp->d_name, dp->d_namlen, isDir, dirURL);
459459
#endif
460460
} else {
461-
#if DEPLOYMENT_TARGET_LINUX
461+
#if TARGET_OS_LINUX
462462
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase (alloc, (uint8_t *)dp->d_name, namelen, false, dirURL);
463463
#else
464464
fileURL = CFURLCreateFromFileSystemRepresentationRelativeToBase (alloc, (uint8_t *)dp->d_name, dp->d_namlen, false, dirURL);
@@ -545,7 +545,7 @@ CF_PRIVATE SInt32 _CFGetPathProperties(CFAllocatorRef alloc, char *path, Boolean
545545

546546
if (modTime != NULL) {
547547
if (fileExists) {
548-
#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
548+
#if TARGET_OS_WIN32 || TARGET_OS_LINUX
549549
struct timespec ts = {statBuf.st_mtime, 0};
550550
#else
551551
struct timespec ts = statBuf.st_mtimespec;
@@ -599,7 +599,7 @@ CF_PRIVATE bool _CFURLExists(CFURLRef url) {
599599
return url && (0 == _CFGetFileProperties(kCFAllocatorSystemDefault, url, &exists, NULL, NULL, NULL, NULL, NULL)) && exists;
600600
}
601601

602-
#if DEPLOYMENT_TARGET_WINDOWS
602+
#if TARGET_OS_WIN32
603603
#define WINDOWS_PATH_SEMANTICS
604604
#else
605605
#define UNIX_PATH_SEMANTICS
@@ -1011,7 +1011,7 @@ CF_PRIVATE CFIndex _CFLengthAfterDeletingPathExtension(UniChar *unichars, CFInde
10111011
return ((0 < start) ? start : length);
10121012
}
10131013

1014-
#if DEPLOYMENT_TARGET_WINDOWS
1014+
#if TARGET_OS_WIN32
10151015
#define DT_DIR 4
10161016
#define DT_REG 8
10171017
#define DT_LNK 10
@@ -1023,7 +1023,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla
10231023
char directoryPathBuf[CFMaxPathSize];
10241024
if (!CFStringGetFileSystemRepresentation(directoryPath, directoryPathBuf, CFMaxPathSize)) return;
10251025

1026-
#if DEPLOYMENT_TARGET_WINDOWS
1026+
#if TARGET_OS_WIN32
10271027
// Make sure there is room for the additional space we need in the win32 api
10281028
if (strlen(directoryPathBuf) > CFMaxPathSize - 2) return;
10291029

@@ -1072,7 +1072,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla
10721072
struct dirent *dent;
10731073
if ((dirp = opendir(directoryPathBuf))) {
10741074
while ((dent = readdir(dirp))) {
1075-
#if DEPLOYMENT_TARGET_LINUX
1075+
#if TARGET_OS_LINUX
10761076
CFIndex nameLen = strlen(dent->d_name);
10771077
if (dent->d_type == DT_UNKNOWN) {
10781078
// on some old file systems readdir may always fill d_type as DT_UNKNOWN (0), double check with stat
@@ -1141,7 +1141,7 @@ CF_PRIVATE void _CFIterateDirectory(CFStringRef directoryPath, Boolean appendSla
11411141
if (dent->d_type == DT_DIR) {
11421142
isDirectory = true;
11431143
}
1144-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
1144+
#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
11451145
else if (dent->d_type == DT_UNKNOWN) {
11461146
// We need to do an additional stat on this to see if it's really a directory or not.
11471147
// This path should be uncommon.

0 commit comments

Comments
 (0)