diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-05-08 10:53:22 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-05-08 10:53:22 -0700 |
| commit | b6bb0ee1acd6fb9e3360f35d7b63687f755785f6 (patch) | |
| tree | 34f42b24cc683d13a9e78bd27f914dfee00c37b0 /lib/std/os/bits/linux.zig | |
| parent | 28353b315935e54b497f4abb875fac387e20f65f (diff) | |
| parent | 84d5cc31c560749eda1e36b7bc9e6cf542eee550 (diff) | |
| download | zig-b6bb0ee1acd6fb9e3360f35d7b63687f755785f6.tar.gz zig-b6bb0ee1acd6fb9e3360f35d7b63687f755785f6.zip | |
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen
Conflicts:
* lib/std/os/linux/tls.zig
* test/behavior/align.zig
* test/behavior/atomics.zig
* test/behavior/vector.zig
Diffstat (limited to 'lib/std/os/bits/linux.zig')
| -rw-r--r-- | lib/std/os/bits/linux.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig index b877976072..556eb20ab2 100644 --- a/lib/std/os/bits/linux.zig +++ b/lib/std/os/bits/linux.zig @@ -18,7 +18,7 @@ pub usingnamespace switch (arch) { .i386 => @import("linux/i386.zig"), .x86_64 => @import("linux/x86_64.zig"), .aarch64 => @import("linux/arm64.zig"), - .arm => @import("linux/arm-eabi.zig"), + .arm, .thumb => @import("linux/arm-eabi.zig"), .riscv64 => @import("linux/riscv64.zig"), .sparcv9 => @import("linux/sparc64.zig"), .mips, .mipsel => @import("linux/mips.zig"), |