user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/master' into HEAD

Browse source 
Conflicts:
	src/comp/middle/trans.rs
This commit is contained in:
Graydon Hoare 2011-05-16 19:04:45 -07:00
commit a2e2e78103
27 changed files with 3363 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/comp/driver/rustc.rs
View file

@ -9,7 +9,7 @@ import middle::trans;
import middle::resolve;
import middle::ty;
import middle::typeck;
import middle::typestate_check;
import middle::tstate::ck;
import back::link;
import lib::llvm;
import util::common;
@ -105,7 +105,8 @@ fn compile_input(session::session sess,
if (sess.get_opts().run_typestate) {
crate = time(time_passes, "typestate checking",
bind typestate_check::check_crate(crate, def_map));
bind middle::tstate::ck::check_crate(node_type_table,
ty_cx, crate));
}
auto llmod = time[llvm::ModuleRef](time_passes, "translation",
@ -165,26 +166,31 @@ options:
}
fn get_os(str triple) -> session::os {
if (_str::find(triple, "win32") > 0 ||
_str::find(triple, "mingw32") > 0 ) {
if (_str::find(triple, "win32") >= 0 ||
_str::find(triple, "mingw32") >= 0 ) {
ret session::os_win32;
} else if (_str::find(triple, "darwin") > 0) { ret session::os_macos; }
else if (_str::find(triple, "linux") > 0) { ret session::os_linux; }
} else if (_str::find(triple, "darwin") >= 0) { ret session::os_macos; }
else if (_str::find(triple, "linux") >= 0) { ret session::os_linux; }
else { log_err "Unknown operating system!"; fail; }
}
fn get_arch(str triple) -> session::arch {
if (_str::find(triple, "i386") > 0 ||
_str::find(triple, "i486") > 0 ||
_str::find(triple, "i586") > 0 ||
_str::find(triple, "i686") > 0 ||
_str::find(triple, "i786") > 0 ) {
if (_str::find(triple, "i386") >= 0 ||
_str::find(triple, "i486") >= 0 ||
_str::find(triple, "i586") >= 0 ||
_str::find(triple, "i686") >= 0 ||
_str::find(triple, "i786") >= 0 ) {
ret session::arch_x86;
} else if (_str::find(triple, "x86_64") > 0) {
} else if (_str::find(triple, "x86_64") >= 0) {
ret session::arch_x64;
} else if (_str::find(triple, "arm") > 0 ||
_str::find(triple, "xscale") > 0 ) {
} else if (_str::find(triple, "arm") >= 0 ||
_str::find(triple, "xscale") >= 0 ) {
ret session::arch_arm;
}
else {
log_err ("Unknown architecture! " + triple);
fail;
}
}
fn get_default_sysroot(str binary) -> str {