[PATCH] D146266: gn build: Fix Android build.
Peter Collingbourne via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 17 11:18:53 PDT 2023
pcc updated this revision to Diff 506150.
pcc edited the summary of this revision.
pcc added a comment.
Bring back -Wl,-z,defs for Android
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D146266/new/
https://reviews.llvm.org/D146266
Files:
llvm/utils/gn/build/BUILD.gn
llvm/utils/gn/build/libs/implicit/BUILD.gn
llvm/utils/gn/build/toolchain/target_flags.gni
llvm/utils/gn/secondary/libunwind/src/BUILD.gn
llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn
Index: llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn
+++ 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",
Index: llvm/utils/gn/secondary/libunwind/src/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/libunwind/src/BUILD.gn
+++ 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
Index: llvm/utils/gn/build/toolchain/target_flags.gni
===================================================================
--- llvm/utils/gn/build/toolchain/target_flags.gni
+++ 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" ]
}
Index: llvm/utils/gn/build/libs/implicit/BUILD.gn
===================================================================
--- /dev/null
+++ 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",
+ ]
+ }
+}
Index: llvm/utils/gn/build/BUILD.gn
===================================================================
--- llvm/utils/gn/build/BUILD.gn
+++ llvm/utils/gn/build/BUILD.gn
@@ -448,7 +448,7 @@
# -Wl,-z,defs doesn't work with sanitizers.
# https://clang.llvm.org/docs/AddressSanitizer.html
if (current_os != "ios" && current_os != "mac" && current_os != "win" &&
- current_os != "android" && !(use_asan || use_tsan || use_ubsan)) {
+ !(use_asan || use_tsan || use_ubsan)) {
ldflags = [ "-Wl,-z,defs" ]
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D146266.506150.patch
Type: text/x-patch
Size: 2632 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230317/056a0d57/attachment.bin>
More information about the llvm-commits
mailing list