[CMake] Remove USE_UDIS86 variable
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jan 2016 07:17:00 +0000 (07:17 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jan 2016 07:17:00 +0000 (07:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=152731

Reviewed by Gyuyoung Kim.

.:

Remove the USE_UDIS86 variable in CMake files. The specific build guard
is now enabled by default in Source/WTF/wtf/Platform.h, so the handling
in CMake isn't required anymore. The Udis86-specific files have to be
built unconditionally now, though.

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:

Source/JavaScriptCore:

* CMakeLists.txt: Unconditionally build the Udis86-specific files.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194633 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsMac.cmake

index 9b459ba..f6746e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2016-01-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        [CMake] Remove USE_UDIS86 variable
+        https://bugs.webkit.org/show_bug.cgi?id=152731
+
+        Reviewed by Gyuyoung Kim.
+
+        Remove the USE_UDIS86 variable in CMake files. The specific build guard
+        is now enabled by default in Source/WTF/wtf/Platform.h, so the handling
+        in CMake isn't required anymore. The Udis86-specific files have to be
+        built unconditionally now, though.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsMac.cmake:
+
 2016-01-04  Alex Christensen  <achristensen@webkit.org>
 
         Fix Mac CMake build after r194454.
index 3d5b49f..67d3383 100644 (file)
@@ -16,6 +16,7 @@ set(JavaScriptCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/bytecompiler"
     "${JAVASCRIPTCORE_DIR}/dfg"
     "${JAVASCRIPTCORE_DIR}/disassembler"
+    "${JAVASCRIPTCORE_DIR}/disassembler/udis86"
     "${JAVASCRIPTCORE_DIR}/ftl"
     "${JAVASCRIPTCORE_DIR}/heap"
     "${JAVASCRIPTCORE_DIR}/debugger"
@@ -359,12 +360,21 @@ set(JavaScriptCore_SOURCES
     disassembler/ARMv7Disassembler.cpp
     disassembler/Disassembler.cpp
     disassembler/LLVMDisassembler.cpp
+    disassembler/UDis86Disassembler.cpp
     disassembler/X86Disassembler.cpp
 
     disassembler/ARM64/A64DOpcode.cpp
 
     disassembler/ARMv7/ARMv7DOpcode.cpp
 
+    disassembler/udis86/udis86.c
+    disassembler/udis86/udis86_decode.c
+    disassembler/udis86/udis86_input.c
+    disassembler/udis86/udis86_itab_holder.c
+    disassembler/udis86/udis86_syn-att.c
+    disassembler/udis86/udis86_syn-intel.c
+    disassembler/udis86/udis86_syn.c
+
     heap/CodeBlockSet.cpp
     heap/ConservativeRoots.cpp
     heap/CopiedBlock.cpp
@@ -834,37 +844,21 @@ foreach (_file ${JavaScriptCore_SCRIPTS_SOURCES})
     list(APPEND JavaScriptCore_SCRIPTS ${JavaScriptCore_SCRIPTS_DIR}/${_script})
 endforeach ()
 
-if (USE_UDIS86)
-    set(UDIS_GEN_DEP
-        disassembler/udis86/ud_opcode.py
-        disassembler/udis86/ud_optable.py
-    )
+set(UDIS_GEN_DEP
+    disassembler/udis86/ud_opcode.py
+    disassembler/udis86/ud_optable.py
+)
 
-    add_custom_command(
-        OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.c ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
-        DEPENDS ${UDIS_GEN_DEP}
-        WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
-        COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/disassembler/udis86/itab.py ${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml
-        VERBATIM)
+add_custom_command(
+    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.c ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+    DEPENDS ${UDIS_GEN_DEP}
+    WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+    COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/disassembler/udis86/itab.py ${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml
+    VERBATIM)
 
-    list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
-        ${JAVASCRIPTCORE_DIR}/disassembler/udis86
-    )
-    list(APPEND JavaScriptCore_HEADERS
-        ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
-    )
-    list(APPEND JavaScriptCore_SOURCES
-        disassembler/UDis86Disassembler.cpp
-
-        disassembler/udis86/udis86.c
-        disassembler/udis86/udis86_decode.c
-        disassembler/udis86/udis86_input.c
-        disassembler/udis86/udis86_itab_holder.c
-        disassembler/udis86/udis86_syn-att.c
-        disassembler/udis86/udis86_syn-intel.c
-        disassembler/udis86/udis86_syn.c
-    )
-endif ()
+list(APPEND JavaScriptCore_HEADERS
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+)
 
 set(LLINT_ASM
     llint/LowLevelInterpreter.asm
index 207a462..1b14b33 100644 (file)
@@ -1,3 +1,12 @@
+2016-01-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        [CMake] Remove USE_UDIS86 variable
+        https://bugs.webkit.org/show_bug.cgi?id=152731
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt: Unconditionally build the Udis86-specific files.
+
 2016-01-05  Filip Pizlo  <fpizlo@apple.com>
 
         FTL B3 fails cdjs-tests.yaml/red_black_tree_test.js.ftl-eager-no-cjit
index a375832..4273977 100644 (file)
@@ -12,7 +12,6 @@ if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 endif ()
 
 set(USE_SOUP 1)
-set(USE_UDIS86 1)
 
 set(WTF_LIBRARY_TYPE STATIC)
 set(WTF_OUTPUT_NAME wtf_efl)
index e03b4bd..3ff554d 100644 (file)
@@ -178,7 +178,6 @@ if (${WTF_OS_UNIX})
     SET_AND_EXPOSE_TO_BUILD(XP_UNIX 1)
 endif ()
 
-set(USE_UDIS86 ON)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBKIT2 ON)
 set(ENABLE_PLUGIN_PROCESS ${ENABLE_X11_TARGET})
index 55fe80e..72221bb 100644 (file)
@@ -129,4 +129,3 @@ WEBKIT_OPTION_END()
 set(ENABLE_GRAPHICS_CONTEXT_3D ON)
 set(ENABLE_WEBKIT ON)
 set(ENABLE_WEBKIT2 ON)
-set(USE_UDIS86 1)