AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Added architecture properties to Windows Scons build.

Browse Source 
Made scons build work on windows.

Review URL: http://codereview.chromium.org/100175


git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1822 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
lrn@chromium.org 2009-04-30 07:21:54 +00:00
parent ec3beee2bf
commit 9156ed9e04
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SConstruct
View File

@ -172,6 +172,9 @@ LIBRARY_FLAGS = {
'ARFLAGS': ['/NOLOGO'], 'ARFLAGS': ['/NOLOGO'],
'CCPDBFLAGS': ['/Zi'] 'CCPDBFLAGS': ['/Zi']
}, },
'arch:ia32': {
'CPPDEFINES': ['V8_ARCH_IA32']
},
'mode:debug': { 'mode:debug': {
'CCFLAGS': ['/Od', '/Gm'], 'CCFLAGS': ['/Od', '/Gm'],
'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'], 'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'],
@ -209,9 +212,6 @@ V8_EXTRA_FLAGS = {
'WARNINGFLAGS': ['-Wall', '-Werror', '-W', 'WARNINGFLAGS': ['-Wall', '-Werror', '-W',
'-Wno-unused-parameter'] '-Wno-unused-parameter']
}, },
'arch:arm': {
'CPPDEFINES': ['ARM']
},
'os:win32': { 'os:win32': {
'WARNINGFLAGS': ['-pedantic', '-Wno-long-long'] 'WARNINGFLAGS': ['-pedantic', '-Wno-long-long']
}, },
@ -234,7 +234,7 @@ V8_EXTRA_FLAGS = {
'LIBS': ['winmm', 'ws2_32'] 'LIBS': ['winmm', 'ws2_32']
}, },
'arch:arm': { 'arch:arm': {
'CPPDEFINES': ['ARM'], 'CPPDEFINES': ['V8_ARCH_ARM'],
# /wd4996 is to silence the warning about sscanf # /wd4996 is to silence the warning about sscanf
# used by the arm simulator. # used by the arm simulator.
'WARNINGFLAGS': ['/wd4996'] 'WARNINGFLAGS': ['/wd4996']
@ -341,6 +341,9 @@ CCTEST_EXTRA_FLAGS = {
}, },
'library:shared': { 'library:shared': {
'CPPDEFINES': ['USING_V8_SHARED'] 'CPPDEFINES': ['USING_V8_SHARED']
},
'arch:ia32': {
'CPPDEFINES': ['V8_ARCH_IA32']
} }
} }
} }
@ -433,6 +436,9 @@ SAMPLE_FLAGS = {
'LINKFLAGS': ['/LTCG'], 'LINKFLAGS': ['/LTCG'],
} }
}, },
'arch:ia32': {
'CPPDEFINES': ['V8_ARCH_IA32']
},
'mode:debug': { 'mode:debug': {
'CCFLAGS': ['/Od'], 'CCFLAGS': ['/Od'],
'LINKFLAGS': ['/DEBUG'], 'LINKFLAGS': ['/DEBUG'],

12
test/cctest/test-regexp.cc
View File

@ -1,4 +1,4 @@
// Copyright 2008 the V8 project authors. All rights reserved. /// Copyright 2008 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
@ -38,9 +38,13 @@
#include "jsregexp-inl.h" #include "jsregexp-inl.h"
#include "regexp-macro-assembler.h" #include "regexp-macro-assembler.h"
#include "regexp-macro-assembler-irregexp.h" #include "regexp-macro-assembler-irregexp.h"
#ifdef ARM #ifdef V8_ARCH_ARM
#include "arm/regexp-macro-assembler-arm.h" #include "arm/regexp-macro-assembler-arm.h"
#else // IA32 #endif
#ifdef V8_ARCH_X64
// No X64-implementation yet.
#endif
#ifdef V8_ARCH_IA32
#include "ia32/macro-assembler-ia32.h" #include "ia32/macro-assembler-ia32.h"
#include "ia32/regexp-macro-assembler-ia32.h" #include "ia32/regexp-macro-assembler-ia32.h"
#endif #endif
@ -657,7 +661,7 @@ TEST(MacroAssembler) {
} }
#ifndef ARM // IA32 only tests. #ifdef V8_ARCH_IA32 // IA32 only tests.
class ContextInitializer { class ContextInitializer {
public: public: