Skip to content

Commit 48d71e7

Browse files
ringaboutnarimiran
authored andcommitted
fixes nightlies due to UB errors; increase maxCPU hard limits (#25219)
ref #25217 The issues is actually that there is a hard limit for max cpus in niminst: #25219, which set to 20 while there is a 21 cpus now (cherry picked from commit c0fa868)
1 parent 0c2d7d9 commit 48d71e7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
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;m68k;mips;mipsel;mips64;mips64el;powerpc;powerpc64el;arm64;riscv32;riscv64;loongarch64;s390x
9+
linux: i386;hppa;ia64;alpha;amd64;powerpc64;arm;sparc;sparc64;s390x;m68k;mips;mipsel;mips64;mips64el;powerpc;powerpc64el;arm64;riscv32;riscv64;loongarch64
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, cpuMips64, cpuMips64el, cpuRiscV32, cpuRiscV64,
214-
cpuEsp, cpuWasm32, cpuE2k, cpuLoongArch64, cpuS390x
213+
cpuSparc64, cpuS390x, cpuMips64, cpuMips64el, cpuRiscV32, cpuRiscV64,
214+
cpuEsp, cpuWasm32, cpuE2k, cpuLoongArch64
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),
244245
(name: "mips64", intSize: 64, endian: bigEndian, floatSize: 64, bit: 64),
245246
(name: "mips64el", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64),
246247
(name: "riscv32", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32),
247248
(name: "riscv64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64),
248249
(name: "esp", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32),
249250
(name: "wasm32", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32),
250251
(name: "e2k", 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)]
252+
(name: "loongarch64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64)]
253253

254254
type
255255
Target* = object

tools/niminst/niminst.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ when not defined(nimHasEffectsOf):
2020

2121
const
2222
maxOS = 20 # max number of OSes
23-
maxCPU = 20 # max number of CPUs
23+
maxCPU = 30 # max number of CPUs
2424
buildShFile = "build.sh"
2525
buildBatFile = "build.bat"
2626
buildBatFile32 = "build32.bat"

0 commit comments

Comments
 (0)