Skip to content

Commit 3b34aac

Browse files
borsbors
committed
---
yaml --- r: 58260 b: refs/heads/auto c: 5617916 h: refs/heads/master v: v3
1 parent 2fb8647 commit 3b34aac

File tree

11 files changed

+17
-228
lines changed

11 files changed

+17
-228
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: c2bf9bf9fed8de0c399125feba8252ad263a71fc
17+
refs/heads/auto: 5617916726186290710dade90057683904a5f215
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

‎branches/auto/mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,12 @@ AR_mips-unknown-linux-gnu=mips-linux-gnu-ar
247247
CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
248248
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
249249
CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
250-
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
250+
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32
251251
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti
252252
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
253253
CFG_GCCISH_DEF_FLAG_mips-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
254254
CFG_GCCISH_PRE_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-whole-archive
255-
CFG_GCCISH_POST_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-no-whole-archive
255+
CFG_GCCISH_POST_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-no-whole-archive -Wl,-znoexecstack
256256
CFG_DEF_SUFFIX_mips-unknown-linux-gnu := .linux.def
257257
CFG_INSTALL_NAME_mips-unknown-linux-gnu =
258258
CFG_LIBUV_LINK_FLAGS_mips-unknown-linux-gnu =

‎branches/auto/src/libcore/iter.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ breaking out of iteration. The adaptors in the module work with any such iterato
1717
tied to specific traits. For example:
1818
1919
~~~~
20-
use core::iter::iter_to_vec;
21-
println(iter_to_vec(|f| uint::range(0, 20, f)).to_str());
20+
println(iter::to_vec(|f| uint::range(0, 20, f)).to_str());
2221
~~~~
2322
2423
An external iterator object implementing the interface in the `iterator` module can be used as an
@@ -55,12 +54,12 @@ pub trait Times {
5554
*
5655
* ~~~
5756
* let xs = ~[1, 2, 3];
58-
* let ys = do iter_to_vec |f| { xs.each(|x| f(*x)) };
57+
* let ys = do iter::to_vec |f| { xs.each(|x| f(*x)) };
5958
* assert_eq!(xs, ys);
6059
* ~~~
6160
*/
6261
#[inline(always)]
63-
pub fn iter_to_vec<T>(iter: &fn(f: &fn(T) -> bool)) -> ~[T] {
62+
pub fn to_vec<T>(iter: &fn(f: &fn(T) -> bool)) -> ~[T] {
6463
let mut v = ~[];
6564
for iter |x| { v.push(x) }
6665
v
@@ -185,9 +184,9 @@ mod tests {
185184
use prelude::*;
186185

187186
#[test]
188-
fn test_iter_to_vec() {
187+
fn test_to_vec() {
189188
let xs = ~[1, 2, 3];
190-
let ys = do iter_to_vec |f| { xs.each(|x| f(*x)) };
189+
let ys = do to_vec |f| { xs.each(|x| f(*x)) };
191190
assert_eq!(xs, ys);
192191
}
193192

‎branches/auto/src/libcore/iterator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ mod tests {
378378
#[test]
379379
fn test_counter_to_vec() {
380380
let mut it = Counter::new(0, 5).take(10);
381-
let xs = iter::iter_to_vec(|f| it.advance(f));
381+
let xs = iter::to_vec(|f| it.advance(f));
382382
assert_eq!(xs, ~[0, 5, 10, 15, 20, 25, 30, 35, 40, 45]);
383383
}
384384

‎branches/auto/src/libcore/libc.rs

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -268,17 +268,14 @@ pub mod types {
268268
pub type ssize_t = i32;
269269
}
270270
pub mod posix01 {
271-
use libc::types::os::arch::c95::{c_short, c_long, c_ulong, time_t};
271+
use libc::types::os::arch::c95::{c_short, c_long, time_t};
272272
use libc::types::os::arch::posix88::{dev_t, gid_t, ino_t};
273273
use libc::types::os::arch::posix88::{mode_t, off_t};
274274
use libc::types::os::arch::posix88::{uid_t};
275275

276276
pub type nlink_t = u32;
277277
pub type blksize_t = i32;
278278
pub type blkcnt_t = i32;
279-
280-
#[cfg(target_arch = "x86")]
281-
#[cfg(target_arch = "arm")]
282279
pub struct stat {
283280
st_dev: dev_t,
284281
__pad1: c_short,
@@ -301,30 +298,6 @@ pub mod types {
301298
__unused4: c_long,
302299
__unused5: c_long,
303300
}
304-
305-
#[cfg(target_arch = "mips")]
306-
pub struct stat {
307-
st_dev: c_ulong,
308-
st_pad1: [c_long, ..3],
309-
st_ino: ino_t,
310-
st_mode: mode_t,
311-
st_nlink: nlink_t,
312-
st_uid: uid_t,
313-
st_gid: gid_t,
314-
st_rdev: c_ulong,
315-
st_pad2: [c_long, ..2],
316-
st_size: off_t,
317-
st_pad3: c_long,
318-
st_atime: time_t,
319-
st_atime_nsec: c_long,
320-
st_mtime: time_t,
321-
st_mtime_nsec: c_long,
322-
st_ctime: time_t,
323-
st_ctime_nsec: c_long,
324-
st_blksize: blksize_t,
325-
st_blocks: blkcnt_t,
326-
st_pad5: [c_long, ..14],
327-
}
328301
}
329302
pub mod posix08 {}
330303
pub mod bsd44 {}
@@ -990,9 +963,6 @@ pub mod consts {
990963
}
991964
pub mod c99 {
992965
}
993-
#[cfg(target_arch = "x86")]
994-
#[cfg(target_arch = "x86_64")]
995-
#[cfg(target_arch = "arm")]
996966
pub mod posix88 {
997967
pub static O_RDONLY : int = 0;
998968
pub static O_WRONLY : int = 1;
@@ -1037,51 +1007,6 @@ pub mod consts {
10371007
pub static SIGALRM : int = 14;
10381008
pub static SIGTERM : int = 15;
10391009
}
1040-
#[cfg(target_arch = "mips")]
1041-
pub mod posix88 {
1042-
pub static O_RDONLY : int = 0;
1043-
pub static O_WRONLY : int = 1;
1044-
pub static O_RDWR : int = 2;
1045-
pub static O_APPEND : int = 8;
1046-
pub static O_CREAT : int = 256;
1047-
pub static O_EXCL : int = 1024;
1048-
pub static O_TRUNC : int = 512;
1049-
pub static S_IFIFO : int = 4096;
1050-
pub static S_IFCHR : int = 8192;
1051-
pub static S_IFBLK : int = 24576;
1052-
pub static S_IFDIR : int = 16384;
1053-
pub static S_IFREG : int = 32768;
1054-
pub static S_IFMT : int = 61440;
1055-
pub static S_IEXEC : int = 64;
1056-
pub static S_IWRITE : int = 128;
1057-
pub static S_IREAD : int = 256;
1058-
pub static S_IRWXU : int = 448;
1059-
pub static S_IXUSR : int = 64;
1060-
pub static S_IWUSR : int = 128;
1061-
pub static S_IRUSR : int = 256;
1062-
pub static F_OK : int = 0;
1063-
pub static R_OK : int = 4;
1064-
pub static W_OK : int = 2;
1065-
pub static X_OK : int = 1;
1066-
pub static STDIN_FILENO : int = 0;
1067-
pub static STDOUT_FILENO : int = 1;
1068-
pub static STDERR_FILENO : int = 2;
1069-
pub static F_LOCK : int = 1;
1070-
pub static F_TEST : int = 3;
1071-
pub static F_TLOCK : int = 2;
1072-
pub static F_ULOCK : int = 0;
1073-
pub static SIGHUP : int = 1;
1074-
pub static SIGINT : int = 2;
1075-
pub static SIGQUIT : int = 3;
1076-
pub static SIGILL : int = 4;
1077-
pub static SIGABRT : int = 6;
1078-
pub static SIGFPE : int = 8;
1079-
pub static SIGKILL : int = 9;
1080-
pub static SIGSEGV : int = 11;
1081-
pub static SIGPIPE : int = 13;
1082-
pub static SIGALRM : int = 14;
1083-
pub static SIGTERM : int = 15;
1084-
}
10851010
pub mod posix01 {
10861011
pub static SIGTRAP : int = 5;
10871012

@@ -1101,20 +1026,11 @@ pub mod consts {
11011026
}
11021027
pub mod bsd44 {
11031028
}
1104-
#[cfg(target_arch = "x86")]
1105-
#[cfg(target_arch = "x86_64")]
1106-
#[cfg(target_arch = "arm")]
11071029
pub mod extra {
11081030
pub static O_RSYNC : int = 1052672;
11091031
pub static O_DSYNC : int = 4096;
11101032
pub static O_SYNC : int = 1052672;
11111033
}
1112-
#[cfg(target_arch = "mips")]
1113-
pub mod extra {
1114-
pub static O_RSYNC : int = 16400;
1115-
pub static O_DSYNC : int = 16;
1116-
pub static O_SYNC : int = 16400;
1117-
}
11181034
}
11191035

11201036
#[cfg(target_os = "freebsd")]

‎branches/auto/src/libcore/path.rs

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ pub trait GenericPath {
122122
mod stat {
123123
#[cfg(target_arch = "x86")]
124124
#[cfg(target_arch = "arm")]
125+
#[cfg(target_arch = "mips")]
125126
pub mod arch {
126127
use libc;
127128

@@ -151,36 +152,6 @@ mod stat {
151152
}
152153
}
153154

154-
#[cfg(target_arch = "mips")]
155-
pub mod arch {
156-
use libc;
157-
158-
pub fn default_stat() -> libc::stat {
159-
libc::stat {
160-
st_dev: 0,
161-
st_pad1: [0, ..3],
162-
st_ino: 0,
163-
st_mode: 0,
164-
st_nlink: 0,
165-
st_uid: 0,
166-
st_gid: 0,
167-
st_rdev: 0,
168-
st_pad2: [0, ..2],
169-
st_size: 0,
170-
st_pad3: 0,
171-
st_atime: 0,
172-
st_atime_nsec: 0,
173-
st_mtime: 0,
174-
st_mtime_nsec: 0,
175-
st_ctime: 0,
176-
st_ctime_nsec: 0,
177-
st_blksize: 0,
178-
st_blocks: 0,
179-
st_pad5: [0, ..14],
180-
}
181-
}
182-
}
183-
184155
#[cfg(target_arch = "x86_64")]
185156
pub mod arch {
186157
use libc;

‎branches/auto/src/libstd/ebml.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ pub mod reader {
157157
}
158158
159159
#[cfg(target_arch = "arm")]
160-
#[cfg(target_arch = "mips")]
161160
pub fn vuint_at(data: &[u8], start: uint) -> Res {
162161
vuint_at_slow(data, start)
163162
}

‎branches/auto/src/rt/arch/mips/ccall.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.align 2
99
.globl __morestack
1010
.hidden __morestack
11+
.cfi_sections .eh_frame_entry
1112
.cfi_startproc
1213
.set nomips16
1314
.ent __morestack

‎branches/auto/src/rt/arch/mips/morestack.S

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎branches/auto/src/rt/arch/mips/record_sp.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ record_sp_limit:
1616
.set mips32r2
1717
rdhwr $3, $29
1818
.set pop
19-
addiu $3, $3, -0x7004
20-
sw $4, 0($3)
19+
addiu $3, $3, -0x7008
20+
sw $4, 4($3)
2121
jr $31
2222
nop
2323
.end record_sp_limit
@@ -33,8 +33,8 @@ get_sp_limit:
3333
.set mips32r2
3434
rdhwr $3, $29
3535
.set pop
36-
addiu $3, $3, -0x7004
37-
lw $2, 0($3)
36+
addiu $3, $3, -0x7008
37+
lw $2, 4($3)
3838
jr $31
3939
nop
4040
.end get_sp_limit

‎branches/auto/src/rt/rust_task.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
#define RED_ZONE_SIZE RZ_LINUX_64
145145
#endif
146146
#ifdef __mips__
147-
#define RED_ZONE_SIZE RZ_MAC_32
147+
#define RED_ZONE_SIZE RZ_LINUX_32
148148
#endif
149149
#endif
150150
#ifdef __APPLE__

0 commit comments

Comments
 (0)