Skip to content

Commit

Permalink
Merge r228370 - [MIPS] JSC needs to be built with -latomic
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=182610

Reviewed by Žan Doberšek.

Since r228149, on MIPS we need to link with -latomic, because
__atomic_fetch_add_8 is not available as a compiler intrinsic.

* CMakeLists.txt:
  • Loading branch information
guijemont authored and carlosgcampos committed Feb 19, 2018
1 parent c3031d5 commit 41efc3f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Source/JavaScriptCore/CMakeLists.txt
Expand Up @@ -118,6 +118,16 @@ set(JavaScriptCore_LIBRARIES
${LLVM_LIBRARIES}
)

# Since r228149, on MIPS we need to link with -latomic, because
# __atomic_fetch_add_8 is not available as a compiler intrinsic. It is
# available on other platforms (including 32-bit Arm), so the link with
# libatomic is only neede on MIPS.
if (WTF_CPU_MIPS)
list(APPEND JavaScriptCore_LIBRARIES
-latomic
)
endif ()

set(JavaScriptCore_SCRIPTS_SOURCES_DIR "${JAVASCRIPTCORE_DIR}/Scripts")

# Globbing relies on the fact that generator-specific file names are prefixed with their directory.
Expand Down
12 changes: 12 additions & 0 deletions Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
2018-02-11 Guillaume Emont <guijemont@igalia.com>

[MIPS] JSC needs to be built with -latomic
https://bugs.webkit.org/show_bug.cgi?id=182610

Reviewed by Žan Doberšek.

Since r228149, on MIPS we need to link with -latomic, because
__atomic_fetch_add_8 is not available as a compiler intrinsic.

* CMakeLists.txt:

2018-01-28 Filip Pizlo <fpizlo@apple.com>

Global objects should be able to use TLCs to allocate from different blocks from each other
Expand Down

0 comments on commit 41efc3f

Please sign in to comment.