diff options
| -rw-r--r-- | src/link.cpp | 8 | ||||
| -rw-r--r-- | src/target.cpp | 13 | ||||
| -rw-r--r-- | src/target.hpp | 1 |
3 files changed, 2 insertions, 20 deletions
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)); diff --git a/src/target.cpp b/src/target.cpp index 0307216834..4430adfe5a 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -1295,19 +1295,6 @@ const char *target_arch_musl_name(ZigLLVM_ArchType arch) { } } -bool target_supports_libunwind(const ZigTarget *target) { - switch (target->arch) { - case ZigLLVM_arm: - case ZigLLVM_armeb: - case ZigLLVM_riscv32: - case ZigLLVM_riscv64: - return false; - default: - return true; - } - return true; -} - bool target_libc_needs_crti_crtn(const ZigTarget *target) { if (target->arch == ZigLLVM_riscv32 || target->arch == ZigLLVM_riscv64 || target_is_android(target)) { return false; diff --git a/src/target.hpp b/src/target.hpp index c3f8530e02..898fa90203 100644 --- a/src/target.hpp +++ b/src/target.hpp @@ -119,7 +119,6 @@ bool target_supports_stack_probing(const ZigTarget *target); bool target_supports_sanitize_c(const ZigTarget *target); bool target_has_debug_info(const ZigTarget *target); const char *target_arch_musl_name(ZigLLVM_ArchType arch); -bool target_supports_libunwind(const ZigTarget *target); uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch); uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch); |