From d819663543bd2f19bcabb86978adf06931a2dd8b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 21 Jan 2022 14:42:58 -0700 Subject: [PATCH] disable some broken stuff for stage2 llvm backend on aarch64 --- lib/std/special/compiler_rt.zig | 4 +++- test/behavior/cast_llvm.zig | 4 +++- test/behavior/inttoptr.zig | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig index 0cd7ca2418b9549b35274c8b42a1aa591295c5bd..24bca128de9693a3b2421c798b5fa0a9e28cc22c 100644 --- a/lib/std/special/compiler_rt.zig +++ b/lib/std/special/compiler_rt.zig @@ -26,7 +26,9 @@ comptime { if (builtin.zig_backend == .stage1) { _ = @import("compiler_rt/atomics.zig"); } - _ = @import("compiler_rt/clear_cache.zig").clear_cache; + if (builtin.zig_backend != .stage2_llvm) { // TODO + _ = @import("compiler_rt/clear_cache.zig").clear_cache; + } const __extenddftf2 = @import("compiler_rt/extendXfYf2.zig").__extenddftf2; @export(__extenddftf2, .{ .name = "__extenddftf2", .linkage = linkage }); diff --git a/test/behavior/cast_llvm.zig b/test/behavior/cast_llvm.zig index 57413df920f50afd1a87f2c176bbb2a869b574bc..1b27d10d593c0462594c4a92ccc3f98756b2e303 100644 --- a/test/behavior/cast_llvm.zig +++ b/test/behavior/cast_llvm.zig @@ -1,8 +1,9 @@ +const builtin = @import("builtin"); const std = @import("std"); const expect = std.testing.expect; const mem = std.mem; const maxInt = std.math.maxInt; -const native_endian = @import("builtin").target.cpu.arch.endian(); +const native_endian = builtin.target.cpu.arch.endian(); test "pointer reinterpret const float to int" { // The hex representation is 0x3fe3333333333303. @@ -46,6 +47,7 @@ fn incrementVoidPtrArray(array: ?*anyopaque, len: usize) void { } test "compile time int to ptr of function" { + if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) return error.SkipZigTest; // TODO try foobar(FUNCTION_CONSTANT); } diff --git a/test/behavior/inttoptr.zig b/test/behavior/inttoptr.zig index 7c07a63b7cefd37d86e5dfad2edc47a04fc41c58..ec26a09699164fac1dada1aa099cca4ba43fd943 100644 --- a/test/behavior/inttoptr.zig +++ b/test/behavior/inttoptr.zig @@ -1,4 +1,7 @@ +const builtin = @import("builtin"); + test "casting random address to function pointer" { + if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) return error.SkipZigTest; // TODO randomAddressToFunction(); comptime randomAddressToFunction(); } -- 2.54.0