Reviewers: danno,
Message:
PTAL.
Description:
Merge revision 8894 from bleeding_edge
Revert some .gyp refactoring to fix ARM cross-compilation
Please review this at http://codereview.chromium.org/7622007/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M build/v8-features.gypi
M src/version.cc
M tools/gyp/v8.gyp
Index: build/v8-features.gypi
diff --git a/build/v8-features.gypi b/build/v8-features.gypi
index
099c8f429dff7e9a38d0e14b948d37ba20a0f455..45235db08d0c3b67e863ab7a4558e3ec28fac89a
100644
--- a/build/v8-features.gypi
+++ b/build/v8-features.gypi
@@ -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"', {
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
c96abaf9845f18455ed10a57d90d0c2bf9e090d7..f056458dbdc921a9315473774b933731853e18d3
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 5
#define BUILD_NUMBER 4
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index
d176b93195605fec65d1b19559013121c1115d46..7a36d823675ace56068607c3e403057ae1e13890
100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -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': [
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
