Revision: 11830
Author: [email protected]
Date: Fri Jun 15 03:45:19 2012
Log: Merge r11643, r11597, and a tiny piece from r11486 to the 3.9
branch.
This should fix the ia32 and arm builders for the 3.9 branch.
Review URL: https://chromiumcodereview.appspot.com/10541192
http://code.google.com/p/v8/source/detail?r=11830
Modified:
/branches/3.9/Makefile
/branches/3.9/build/common.gypi
/branches/3.9/build/standalone.gypi
=======================================
--- /branches/3.9/Makefile Fri Jun 8 07:44:14 2012
+++ /branches/3.9/Makefile Fri Jun 15 03:45:19 2012
@@ -243,6 +243,7 @@
$(OUTDIR)/Makefile-android: $(GYPFILES) $(ENVFILE) build/android.gypi \
must-set-ANDROID_NDK_ROOT
CC="${ANDROID_TOOL_PREFIX}-gcc" \
+ CXX="${ANDROID_TOOL_PREFIX}-g++" \
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
-S-android $(GYPFLAGS)
=======================================
--- /branches/3.9/build/common.gypi Fri Jun 8 07:44:14 2012
+++ /branches/3.9/build/common.gypi Fri Jun 15 03:45:19 2012
@@ -149,16 +149,6 @@
'defines': [
'USE_EABI_HARDFLOAT=0',
],
- }],
- # The ARM assembler assumes the host is 32 bits,
- # so force building 32-bit host tools.
- ['host_arch=="x64" or OS=="android"', {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'cflags': ['-m32'],
- 'ldflags': ['-m32'],
- }],
- ],
}],
],
}],
@@ -217,16 +207,6 @@
}],
['mips_arch_variant=="loongson"', {
'defines': ['_MIPS_ARCH_LOONGSON',],
- }],
- # The MIPS assembler assumes the host is 32 bits,
- # so force building 32-bit host tools.
- ['host_arch=="x64"', {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'cflags': ['-m32'],
- 'ldflags': ['-m32'],
- }],
- ],
}],
],
}],
@@ -272,10 +252,6 @@
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
or OS=="netbsd"', {
'conditions': [
- [ 'target_arch=="ia32"', {
- 'cflags': [ '-m32' ],
- 'ldflags': [ '-m32' ],
- }],
[ 'v8_no_strict_aliasing==1', {
'cflags': [ '-fno-strict-aliasing' ],
}],
@@ -283,6 +259,29 @@
}],
['OS=="solaris"', {
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
+ }],
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+ or OS=="netbsd" or OS=="mac" or OS=="android") and \
+ (v8_target_arch=="arm" or v8_target_arch=="ia32" or \
+ v8_target_arch=="mips")', {
+ # Check whether the host compiler and target compiler support the
+ # '-m32' option and set it if so.
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ 'variables': {
+ 'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)})
-m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)',
+ },
+ 'cflags': [ '<(m32flag)' ],
+ 'ldflags': [ '<(m32flag)' ],
+ }],
+ ['_toolset=="target"', {
+ 'variables': {
+ 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which
g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)',
+ },
+ 'cflags': [ '<(m32flag)' ],
+ 'ldflags': [ '<(m32flag)' ],
+ }],
+ ],
}],
], # conditions
'configurations': {
=======================================
--- /branches/3.9/build/standalone.gypi Fri Jun 8 07:44:14 2012
+++ /branches/3.9/build/standalone.gypi Fri Jun 15 03:45:19 2012
@@ -71,6 +71,10 @@
'want_separate_host_toolset': 0,
}],
],
+ # Default ARM variable settings.
+ 'armv7%': 1,
+ 'arm_neon%': 0,
+ 'arm_fpu%': 'vfpv3',
},
'target_defaults': {
'default_configuration': 'Debug',
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
