Skip to content

Commit 3962264

Browse files
authored
nightlies regressions: CPU order matters for C sources? (#25217)
ref #25056 https://github.com/nim-lang/nightlies/actions/runs/18053288396/job/51378922406#step:12:1572 ``` bin/nim compile -f --incremental:off --compileonly --gen_mapping --cc:gcc --skipUserCfg --os:windows --cpu:loongarch64 -d:danger -d:gitHash:f4497c61584dca8acd489ceb7ba862b150f5cf55 compiler/nim.nim ``` `loongarch64` is applied to all the platforms wrongly. Presumably it was caused by the order?
1 parent 7c65d9e commit 3962264

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

compiler/installer.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Name: "Nim"
66
Version: "$version"
77
Platforms: """
88
windows: i386;amd64
9-
linux: i386;hppa;ia64;alpha;amd64;powerpc64;arm;sparc;sparc64;s390x;m68k;mips;mipsel;mips64;mips64el;powerpc;powerpc64el;arm64;riscv32;riscv64;loongarch64
9+
linux: i386;hppa;ia64;alpha;amd64;powerpc64;arm;sparc;sparc64;m68k;mips;mipsel;mips64;mips64el;powerpc;powerpc64el;arm64;riscv32;riscv64;loongarch64;s390x
1010
macosx: i386;amd64;powerpc64;arm64
1111
solaris: i386;amd64;sparc;sparc64
1212
freebsd: i386;amd64;powerpc64;arm;arm64;riscv64;sparc64;mips;mipsel;mips64;mips64el;powerpc;powerpc64el

compiler/platform.nim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ type
210210
cpuNone, cpuI386, cpuM68k, cpuAlpha, cpuPowerpc, cpuPowerpc64,
211211
cpuPowerpc64el, cpuSparc, cpuVm, cpuHppa, cpuIa64, cpuAmd64, cpuMips,
212212
cpuMipsel, cpuArm, cpuArm64, cpuJS, cpuNimVM, cpuAVR, cpuMSP430,
213-
cpuSparc64, cpuS390x, cpuMips64, cpuMips64el, cpuRiscV32, cpuRiscV64,
214-
cpuEsp, cpuWasm32, cpuE2k, cpuLoongArch64
213+
cpuSparc64, cpuMips64, cpuMips64el, cpuRiscV32, cpuRiscV64,
214+
cpuEsp, cpuWasm32, cpuE2k, cpuLoongArch64, cpuS390x
215215

216216
type
217217
TInfoCPU* = tuple[name: string, intSize: int, endian: Endianness,
@@ -241,15 +241,15 @@ const
241241
(name: "avr", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16),
242242
(name: "msp430", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16),
243243
(name: "sparc64", intSize: 64, endian: bigEndian, floatSize: 64, bit: 64),
244-
(name: "s390x", intSize: 64, endian: bigEndian, floatSize: 64, bit: 64),
245244
(name: "mips64", intSize: 64, endian: bigEndian, floatSize: 64, bit: 64),
246245
(name: "mips64el", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64),
247246
(name: "riscv32", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32),
248247
(name: "riscv64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64),
249248
(name: "esp", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32),
250249
(name: "wasm32", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32),
251250
(name: "e2k", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64),
252-
(name: "loongarch64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64)]
251+
(name: "loongarch64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64),
252+
(name: "s390x", intSize: 64, endian: bigEndian, floatSize: 64, bit: 64)]
253253

254254
type
255255
Target* = object

0 commit comments

Comments
 (0)