Skip to content

Commit 965953d

Browse files
mikeashmikeash
authored
Merge pull request swiftlang#23451 from mikeash/magic-symbols-for-install-name
[Build] Use magic linker symbols to specify an @rpath-relative install name when targeting pre-stable-ABI OSes.
2 parents 955234e + 26d44d5 commit 965953d

File tree

48 files changed

+190
-2
lines changed

Some content is hidden

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

48 files changed

+190
-2
lines changed

‎cmake/modules/AddSwift.cmake‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1881,10 +1881,13 @@ function(add_swift_target_library name)
18811881
endforeach()
18821882

18831883
# Add PrivateFrameworks, rdar://28466433
1884+
set(swiftlib_c_compile_flags_all ${SWIFTLIB_C_COMPILE_FLAGS})
18841885
if(sdk IN_LIST SWIFT_APPLE_PLATFORMS AND SWIFTLIB_IS_SDK_OVERLAY)
18851886
set(swiftlib_swift_compile_private_frameworks_flag "-Fsystem" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/System/Library/PrivateFrameworks/")
18861887
endif()
18871888

1889+
list(APPEND swiftlib_c_compile_flags_all "-DSWIFT_TARGET_LIBRARY_NAME=${name}")
1890+
18881891
# Add this library variant.
18891892
_add_swift_library_single(
18901893
${VARIANT_NAME}
@@ -1902,7 +1905,7 @@ function(add_swift_target_library name)
19021905
FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK}
19031906
LLVM_COMPONENT_DEPENDS ${SWIFTLIB_LLVM_COMPONENT_DEPENDS}
19041907
FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
1905-
C_COMPILE_FLAGS ${SWIFTLIB_C_COMPILE_FLAGS}
1908+
C_COMPILE_FLAGS ${swiftlib_c_compile_flags_all}
19061909
SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all} ${swiftlib_swift_compile_flags_arch} ${swiftlib_swift_compile_private_frameworks_flag}
19071910
LINK_FLAGS ${swiftlib_link_flags_all}
19081911
PRIVATE_LINK_LIBRARIES ${swiftlib_private_link_libraries_targets}

‎stdlib/linker-support/magic-symbols-for-install-name.c‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
//===--- magic-symbols-for-install-name.c - Magic linker directive symbols ===//
2+
//
3+
// This source file is part of the Swift.org open source project
4+
//
5+
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
7+
//
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
10+
//
11+
//===----------------------------------------------------------------------===//
12+
//
13+
// A file containing magic symbols that instruct the linker to use a
14+
// different install name when targeting older OSes. This file gets
15+
// compiled into all of the libraries that are embedded for backward
16+
// deployment.
17+
//
18+
//===----------------------------------------------------------------------===//
19+
20+
#if defined(__APPLE__) && defined(__MACH__)
21+
22+
#include <Availability.h>
23+
#include <TargetConditionals.h>
24+
#include "../public/SwiftShims/Visibility.h"
25+
26+
#define RPATH_INSTALL_NAME_DIRECTIVE_IMPL2(name, major, minor) \
27+
SWIFT_RUNTIME_EXPORT const char install_name_ ## major ## _ ## minor \
28+
__asm("$ld$install_name$os" #major "." #minor "$@rpath/lib" #name ".dylib"); \
29+
const char install_name_ ## major ## _ ## minor = 0;
30+
31+
#define RPATH_INSTALL_NAME_DIRECTIVE_IMPL(name, major, minor) \
32+
RPATH_INSTALL_NAME_DIRECTIVE_IMPL2(name, major, minor)
33+
34+
#define RPATH_INSTALL_NAME_DIRECTIVE(major, minor) \
35+
RPATH_INSTALL_NAME_DIRECTIVE_IMPL(SWIFT_TARGET_LIBRARY_NAME, major, minor)
36+
37+
38+
#if TARGET_OS_WATCH
39+
// Check watchOS first, because TARGET_OS_IPHONE includes watchOS.
40+
RPATH_INSTALL_NAME_DIRECTIVE( 2, 0)
41+
RPATH_INSTALL_NAME_DIRECTIVE( 2, 1)
42+
RPATH_INSTALL_NAME_DIRECTIVE( 2, 2)
43+
RPATH_INSTALL_NAME_DIRECTIVE( 3, 0)
44+
RPATH_INSTALL_NAME_DIRECTIVE( 3, 1)
45+
RPATH_INSTALL_NAME_DIRECTIVE( 3, 2)
46+
RPATH_INSTALL_NAME_DIRECTIVE( 4, 0)
47+
RPATH_INSTALL_NAME_DIRECTIVE( 4, 1)
48+
RPATH_INSTALL_NAME_DIRECTIVE( 4, 2)
49+
RPATH_INSTALL_NAME_DIRECTIVE( 4, 3)
50+
RPATH_INSTALL_NAME_DIRECTIVE( 5, 0)
51+
RPATH_INSTALL_NAME_DIRECTIVE( 5, 1)
52+
#elif TARGET_OS_IPHONE
53+
RPATH_INSTALL_NAME_DIRECTIVE( 7, 0)
54+
RPATH_INSTALL_NAME_DIRECTIVE( 7, 1)
55+
RPATH_INSTALL_NAME_DIRECTIVE( 8, 0)
56+
RPATH_INSTALL_NAME_DIRECTIVE( 8, 1)
57+
RPATH_INSTALL_NAME_DIRECTIVE( 8, 2)
58+
RPATH_INSTALL_NAME_DIRECTIVE( 8, 3)
59+
RPATH_INSTALL_NAME_DIRECTIVE( 8, 4)
60+
RPATH_INSTALL_NAME_DIRECTIVE( 9, 0)
61+
RPATH_INSTALL_NAME_DIRECTIVE( 9, 1)
62+
RPATH_INSTALL_NAME_DIRECTIVE( 9, 2)
63+
RPATH_INSTALL_NAME_DIRECTIVE( 9, 3)
64+
RPATH_INSTALL_NAME_DIRECTIVE(10, 0)
65+
RPATH_INSTALL_NAME_DIRECTIVE(10, 1)
66+
RPATH_INSTALL_NAME_DIRECTIVE(10, 2)
67+
RPATH_INSTALL_NAME_DIRECTIVE(10, 3)
68+
RPATH_INSTALL_NAME_DIRECTIVE(11, 0)
69+
RPATH_INSTALL_NAME_DIRECTIVE(11, 1)
70+
RPATH_INSTALL_NAME_DIRECTIVE(11, 2)
71+
RPATH_INSTALL_NAME_DIRECTIVE(11, 3)
72+
RPATH_INSTALL_NAME_DIRECTIVE(11, 4)
73+
RPATH_INSTALL_NAME_DIRECTIVE(12, 0)
74+
RPATH_INSTALL_NAME_DIRECTIVE(12, 1)
75+
#elif TARGET_OS_OSX
76+
RPATH_INSTALL_NAME_DIRECTIVE(10, 9)
77+
RPATH_INSTALL_NAME_DIRECTIVE(10, 10)
78+
RPATH_INSTALL_NAME_DIRECTIVE(10, 11)
79+
RPATH_INSTALL_NAME_DIRECTIVE(10, 12)
80+
RPATH_INSTALL_NAME_DIRECTIVE(10, 13)
81+
82+
// When building with a deployment target of < macOS 10.14,
83+
// treat macOS 10.14 as an "older OS."
84+
#if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_14
85+
RPATH_INSTALL_NAME_DIRECTIVE(10, 14)
86+
#endif
87+
88+
#else
89+
#error Unknown target.
90+
#endif
91+
92+
#endif // defined(__APPLE__) && defined(__MACH__)

‎stdlib/private/SwiftPrivate/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
1010
IO.swift
1111
ShardedAtomicCounter.swift
1212

13+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
14+
1315
GYB_SOURCES
1416
AtomicInt.swift.gyb
1517

‎stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
55
Subprocess.c
66
Subprocess.swift
77

8+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
9+
810
SWIFT_MODULE_DEPENDS SwiftPrivate
911
SWIFT_COMPILE_FLAGS
1012
SWIFT_MODULE_DEPENDS_OSX Darwin

‎stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
44
SwiftPrivateThreadExtras.swift
55
ThreadBarriers.swift
66

7+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
8+
79
SWIFT_MODULE_DEPENDS_IOS Darwin
810
SWIFT_MODULE_DEPENDS_OSX Darwin
911
SWIFT_MODULE_DEPENDS_TVOS Darwin

‎stdlib/public/Darwin/ARKit/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
44
add_swift_target_library(swiftARKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
55
ARKit.swift
66

7+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
8+
79
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
810
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
911
TARGET_SDKS IOS IOS_SIMULATOR

‎stdlib/public/Darwin/AVFoundation/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ add_swift_target_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYP
99
AVError.swift
1010
AVMetadataObject.swift
1111

12+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
13+
1214
GYB_SOURCES
1315
NSValue.swift.gyb
1416

‎stdlib/public/Darwin/Accelerate/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
33

44
add_swift_target_library(swiftAccelerate ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
55

6+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
7+
68
GYB_SOURCES
79
BNNS.swift.gyb
810

‎stdlib/public/Darwin/AppKit/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ add_swift_target_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS
99
NSGraphics.swift
1010
NSOpenGL.swift
1111

12+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
13+
1214
SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} -swift-version 4
1315
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
1416
TARGET_SDKS OSX

‎stdlib/public/Darwin/AssetsLibrary/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
44
add_swift_target_library(swiftAssetsLibrary ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
55
ALAssetsLibrary.swift
66

7+
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
8+
79
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
810
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
911
TARGET_SDKS IOS IOS_SIMULATOR

0 commit comments

Comments
 (0)