Skip to content

Commit 90b3e6f

Browse files
vadimcnvadimcn
committed
---
yaml --- r: 128830 b: refs/heads/try c: 3dfd129 h: refs/heads/master v: v3
1 parent c6e9726 commit 90b3e6f

File tree

18 files changed

+73
-38
lines changed

18 files changed

+73
-38
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
5-
refs/heads/try: 98332b1a06193c4f83fc2613f72273b50b77f2b3
5+
refs/heads/try: 3dfd12967aed35b7788f7d3c7460b76b76e70b60
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/src/compiletest/runtest.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ use header::TestProps;
1616
use header;
1717
use procsrv;
1818
use util::logv;
19-
#[cfg(target_os = "win32")]
19+
#[cfg(target_os = "windows")]
20+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
2021
use util;
2122

2223
use std::io::File;
@@ -816,7 +817,8 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
816817
format!("{}:{}:", testfile.display(), ee.line)
817818
}).collect::<Vec<String> >();
818819

819-
#[cfg(target_os = "win32")]
820+
#[cfg(target_os = "windows")]
821+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
820822
fn to_lower( s : &str ) -> String {
821823
let i = s.chars();
822824
let c : Vec<char> = i.map( |c| {
@@ -829,7 +831,8 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
829831
String::from_chars(c.as_slice())
830832
}
831833

832-
#[cfg(target_os = "win32")]
834+
#[cfg(target_os = "windows")]
835+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
833836
fn prefix_matches( line : &str, prefix : &str ) -> bool {
834837
to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
835838
}
@@ -1246,14 +1249,16 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
12461249
format!("{} {}", prog, args.connect(" "))
12471250
}
12481251

1249-
#[cfg(target_os = "win32")]
1252+
#[cfg(target_os = "windows")]
1253+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
12501254
fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
12511255
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
12521256
}
12531257

12541258
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
12551259
// for diagnostic purposes
1256-
#[cfg(target_os = "win32")]
1260+
#[cfg(target_os = "windows")]
1261+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
12571262
fn lib_path_cmd_prefix(path: &str) -> String {
12581263
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
12591264
}

‎branches/try/src/compiletest/util.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010

1111
use common::Config;
1212

13-
#[cfg(target_os = "win32")]
13+
#[cfg(target_os = "windows")]
14+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
1415
use std::os::getenv;
1516

1617
/// Conversion table from triple OS name to Rust SYSNAME
1718
static OS_TABLE: &'static [(&'static str, &'static str)] = &[
18-
("mingw32", "win32"),
19-
("win32", "win32"),
19+
("mingw32", "windows"),
20+
("win32", "windows"),
21+
("windows", "windows"),
2022
("darwin", "macos"),
2123
("android", "android"),
2224
("linux", "linux"),
@@ -33,7 +35,8 @@ pub fn get_os(triple: &str) -> &'static str {
3335
fail!("Cannot determine OS from triple");
3436
}
3537

36-
#[cfg(target_os = "win32")]
38+
#[cfg(target_os = "windows")]
39+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
3740
pub fn make_new_path(path: &str) -> String {
3841

3942
// Windows just uses PATH as the library search path, so we have to
@@ -46,10 +49,12 @@ pub fn make_new_path(path: &str) -> String {
4649
}
4750
}
4851

49-
#[cfg(target_os = "win32")]
52+
#[cfg(target_os = "windows")]
53+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5054
pub fn lib_path_env_var() -> &'static str { "PATH" }
5155

52-
#[cfg(target_os = "win32")]
56+
#[cfg(target_os = "windows")]
57+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5358
pub fn path_div() -> &'static str { ";" }
5459

5560
pub fn logv(config: &Config, s: String) {

‎branches/try/src/etc/mklldeps.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,15 @@ def run(args):
6161
elif 'android' in os:
6262
os = 'android'
6363
elif 'win' in os or 'mingw' in os:
64-
os = 'win32'
64+
os = 'windows'
6565
cfg = [
6666
"target_arch = \"" + arch + "\"",
6767
"target_os = \"" + os + "\"",
6868
]
6969

7070
f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
71+
if os == "windows": # NOTE: Remove after snapshot
72+
f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
7173

7274
version = run([llconfig, '--version']).strip()
7375

‎branches/try/src/liblibc/lib.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,8 @@ pub mod types {
11381138
}
11391139
}
11401140

1141-
#[cfg(target_os = "win32")]
1141+
#[cfg(target_os = "windows")]
1142+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
11421143
pub mod os {
11431144
pub mod common {
11441145
pub mod posix01 {
@@ -1803,7 +1804,8 @@ pub mod consts {
18031804
// Consts tend to vary per OS so we pull their definitions out
18041805
// into this module.
18051806

1806-
#[cfg(target_os = "win32")]
1807+
#[cfg(target_os = "windows")]
1808+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
18071809
pub mod os {
18081810
pub mod c95 {
18091811
use types::os::arch::c95::{c_int, c_uint};
@@ -3887,7 +3889,8 @@ pub mod funcs {
38873889
// so be careful when trying to write portable code; it won't always work
38883890
// with the same POSIX functions and types as other platforms.
38893891

3890-
#[cfg(target_os = "win32")]
3892+
#[cfg(target_os = "windows")]
3893+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
38913894
pub mod posix88 {
38923895
pub mod stat_ {
38933896
use types::os::common::posix01::{stat, utimbuf};
@@ -4316,7 +4319,8 @@ pub mod funcs {
43164319
}
43174320
}
43184321

4319-
#[cfg(target_os = "win32")]
4322+
#[cfg(target_os = "windows")]
4323+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
43204324
pub mod posix01 {
43214325
pub mod stat_ {
43224326
}
@@ -4332,7 +4336,8 @@ pub mod funcs {
43324336
}
43334337

43344338

4335-
#[cfg(target_os = "win32")]
4339+
#[cfg(target_os = "windows")]
4340+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
43364341
#[cfg(target_os = "linux")]
43374342
#[cfg(target_os = "android")]
43384343
#[cfg(target_os = "macos")]
@@ -4470,7 +4475,8 @@ pub mod funcs {
44704475
}
44714476

44724477

4473-
#[cfg(target_os = "win32")]
4478+
#[cfg(target_os = "windows")]
4479+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
44744480
pub mod bsd44 {
44754481
}
44764482

@@ -4496,7 +4502,8 @@ pub mod funcs {
44964502
}
44974503

44984504

4499-
#[cfg(target_os = "win32")]
4505+
#[cfg(target_os = "windows")]
4506+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
45004507
pub mod extra {
45014508

45024509
pub mod kernel32 {

‎branches/try/src/libnative/io/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ pub mod file;
5858
#[path = "timer_unix.rs"]
5959
pub mod timer;
6060

61-
#[cfg(target_os = "win32")]
61+
#[cfg(target_os = "windows")]
62+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
6263
#[path = "timer_win32.rs"]
6364
pub mod timer;
6465

‎branches/try/src/librustc/driver/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ pub fn default_lib_output() -> CrateType {
390390

391391
pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
392392
let tos = match sess.targ_cfg.os {
393-
abi::OsWindows => InternedString::new("win32"),
393+
abi::OsWindows => InternedString::new("windows"),
394394
abi::OsMacos => InternedString::new("macos"),
395395
abi::OsLinux => InternedString::new("linux"),
396396
abi::OsAndroid => InternedString::new("android"),
@@ -454,6 +454,7 @@ pub fn get_os(triple: &str) -> Option<abi::Os> {
454454
static os_names : &'static [(&'static str, abi::Os)] = &[
455455
("mingw32", abi::OsWindows),
456456
("win32", abi::OsWindows),
457+
("windows", abi::OsWindows),
457458
("darwin", abi::OsMacos),
458459
("android", abi::OsAndroid),
459460
("linux", abi::OsLinux),

‎branches/try/src/librustdoc/plugins.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ impl PluginManager {
7373
}
7474
}
7575

76-
#[cfg(target_os="win32")]
76+
#[cfg(target_os = "windows")]
77+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
7778
fn libname(mut n: String) -> String {
7879
n.push_str(".dll");
7980
n
@@ -85,7 +86,8 @@ fn libname(mut n: String) -> String {
8586
n
8687
}
8788

88-
#[cfg(not(target_os="win32"), not(target_os="macos"))]
89+
#[cfg(not(stage0), not(target_os="windows"), not(target_os="macos"))]
90+
#[cfg(stage0, not(target_os="win32"), not(target_os="macos"))] // NOTE: Remove after snapshot
8991
fn libname(n: String) -> String {
9092
let mut i = String::from_str("lib");
9193
i.push_str(n.as_slice());

‎branches/try/src/librustrt/args.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ mod imp {
147147

148148
#[cfg(target_os = "macos")]
149149
#[cfg(target_os = "ios")]
150-
#[cfg(target_os = "win32")]
150+
#[cfg(target_os = "windows")]
151+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
151152
mod imp {
152153
use core::prelude::*;
153154
use collections::vec::Vec;

‎branches/try/src/librustrt/libunwind.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ pub type _Unwind_Exception_Cleanup_Fn =
8686

8787
#[cfg(target_os = "linux")]
8888
#[cfg(target_os = "freebsd")]
89-
#[cfg(target_os = "win32")]
89+
#[cfg(target_os = "windows")]
90+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
9091
#[link(name = "gcc_s")]
9192
extern {}
9293

‎branches/try/src/librustrt/stack.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ pub unsafe fn record_sp_limit(limit: uint) {
199199
unsafe fn target_record_sp_limit(limit: uint) {
200200
asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile")
201201
}
202-
#[cfg(target_arch = "x86_64", target_os = "win32")] #[inline(always)]
202+
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
203+
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
203204
unsafe fn target_record_sp_limit(limit: uint) {
204205
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
205206
// store this inside of the "arbitrary data slot", but double the size
@@ -227,7 +228,8 @@ pub unsafe fn record_sp_limit(limit: uint) {
227228
unsafe fn target_record_sp_limit(limit: uint) {
228229
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
229230
}
230-
#[cfg(target_arch = "x86", target_os = "win32")] #[inline(always)]
231+
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
232+
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
231233
unsafe fn target_record_sp_limit(limit: uint) {
232234
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
233235
// store this inside of the "arbitrary data slot"
@@ -280,7 +282,8 @@ pub unsafe fn get_sp_limit() -> uint {
280282
asm!("movq %fs:112, $0" : "=r"(limit) ::: "volatile");
281283
return limit;
282284
}
283-
#[cfg(target_arch = "x86_64", target_os = "win32")] #[inline(always)]
285+
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
286+
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
284287
unsafe fn target_get_sp_limit() -> uint {
285288
let limit;
286289
asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile");
@@ -316,7 +319,8 @@ pub unsafe fn get_sp_limit() -> uint {
316319
asm!("movl %gs:48, $0" : "=r"(limit) ::: "volatile");
317320
return limit;
318321
}
319-
#[cfg(target_arch = "x86", target_os = "win32")] #[inline(always)]
322+
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
323+
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
320324
unsafe fn target_get_sp_limit() -> uint {
321325
let limit;
322326
asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile");

‎branches/try/src/librustuv/uvll.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,8 @@ extern {}
723723
#[link(name = "rt")]
724724
extern {}
725725

726-
#[cfg(target_os = "win32")]
726+
#[cfg(target_os = "windows")]
727+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
727728
#[link(name = "ws2_32")]
728729
#[link(name = "psapi")]
729730
#[link(name = "iphlpapi")]

‎branches/try/src/libstd/dynamic_lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ pub mod dl {
278278
}
279279
}
280280

281-
#[cfg(target_os = "win32")]
281+
#[cfg(target_os = "windows")]
282+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
282283
pub mod dl {
283284
use c_str::ToCStr;
284285
use iter::Iterator;

‎branches/try/src/libstd/os.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,15 +1842,16 @@ pub mod consts {
18421842
pub static EXE_EXTENSION: &'static str = "";
18431843
}
18441844

1845-
#[cfg(target_os = "win32")]
1845+
#[cfg(target_os = "windows")]
1846+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
18461847
pub mod consts {
18471848
pub use os::arch_consts::ARCH;
18481849

18491850
pub static FAMILY: &'static str = "windows";
18501851

18511852
/// A string describing the specific operating system in use: in this
18521853
/// case, `win32`.
1853-
pub static SYSNAME: &'static str = "win32";
1854+
pub static SYSNAME: &'static str = "windows";
18541855

18551856
/// Specifies the filename prefix used for shared libraries on this
18561857
/// platform: in this case, the empty string.

‎branches/try/src/libsyntax/abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl fmt::Show for Os {
147147
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
148148
match *self {
149149
OsLinux => "linux".fmt(f),
150-
OsWindows => "win32".fmt(f),
150+
OsWindows => "windows".fmt(f),
151151
OsMacos => "macos".fmt(f),
152152
OsiOS => "ios".fmt(f),
153153
OsAndroid => "android".fmt(f),

‎branches/try/src/test/run-pass/dupe-first-attr.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ mod hello;
1717
#[cfg(target_os = "macos")]
1818
mod hello;
1919

20-
#[cfg(target_os = "win32")]
20+
#[cfg(target_os = "windows")]
21+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
2122
mod hello;
2223

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

‎branches/try/src/test/run-pass/intrinsic-alignment.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ mod m {
4242
}
4343
}
4444

45-
#[cfg(target_os = "win32")]
45+
#[cfg(target_os = "windows")]
46+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
4647
mod m {
4748
#[main]
4849
#[cfg(target_arch = "x86")]

‎branches/try/src/test/run-pass/rec-align-u64.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ mod m {
5555
}
5656
}
5757

58-
#[cfg(target_os = "win32")]
58+
#[cfg(target_os = "windows")]
59+
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5960
mod m {
6061
#[cfg(target_arch = "x86")]
6162
pub mod m {

0 commit comments

Comments
 (0)