Skip to content

Commit 30c292c

Browse files
finagolfinfinagolfin
authored
[android] Update to NDK 23b (#39921)
The latest Long Term Support NDK finally removed binutils, including the bfd/gold linkers and libgcc. This simplifies our Android support, including making lld the default linker for Android. Disable three reflection tests that now fail, likely related to issues with swift-reflection-dump and switching to lld.
1 parent 0470406 commit 30c292c

File tree

21 files changed

+85
-135
lines changed

21 files changed

+85
-135
lines changed

‎CMakeLists.txt‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -175,21 +175,6 @@ set(SWIFT_COMPILER_VERSION "" CACHE STRING
175175
set(CLANG_COMPILER_VERSION "" CACHE STRING
176176
"The internal version of the Clang compiler")
177177

178-
# Which default linker to use. Prefer LLVM_USE_LINKER if it set, otherwise use
179-
# our own defaults. This should only be possible in a unified (not stand alone)
180-
# build environment.
181-
if(LLVM_USE_LINKER)
182-
set(SWIFT_USE_LINKER_default "${LLVM_USE_LINKER}")
183-
elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
184-
set(SWIFT_USE_LINKER_default "lld")
185-
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
186-
set(SWIFT_USE_LINKER_default "")
187-
else()
188-
set(SWIFT_USE_LINKER_default "gold")
189-
endif()
190-
set(SWIFT_USE_LINKER ${SWIFT_USE_LINKER_default} CACHE STRING
191-
"Build Swift with a non-default linker")
192-
193178
option(SWIFT_DISABLE_DEAD_STRIPPING
194179
"Turn off Darwin-specific dead stripping for Swift host tools." FALSE)
195180

@@ -308,8 +293,8 @@ set(SWIFT_ANDROID_API_LEVEL "" CACHE STRING
308293

309294
set(SWIFT_ANDROID_NDK_PATH "" CACHE STRING
310295
"Path to the directory that contains the Android NDK tools that are executable on the build machine")
311-
set(SWIFT_ANDROID_NDK_GCC_VERSION "" CACHE STRING
312-
"The GCC version to use when building for Android. Currently only 4.9 is supported.")
296+
set(SWIFT_ANDROID_NDK_CLANG_VERSION "12.0.8" CACHE STRING
297+
"The Clang version to use when building for Android.")
313298
set(SWIFT_ANDROID_DEPLOY_DEVICE_PATH "" CACHE STRING
314299
"Path on an Android device where build products will be pushed. These are used when running the test suite against the device")
315300

@@ -748,6 +733,23 @@ set(SWIFT_HOST_VARIANT_SDK "${SWIFT_HOST_VARIANT_SDK_default}" CACHE STRING
748733
set(SWIFT_HOST_VARIANT_ARCH "${SWIFT_HOST_VARIANT_ARCH_default}" CACHE STRING
749734
"Deployment arch for Swift host tools (the compiler).")
750735

736+
# Which default linker to use. Prefer LLVM_USE_LINKER if it set, otherwise use
737+
# our own defaults. This should only be possible in a unified (not stand alone)
738+
# build environment.
739+
if(LLVM_USE_LINKER)
740+
set(SWIFT_USE_LINKER_default "${LLVM_USE_LINKER}")
741+
elseif(${SWIFT_HOST_VARIANT_SDK} STREQUAL ANDROID)
742+
set(SWIFT_USE_LINKER_default "lld")
743+
elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
744+
set(SWIFT_USE_LINKER_default "lld")
745+
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
746+
set(SWIFT_USE_LINKER_default "")
747+
else()
748+
set(SWIFT_USE_LINKER_default "gold")
749+
endif()
750+
set(SWIFT_USE_LINKER ${SWIFT_USE_LINKER_default} CACHE STRING
751+
"Build Swift with a non-default linker")
752+
751753
#
752754
# Enable additional warnings.
753755
#

‎cmake/modules/AddSwift.cmake‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,9 @@ function(_add_host_variant_c_compile_link_flags name)
145145
endif()
146146

147147
if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)
148-
# lld can handle targeting the android build. However, if lld is not
149-
# enabled, then fallback to the linker included in the android NDK.
150-
if(NOT SWIFT_USE_LINKER STREQUAL "lld")
151-
swift_android_tools_path(${SWIFT_HOST_VARIANT_ARCH} tools_path)
152-
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-B${tools_path}>)
153-
endif()
148+
# Make sure the Android NDK lld is used.
149+
swift_android_tools_path(${SWIFT_HOST_VARIANT_ARCH} tools_path)
150+
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-B${tools_path}>)
154151
endif()
155152

156153
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
@@ -384,11 +381,6 @@ function(_add_host_variant_link_flags target)
384381
cxx_link_libraries)
385382
target_link_libraries(${target} PRIVATE
386383
${cxx_link_libraries})
387-
388-
swift_android_libgcc_for_arch_cross_compile(${SWIFT_HOST_VARIANT_ARCH}
389-
${SWIFT_HOST_VARIANT_ARCH}_LIB)
390-
target_link_directories(${target} PRIVATE
391-
${${SWIFT_HOST_VARIANT_ARCH}_LIB})
392384
else()
393385
# If lto is enabled, we need to add the object path flag so that the LTO code
394386
# generator leaves the intermediate object file in a place where it will not

‎cmake/modules/AddSwiftUnittests.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ function(add_swift_unittest test_dirname)
3232
COMMAND "${SWIFT_SOURCE_DIR}/utils/swift-rpathize.py"
3333
"$<TARGET_FILE:${test_dirname}>")
3434
elseif("${SWIFT_HOST_VARIANT}" STREQUAL "android")
35-
swift_android_libgcc_for_arch_cross_compile(${SWIFT_HOST_VARIANT_ARCH} android_system_libs)
36-
set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_DIRECTORIES
37-
"${android_system_libs}")
3835
set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_LIBRARIES "log")
3936
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
4037
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")

‎cmake/modules/SwiftAndroidSupport.cmake‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,7 @@
1-
function(swift_android_prebuilt_host_name prebuilt_var_name)
2-
# Get the prebuilt suffix to create the correct toolchain path when using the NDK
3-
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
4-
set(${prebuilt_var_name} darwin-x86_64 PARENT_SCOPE)
5-
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Linux)
6-
set(${prebuilt_var_name} linux-x86_64 PARENT_SCOPE)
7-
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
8-
set(${prebuilt_var_name} Windows-x86_64 PARENT_SCOPE)
9-
else()
10-
message(SEND_ERROR "cannot cross-compile to android from ${CMAKE_HOST_SYSTEM_NAME}")
11-
endif()
12-
endfunction()
13-
14-
function(swift_android_libgcc_for_arch_cross_compile arch var)
15-
set(paths)
16-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
17-
list(APPEND paths "${SWIFT_SDK_ANDROID_ARCH_${arch}_PATH}/../lib/gcc/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}/${SWIFT_ANDROID_NDK_GCC_VERSION}.x")
18-
endif()
19-
set(${var} ${paths} PARENT_SCOPE)
20-
endfunction()
21-
221
function(swift_android_sysroot sysroot_var_name)
232
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
24-
swift_android_prebuilt_host_name(prebuilt_build)
25-
set(${sysroot_var_name} "${SWIFT_ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/${prebuilt_build}/sysroot" PARENT_SCOPE)
3+
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} platform)
4+
set(${sysroot_var_name} "${SWIFT_ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/${platform}-x86_64/sysroot" PARENT_SCOPE)
265
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
276
set(${sysroot_var_name} "${SWIFT_ANDROID_NATIVE_SYSROOT}" PARENT_SCOPE)
287
else()
@@ -32,19 +11,8 @@ endfunction()
3211

3312
function(swift_android_tools_path arch path_var_name)
3413
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
35-
swift_android_prebuilt_host_name(prebuilt_build)
36-
if("${arch}" STREQUAL "i686")
37-
set(ndk_prebuilt_path
38-
"${SWIFT_ANDROID_NDK_PATH}/toolchains/x86-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${prebuilt_build}")
39-
elseif("${arch}" STREQUAL "x86_64")
40-
set(ndk_prebuilt_path
41-
"${SWIFT_ANDROID_NDK_PATH}/toolchains/x86_64-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${prebuilt_build}")
42-
else()
43-
set(ndk_prebuilt_path
44-
"${SWIFT_ANDROID_NDK_PATH}/toolchains/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${prebuilt_build}")
45-
endif()
46-
47-
set(${path_var_name} "${ndk_prebuilt_path}/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}/bin" PARENT_SCOPE)
14+
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} platform)
15+
set(${path_var_name} "${SWIFT_ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/${platform}-x86_64/bin" PARENT_SCOPE)
4816
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
4917
set(${path_var_name} "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/bin" PARENT_SCOPE)
5018
else()

‎docs/Android.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ To follow along with this guide, you'll need:
3333
Ubuntu 18.04 or Ubuntu 16.04. Before attempting to build for Android,
3434
please make sure you are able to build for Linux by following the
3535
instructions in the Swift project README.
36-
2. The latest version of the Android NDK (r21e at the time of this writing,
37-
only r19 or later are supported), available to download here:
36+
2. The latest version of the Android NDK (r23b at the time of this writing),
37+
available to download here:
3838
https://developer.android.com/ndk/downloads/index.html.
3939
3. An Android device with remote debugging enabled or the emulator. We require
4040
remote debugging in order to deploy built stdlib products to the device. You
@@ -73,7 +73,7 @@ Android NDK, as well as the directories that contain the `libicuucswift.so` and
7373

7474
```
7575
$ ARM_DIR=path/to/libiconv-libicu-android/armeabi-v7a
76-
$ NDK_PATH=path/to/android-ndk-r21e
76+
$ NDK_PATH=path/to/android-ndk-r23b
7777
$ utils/build-script \
7878
-R \ # Build in ReleaseAssert mode.
7979
--android \ # Build for Android.
@@ -99,7 +99,7 @@ Then use the built Swift compiler from the previous step to compile a Swift
9999
source file, targeting Android:
100100

101101
```
102-
$ NDK_PATH="path/to/android-ndk-r21e"
102+
$ NDK_PATH="path/to/android-ndk-r23b"
103103
$ build/Ninja-ReleaseAssert/swift-linux-x86_64/bin/swiftc \ # The Swift compiler built in the previous step
104104
# The location of the tools used to build Android binaries
105105
-tools-directory ${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/ \
@@ -153,7 +153,7 @@ adb push /path/to/libicu-android/armeabi-v7a/libicuucswift.so /data/local/tmp
153153
In addition, you'll also need to copy the Android NDK's libc++:
154154

155155
```
156-
$ adb push /path/to/android-ndk-r21e/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so /data/local/tmp
156+
$ adb push /path/to/android-ndk-r23b/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so /data/local/tmp
157157
```
158158

159159
Finally, you'll need to copy the `hello` executable you built in the
@@ -196,7 +196,7 @@ $ utils/build-script \
196196
-R \ # Build in ReleaseAssert mode.
197197
-T \ # Run all tests, including on the Android device (add --host-test to only run Android tests on the linux host).
198198
--android \ # Build for Android.
199-
--android-ndk ~/android-ndk-r21e \ # Path to an Android NDK.
199+
--android-ndk ~/android-ndk-r23b \ # Path to an Android NDK.
200200
--android-arch armv7 \ # Optionally specify Android architecture, alternately aarch64
201201
--android-ndk-version 21 \
202202
--android-icu-uc ~/libicu-android/armeabi-v7a/libicuuc.so \

‎lib/Driver/UnixToolChains.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ ToolChain::InvocationInfo toolchains::GenericUnix::constructInvocation(
8585
}
8686

8787
std::string toolchains::GenericUnix::getDefaultLinker() const {
88+
if (getTriple().isAndroid())
89+
return "lld";
90+
8891
switch (getTriple().getArch()) {
8992
case llvm::Triple::arm:
9093
case llvm::Triple::aarch64:
@@ -384,9 +387,12 @@ toolchains::GenericUnix::constructInvocation(const StaticLinkJobAction &job,
384387

385388
ArgStringList Arguments;
386389

390+
const char *AR;
387391
// Configure the toolchain.
388-
const char *AR =
389-
context.OI.LTOVariant != OutputInfo::LTOKind::None ? "llvm-ar" : "ar";
392+
if (getTriple().isAndroid())
393+
AR = "llvm-ar";
394+
else
395+
AR = context.OI.LTOVariant != OutputInfo::LTOKind::None ? "llvm-ar" : "ar";
390396
Arguments.push_back("crs");
391397

392398
Arguments.push_back(

‎stdlib/cmake/modules/AddSwiftStdlib.cmake‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,9 @@ function(_add_target_variant_c_compile_link_flags)
9494
endif()
9595

9696
if("${CFLAGS_SDK}" STREQUAL "ANDROID")
97-
# lld can handle targeting the android build. However, if lld is not
98-
# enabled, then fallback to the linker included in the android NDK.
99-
if(NOT SWIFT_USE_LINKER STREQUAL "lld")
100-
swift_android_tools_path(${CFLAGS_ARCH} tools_path)
101-
list(APPEND result "-B" "${tools_path}")
102-
endif()
97+
# Make sure the Android NDK lld is used.
98+
swift_android_tools_path(${CFLAGS_ARCH} tools_path)
99+
list(APPEND result "-B" "${tools_path}")
103100
endif()
104101

105102
if("${CFLAGS_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
@@ -407,8 +404,8 @@ function(_add_target_variant_link_flags)
407404
MACCATALYST_BUILD_FLAVOR "${LFLAGS_MACCATALYST_BUILD_FLAVOR}")
408405
if("${LFLAGS_SDK}" STREQUAL "LINUX")
409406
list(APPEND link_libraries "pthread" "dl")
410-
if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv6|armv7|i686")
411-
list(APPEND link_libraries PRIVATE "atomic")
407+
if("${LFLAGS_ARCH}" MATCHES "armv6|armv7|i686")
408+
list(APPEND link_libraries "atomic")
412409
endif()
413410
elseif("${LFLAGS_SDK}" STREQUAL "FREEBSD")
414411
list(APPEND link_libraries "pthread")
@@ -437,6 +434,9 @@ function(_add_target_variant_link_flags)
437434
list(APPEND link_libraries "dl" "log")
438435
# We need to add the math library, which is linked implicitly by libc++
439436
list(APPEND result "-lm")
437+
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
438+
list(APPEND result "-resource-dir=${SWIFT_SDK_ANDROID_ARCH_${LFLAGS_ARCH}_PATH}/../lib64/clang/${SWIFT_ANDROID_NDK_CLANG_VERSION}")
439+
endif()
440440

441441
# link against the custom C++ library
442442
swift_android_cxx_libraries_for_arch(${LFLAGS_ARCH} cxx_link_libraries)
@@ -446,11 +446,6 @@ function(_add_target_variant_link_flags)
446446
list(APPEND link_libraries
447447
${SWIFT_ANDROID_${LFLAGS_ARCH}_ICU_I18N}
448448
${SWIFT_ANDROID_${LFLAGS_ARCH}_ICU_UC})
449-
450-
swift_android_libgcc_for_arch_cross_compile(${LFLAGS_ARCH} ${LFLAGS_ARCH}_LIB)
451-
foreach(path IN LISTS ${LFLAGS_ARCH}_LIB)
452-
list(APPEND library_search_directories ${path})
453-
endforeach()
454449
else()
455450
# If lto is enabled, we need to add the object path flag so that the LTO code
456451
# generator leaves the intermediate object file in a place where it will not
@@ -478,10 +473,17 @@ function(_add_target_variant_link_flags)
478473
endif()
479474

480475
if(SWIFT_USE_LINKER AND NOT SWIFT_COMPILER_IS_MSVC_LIKE)
476+
# The linker is normally chosen based on the host, but the Android NDK only
477+
# uses lld now.
478+
if("${LFLAGS_SDK}" STREQUAL "ANDROID")
479+
set(linker "lld")
480+
else()
481+
set(linker "${SWIFT_USE_LINKER}")
482+
endif()
481483
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
482-
list(APPEND result "-fuse-ld=${SWIFT_USE_LINKER}.exe")
484+
list(APPEND result "-fuse-ld=${linker}.exe")
483485
else()
484-
list(APPEND result "-fuse-ld=${SWIFT_USE_LINKER}")
486+
list(APPEND result "-fuse-ld=${linker}")
485487
endif()
486488
endif()
487489

‎stdlib/public/runtime/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ foreach(sdk ${SWIFT_SDKS})
229229
endif()
230230
set(libpthread -lpthread)
231231
set(android_libraries)
232-
if(sdk STREQUAL ANDROID)
232+
if(${sdk} STREQUAL ANDROID)
233233
set(android_libraries -llog)
234234
set(libpthread)
235235
endif()

‎test/AutoDiff/validation-test/reflection.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: no_asan
2+
// UNSUPPORTED: OS=linux-android, OS=linux-androideabi
23
// RUN: %empty-directory(%t)
34
import _Differentiation
45

‎test/LinkerSections/function_sections-lld.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// REQUIRES: OS=linux-androideabi || OS=linux-android
2+
// RUN: %empty-directory(%t)
3+
// RUN: %target-build-swift -Xfrontend -function-sections -emit-module -emit-library -static -parse-stdlib %S/Inputs/FunctionSections.swift
4+
// RUN: %target-build-swift -Xlinker --gc-sections -Xlinker -Map=%t/../../FunctionSections.map -I%t/../.. -L%t/../.. -lFunctionSections %S/Inputs/FunctionSectionsUse.swift
5+
// RUN: %FileCheck %s < %t/../../FunctionSections.map
6+
7+
// CHECK-NOT: .text.$s16FunctionSections5func2yyF
8+
// CHECK: .text.$s16FunctionSections5func1yyF

0 commit comments

Comments
 (0)