---

yaml
---
r: 152774
b: refs/heads/try2
c: 0af4985
h: refs/heads/master
v: v3

Author: tomjakubowski

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 82ec1aef293ddc5c6373bd7f5ec323fafbdf7901
+refs/heads/try2: 0af4985332c16e07ad8348a941c9de4efdafb13e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/platform.mk

@@ -374,36 +374,6 @@ CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,
 RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
 RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
 
-# mipsel-linux configuration
-CC_mipsel-linux=mipsel-linux-gcc
-CXX_mipsel-linux=mipsel-linux-g++
-CPP_mipsel-linux=mipsel-linux-gcc 
-AR_mipsel-linux=mipsel-linux-ar
-CFG_LIB_NAME_mipsel-linux=lib$(1).so
-CFG_STATIC_LIB_NAME_mipsel-linux=lib$(1).a
-CFG_LIB_GLOB_mipsel-linux=lib$(1)-*.so
-CFG_LIB_DSYM_GLOB_mipsel-linux=lib$(1)-*.dylib.dSYM
-CFG_CFLAGS_mipsel-linux := -mips32 -mabi=32 $(CFLAGS)
-CFG_GCCISH_CFLAGS_mipsel-linux := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
-CFG_GCCISH_CXXFLAGS_mipsel-linux := -fno-rtti $(CXXFLAGS)
-CFG_GCCISH_LINK_FLAGS_mipsel-linux := -shared -fPIC -g -mips32
-CFG_GCCISH_DEF_FLAG_mipsel-linux := -Wl,--export-dynamic,--dynamic-list=
-CFG_GCCISH_PRE_LIB_FLAGS_mipsel-linux := -Wl,-whole-archive
-CFG_GCCISH_POST_LIB_FLAGS_mipsel-linux := -Wl,-no-whole-archive
-CFG_DEF_SUFFIX_mipsel-linux := .linux.def
-CFG_LLC_FLAGS_mipsel-linux :=
-CFG_INSTALL_NAME_mipsel-linux =
-CFG_LIBUV_LINK_FLAGS_mipsel-linux =
-CFG_EXE_SUFFIX_mipsel-linux :=
-CFG_WINDOWSY_mipsel-linux :=
-CFG_UNIXY_mipsel-linux := 1
-CFG_PATH_MUNGE_mipsel-linux := true
-CFG_LDPATH_mipsel-linux :=
-CFG_RUN_mipsel-linux=
-CFG_RUN_TARG_mipsel-linux=
-RUSTC_FLAGS_mipsel-linux := -C target-cpu=mips32 -C target-feature="+mips32,+o32"
-
-
 # mips-unknown-linux-gnu configuration
 CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
 CXX_mips-unknown-linux-gnu=mips-linux-gnu-g++
@@ -642,7 +612,7 @@ define CFG_MAKE_TOOLCHAIN
         $$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2)        \
         $$(call CFG_INSTALL_NAME_$(1),$$(4))
 
-  ifeq ($$(findstring $(HOST_$(1)),arm mips mipsel),)
+  ifeq ($$(findstring $(HOST_$(1)),arm mips),)
 
   # We're using llvm-mc as our assembler because it supports
   # .cfi pseudo-ops on mac

branches/try2/src/doc/tutorial.md

@@ -2522,7 +2522,7 @@ fn sendable_foo(f: Box<Foo + Send>) { /* ... */ }
 fn shareable_bar<T: Share>(b: &Bar<T> + Share) { /* ... */ }
 ~~~
 
-When no colon is specified (such as the type `Box<Foo>`), it is inferred that the
+When no colon is specified (such as the type `~Foo`), it is inferred that the
 value ascribes to no bounds. They must be added manually if any bounds are
 necessary for usage.
 
@@ -2579,18 +2579,17 @@ fn radius_times_area<T: Circle>(c: T) -> f64 {
 
 Likewise, supertrait methods may also be called on trait objects.
 
-~~~
+~~~ {.ignore}
 use std::f64::consts::PI;
 # trait Shape { fn area(&self) -> f64; }
 # trait Circle : Shape { fn radius(&self) -> f64; }
 # struct Point { x: f64, y: f64 }
 # struct CircleStruct { center: Point, radius: f64 }
 # impl Circle for CircleStruct { fn radius(&self) -> f64 { (self.area() / PI).sqrt() } }
 # impl Shape for CircleStruct { fn area(&self) -> f64 { PI * square(self.radius) } }
-# fn square(x: f64) -> f64 { x * x }
 
-let concrete = box CircleStruct{center:Point{x:3.0,y:4.0},radius:5.0};
-let mycircle: Box<Circle> = concrete as Box<Circle>;
+let concrete = ~CircleStruct{center:Point{x:3.0,y:4.0},radius:5.0};
+let mycircle: ~Circle = concrete as ~Circle;
 let nonsense = mycircle.radius() * mycircle.area();
 ~~~
 

branches/try2/src/libcore/mem.rs

@@ -404,7 +404,6 @@ mod tests {
     #[cfg(target_arch = "x86")]
     #[cfg(target_arch = "arm")]
     #[cfg(target_arch = "mips")]
-    #[cfg(target_arch = "mipsel")]
     fn size_of_32() {
         assert_eq!(size_of::<uint>(), 4u);
         assert_eq!(size_of::<*uint>(), 4u);
@@ -436,7 +435,6 @@ mod tests {
     #[cfg(target_arch = "x86")]
     #[cfg(target_arch = "arm")]
     #[cfg(target_arch = "mips")]
-    #[cfg(target_arch = "mipsel")]
     fn align_of_32() {
         assert_eq!(align_of::<uint>(), 4u);
         assert_eq!(align_of::<*uint>(), 4u);

branches/try2/src/libgreen/context.rs

@@ -268,15 +268,12 @@ fn initialize_call_frame(regs: &mut Registers, fptr: InitFn, arg: uint,
 }
 
 #[cfg(target_arch = "mips")]
-#[cfg(target_arch = "mipsel")]
 type Registers = [uint, ..32];
 
 #[cfg(target_arch = "mips")]
-#[cfg(target_arch = "mipsel")]
 fn new_regs() -> Box<Registers> { box {[0, .. 32]} }
 
 #[cfg(target_arch = "mips")]
-#[cfg(target_arch = "mipsel")]
 fn initialize_call_frame(regs: &mut Registers, fptr: InitFn, arg: uint,
                          procedure: raw::Procedure, sp: *mut uint) {
     let sp = align_down(sp);

branches/try2/src/liblibc/lib.rs

@@ -463,7 +463,6 @@ pub mod types {
         #[cfg(target_arch = "x86")]
         #[cfg(target_arch = "arm")]
         #[cfg(target_arch = "mips")]
-        #[cfg(target_arch = "mipsel")]
         pub mod arch {
             pub mod c95 {
                 pub type c_char = i8;
@@ -492,7 +491,6 @@ pub mod types {
             }
             #[cfg(target_arch = "x86")]
             #[cfg(target_arch = "mips")]
-            #[cfg(target_arch = "mipsel")]
             pub mod posix88 {
                 pub type off_t = i32;
                 pub type dev_t = u64;
@@ -601,7 +599,6 @@ pub mod types {
                 }
             }
             #[cfg(target_arch = "mips")]
-            #[cfg(target_arch = "mipsel")]
             pub mod posix01 {
                 use types::os::arch::c95::{c_long, c_ulong, time_t};
                 use types::os::arch::posix88::{gid_t, ino_t};
@@ -2212,7 +2209,6 @@ pub mod consts {
         }
 
         #[cfg(target_arch = "mips")]
-        #[cfg(target_arch = "mipsel")]
         pub mod posix88 {
             use types::os::arch::c95::c_int;
             use types::common::c95::c_void;
@@ -2487,7 +2483,6 @@ pub mod consts {
             pub static PTHREAD_STACK_MIN: size_t = 16384;
 
             #[cfg(target_arch = "mips", target_os = "linux")]
-            #[cfg(target_arch = "mipsel", target_os = "linux")]
             pub static PTHREAD_STACK_MIN: size_t = 131072;
 
             pub static CLOCK_REALTIME: c_int = 0;
@@ -2541,7 +2536,6 @@ pub mod consts {
             pub static SHUT_RDWR: c_int = 2;
         }
         #[cfg(target_arch = "mips")]
-        #[cfg(target_arch = "mipsel")]
         pub mod bsd44 {
             use types::os::arch::c95::c_int;
 
@@ -2610,7 +2604,6 @@ pub mod consts {
             pub static MAP_STACK : c_int = 0x020000;
         }
         #[cfg(target_arch = "mips")]
-        #[cfg(target_arch = "mipsel")]
         pub mod extra {
             use types::os::arch::c95::c_int;
 
@@ -2983,7 +2976,6 @@ pub mod consts {
             pub static PTHREAD_STACK_MIN: size_t = 4096;
 
             #[cfg(target_arch = "mips")]
-            #[cfg(target_arch = "mipsel")]
             #[cfg(target_arch = "x86")]
             #[cfg(target_arch = "x86_64")]
             pub static PTHREAD_STACK_MIN: size_t = 2048;

branches/try2/src/libnative/io/c_unix.rs

@@ -23,26 +23,20 @@ use libc;
 #[cfg(target_os = "ios")]
 #[cfg(target_os = "freebsd")]
 pub static FIONBIO: libc::c_ulong = 0x8004667e;
-#[cfg(target_os = "linux", target_arch = "x86")]
-#[cfg(target_os = "linux", target_arch = "x86_64")]
-#[cfg(target_os = "linux", target_arch = "arm")]
+#[cfg(target_os = "linux", not(target_arch = "mips"))]
 #[cfg(target_os = "android")]
 pub static FIONBIO: libc::c_ulong = 0x5421;
 #[cfg(target_os = "linux", target_arch = "mips")]
-#[cfg(target_os = "linux", target_arch = "mipsel")]
 pub static FIONBIO: libc::c_ulong = 0x667e;
 
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "ios")]
 #[cfg(target_os = "freebsd")]
 pub static FIOCLEX: libc::c_ulong = 0x20006601;
-#[cfg(target_os = "linux", target_arch = "x86")]
-#[cfg(target_os = "linux", target_arch = "x86_64")]
-#[cfg(target_os = "linux", target_arch = "arm")]
+#[cfg(target_os = "linux", not(target_arch = "mips"))]
 #[cfg(target_os = "android")]
 pub static FIOCLEX: libc::c_ulong = 0x5451;
 #[cfg(target_os = "linux", target_arch = "mips")]
-#[cfg(target_os = "linux", target_arch = "mipsel")]
 pub static FIOCLEX: libc::c_ulong = 0x6601;
 
 #[cfg(target_os = "macos")]
@@ -115,9 +109,7 @@ mod select {
     }
 }
 
-#[cfg(target_os = "linux", target_arch = "x86")]
-#[cfg(target_os = "linux", target_arch = "x86_64")]
-#[cfg(target_os = "linux", target_arch = "arm")]
+#[cfg(target_os = "linux", not(target_arch = "mips"))]
 #[cfg(target_os = "android")]
 mod signal {
     use libc;
@@ -161,7 +153,6 @@ mod signal {
 }
 
 #[cfg(target_os = "linux", target_arch = "mips")]
-#[cfg(target_os = "linux", target_arch = "mipsel")]
 mod signal {
     use libc;
 

branches/try2/src/librustc/back/mipsel.rs

@@ -18,7 +18,7 @@ use driver::session::Session;
 use back;
 use back::link;
 use back::target_strs;
-use back::{arm, x86, x86_64, mips, mipsel};
+use back::{arm, x86, x86_64, mips};
 use middle::lint;
 
 use syntax::abi;
@@ -373,8 +373,7 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
         abi::X86 =>    ("little", "x86",    "32"),
         abi::X86_64 => ("little", "x86_64", "64"),
         abi::Arm =>    ("little", "arm",    "32"),
-        abi::Mips =>   ("big",    "mips",   "32"),
-        abi::Mipsel => ("little", "mipsel", "32")
+        abi::Mips =>   ("big",    "mips",   "32")
     };
 
     let fam = match sess.targ_cfg.os {
@@ -453,7 +452,6 @@ static architecture_abis : &'static [(&'static str, abi::Architecture)] = &'stat
     ("xscale", abi::Arm),
     ("thumb",  abi::Arm),
 
-    ("mipsel", abi::Mipsel),
     ("mips",   abi::Mips)];
 
 pub fn build_target_config(sopts: &Options) -> Config {
@@ -472,16 +470,14 @@ pub fn build_target_config(sopts: &Options) -> Config {
       abi::X86 => (ast::TyI32, ast::TyU32),
       abi::X86_64 => (ast::TyI64, ast::TyU64),
       abi::Arm => (ast::TyI32, ast::TyU32),
-      abi::Mips => (ast::TyI32, ast::TyU32),
-      abi::Mipsel => (ast::TyI32, ast::TyU32)
+      abi::Mips => (ast::TyI32, ast::TyU32)
     };
     let target_triple = sopts.target_triple.clone();
     let target_strs = match arch {
       abi::X86 => x86::get_target_strs(target_triple, os),
       abi::X86_64 => x86_64::get_target_strs(target_triple, os),
       abi::Arm => arm::get_target_strs(target_triple, os),
-      abi::Mips => mips::get_target_strs(target_triple, os),
-      abi::Mipsel => mipsel::get_target_strs(target_triple, os)
+      abi::Mips => mips::get_target_strs(target_triple, os)
     };
     Config {
         os: os,

branches/try2/src/librustc/driver/config.rs

@@ -99,7 +99,6 @@ pub mod back {
     pub mod link;
     pub mod lto;
     pub mod mips;
-    pub mod mipsel;
     pub mod rpath;
     pub mod svh;
     pub mod target_strs;

branches/try2/src/librustc/lib.rs

@@ -1121,7 +1121,10 @@ impl<'t,TYPER:Typer> MemCategorizationContext<'t,TYPER> {
                       "captured outer variable".to_string()
                   }
                   _ => {
-                      format!("dereference of `{}`-pointer", ptr_sigil(pk))
+                      match pk {
+                          OwnedPtr | GcPtr => format!("dereference of `{}`", ptr_sigil(pk)),
+                          _ => format!("dereference of `{}`-pointer", ptr_sigil(pk))
+                      }
                   }
               }
           }
@@ -1291,8 +1294,8 @@ impl Repr for categorization {
 
 pub fn ptr_sigil(ptr: PointerKind) -> &'static str {
     match ptr {
-        OwnedPtr => "~",
-        GcPtr => "@",
+        OwnedPtr => "Box",
+        GcPtr => "Gc",
         BorrowedPtr(ty::ImmBorrow, _) => "&",
         BorrowedPtr(ty::MutBorrow, _) => "&mut",
         BorrowedPtr(ty::UniqueImmBorrow, _) => "&unique",

branches/try2/src/librustc/middle/mem_categorization.rs

@@ -59,7 +59,7 @@ use middle::trans::type_::Type;
 use middle::trans::type_of;
 use middle::ty;
 use middle::ty::Disr;
-use syntax::abi::{X86, X86_64, Arm, Mips, Mipsel};
+use syntax::abi::{X86, X86_64, Arm, Mips};
 use syntax::ast;
 use syntax::attr;
 use syntax::attr::IntType;
@@ -365,7 +365,6 @@ fn range_to_inttype(cx: &CrateContext, hint: Hint, bounds: &IntBounds) -> IntTyp
                 // corresponding to `choose_shortest`.  However, we don't run on those yet...?
                 Arm => at_least_32,
                 Mips => at_least_32,
-                Mipsel => at_least_32,
             }
         }
         attr::ReprAny => {