Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LuaJIT-proj: fixed location of option for e2k #1779

Merged
merged 1 commit into from
Jan 27, 2025
Merged

LuaJIT-proj: fixed location of option for e2k #1779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Externals/LuaJIT-proj/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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)")
Expand Down Expand Up @@ -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)
Expand Down
Loading