MIPS: Rename "mips" arch to "mipsel" in the GYP build.

In the traditional MIPS naming scheme, "mips" is used for
big-endian mips and "mipsel" is used for little-endian mips.
In V8 the "mips" build is little-endian, so the "mips" target is
renamed to "mipsel" to be compliant with the traditional MIPS
naming scheme.

This change is also required for supporting the Chromium project on MIPS.

BUG=
TEST=

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12047 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2012-07-11 15:15:04 +00:00
parent 0c4cc038e6
commit 2f43f5e9d7
11 changed files with 25 additions and 21 deletions

View File

@ -118,7 +118,7 @@ endif
# Architectures and modes to be compiled. Consider these to be internal
# variables, don't override them (use the targets instead).
ARCHES = ia32 x64 arm mips
ARCHES = ia32 x64 arm mipsel
DEFAULT_ARCHES = ia32 x64 arm
MODES = release debug
ANDROID_MODES = android.release android.debug
@ -149,6 +149,10 @@ buildbot:
$(MAKE) -C "$(OUTDIR)" BUILDTYPE=$(BUILDTYPE) \
builddir="$(abspath $(OUTDIR))/$(BUILDTYPE)"
mips mips.release mips.debug:
@echo "V8 does not support big-endian MIPS builds at the moment," \
"please use little-endian builds (mipsel)."
# Compile targets. MODES and ARCHES are convenience targets.
.SECONDEXPANSION:
$(MODES): $(addsuffix .$$@,$(DEFAULT_ARCHES))

View File

@ -159,7 +159,7 @@
'V8_TARGET_ARCH_IA32',
],
}], # v8_target_arch=="ia32"
['v8_target_arch=="mips"', {
['v8_target_arch=="mipsel"', {
'defines': [
'V8_TARGET_ARCH_MIPS',
],
@ -214,7 +214,7 @@
'defines': ['_MIPS_ARCH_LOONGSON',],
}],
],
}], # v8_target_arch=="mips"
}], # v8_target_arch=="mipsel"
['v8_target_arch=="x64"', {
'defines': [
'V8_TARGET_ARCH_X64',
@ -273,7 +273,7 @@
['(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")', {
v8_target_arch=="mipsel")', {
# Check whether the host compiler and target compiler support the
# '-m32' option and set it if so.
'target_conditions': [

View File

@ -46,7 +46,7 @@
# to gyp.
'host_arch%':
'<!(uname -m | sed -e "s/i.86/ia32/;\
s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/mips.*/mips/")',
s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/mips.*/mipsel/")',
}, {
# OS!="linux" and OS!="freebsd" and OS!="openbsd" and
# OS!="netbsd" and OS!="mac"
@ -67,7 +67,7 @@
'werror%': '-Werror',
'conditions': [
['(v8_target_arch=="arm" and host_arch!="arm") or \
(v8_target_arch=="mips" and host_arch!="mips") or \
(v8_target_arch=="mipsel" and host_arch!="mipsel") or \
(v8_target_arch=="x64" and host_arch!="x64")', {
'want_separate_host_toolset': 1,
}, {

View File

@ -118,7 +118,7 @@
'test-disasm-arm.cc'
],
}],
['v8_target_arch=="mips"', {
['v8_target_arch=="mipsel"', {
'sources': [
'test-assembler-mips.cc',
'test-disasm-mips.cc',

View File

@ -49,7 +49,7 @@ regress/regress-create-exception: PASS, SKIP if $mode == debug
##############################################################################
# This one uses a built-in that's only present in debug mode. It takes
# too long to run in debug mode on ARM and MIPS.
fuzz-natives: PASS, SKIP if ($mode == release || $arch == arm || $arch == android || $arch == mips)
fuzz-natives: PASS, SKIP if ($mode == release || $arch == arm || $arch == android || $arch == mipsel)
big-object-literal: PASS, SKIP if ($arch == arm || $arch == android)
@ -57,7 +57,7 @@ big-object-literal: PASS, SKIP if ($arch == arm || $arch == android)
array-constructor: PASS || TIMEOUT
# Very slow on ARM and MIPS, contains no architecture dependent code.
unicode-case-overoptimization: PASS, TIMEOUT if ($arch == arm || $arch == android || $arch == mips)
unicode-case-overoptimization: PASS, TIMEOUT if ($arch == arm || $arch == android || $arch == mipsel)
# Test Crankshaft compilation time. Expected to take too long in debug mode.
regress/regress-1969: PASS, SKIP if $mode == debug
@ -130,7 +130,7 @@ debug-liveedit-double-call: SKIP
math-floor-of-div-minus-zero: SKIP
##############################################################################
[ $arch == mips ]
[ $arch == mipsel ]
# Slow tests which times out in debug mode.
try: PASS, SKIP if $mode == debug

View File

@ -126,13 +126,13 @@ ecma/Date/15.9.2.2-5: PASS || FAIL
ecma/Date/15.9.2.2-6: PASS || FAIL
# 1026139: These date tests fail on arm and mips
ecma/Date/15.9.5.29-1: PASS || FAIL if ($arch == arm || $arch == mips)
ecma/Date/15.9.5.34-1: PASS || FAIL if ($arch == arm || $arch == mips)
ecma/Date/15.9.5.28-1: PASS || FAIL if ($arch == arm || $arch == mips)
ecma/Date/15.9.5.29-1: PASS || FAIL if ($arch == arm || $arch == mipsel)
ecma/Date/15.9.5.34-1: PASS || FAIL if ($arch == arm || $arch == mipsel)
ecma/Date/15.9.5.28-1: PASS || FAIL if ($arch == arm || $arch == mipsel)
# 1050186: Arm/MIPS vm is broken; probably unrelated to dates
ecma/Array/15.4.4.5-3: PASS || FAIL if ($arch == arm || $arch == mips)
ecma/Date/15.9.5.22-2: PASS || FAIL if ($arch == arm || $arch == mips)
ecma/Array/15.4.4.5-3: PASS || FAIL if ($arch == arm || $arch == mipsel)
ecma/Date/15.9.5.22-2: PASS || FAIL if ($arch == arm || $arch == mipsel)
# Flaky test that fails due to what appears to be a bug in the test.
# Occurs depending on current time
@ -842,7 +842,7 @@ js1_5/Regress/regress-451322: SKIP
js1_5/GC/regress-203278-2: PASS || TIMEOUT
[ $arch == mips ]
[ $arch == mipsel ]
# Times out and print so much output that we need to skip it to not
# hang the builder.

View File

@ -216,7 +216,7 @@ S15.1.3.4_A2.3_T1: SKIP
S15.1.3.1_A2.5_T1: SKIP
S15.1.3.2_A2.5_T1: SKIP
[ $arch == mips ]
[ $arch == mipsel ]
# BUG(3251225): Tests that timeout with --nocrankshaft.
S15.1.3.1_A2.5_T1: SKIP

View File

@ -78,7 +78,7 @@ S15.9.3.1_A5_T6: PASS || FAIL_OK
S15.1.3.1_A2.5_T1: PASS, SKIP if $mode == debug
S15.1.3.2_A2.5_T1: PASS, SKIP if $mode == debug
[ $arch == arm || $arch == mips ]
[ $arch == arm || $arch == mipsel ]
# BUG(3251225): Tests that timeout with --nocrankshaft.
S15.1.3.1_A2.4_T1: SKIP

View File

@ -558,7 +558,7 @@
'../../src/ia32/stub-cache-ia32.cc',
],
}],
['v8_target_arch=="mips"', {
['v8_target_arch=="mipsel"', {
'sources': [
'../../src/mips/assembler-mips.cc',
'../../src/mips/assembler-mips.h',

View File

@ -148,7 +148,7 @@ def ProcessOptions(options):
print "Unknown mode %s" % mode
return False
for arch in options.arch:
if not arch in ['ia32', 'x64', 'arm', 'mips', 'android']:
if not arch in ['ia32', 'x64', 'arm', 'mipsel', 'android']:
print "Unknown architecture %s" % arch
return False
if options.buildbot:

View File

@ -1283,7 +1283,7 @@ def ProcessOptions(options):
options.scons_flags.append("arch=" + options.arch)
# Simulators are slow, therefore allow a longer default timeout.
if options.timeout == -1:
if options.arch in ['android', 'arm', 'mips']:
if options.arch in ['android', 'arm', 'mipsel']:
options.timeout = 2 * TIMEOUT_DEFAULT;
else:
options.timeout = TIMEOUT_DEFAULT;