diff --git a/llvm/utils/gn/build/libs/implicit/BUILD.gn b/llvm/utils/gn/build/libs/implicit/BUILD.gn new file mode 100644 --- /dev/null +++ b/llvm/utils/gn/build/libs/implicit/BUILD.gn @@ -0,0 +1,10 @@ +# This target represents the library dependencies that are implicitly linked by +# the compiler. +group("implicit") { + if (current_os == "android") { + deps = [ + "//compiler-rt/lib/builtins", + "//libunwind/src:unwind_static", + ] + } +} diff --git a/llvm/utils/gn/build/toolchain/target_flags.gni b/llvm/utils/gn/build/toolchain/target_flags.gni --- a/llvm/utils/gn/build/toolchain/target_flags.gni +++ b/llvm/utils/gn/build/toolchain/target_flags.gni @@ -15,10 +15,7 @@ "--sysroot=$android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "--gcc-toolchain=$android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64", ] - target_ldflags += [ - "-static-libstdc++", - "--unwindlib=none", - ] + target_ldflags += [ "-static-libstdc++" ] if (current_cpu == "arm") { target_flags += [ "-march=armv7-a" ] } diff --git a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn --- a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn +++ b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn @@ -58,7 +58,7 @@ } else if (current_cpu == "x64") { unwind_output_dir = "$crt_current_out_dir/x86_64" } else if (current_cpu == "x86") { - unwind_output_dir = "$crt_current_out_dir/i686" + unwind_output_dir = "$crt_current_out_dir/i386" } } else { unwind_output_dir = runtimes_dir diff --git a/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn @@ -4,6 +4,7 @@ "BLAKE3", "//llvm/include/llvm/Config:config", "//llvm/lib/Demangle", + "//llvm/utils/gn/build/libs/implicit", "//llvm/utils/gn/build/libs/pthread", "//llvm/utils/gn/build/libs/terminfo", "//llvm/utils/gn/build/libs/zlib",