| author | |
| committer | |
| log | 163d505e27bfbdb0aed30339fcc98c0f5f364e7a |
| tree | 11c21a946bbc4da130e9d1e462e071e4ac56b902 |
| parent | 9fca80941cd3f7dfd46157413a760dda5716f91a |
Seems to have been an invisible merge conflict.1 files changed, 2 insertions(+), 0 deletions(-)
lib/std/Target.zig+2| ... | ... | @@ -1574,6 +1574,8 @@ pub const Cpu = struct { |
| 1574 | 1574 | .powerpcle => &powerpc.cpu.ppc, |
| 1575 | 1575 | .powerpc64 => &powerpc.cpu.ppc64, |
| 1576 | 1576 | .powerpc64le => &powerpc.cpu.ppc64le, |
| 1577 | .propeller1 => &propeller.cpu.generic, | |
| 1578 | .propeller2 => &propeller.cpu.generic, | |
| 1577 | 1579 | .amdgcn => &amdgpu.cpu.generic, |
| 1578 | 1580 | .riscv32 => &riscv.cpu.generic_rv32, |
| 1579 | 1581 | .riscv64 => &riscv.cpu.generic_rv64, |