diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-11-01 23:27:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 23:27:21 +0100 |
commit | 7b83039885d2d3051726f93760d3f8f2a617b8f2 (patch) | |
tree | 29dea6717b572dd2ef58375d9a761d0845cc5f53 | |
parent | 0fbf53dbc5cb07835b3afcf00bd2a20f780d09a6 (diff) | |
parent | 3a84a64d2fd600e68ee3e54a5fbc12347e9b2f9f (diff) |
Merge pull request #54490 from q66/ppc
-rw-r--r-- | core/os/os.cpp | 9 | ||||
-rw-r--r-- | modules/denoise/config.py | 8 | ||||
-rw-r--r-- | modules/raycast/config.py | 2 | ||||
-rw-r--r-- | platform/linuxbsd/detect.py | 12 |
4 files changed, 27 insertions, 4 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 5892f91ff3..03e251880f 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -440,6 +440,15 @@ bool OS::has_feature(const String &p_feature) { if (p_feature == "riscv") { return true; } +#elif defined(__powerpc__) +#if defined(__powerpc64__) + if (p_feature == "ppc64") { + return true; + } +#endif + if (p_feature == "ppc") { + return true; + } #endif if (_check_internal_feature_support(p_feature)) { diff --git a/modules/denoise/config.py b/modules/denoise/config.py index 6f650354cb..3aa840acb0 100644 --- a/modules/denoise/config.py +++ b/modules/denoise/config.py @@ -5,7 +5,13 @@ def can_build(env, platform): # as doing lightmap generation and denoising on Android or HTML5 # would be a bit far-fetched. desktop_platforms = ["linuxbsd", "osx", "windows"] - supported_arch = env["bits"] == "64" and env["arch"] != "arm64" and not env["arch"].startswith("rv") + supported_arch = env["bits"] == "64" + if env["arch"] == "arm64": + supported_arch = False + if env["arch"].startswith("ppc"): + supported_arch = False + if env["arch"].startswith("rv"): + supported_arch = False return env["tools"] and platform in desktop_platforms and supported_arch diff --git a/modules/raycast/config.py b/modules/raycast/config.py index 2f8bacd4ae..7e8b3e9840 100644 --- a/modules/raycast/config.py +++ b/modules/raycast/config.py @@ -1,6 +1,6 @@ def can_build(env, platform): # Depends on Embree library, which only supports x86_64 and aarch64. - if env["arch"].startswith("rv"): + if env["arch"].startswith("rv") or env["arch"].startswith("ppc"): return False if platform == "android": diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index a9e8fb64c3..07e16a982b 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -119,8 +119,16 @@ def configure(env): if env["bits"] == "default": env["bits"] = "64" if is64 else "32" - if env["arch"] == "" and platform.machine() == "riscv64": - env["arch"] = "rv64" + machines = { + "riscv64": "rv64", + "ppc64le": "ppc64", + "ppc64": "ppc64", + "ppcle": "ppc", + "ppc": "ppc", + } + + if env["arch"] == "" and platform.machine() in machines: + env["arch"] = machines[platform.machine()] if env["arch"] == "rv64": # G = General-purpose extensions, C = Compression extension (very common). |