From 5005c2b99a1edae08e75fea46f8e403eddcf3a10 Mon Sep 17 00:00:00 2001 From: r-a-sattarov Date: Mon, 27 Jan 2025 15:05:07 +0300 Subject: [PATCH] LuaJIT-proj: fixed location of option for e2k --- Externals/LuaJIT-proj/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Externals/LuaJIT-proj/CMakeLists.txt b/Externals/LuaJIT-proj/CMakeLists.txt index 0dd45f66add..61b46d67392 100644 --- a/Externals/LuaJIT-proj/CMakeLists.txt +++ b/Externals/LuaJIT-proj/CMakeLists.txt @@ -80,7 +80,8 @@ else() endif() # Compiler options -if (PROJECT_PLATFORM_E2K) # E2K: O3 on mcst-lcc approximately equal to O2 at gcc X86/ARM +if (PROJECT_PLATFORM_E2K) + # O3 on E2K mcst-lcc approximately equal to O2 at X86/ARM gcc set(CCOPT_OPT_LEVEL "-O3") else() set(CCOPT_OPT_LEVEL "-O2") @@ -160,7 +161,6 @@ if ("${TESTARCH_OUTPUT}" MATCHES "LJ_TARGET_X64") set(TARGET_LJARCH "x64") elseif ("${TESTARCH_OUTPUT}" MATCHES "LJ_TARGET_X86") set(TARGET_LJARCH "x86") - string(APPEND TARGET_XCFLAGS " -march=i686 -msse -msse2 -mfpmath=sse") elseif ("${TESTARCH_OUTPUT}" MATCHES "LJ_TARGET_ARM64") set(TARGET_LJARCH "arm64") @@ -182,6 +182,7 @@ elseif ("${TESTARCH_OUTPUT}" MATCHES "LJ_TARGET_MIPS") endif() elseif ("${TESTARCH_OUTPUT}" MATCHES "LJ_TARGET_E2K") set(TARGET_LJARCH "e2k") + string(APPEND TARGET_XCFLAGS " -fexceptions") else() message("${TESTARCH_OUTPUT}") message(FATAL_ERROR "Unsupported luajit target architecture (see output above)") @@ -219,8 +220,6 @@ elseif (APPLE) string(APPEND TARGET_XLDFLAGS " -pagezero_size 10000 -image_base 100000000 -image_base 7fff04c4a000") elseif (${TARGET_LJARCH} STREQUAL "arm64") string(APPEND TARGET_XCFLAGS " -fno-omit-frame-pointer") - elseif (${TARGET_LJARCH} STREQUAL "e2k") - string(APPEND TARGET_XCFLAGS " -fexceptions") endif() set(LJVM_MODE machasm)