Skip to content

Fix JIT enablement when building 2.38 with clang #1696

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

Open
aoikonomopoulos wants to merge 2 commits into
base: wpe-2.38
Choose a base branch
from
+26 −6
Open

Fix JIT enablement when building 2.38 with clang #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4566d37
[JSC][32bit] Fix JIT being disabled when compiling JSC on linux with …
mikhailramalho Feb 28, 2023
5627dbd
[ARMv7] Fix clang20 build
justinmichaud Jan 26, 2026
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
11 changes: 8 additions & 3 deletions Source/JavaScriptCore/offlineasm/arm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,14 @@ def lowerARMCommon
armMoveImmediate(operands[0].value >> 32, operands[1])
armMoveImmediate(operands[0].value & 0xffffffff, operands[2])
when "mvlbl"
$asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
$asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
afterData = LocalLabel.unique("mvlbl")
data = LocalLabel.unique("mvlbl")
$asm.puts "b #{LocalLabelReference.new(codeOrigin, afterData).asmLabel}"
$asm.puts ".align 1"
data.lower("ARM")
$asm.puts ".word #{operands[0].value}"
afterData.lower("ARM")
$asm.puts "ldr #{operands[1].armOperand}, #{LocalLabelReference.new(codeOrigin, data).asmLabel}"
when "sxb2i"
$asm.puts "sxtb #{armFlippedOperands(operands)}"
when "sxh2i"
Expand Down Expand Up @@ -998,4 +1004,3 @@ def lowerARMCommon
end
end
end

4 changes: 3 additions & 1 deletion Source/WTF/wtf/PlatformCPU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@
|| defined(__ARM_ARCH_7K__) \
|| defined(__ARM_ARCH_7M__) \
|| defined(__ARM_ARCH_7R__) \
|| defined(__ARM_ARCH_7S__)
|| defined(__ARM_ARCH_7S__) \
|| defined(__ARM_ARCH_8__) \
|| defined(__ARM_ARCH_8A__)
#define WTF_THUMB_ARCH_VERSION 4

/* RVCT sets __TARGET_ARCH_THUMB */
Expand Down
4 changes: 3 additions & 1 deletion Source/bmalloc/bmalloc/BPlatform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,9 @@
|| defined(__ARM_ARCH_7K__) \
|| defined(__ARM_ARCH_7M__) \
|| defined(__ARM_ARCH_7R__) \
|| defined(__ARM_ARCH_7S__)
|| defined(__ARM_ARCH_7S__) \
|| defined(__ARM_ARCH_8__) \
|| defined(__ARM_ARCH_8A__)
#define BTHUMB_ARCH_VERSION 4

/* RVCT sets __TARGET_ARCH_THUMB */
Expand Down
13 changes: 12 additions & 1 deletion Source/cmake/OptionsCommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@ if (WTF_CPU_ARM)
#error \"Thumb2 instruction set isn't available\"
#endif
int main() {}
")
")

if (COMPILER_IS_CLANG AND NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
set(CLANG_EXTRA_ARM_ARGS " -mthumb")
endif ()

set(CMAKE_REQUIRED_FLAGS "${CLANG_EXTRA_ARM_ARGS}")
CHECK_CXX_SOURCE_COMPILES("${ARM_THUMB2_TEST_SOURCE}" ARM_THUMB2_DETECTED)
unset(CMAKE_REQUIRED_FLAGS)

if (ARM_THUMB2_DETECTED AND NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
string(APPEND CMAKE_C_FLAGS " ${CLANG_EXTRA_ARM_ARGS}")
string(APPEND CMAKE_CXX_FLAGS " ${CLANG_EXTRA_ARM_ARGS}")
endif ()
endif ()

# Use ld.lld when building with LTO, or for debug builds, if available.
Expand Down