From 6408766d6b55d228a305b877f28f45c1587f7d39 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 30 Mar 2020 15:50:53 -0400 Subject: linking: remove check for target_supports_libunwind I'm not sure why this was ever there. Maybe it was working around a problem with LLVM 9. Anyway this fixes linking C++ code for 32 bit arm and riscv. --- src/link.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/link.cpp') diff --git a/src/link.cpp b/src/link.cpp index 693aaca0e3..ed6275ec3a 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -1947,15 +1947,11 @@ static void construct_linker_job_elf(LinkJob *lj) { lj->args.append("-lpthread"); } } else if (target_is_glibc(g->zig_target)) { - if (target_supports_libunwind(g->zig_target)) { - lj->args.append(build_libunwind(g, lj->build_dep_prog_node)); - } + lj->args.append(build_libunwind(g, lj->build_dep_prog_node)); add_glibc_libs(lj); lj->args.append(get_libc_crt_file(g, "libc_nonshared.a", lj->build_dep_prog_node)); } else if (target_is_musl(g->zig_target)) { - if (target_supports_libunwind(g->zig_target)) { - lj->args.append(build_libunwind(g, lj->build_dep_prog_node)); - } + lj->args.append(build_libunwind(g, lj->build_dep_prog_node)); lj->args.append(build_musl(g, lj->build_dep_prog_node)); } else if (g->libcpp_link_lib != nullptr) { lj->args.append(build_libunwind(g, lj->build_dep_prog_node)); -- cgit v1.2.3