Index: tools/testing/dart/compiler_configuration.dart |
diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart |
index 161252a17841a0569f90098f660039ae6d641b04..89a5aae2357c99bdde36c8b4ed1ba313e880dd6d 100644 |
--- a/tools/testing/dart/compiler_configuration.dart |
+++ b/tools/testing/dart/compiler_configuration.dart |
@@ -346,6 +346,9 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration { |
args.add("--use_blobs"); |
} |
args.addAll(arguments); |
+ if (arch == 'arm') { |
+ args.add('--no-sim-use-hardfp'); |
Bill Hesse
2016/04/27 12:22:32
I think this should be before the arguments parame
kustermann
2016/04/27 13:25:09
It is in the latest patchset.
|
+ } |
return commandBuilder.getCompilationCommand('precompiler', tempDir, !useSdk, |
bootstrapDependencies(buildDir), exec, args, environmentOverrides); |
@@ -374,11 +377,15 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration { |
cc_flags = "-m64"; |
} else if (arch == 'simarm64') { |
cc_flags = "-m64"; |
+ } else if (arch == 'ia32') { |
+ cc_flags = "-m32"; |
} else if (arch == 'simarm') { |
cc_flags = "-m32"; |
} else if (arch == 'simmips') { |
cc_flags = "-m32"; |
} else if (arch == 'arm') { |
+ // TODO: If we're not using "--use_blobs" we need to use the arm cross |
+ // compiler instead of just 'gcc'. |
cc_flags = ""; |
Bill Hesse
2016/04/27 12:22:32
Maybe use null here instead. Or find out the corr
kustermann
2016/04/27 13:25:09
Done.
|
} else if (arch == 'mips') { |
cc_flags = "-EL"; |
@@ -387,13 +394,13 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration { |
} |
var exec = cc; |
- var args = [ |
- shared, |
- cc_flags, |
+ var args = [ shared ]; |
+ if (cc_flags != null && cc_flags.length > 0) args.add(cc_flags); |
Bill Hesse
2016/04/27 12:22:31
Decide which value to use for "none" in arch == 'a
kustermann
2016/04/27 13:25:09
Done.
|
+ args.addAll([ |
'-o', |
'$tempDir/$libname', |
'$tempDir/precompiled.S' |
- ]; |
+ ]); |
return commandBuilder.getCompilationCommand('assemble', tempDir, !useSdk, |
bootstrapDependencies(buildDir), exec, args, environmentOverrides); |