diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-02-11 13:12:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 13:12:42 -0500 |
| commit | ab4ea5d3cf5a96cd596df14515521843ca4dccad (patch) | |
| tree | 53dbd5a50a589cd0c93db62e19a4a36f619f3401 /lib/std/special/compiler_rt.zig | |
| parent | e624c862894ec50998aafb3026d4ed45208acd6d (diff) | |
| parent | 6c05f0949aa09ac41268097161bacf8dc047e195 (diff) | |
| download | zig-ab4ea5d3cf5a96cd596df14515521843ca4dccad.tar.gz zig-ab4ea5d3cf5a96cd596df14515521843ca4dccad.zip | |
Merge pull request #4433 from LemonBoy/ohno
Trivial patchset
Diffstat (limited to 'lib/std/special/compiler_rt.zig')
| -rw-r--r-- | lib/std/special/compiler_rt.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig index f5e83b5278..8d49fdbd2a 100644 --- a/lib/std/special/compiler_rt.zig +++ b/lib/std/special/compiler_rt.zig @@ -149,7 +149,7 @@ comptime { @export(@import("compiler_rt/clzsi2.zig").__clzsi2, .{ .name = "__clzsi2", .linkage = linkage }); - if (builtin.arch.isARM() and !is_test) { + if ((builtin.arch.isARM() or builtin.arch.isThumb()) and !is_test) { @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr0, .{ .name = "__aeabi_unwind_cpp_pr0", .linkage = linkage }); @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr1, .{ .name = "__aeabi_unwind_cpp_pr1", .linkage = linkage }); @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr2, .{ .name = "__aeabi_unwind_cpp_pr2", .linkage = linkage }); |