Reland "Remove erroneous uses of CXX / CXX_target / CXX_host from gyp."
The current gyp config tries to test whether the compiler is an arm / mips compiler and whether it supports -m32 / -m64 based on a test within gyp. Unfortunately CXX / CXX_target / CXX_host are no no longer set early enough in gyp for this to work, and so all of these tests were actually being done using "$(which g++)" rather than the appropriate CXX_target / CXX_host compiler. This change removes these dynamic tests and instead bases the decisions on knowledge of the host / target / v8_target architecture combination. The the -m32/-m64 flags are set based on host_cxx_is_biarch / target_cxx_is_biarch, which are set to reasonable defaults of only ia32/x64 or clang compilers being build for biarch support. The host_cxx_is_biarch / target_cxx_is_biarch variables can be overriden if required. Original Review URL: https://codereview.chromium.org/382343003 TBR=jkummerow@chromium.org BUG=384474 LOG=NO Review URL: https://codereview.chromium.org/400573002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22444 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
rmcilroy@chromium.org
parent
56ec59bd26
commit
e6936f2145
@ -265,15 +265,8 @@
|
||||
}], # _toolset=="target"
|
||||
# Settings for building host targets using the system toolchain.
|
||||
['_toolset=="host"', {
|
||||
'conditions': [
|
||||
['target_arch=="x64"', {
|
||||
'cflags': [ '-m64', '-pthread' ],
|
||||
'ldflags': [ '-m64', '-pthread' ],
|
||||
}, {
|
||||
'cflags': [ '-m32', '-pthread' ],
|
||||
'ldflags': [ '-m32', '-pthread' ],
|
||||
}],
|
||||
],
|
||||
'cflags': [ '-pthread' ],
|
||||
'ldflags': [ '-pthread' ],
|
||||
'ldflags!': [
|
||||
'-Wl,-z,noexecstack',
|
||||
'-Wl,--gc-sections',
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
'variables': {
|
||||
'msvs_use_common_release': 0,
|
||||
'gcc_version%': 'unknown',
|
||||
'CXX%': '${CXX:-$(which g++)}', # Used to assemble a shell command.
|
||||
'clang%': 0,
|
||||
'v8_target_arch%': '<(target_arch)',
|
||||
# Native Client builds currently use the V8 ARM JIT and
|
||||
# arm/simulator-arm.cc to defer the significant effort required
|
||||
@ -83,6 +83,27 @@
|
||||
# Allow to suppress the array bounds warning (default is no suppression).
|
||||
'wno_array_bounds%': '',
|
||||
},
|
||||
'conditions': [
|
||||
['host_arch=="ia32" or host_arch=="x64" or clang==1', {
|
||||
'variables': {
|
||||
'host_cxx_is_biarch%': 1,
|
||||
},
|
||||
}, {
|
||||
'variables': {
|
||||
'host_cxx_is_biarch%': 0,
|
||||
},
|
||||
}],
|
||||
['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \
|
||||
clang==1', {
|
||||
'variables': {
|
||||
'target_cxx_is_biarch%': 1,
|
||||
},
|
||||
}, {
|
||||
'variables': {
|
||||
'target_cxx_is_biarch%': 0,
|
||||
},
|
||||
}],
|
||||
],
|
||||
'target_defaults': {
|
||||
'conditions': [
|
||||
['v8_target_arch=="arm"', {
|
||||
@ -121,11 +142,9 @@
|
||||
],
|
||||
'target_conditions': [
|
||||
['_toolset=="host"', {
|
||||
'variables': {
|
||||
'armcompiler': '<!($(echo ${CXX_host:-$(which g++)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
|
||||
},
|
||||
'conditions': [
|
||||
['armcompiler=="yes"', {
|
||||
['v8_target_arch==host_arch', {
|
||||
# Host built with an Arm CXX compiler.
|
||||
'conditions': [
|
||||
[ 'arm_version==7', {
|
||||
'cflags': ['-march=armv7-a',],
|
||||
@ -148,7 +167,8 @@
|
||||
}],
|
||||
],
|
||||
}, {
|
||||
# armcompiler=="no"
|
||||
# 'v8_target_arch!=host_arch'
|
||||
# Host not built with an Arm CXX compiler (simulator build).
|
||||
'conditions': [
|
||||
[ 'arm_float_abi=="hard"', {
|
||||
'defines': [
|
||||
@ -165,11 +185,9 @@
|
||||
],
|
||||
}], # _toolset=="host"
|
||||
['_toolset=="target"', {
|
||||
'variables': {
|
||||
'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
|
||||
},
|
||||
'conditions': [
|
||||
['armcompiler=="yes"', {
|
||||
['v8_target_arch==target_arch', {
|
||||
# Target built with an Arm CXX compiler.
|
||||
'conditions': [
|
||||
[ 'arm_version==7', {
|
||||
'cflags': ['-march=armv7-a',],
|
||||
@ -192,7 +210,8 @@
|
||||
}],
|
||||
],
|
||||
}, {
|
||||
# armcompiler=="no"
|
||||
# 'v8_target_arch!=target_arch'
|
||||
# Target not built with an Arm CXX compiler (simulator build).
|
||||
'conditions': [
|
||||
[ 'arm_float_abi=="hard"', {
|
||||
'defines': [
|
||||
@ -230,11 +249,9 @@
|
||||
'defines': [
|
||||
'V8_TARGET_ARCH_MIPS',
|
||||
],
|
||||
'variables': {
|
||||
'mipscompiler': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: mips" && echo "yes" || echo "no")',
|
||||
},
|
||||
'conditions': [
|
||||
['mipscompiler=="yes"', {
|
||||
['v8_target_arch==target_arch', {
|
||||
# Target built with a Mips CXX compiler.
|
||||
'target_conditions': [
|
||||
['_toolset=="target"', {
|
||||
'cflags': ['-EB'],
|
||||
@ -281,11 +298,9 @@
|
||||
'defines': [
|
||||
'V8_TARGET_ARCH_MIPS',
|
||||
],
|
||||
'variables': {
|
||||
'mipscompiler': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: mips" && echo "yes" || echo "no")',
|
||||
},
|
||||
'conditions': [
|
||||
['mipscompiler=="yes"', {
|
||||
['v8_target_arch==target_arch', {
|
||||
# Target built with a Mips CXX compiler.
|
||||
'target_conditions': [
|
||||
['_toolset=="target"', {
|
||||
'cflags': ['-EL'],
|
||||
@ -338,11 +353,9 @@
|
||||
'defines': [
|
||||
'V8_TARGET_ARCH_MIPS64',
|
||||
],
|
||||
'variables': {
|
||||
'mipscompiler': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: mips" && echo "yes" || echo "no")',
|
||||
},
|
||||
'conditions': [
|
||||
['mipscompiler=="yes"', {
|
||||
['v8_target_arch==target_arch', {
|
||||
# Target built with a Mips CXX compiler.
|
||||
'target_conditions': [
|
||||
['_toolset=="target"', {
|
||||
'cflags': ['-EL'],
|
||||
@ -439,44 +452,28 @@
|
||||
},
|
||||
},
|
||||
}],
|
||||
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
|
||||
or OS=="netbsd" or OS=="qnx"', {
|
||||
'conditions': [
|
||||
[ 'v8_no_strict_aliasing==1', {
|
||||
'cflags': [ '-fno-strict-aliasing' ],
|
||||
}],
|
||||
], # conditions
|
||||
}],
|
||||
['OS=="solaris"', {
|
||||
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
||||
}],
|
||||
['(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=="mac" or OS=="android" or OS=="qnx") and \
|
||||
(v8_target_arch=="arm" or v8_target_arch=="ia32" or v8_target_arch=="x87" or\
|
||||
v8_target_arch=="mips" or v8_target_arch=="mipsel")', {
|
||||
# Check whether the host compiler and target compiler support the
|
||||
# '-m32' option and set it if so.
|
||||
(v8_target_arch=="arm" or v8_target_arch=="ia32" or \
|
||||
v8_target_arch=="x87" or v8_target_arch=="mips" or \
|
||||
v8_target_arch=="mipsel")', {
|
||||
'target_conditions': [
|
||||
['_toolset=="host"', {
|
||||
'variables': {
|
||||
'm32flag': '<!(($(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1 < /dev/null) && echo "-m32" || true)',
|
||||
},
|
||||
'cflags': [ '<(m32flag)' ],
|
||||
'ldflags': [ '<(m32flag)' ],
|
||||
'conditions': [
|
||||
['host_cxx_is_biarch==1', {
|
||||
'cflags': [ '-m32' ],
|
||||
'ldflags': [ '-m32' ]
|
||||
}],
|
||||
],
|
||||
'xcode_settings': {
|
||||
'ARCHS': [ 'i386' ],
|
||||
},
|
||||
}],
|
||||
['_toolset=="target"', {
|
||||
'variables': {
|
||||
'm32flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m32 -E - > /dev/null 2>&1 < /dev/null) && echo "-m32" || true)',
|
||||
'clang%': 0,
|
||||
},
|
||||
'conditions': [
|
||||
['((OS!="android" and OS!="qnx") or clang==1) and \
|
||||
nacl_target_arch!="nacl_x64"', {
|
||||
'cflags': [ '<(m32flag)' ],
|
||||
'ldflags': [ '<(m32flag)' ],
|
||||
['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', {
|
||||
'cflags': [ '-m32' ],
|
||||
'ldflags': [ '-m32' ],
|
||||
}],
|
||||
],
|
||||
'xcode_settings': {
|
||||
@ -487,28 +484,35 @@
|
||||
}],
|
||||
['(OS=="linux" or OS=="android") and \
|
||||
(v8_target_arch=="x64" or v8_target_arch=="arm64")', {
|
||||
# Check whether the host compiler and target compiler support the
|
||||
# '-m64' option and set it if so.
|
||||
'target_conditions': [
|
||||
['_toolset=="host"', {
|
||||
'variables': {
|
||||
'm64flag': '<!(($(echo ${CXX_host:-$(which g++)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
|
||||
},
|
||||
'cflags': [ '<(m64flag)' ],
|
||||
'ldflags': [ '<(m64flag)' ],
|
||||
}],
|
||||
['_toolset=="target"', {
|
||||
'variables': {
|
||||
'm64flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
|
||||
},
|
||||
'conditions': [
|
||||
['((OS!="android" and OS!="qnx") or clang==1)', {
|
||||
'cflags': [ '<(m64flag)' ],
|
||||
'ldflags': [ '<(m64flag)' ],
|
||||
['host_cxx_is_biarch==1', {
|
||||
'cflags': [ '-m64' ],
|
||||
'ldflags': [ '-m64' ]
|
||||
}],
|
||||
],
|
||||
}]
|
||||
],
|
||||
],
|
||||
}],
|
||||
['_toolset=="target"', {
|
||||
'conditions': [
|
||||
['target_cxx_is_biarch==1', {
|
||||
'cflags': [ '-m64' ],
|
||||
'ldflags': [ '-m64' ],
|
||||
}],
|
||||
]
|
||||
}],
|
||||
],
|
||||
}],
|
||||
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
|
||||
or OS=="netbsd" or OS=="qnx"', {
|
||||
'conditions': [
|
||||
[ 'v8_no_strict_aliasing==1', {
|
||||
'cflags': [ '-fno-strict-aliasing' ],
|
||||
}],
|
||||
], # conditions
|
||||
}],
|
||||
['OS=="solaris"', {
|
||||
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
||||
}],
|
||||
['OS=="freebsd" or OS=="openbsd"', {
|
||||
'cflags': [ '-I/usr/local/include' ],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user