2022-11-15 12:25:32 -05:00
|
|
|
From 5b595a31c53f9a4e660be9f1c28520d89c1386db Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
|
|
|
Date: Thu, 22 Sep 2022 23:20:45 +0000
|
|
|
|
|
Subject: [PATCH] Add RISCV32 support
|
2022-05-28 11:20:07 -04:00
|
|
|
|
|
|
|
|
Upstream-Status: Pending
|
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
|
|
2022-11-15 12:25:32 -05:00
|
|
|
---
|
|
|
|
|
build/moz.configure/init.configure | 3 +++
|
|
|
|
|
python/mozbuild/mozbuild/configure/constants.py | 2 ++
|
|
|
|
|
.../mozbuild/test/configure/test_toolchain_configure.py | 1 +
|
|
|
|
|
3 files changed, 6 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
|
|
|
|
|
index 0b7a2ff60f..54f8325b44 100644
|
2022-05-28 11:20:07 -04:00
|
|
|
--- a/build/moz.configure/init.configure
|
|
|
|
|
+++ b/build/moz.configure/init.configure
|
2022-11-15 12:25:32 -05:00
|
|
|
@@ -524,6 +524,9 @@ def split_triplet(triplet, allow_msvc=False, allow_wasi=False):
|
2022-05-28 11:20:07 -04:00
|
|
|
elif cpu.startswith("aarch64"):
|
|
|
|
|
canonical_cpu = "aarch64"
|
|
|
|
|
endianness = "little"
|
|
|
|
|
+ elif cpu in ("riscv32", "riscv32gc"):
|
|
|
|
|
+ canonical_cpu = "riscv32"
|
|
|
|
|
+ endianness = "little"
|
|
|
|
|
elif cpu in ("riscv64", "riscv64gc"):
|
|
|
|
|
canonical_cpu = "riscv64"
|
|
|
|
|
endianness = "little"
|
2022-11-15 12:25:32 -05:00
|
|
|
diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
|
|
|
|
|
index c71460cb20..15bef93e19 100644
|
2022-05-28 11:20:07 -04:00
|
|
|
--- a/python/mozbuild/mozbuild/configure/constants.py
|
|
|
|
|
+++ b/python/mozbuild/mozbuild/configure/constants.py
|
2022-11-15 12:25:32 -05:00
|
|
|
@@ -53,6 +53,7 @@ CPU_bitness = {
|
2022-05-28 11:20:07 -04:00
|
|
|
"mips64": 64,
|
|
|
|
|
"ppc": 32,
|
|
|
|
|
"ppc64": 64,
|
|
|
|
|
+ 'riscv32': 32,
|
|
|
|
|
"riscv64": 64,
|
|
|
|
|
"s390": 32,
|
|
|
|
|
"s390x": 64,
|
2022-11-15 12:25:32 -05:00
|
|
|
@@ -95,6 +96,7 @@ CPU_preprocessor_checks = OrderedDict(
|
2022-05-28 11:20:07 -04:00
|
|
|
("m68k", "__m68k__"),
|
|
|
|
|
("mips64", "__mips64"),
|
|
|
|
|
("mips32", "__mips__"),
|
|
|
|
|
+ ("riscv32", "__riscv && __riscv_xlen == 32"),
|
|
|
|
|
("riscv64", "__riscv && __riscv_xlen == 64"),
|
2022-11-15 12:25:32 -05:00
|
|
|
("loongarch64", "__loongarch64"),
|
2022-05-28 11:20:07 -04:00
|
|
|
("sh4", "__sh__"),
|
2022-11-15 12:25:32 -05:00
|
|
|
diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
|
|
index 059cde0139..4f9986eb31 100644
|
2022-05-28 11:20:07 -04:00
|
|
|
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
|
|
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
2022-11-15 12:25:32 -05:00
|
|
|
@@ -1192,6 +1192,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
|
2022-05-28 11:20:07 -04:00
|
|
|
"m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1},
|
|
|
|
|
"mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1},
|
|
|
|
|
"mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
|
|
|
|
|
+ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
|
|
|
|
|
"riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
|
|
|
|
|
"sh4-unknown-linux-gnu": little_endian + {"__sh__": 1},
|
|
|
|
|
}
|
