changeset 4245:b85884d0523e

Fixed ASM compilation on win64
author Alexey Utkin <alexey.utkin@oracle.com>
date Tue, 09 Jul 2013 14:02:00 +0400
parents 70d60ca000c6
children 64ece25b039f
files modules/web/src/main/native/Source/JavaScriptCore/TargetJava.pri
diffstat 1 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/modules/web/src/main/native/Source/JavaScriptCore/TargetJava.pri	Mon Jul 08 20:54:50 2013 +0400
+++ b/modules/web/src/main/native/Source/JavaScriptCore/TargetJava.pri	Tue Jul 09 14:02:00 2013 +0400
@@ -344,17 +344,21 @@
     SOURCES += $$PWD/../WTF/wtf/unicode/java/UnicodeJava.cpp
 }
 
-win32-*:contains(QMAKE_TARGET.arch, x86_64) {
-    ASM_SOURCES += $$PWD/jit/JITStubsMSVC64.asm $${GENERATED_SOURCES_DIR}/GeneratedJITStubs_MSVC.asm
+win32-* {
+    procarch = $$(PROCESSOR_ARCHITECTURE)
+    procw6432 = $$(PROCESSOR_ARCHITEW6432)
+    contains(procarch, AMD64) | contains(procw6432, AMD64) {
+        ASM_SOURCES += $$PWD/jit/JITStubsMSVC64.asm
 
-    asm_compiler.CONFIG = target_predeps
-    asm_compiler.dependency_type = TYPE_C
-    asm_compiler.commands = ml64 /c /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-    asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-    asm_compiler.input = ASM_SOURCES
-    asm_compiler.variable_out = OBJECTS
-    asm_compiler.name = compiling[asm] ${QMAKE_FILE_IN}
+        asm_compiler.CONFIG = target_predeps
+        asm_compiler.dependency_type = TYPE_C
+        asm_compiler.commands = ml64 /c /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+        asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+        asm_compiler.input = ASM_SOURCES
+        asm_compiler.variable_out = OBJECTS
+        asm_compiler.name = compiling[asm] ${QMAKE_FILE_IN}
 
-    QMAKE_EXTRA_COMPILERS += asm_compiler
-    DEFAULT_TARGETS += compiler_asm_compiler_make_all
+        QMAKE_EXTRA_COMPILERS += asm_compiler
+        DEFAULT_TARGETS += compiler_asm_compiler_make_all
+    }
 }