diff --git a/makefile b/makefile index c29a70dd42fc3..176f9855a35f3 100644 --- a/makefile +++ b/makefile @@ -390,6 +390,11 @@ endif ifeq ($(findstring arm,$(UNAME)),arm) ARCHITECTURE := +ifneq ($(PLATFORM),arm64) + ifndef FORCE_DRC_C_BACKEND + FORCE_DRC_C_BACKEND := 1 + endif +endif endif ifeq ($(findstring aarch64,$(UNAME)),aarch64) diff --git a/scripts/genie.lua b/scripts/genie.lua index 8f90ed02942ac..89b60a6366e85 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -710,12 +710,11 @@ end if not _OPTIONS["FORCE_DRC_C_BACKEND"] then if _OPTIONS["BIGENDIAN"]~="1" then - if (_OPTIONS["PLATFORM"]=="arm" or _OPTIONS["PLATFORM"]=="arm64") then - configuration { "x64" } + if (_OPTIONS["PLATFORM"]=="arm64") then + configuration { } defines { "NATIVE_DRC=drcbe_arm64", } - configuration { } else configuration { "x64" } defines { diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 9e2b69d79e6c8..785daa4a93b34 100755 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1959,8 +1959,8 @@ project "asmjit" end end - if (_OPTIONS["PLATFORM"]=="arm" or _OPTIONS["PLATFORM"]=="arm64") then - configuration { "x64" } + if (_OPTIONS["PLATFORM"]=="arm64") then + configuration { } defines { "ASMJIT_NO_X86", } diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 00eac3e8b0482..8d115a91ed06e 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -42,7 +42,7 @@ if (CPU_INCLUDE_DRC) then MAME_DIR .. "src/devices/cpu/drcumlsh.h", } if not _OPTIONS["FORCE_DRC_C_BACKEND"] then - if (_OPTIONS["PLATFORM"]=="arm" or _OPTIONS["PLATFORM"]=="arm64") then + if (_OPTIONS["PLATFORM"]=="arm64") then files { MAME_DIR .. "src/devices/cpu/drcbearm64.cpp", MAME_DIR .. "src/devices/cpu/drcbearm64.h",