Skip to content

Commit c98696c

Browse files
posix4eposix4e
committed
---
yaml --- r: 235093 b: refs/heads/stable c: 0b7c4f5 h: refs/heads/master i: 235091: 3cda4a9 v: v3
1 parent c708cb3 commit c98696c

File tree

110 files changed

+969
-929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+969
-929
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 68094818969b295a043963ad59c502928f66239f
32+
refs/heads/stable: 0b7c4f57f6ba59dabe4db2808fe45e8bd8bbce22
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,10 @@ case $CFG_OSTYPE in
405405
CFG_OSTYPE=unknown-openbsd
406406
;;
407407

408+
NetBSD)
409+
CFG_OSTYPE=unknown-netbsd
410+
;;
411+
408412
Darwin)
409413
CFG_OSTYPE=apple-darwin
410414
;;

‎branches/stable/mk/cfg/x86_64-unknown-netbsd.mk

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# x86_64-unknown-netbsd configuration
2+
CC_x86_64-unknown-netbsd=$(CC)
3+
CXX_x86_64-unknown-netbsd=$(CXX)
4+
CPP_x86_64-unknown-netbsd=$(CPP)
5+
AR_x86_64-unknown-netbsd=$(AR)
6+
CFG_LIB_NAME_x86_64-unknown-netbsd=lib$(1).so
7+
CFG_STATIC_LIB_NAME_x86_64-unknown-netbsd=lib$(1).a
8+
CFG_LIB_GLOB_x86_64-unknown-netbsd=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_x86_64-unknown-netbsd=$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_x86_64-unknown-netbsd := -I/usr/local/include $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_x86_64-unknown-netbsd := -Wall -Werror -g -fPIC -I/usr/local/include $(CFLAGS)
12+
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-netbsd := -shared -fPIC -g -pthread -lrt
13+
CFG_GCCISH_DEF_FLAG_x86_64-unknown-netbsd := -Wl,--export-dynamic,--dynamic-list=
14+
CFG_LLC_FLAGS_x86_64-unknown-netbsd :=
15+
CFG_INSTALL_NAME_x86_64-unknown-netbsd =
16+
CFG_EXE_SUFFIX_x86_64-unknown-netbsd :=
17+
CFG_WINDOWSY_x86_64-unknown-netbsd :=
18+
CFG_UNIXY_x86_64-unknown-netbsd := 1
19+
CFG_LDPATH_x86_64-unknown-netbsd :=
20+
CFG_RUN_x86_64-unknown-netbsd=$(2)
21+
CFG_RUN_TARG_x86_64-unknown-netbsd=$(call CFG_RUN_x86_64-unknown-netbsd,,$(2))
22+
CFG_GNU_TRIPLE_x86_64-unknown-netbsd := x86_64-unknown-netbsd

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const OS_TABLE: &'static [(&'static str, &'static str)] = &[
2121
("ios", "ios"),
2222
("linux", "linux"),
2323
("mingw32", "windows"),
24+
("netbsd", "netbsd"),
2425
("openbsd", "openbsd"),
2526
("win32", "windows"),
2627
("windows", "windows"),

‎branches/stable/src/doc/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2023,7 +2023,7 @@ The following configurations must be defined by the implementation:
20232023
as a configuration itself, like `unix` or `windows`.
20242024
* `target_os = "..."`. Operating system of the target, examples include
20252025
`"windows"`, `"macos"`, `"ios"`, `"linux"`, `"android"`, `"freebsd"`, `"dragonfly"`,
2026-
`"bitrig"` or `"openbsd"`.
2026+
`"bitrig"` , `"openbsd"` or `"netbsd"`.
20272027
* `target_pointer_width = "..."`. Target pointer width in bits. This is set
20282028
to `"32"` for targets with 32-bit pointers, and likewise set to `"64"` for
20292029
64-bit pointers.

‎branches/stable/src/etc/snapshot.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ def scrub(b):
4141
download_unpack_base = os.path.join(download_dir_base, "unpack")
4242

4343
snapshot_files = {
44+
"bitrig": ["bin/rustc"],
45+
"dragonfly": ["bin/rustc"],
46+
"freebsd": ["bin/rustc"],
4447
"linux": ["bin/rustc"],
4548
"macos": ["bin/rustc"],
46-
"winnt": ["bin/rustc.exe"],
47-
"freebsd": ["bin/rustc"],
48-
"dragonfly": ["bin/rustc"],
49-
"bitrig": ["bin/rustc"],
49+
"netbsd": ["bin/rustc"],
5050
"openbsd": ["bin/rustc"],
51+
"winnt": ["bin/rustc.exe"],
5152
}
5253

5354
winnt_runtime_deps_32 = ["libgcc_s_dw2-1.dll", "libstdc++-6.dll"]
@@ -103,6 +104,8 @@ def get_kernel(triple):
103104
return "dragonfly"
104105
if os_name == "bitrig":
105106
return "bitrig"
107+
if os_name == "netbsd":
108+
return "netbsd"
106109
if os_name == "openbsd":
107110
return "openbsd"
108111
return "linux"

‎branches/stable/src/liballoc/arc.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ pub struct Weak<T: ?Sized> {
145145
unsafe impl<T: ?Sized + Sync + Send> Send for Weak<T> { }
146146
unsafe impl<T: ?Sized + Sync + Send> Sync for Weak<T> { }
147147

148-
impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Weak<U>> for Weak<T> {}
149-
150148
#[stable(feature = "rust1", since = "1.0.0")]
151149
impl<T: ?Sized + fmt::Debug> fmt::Debug for Weak<T> {
152150
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

‎branches/stable/src/liballoc/rc.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,6 @@ pub struct Weak<T: ?Sized> {
734734
impl<T: ?Sized> !marker::Send for Weak<T> {}
735735
impl<T: ?Sized> !marker::Sync for Weak<T> {}
736736

737-
impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Weak<U>> for Weak<T> {}
738-
739737
#[unstable(feature = "rc_weak",
740738
reason = "Weak pointers may not belong in this module.")]
741739
impl<T: ?Sized> Weak<T> {

‎branches/stable/src/libcore/any.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
//! Traits for dynamic typing of any `'static` type (through runtime reflection)
12+
//!
1113
//! This module implements the `Any` trait, which enables dynamic typing
1214
//! of any `'static` type through runtime reflection.
1315
//!

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ pub mod types {
13221322
}
13231323
}
13241324

1325-
#[cfg(any(target_os = "bitrig", target_os = "openbsd"))]
1325+
#[cfg(any(target_os = "bitrig", target_os = "netbsd", target_os ="openbsd"))]
13261326
pub mod os {
13271327
pub mod common {
13281328
pub mod posix01 {
@@ -1351,7 +1351,7 @@ pub mod types {
13511351
pub __unused7: *mut c_void,
13521352
}
13531353

1354-
#[cfg(target_os = "openbsd")]
1354+
#[cfg(any(target_os = "netbsd", target_os="openbsd"))]
13551355
#[repr(C)]
13561356
#[derive(Copy, Clone)] pub struct glob_t {
13571357
pub gl_pathc: c_int,
@@ -4323,7 +4323,7 @@ pub mod consts {
43234323
}
43244324
}
43254325

4326-
#[cfg(any(target_os = "bitrig", target_os = "openbsd"))]
4326+
#[cfg(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"))]
43274327
pub mod os {
43284328
pub mod c95 {
43294329
use types::os::arch::c95::{c_int, c_uint};
@@ -5568,6 +5568,7 @@ pub mod funcs {
55685568
target_os = "freebsd",
55695569
target_os = "dragonfly",
55705570
target_os = "bitrig",
5571+
target_os = "netbsd",
55715572
target_os = "openbsd",
55725573
target_os = "nacl"))]
55735574
pub mod posix88 {
@@ -5584,6 +5585,7 @@ pub mod funcs {
55845585
target_os = "freebsd",
55855586
target_os = "dragonfly",
55865587
target_os = "bitrig",
5588+
target_os = "netbsd",
55875589
target_os = "openbsd",
55885590
target_os = "android",
55895591
target_os = "ios",
@@ -5602,6 +5604,7 @@ pub mod funcs {
56025604
target_os = "freebsd",
56035605
target_os = "dragonfly",
56045606
target_os = "bitrig",
5607+
target_os = "netbsd",
56055608
target_os = "openbsd",
56065609
target_os = "android",
56075610
target_os = "ios",
@@ -5889,6 +5892,7 @@ pub mod funcs {
58895892
target_os = "freebsd",
58905893
target_os = "dragonfly",
58915894
target_os = "bitrig",
5895+
target_os = "netbsd",
58925896
target_os = "openbsd",
58935897
target_os = "nacl"))]
58945898
pub mod posix01 {
@@ -5901,6 +5905,7 @@ pub mod funcs {
59015905
target_os = "freebsd",
59025906
target_os = "dragonfly",
59035907
target_os = "bitrig",
5908+
target_os = "netbsd",
59045909
target_os = "openbsd",
59055910
target_os = "android",
59065911
target_os = "ios",
@@ -6019,16 +6024,17 @@ pub mod funcs {
60196024
}
60206025

60216026

6022-
#[cfg(any(target_os = "windows",
6023-
target_os = "linux",
6024-
target_os = "android",
6025-
target_os = "macos",
6027+
#[cfg(any(target_os = "android",
6028+
target_os = "bitrig",
6029+
target_os = "dragonfly",
60266030
target_os = "ios",
60276031
target_os = "freebsd",
6028-
target_os = "dragonfly",
6029-
target_os = "bitrig",
6032+
target_os = "linux",
6033+
target_os = "macos",
6034+
target_os = "nacl",
6035+
target_os = "netbsd",
60306036
target_os = "openbsd",
6031-
target_os = "nacl"))]
6037+
target_os = "windows"))]
60326038
pub mod posix08 {
60336039
pub mod unistd {
60346040
}
@@ -6115,6 +6121,7 @@ pub mod funcs {
61156121
target_os = "freebsd",
61166122
target_os = "dragonfly",
61176123
target_os = "bitrig",
6124+
target_os = "netbsd",
61186125
target_os = "openbsd"))]
61196126
pub mod bsd44 {
61206127
use types::common::c95::{c_void};
@@ -6192,6 +6199,7 @@ pub mod funcs {
61926199
#[cfg(any(target_os = "freebsd",
61936200
target_os = "dragonfly",
61946201
target_os = "bitrig",
6202+
target_os = "netbsd",
61956203
target_os = "openbsd"))]
61966204
pub mod extra {
61976205
}

0 commit comments

Comments
 (0)