authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-01-18 23:40:58+01:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-01-19 00:12:26+01:00
logae31da9334851dfca226ece1a66457d8df3e4abe
tree5a0f2d9d79d689e58b0637db3f0468d3fe3753cf
parent6b056d1fb93bba68c03bda5039994d4df338ef13

Minor cleanup

1 files changed, 1 insertions(+), 21 deletions(-)

lib/std/special/compiler_rt.zig+1-21
...@@ -148,7 +148,7 @@ comptime {...@@ -148,7 +148,7 @@ comptime {
148148
149 @export(@import("compiler_rt/clzsi2.zig").__clzsi2, .{ .name = "__clzsi2", .linkage = linkage });149 @export(@import("compiler_rt/clzsi2.zig").__clzsi2, .{ .name = "__clzsi2", .linkage = linkage });
150150
151 if (is_arm_arch and !is_arm_64 and !is_test) {151 if (builtin.arch.isARM() and !is_test) {
152 @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr0, .{ .name = "__aeabi_unwind_cpp_pr0", .linkage = linkage });152 @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr0, .{ .name = "__aeabi_unwind_cpp_pr0", .linkage = linkage });
153 @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr1, .{ .name = "__aeabi_unwind_cpp_pr1", .linkage = linkage });153 @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr1, .{ .name = "__aeabi_unwind_cpp_pr1", .linkage = linkage });
154 @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr2, .{ .name = "__aeabi_unwind_cpp_pr2", .linkage = linkage });154 @export(@import("compiler_rt/arm.zig").__aeabi_unwind_cpp_pr2, .{ .name = "__aeabi_unwind_cpp_pr2", .linkage = linkage });
...@@ -324,23 +324,3 @@ extern var __stack_chk_guard: usize = blk: {...@@ -324,23 +324,3 @@ extern var __stack_chk_guard: usize = blk: {
324 buf[@sizeOf(usize) - 2] = '\n';324 buf[@sizeOf(usize) - 2] = '\n';
325 break :blk @bitCast(usize, buf);325 break :blk @bitCast(usize, buf);
326};326};
327
328const is_arm_64 = switch (builtin.arch) {
329 builtin.Arch.aarch64,
330 builtin.Arch.aarch64_be,
331 => true,
332 else => false,
333};
334
335const is_arm_arch = switch (builtin.arch) {
336 builtin.Arch.arm,
337 builtin.Arch.armeb,
338 builtin.Arch.aarch64,
339 builtin.Arch.aarch64_be,
340 builtin.Arch.thumb,
341 builtin.Arch.thumbeb,
342 => true,
343 else => false,
344};
345
346const is_arm_32 = is_arm_arch and !is_arm_64;