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

Revert some .gyp refactoring to fix ARM cross-compilation

Browse Source 
Review URL: http://codereview.chromium.org/7623009

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8894 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2011-08-11 12:07:37 +00:00
parent 654417d1a9
commit 0b5f61cd37
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/v8-features.gypi
View File

@ -97,12 +97,6 @@
'USE_EABI_HARDFLOAT=0',
],
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
[ 'host_arch=="x64" and _toolset=="host "', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
['v8_target_arch=="ia32"', {

43
tools/gyp/v8.gyp
View File

@ -112,12 +112,6 @@
'USE_EABI_HARDFLOAT=0',
],
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
[ 'host_arch=="x64" and _toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
['v8_target_arch=="ia32"', {
@ -323,6 +317,13 @@
'toolsets': ['target'],
'dependencies': ['mksnapshot', 'js2c'],
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
['component=="shared_library"', {
'conditions': [
['OS=="win"', {
@ -426,6 +427,13 @@
'../../src/snapshot-empty.cc',
],
'conditions': [
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
'dependencies': ['js2c#host'],
@ -737,6 +745,14 @@
'../../src/arm/simulator-arm.cc',
'../../src/arm/stub-cache-arm.cc',
],
'conditions': [
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['host_arch=="x64" and _toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
}],
['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
'sources': [
@ -975,6 +991,13 @@
}, {
'toolsets': ['target'],
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
['v8_compress_startup_data=="bz2"', {
'libraries': [
'-lbz2',
@ -1040,7 +1063,13 @@
}, {
'toolsets': ['target'],
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
['v8_target_arch=="arm" and host_arch=="x64" and \
_toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
],
'link_settings': {
'libraries': [