Add riscv32 to the list of known platforms

Seen in security/openssl.
rillig · Apr 9, 2024 · b25fb59 · b25fb59
1 parent 4aa913c
commit b25fb59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/v23/mkcondchecker_test.go b/v23/mkcondchecker_test.go
@@ -85,7 +85,7 @@ func (s *Suite) Test_MkCondChecker_Check(c *check.C) {
  "earmeb earmhf earmhfeb earmv4 earmv4eb earmv5 earmv5eb earmv6 earmv6eb earmv6hf earmv6hfeb "+
  "earmv7 earmv7eb earmv7hf earmv7hfeb evbarm hpcmips hpcsh hppa hppa64 i386 i586 i686 ia64 "+
  "m68000 m68k m88k mips mips64 mips64eb mips64el mipseb mipsel mipsn32 mlrisc ns32k pc532 pmax "+
- "powerpc powerpc64 riscv64 rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
+ "powerpc powerpc64 riscv32 riscv64 rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
  "} for MACHINE_ARCH.",
  "NOTE: filename.mk:4: MACHINE_ARCH can be "+
  "compared using the simpler \"${MACHINE_ARCH} == x86\" "+

diff --git a/v23/vartype.go b/v23/vartype.go
@@ -531,7 +531,7 @@ const (
  archValues + " " +
  "aarch64eb amd64 arm26 arm32 coldfire earm earmeb earmhf earmhfeb earmv4 earmv4eb earmv5 " +
  "earmv5eb earmv6 earmv6eb earmv6hf earmv6hfeb earmv7 earmv7eb earmv7hf earmv7hfeb evbarm " +
- "i386 i586 i686 m68000 mips mips64eb riscv64 sh3eb sh3el"
+ "i386 i586 i686 m68000 mips mips64eb riscv32 riscv64 sh3eb sh3el"
 
  // See mk/bsd.prefs.mk:/^GNU_ARCH\./
  machineGnuArchValues = "" +

diff --git a/v23/vartypecheck_test.go b/v23/vartypecheck_test.go
@@ -818,7 +818,7 @@ func (s *Suite) Test_VartypeCheck_EmulPlatform(c *check.C) {
  "hpcmips hpcsh hppa hppa64 "+
  "i386 i586 i686 ia64 m68000 m68k m88k "+
  "mips mips64 mips64eb mips64el mipseb mipsel mipsn32 "+
- "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv64 rs6000 "+
+ "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv32 riscv64 rs6000 "+
  "s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
  "} instead.",
  "WARN: filename.mk:3: \"${LINUX}\" is not a valid emulation platform.")
@@ -1456,7 +1456,7 @@ func (s *Suite) Test_VartypeCheck_MachinePlatform(c *check.C) {
  "earmv6hfeb earmv7 earmv7eb earmv7hf earmv7hfeb evbarm hpcmips hpcsh hppa hppa64 "+
  "i386 i586 i686 ia64 m68000 m68k m88k "+
  "mips mips64 mips64eb mips64el mipseb mipsel mipsn32 "+
- "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv64 "+
+ "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv32 riscv64 "+
  "rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
  "} for the hardware architecture part of MACHINE_PLATFORM.",
  "WARN: filename.mk:3: The pattern \"netbsd\" cannot match any of "+
@@ -1470,7 +1470,7 @@ func (s *Suite) Test_VartypeCheck_MachinePlatform(c *check.C) {
  "earmv6hfeb earmv7 earmv7eb earmv7hf earmv7hfeb evbarm hpcmips hpcsh hppa hppa64 "+
  "i386 i586 i686 ia64 m68000 m68k m88k "+
  "mips mips64 mips64eb mips64el mipseb mipsel mipsn32 "+
- "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv64 "+
+ "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv32 riscv64 "+
  "rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
  "} for the hardware architecture part of MACHINE_PLATFORM.",
  "WARN: filename.mk:5: \"FreeBSD*\" is not a valid platform pattern.",
@@ -1505,7 +1505,7 @@ func (s *Suite) Test_VartypeCheck_MachinePlatformPattern(c *check.C) {
  "earmv6hfeb earmv7 earmv7eb earmv7hf earmv7hfeb evbarm hpcmips hpcsh hppa hppa64 "+
  "i386 i586 i686 ia64 m68000 m68k m88k "+
  "mips mips64 mips64eb mips64el mipseb mipsel mipsn32 "+
- "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv64 "+
+ "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv32 riscv64 "+
  "rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
  "} for the hardware architecture part of ONLY_FOR_PLATFORM.",
  "WARN: filename.mk:3: The pattern \"netbsd\" cannot match any of "+
@@ -1519,7 +1519,7 @@ func (s *Suite) Test_VartypeCheck_MachinePlatformPattern(c *check.C) {
  "earmv6hfeb earmv7 earmv7eb earmv7hf earmv7hfeb evbarm hpcmips hpcsh hppa hppa64 "+
  "i386 i586 i686 ia64 m68000 m68k m88k "+
  "mips mips64 mips64eb mips64el mipseb mipsel mipsn32 "+
- "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv64 "+
+ "mlrisc ns32k pc532 pmax powerpc powerpc64 riscv32 riscv64 "+
  "rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 "+
  "} for the hardware architecture part of ONLY_FOR_PLATFORM.",
  "WARN: filename.mk:5: \"FreeBSD*\" is not a valid platform pattern.",