Skip to content

V
V8
Commit eedb7953 authored by jkummerow@chromium.org's avatar jkummerow@chromium.org
Browse files
Options

Some cleanup to common.gypi. This fixes some host/target combinations that... 

Some cleanup to common.gypi. This fixes some host/target combinations that weren't working in the Make build on Mac.

Review URL: https://chromiumcodereview.appspot.com/10416005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11617 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 3fad3320
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 123 deletions
build/common.gypi
View file @ eedb7953
...@@ -110,131 +110,117 @@ ...@@ -110,131 +110,117 @@
['v8_enable_gdbjit==1', { ['v8_enable_gdbjit==1', {
'defines': ['ENABLE_GDB_JIT_INTERFACE',], 'defines': ['ENABLE_GDB_JIT_INTERFACE',],
}], }],
['OS!="mac"', { ['v8_target_arch=="arm"', {
# TODO(mark): The OS!="mac" conditional is temporary. It can be 'defines': [
# removed once the Mac Chromium build stops setting target_arch to 'V8_TARGET_ARCH_ARM',
# ia32 and instead sets it to mac. Other checks in this file for ],
# OS=="mac" can be removed at that time as well. This can be cleaned
# up once http://crbug.com/44205 is fixed.
'conditions': [ 'conditions': [
['v8_target_arch=="arm"', { [ 'v8_can_use_unaligned_accesses=="true"', {
'defines': [ 'defines': [
'V8_TARGET_ARCH_ARM', 'CAN_USE_UNALIGNED_ACCESSES=1',
], ],
'conditions': [ }],
[ 'v8_can_use_unaligned_accesses=="true"', { [ 'v8_can_use_unaligned_accesses=="false"', {
'defines': [ 'defines': [
'CAN_USE_UNALIGNED_ACCESSES=1', 'CAN_USE_UNALIGNED_ACCESSES=0',
],
}],
[ 'v8_can_use_unaligned_accesses=="false"', {
'defines': [
'CAN_USE_UNALIGNED_ACCESSES=0',
],
}],
[ 'v8_can_use_vfp_instructions=="true"', {
'defines': [
'CAN_USE_VFP_INSTRUCTIONS',
],
}],
[ 'v8_use_arm_eabi_hardfloat=="true"', {
'defines': [
'USE_EABI_HARDFLOAT=1',
'CAN_USE_VFP_INSTRUCTIONS',
],
'target_conditions': [
['_toolset=="target"', {
'cflags': ['-mfloat-abi=hard',],
}],
],
}, {
'defines': [
'USE_EABI_HARDFLOAT=0',
],
}],
], ],
}], }],
['v8_target_arch=="ia32"', { [ 'v8_can_use_vfp_instructions=="true"', {
'defines': [ 'defines': [
'V8_TARGET_ARCH_IA32', 'CAN_USE_VFP_INSTRUCTIONS',
], ],
}], }],
['v8_target_arch=="mips"', { [ 'v8_use_arm_eabi_hardfloat=="true"', {
'defines': [ 'defines': [
'V8_TARGET_ARCH_MIPS', 'USE_EABI_HARDFLOAT=1',
'CAN_USE_VFP_INSTRUCTIONS',
], ],
'variables': { 'target_conditions': [
'mipscompiler': '<!($(echo ${CXX:-$(which g++)}) -v 2>&1 | grep -q "^Target: mips-" && echo "yes" || echo "no")', ['_toolset=="target"', {
}, 'cflags': ['-mfloat-abi=hard',],
'conditions': [
['mipscompiler=="yes"', {
'target_conditions': [
['_toolset=="target"', {
'cflags': ['-EL'],
'ldflags': ['-EL'],
'conditions': [
[ 'v8_use_mips_abi_hardfloat=="true"', {
'cflags': ['-mhard-float'],
'ldflags': ['-mhard-float'],
}, {
'cflags': ['-msoft-float'],
'ldflags': ['-msoft-float'],
}],
['mips_arch_variant=="mips32r2"', {
'cflags': ['-mips32r2', '-Wa,-mips32r2'],
}],
['mips_arch_variant=="loongson"', {
'cflags': ['-mips3', '-Wa,-mips3'],
}, {
'cflags': ['-mips32', '-Wa,-mips32'],
}],
],
}],
],
}], }],
[ 'v8_can_use_fpu_instructions=="true"', { ],
'defines': [ }, {
'CAN_USE_FPU_INSTRUCTIONS', 'defines': [
], 'USE_EABI_HARDFLOAT=0',
}], ],
[ 'v8_use_mips_abi_hardfloat=="true"', { }],
'defines': [ ],
'__mips_hard_float=1', }], # v8_target_arch=="arm"
'CAN_USE_FPU_INSTRUCTIONS', ['v8_target_arch=="ia32"', {
], 'defines': [
}, { 'V8_TARGET_ARCH_IA32',
'defines': [ ],
'__mips_soft_float=1' }], # v8_target_arch=="ia32"
['v8_target_arch=="mips"', {
'defines': [
'V8_TARGET_ARCH_MIPS',
],
'variables': {
'mipscompiler': '<!($(echo ${CXX:-$(which g++)}) -v 2>&1 | grep -q "^Target: mips-" && echo "yes" || echo "no")',
},
'conditions': [
['mipscompiler=="yes"', {
'target_conditions': [
['_toolset=="target"', {
'cflags': ['-EL'],
'ldflags': ['-EL'],
'conditions': [
[ 'v8_use_mips_abi_hardfloat=="true"', {
'cflags': ['-mhard-float'],
'ldflags': ['-mhard-float'],
}, {
'cflags': ['-msoft-float'],
'ldflags': ['-msoft-float'],
}],
['mips_arch_variant=="mips32r2"', {
'cflags': ['-mips32r2', '-Wa,-mips32r2'],
}],
['mips_arch_variant=="loongson"', {
'cflags': ['-mips3', '-Wa,-mips3'],
}, {
'cflags': ['-mips32', '-Wa,-mips32'],
}],
], ],
}], }],
['mips_arch_variant=="mips32r2"', {
'defines': ['_MIPS_ARCH_MIPS32R2',],
}],
['mips_arch_variant=="loongson"', {
'defines': ['_MIPS_ARCH_LOONGSON',],
}],
], ],
}], }],
['v8_target_arch=="x64"', { [ 'v8_can_use_fpu_instructions=="true"', {
'defines': [ 'defines': [
'V8_TARGET_ARCH_X64', 'CAN_USE_FPU_INSTRUCTIONS',
], ],
}], }],
], [ 'v8_use_mips_abi_hardfloat=="true"', {
}, { # Section for OS=="mac". 'defines': [
'conditions': [ '__mips_hard_float=1',
['target_arch=="ia32"', { 'CAN_USE_FPU_INSTRUCTIONS',
'xcode_settings': { ],
'ARCHS': ['i386'], }, {
} 'defines': [
'__mips_soft_float=1'
],
}], }],
['target_arch=="x64"', { ['mips_arch_variant=="mips32r2"', {
'xcode_settings': { 'defines': ['_MIPS_ARCH_MIPS32R2',],
'ARCHS': ['x86_64'], }],
} ['mips_arch_variant=="loongson"', {
'defines': ['_MIPS_ARCH_LOONGSON',],
}], }],
], ],
}], }], # v8_target_arch=="mips"
['v8_target_arch=="x64"', {
'defines': [
'V8_TARGET_ARCH_X64',
],
'xcode_settings': {
'ARCHS': [ 'x86_64' ],
},
'msvs_settings': {
'VCLinkerTool': {
'StackReserveSize': '2097152',
},
},
}], # v8_target_arch=="x64"
['v8_use_liveobjectlist=="true"', { ['v8_use_liveobjectlist=="true"', {
'defines': [ 'defines': [
'ENABLE_DEBUGGER_SUPPORT', 'ENABLE_DEBUGGER_SUPPORT',
...@@ -260,13 +246,6 @@ ...@@ -260,13 +246,6 @@
}, },
}, },
}], }],
['OS=="win" and v8_target_arch=="x64"', {
'msvs_settings': {
'VCLinkerTool': {
'StackReserveSize': '2097152',
},
},
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
or OS=="netbsd"', { or OS=="netbsd"', {
'conditions': [ 'conditions': [
...@@ -291,6 +270,9 @@ ...@@ -291,6 +270,9 @@
}, },
'cflags': [ '<(m32flag)' ], 'cflags': [ '<(m32flag)' ],
'ldflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ],
'xcode_settings': {
'ARCHS': [ 'i386' ],
},
}], }],
['_toolset=="target"', { ['_toolset=="target"', {
'variables': { 'variables': {
...@@ -298,9 +280,18 @@ ...@@ -298,9 +280,18 @@
}, },
'cflags': [ '<(m32flag)' ], 'cflags': [ '<(m32flag)' ],
'ldflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ],
'xcode_settings': {
'ARCHS': [ 'i386' ],
},
}], }],
], ],
}], }],
['OS=="freebsd" or OS=="openbsd"', {
'cflags': [ '-I/usr/local/include' ],
}],
['OS=="netbsd"', {
'cflags': [ '-I/usr/pkg/include' ],
}],
], # conditions ], # conditions
'configurations': { 'configurations': {
'Debug': { 'Debug': {
...@@ -327,12 +318,6 @@ ...@@ -327,12 +318,6 @@
}, },
}, },
'conditions': [ 'conditions': [
['OS=="freebsd" or OS=="openbsd"', {
'cflags': [ '-I/usr/local/include' ],
}],
['OS=="netbsd"', {
'cflags': [ '-I/usr/pkg/include' ],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-Woverloaded-virtual' ], '-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
...@@ -362,12 +347,6 @@ ...@@ -362,12 +347,6 @@
}], }],
], ],
}], }],
['OS=="freebsd" or OS=="openbsd"', {
'cflags': [ '-I/usr/local/include' ],
}],
['OS=="netbsd"', {
'cflags': [ '-I/usr/pkg/include' ],
}],
['OS=="mac"', { ['OS=="mac"', {
'xcode_settings': { 'xcode_settings': {
'GCC_OPTIMIZATION_LEVEL': '3', # -O3 'GCC_OPTIMIZATION_LEVEL': '3', # -O3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment