diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig
index de46483eb5..90db855fde 100644
--- a/lib/std/special/compiler_rt.zig
+++ b/lib/std/special/compiler_rt.zig
@@ -299,7 +299,7 @@ comptime {
         @export(@import("compiler_rt/sparc.zig")._Qp_qtod, .{ .name = "_Qp_qtod", .linkage = linkage });
     }
 
-    if (builtin.arch == .powerpc or builtin.arch.isPPC64()) {
+    if (arch == .powerpc or arch.isPPC64()) {
         @export(@import("compiler_rt/addXf3.zig").__addtf3, .{ .name = "__addkf3", .linkage = linkage });
         @export(@import("compiler_rt/addXf3.zig").__subtf3, .{ .name = "__subkf3", .linkage = linkage });
         @export(@import("compiler_rt/mulXf3.zig").__multf3, .{ .name = "__mulkf3", .linkage = linkage });
diff --git a/test/tests.zig b/test/tests.zig
index e7bd76cd68..5b537d9cc8 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -571,11 +571,11 @@ pub const StackTracesContext = struct {
             if (config.exclude.exclude()) return;
         }
         if (@hasField(@TypeOf(config), "exclude_arch")) {
-            const exclude_arch: []const builtin.Cpu.Arch = &config.exclude_arch;
+            const exclude_arch: []const std.Target.Cpu.Arch = &config.exclude_arch;
             for (exclude_arch) |arch| if (arch == builtin.cpu.arch) return;
         }
         if (@hasField(@TypeOf(config), "exclude_os")) {
-            const exclude_os: []const builtin.Os.Tag = &config.exclude_os;
+            const exclude_os: []const std.Target.Os.Tag = &config.exclude_os;
             for (exclude_os) |os| if (os == builtin.os.tag) return;
         }
         for (self.modes) |mode| {
@@ -615,11 +615,11 @@ pub const StackTracesContext = struct {
             if (mode_config.exclude.exclude()) return;
         }
         if (@hasField(@TypeOf(mode_config), "exclude_arch")) {
-            const exclude_arch: []const builtin.Cpu.Arch = &mode_config.exclude_arch;
+            const exclude_arch: []const std.Target.Cpu.Arch = &mode_config.exclude_arch;
             for (exclude_arch) |arch| if (arch == builtin.cpu.arch) return;
         }
         if (@hasField(@TypeOf(mode_config), "exclude_os")) {
-            const exclude_os: []const builtin.Os.Tag = &mode_config.exclude_os;
+            const exclude_os: []const std.Target.Os.Tag = &mode_config.exclude_os;
             for (exclude_os) |os| if (os == builtin.os.tag) return;
         }