Changeset 216332 in webkit

Timestamp:

May 6, 2017, 11:06:03 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Fix 32bit Windows build by giving correct parameters to MASM
​https://bugs.webkit.org/show_bug.cgi?id=170833

Patch by Bill Ming <​mbbill@gmail.com> on 2017-05-06
Reviewed by Alex Christensen.

• CMakeLists.txt:

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt ¶

@@ -1202 +1202 @@
 if (MSVC)
     enable_language(ASM_MASM)
-    list(APPEND JavaScriptCore_SOURCES
-        ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
-    )
-    # Win32 needs /safeseh with assembly, but Win64 does not.
     if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-        set_source_files_properties(${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
-            PROPERTIES COMPILE_FLAGS  "/safeseh"
-        )
+        # Win32 needs /safeseh with assembly, but Win64 does not.
+        set(MASM_EXECUTABLE ml)
+        set(LLINT_MASM_FLAGS /safeseh /c /Fo)
+    else ()
+        set(MASM_EXECUTABLE ml64)
+        set(LLINT_MASM_FLAGS /c /Fo)
     endif ()
+    add_custom_command(
+        OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.obj
+        DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
+        COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.obj ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
+        VERBATIM)
+    list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.obj)
 else ()
     list(APPEND JavaScriptCore_HEADERS

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2017-05-06  Bill Ming  <mbbill@gmail.com>
+
+        Fix 32bit Windows build by giving correct parameters to MASM
+        https://bugs.webkit.org/show_bug.cgi?id=170833
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+
 2017-05-06  Oleksandr Skachkov  <gskachkov@gmail.com>