1Recognise riscv64gc and riscv32gc as valid architectures 2 3Rust uses above for architecture in tuples 4 5Upstream-Status: Pending 6Signed-off-by: Khem Raj <raj.khem@gmail.com> 7--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py 8+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py 9@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(Bas 10 "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, 11 "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, 12 "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, 13+ "riscv32gc-unknown-linux-gnu": little_endian 14+ + {"__riscv": 1, "__riscv_xlen": 32}, 15+ "riscv64gc-unknown-linux-gnu": little_endian 16+ + {"__riscv": 1, "__riscv_xlen": 64}, 17 "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, 18 } 19 20--- a/build/autoconf/config.sub 21+++ b/build/autoconf/config.sub 22@@ -1236,7 +1236,7 @@ case $cpu-$vendor in 23 | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ 24 | pru \ 25 | pyramid \ 26- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ 27+ | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \ 28 | rl78 | romp | rs6000 | rx \ 29 | s390 | s390x \ 30 | score \ 31