Skip to content

Commit eee5695

Browse files
jroeschjroesch
committed
---
yaml --- r: 169786 b: refs/heads/master c: 2d2159f h: refs/heads/master v: v3
1 parent 8979e7a commit eee5695

Some content is hidden

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

59 files changed

+212
-829
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 66382424798848e1c0135bb54674b71e2ef2066a
2+
refs/heads/master: 2d2159f5b0269ecc50e546d265bb9fdb98c6be36
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
55
refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

‎trunk/RELEASES.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Version 1.0.0-alpha (January 2015)
2222
* Documentation continues to be expanded with more API coverage, more
2323
examples, and more in-depth explanations. The guides have been
2424
consolidated into [The Rust Programming Language][trpl].
25-
* "[Rust By Example][rbe]" is now maintained by the Rust team.
25+
* "Rust By Example" is now maintained by the Rust team.
2626
* All official Rust binary installers now come with [Cargo], the
2727
Rust package manager.
2828

@@ -182,7 +182,6 @@ Version 1.0.0-alpha (January 2015)
182182
[assoc]: https://github.com/rust-lang/rfcs/blob/master/text/0195-associated-items.md
183183
[ints]: https://github.com/rust-lang/rfcs/pull/544#issuecomment-68760871
184184
[trpl]: http://doc.rust-lang.org/book/index.html
185-
[rbe]: http://rustbyexample.com/
186185

187186
Version 0.12.0 (October 2014)
188187
-----------------------------

‎trunk/mk/cfg/aarch64-apple-ios.mk

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

‎trunk/mk/cfg/arm-apple-ios.mk

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# arm-apple-ios configuration
2+
CFG_SDK_NAME_arm-apple-ios = iphoneos
3+
CFG_SDK_ARCHS_arm-apple-ios = armv7
4+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5+
CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
6+
CFG_IOS_FLAGS = -target armv7-apple-ios -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
7+
CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
8+
CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
9+
CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
10+
AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
11+
endif
12+
CFG_LIB_NAME_arm-apple-ios = lib$(1).a
13+
CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
14+
CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
15+
CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
16+
CFG_JEMALLOC_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
17+
CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
18+
CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
19+
CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
20+
CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
21+
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
22+
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
23+
CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
24+
CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
25+
CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
26+
CFG_EXE_SUFFIX_arm-apple-ios :=
27+
CFG_WINDOWSY_arm-apple-ios :=
28+
CFG_UNIXY_arm-apple-ios := 1
29+
CFG_PATH_MUNGE_arm-apple-ios := true
30+
CFG_LDPATH_arm-apple-ios :=
31+
CFG_RUN_arm-apple-ios = $(2)
32+
CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
33+
RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
34+
RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
35+
CFG_GNU_TRIPLE_arm-apple-ios := arm-apple-ios

‎trunk/mk/cfg/armv7-apple-ios.mk

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

‎trunk/mk/cfg/armv7s-apple-ios.mk

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

‎trunk/mk/cfg/i386-apple-ios.mk

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# i386-apple-ios configuration
2-
CFG_SDK_NAME_i386-apple-ios := iphonesimulator
3-
CFG_SDK_ARCHS_i386-apple-ios := i386
2+
CFG_SDK_NAME_i386-apple-ios = iphonesimulator
3+
CFG_SDK_ARCHS_i386-apple-ios = i386
44
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
5-
CFG_IOSSIM_SDK_i386-apple-ios := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6-
CFG_IOSSIM_FLAGS_i386-apple-ios := -m32 -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK_i386-apple-ios) -mios-simulator-version-min=7.0
5+
CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
6+
CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
77
CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
88
CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
99
CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
@@ -13,21 +13,21 @@ CFG_LIB_NAME_i386-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
1414
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
1515
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
16-
CFG_GCCISH_CFLAGS_i386-apple-ios := -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS_i386-apple-ios)
17-
CFG_GCCISH_CXXFLAGS_i386-apple-ios := -fno-rtti $(CFG_IOSSIM_FLAGS_i386-apple-ios) -I$(CFG_IOSSIM_SDK_i386-apple-ios)/usr/include/c++/4.2.1
18-
CFG_GCCISH_LINK_FLAGS_i386-apple-ios := -lpthread -m32 -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK_i386-apple-ios)
19-
CFG_GCCISH_DEF_FLAG_i386-apple-ios := -Wl,-exported_symbols_list,
20-
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios :=
21-
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios :=
22-
CFG_DEF_SUFFIX_i386-apple-ios := .darwin.def
16+
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
17+
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
18+
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
19+
CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
20+
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
21+
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
22+
CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
2323
CFG_LLC_FLAGS_i386-apple-ios =
2424
CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
25-
CFG_EXE_SUFFIX_i386-apple-ios :=
26-
CFG_WINDOWSY_i386-apple-ios :=
27-
CFG_UNIXY_i386-apple-ios := 1
28-
CFG_PATH_MUNGE_i386-apple-ios = :true
25+
CFG_EXE_SUFFIX_i386-apple-ios =
26+
CFG_WINDOWSY_i386-apple-ios =
27+
CFG_UNIXY_i386-apple-ios = 1
28+
CFG_PATH_MUNGE_i386-apple-ios = true
2929
CFG_LDPATH_i386-apple-ios =
3030
CFG_RUN_i386-apple-ios = $(2)
3131
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
32-
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS_i386-apple-ios) -target i386-apple-ios #-Wl,-syslibroot $(CFG_IOSSIM_SDK_i386-apple-ios) -Wl,-no_compact_unwind
32+
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
3333
CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios

‎trunk/mk/cfg/x86_64-apple-ios.mk

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

‎trunk/mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ PKG_FILES := \
5959
rustllvm \
6060
snapshots.txt \
6161
rust-installer \
62-
rustbook \
6362
test) \
6463
$(PKG_GITMODULES) \
6564
$(filter-out config.stamp, \

‎trunk/mk/main.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
# The version number
1616
CFG_RELEASE_NUM=1.0.0
1717

18-
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
19-
# NB Make sure it starts with a dot to conform to semver pre-release
20-
# versions (section 9)
21-
CFG_PRERELEASE_VERSION=
18+
# An optional number to put after the label, e.g. '2' -> '-beta2'
19+
CFG_BETA_CYCLE=
2220

2321
CFG_FILENAME_EXTRA=4e7c5e5c
2422

@@ -31,8 +29,8 @@ CFG_DISABLE_UNSTABLE_FEATURES=1
3129
endif
3230
ifeq ($(CFG_RELEASE_CHANNEL),beta)
3331
# The beta channel is temporarily called 'alpha'
34-
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
35-
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
32+
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
33+
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
3634
CFG_DISABLE_UNSTABLE_FEATURES=1
3735
endif
3836
ifeq ($(CFG_RELEASE_CHANNEL),nightly)

‎trunk/src/compiler-rt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 58ab642c30d9f97735d5745b5d01781ee199c6ae
1+
Subproject commit 62a4ca6055ad6fda8faf767b93b5736dcdfb7013

‎trunk/src/libcollections/bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static FALSE: bool = false;
134134
/// # Examples
135135
///
136136
/// ```rust
137-
/// use std::collections::Bitv;
137+
/// use collections::Bitv;
138138
///
139139
/// let mut bv = Bitv::from_elem(10, false);
140140
///

‎trunk/src/liblibc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1969,7 +1969,7 @@ pub mod types {
19691969
}
19701970
}
19711971

1972-
#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
1972+
#[cfg(target_arch = "x86_64")]
19731973
pub mod arch {
19741974
pub mod c95 {
19751975
pub type c_char = i8;

‎trunk/src/librustc/metadata/creader.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ impl<'a> CrateReader<'a> {
409409
crate_name: name,
410410
hash: hash.map(|a| &*a),
411411
filesearch: self.sess.target_filesearch(kind),
412-
target: &self.sess.target.target,
413412
triple: &self.sess.opts.target_triple[],
414413
root: root,
415414
rejected_via_hash: vec!(),
@@ -473,7 +472,6 @@ impl<'a> CrateReader<'a> {
473472
crate_name: &name[],
474473
hash: None,
475474
filesearch: self.sess.host_filesearch(PathKind::Crate),
476-
target: &self.sess.host,
477475
triple: config::host_triple(),
478476
root: &None,
479477
rejected_via_hash: vec!(),
@@ -488,7 +486,6 @@ impl<'a> CrateReader<'a> {
488486
target_only = true;
489487
should_link = info.should_link;
490488

491-
load_ctxt.target = &self.sess.target.target;
492489
load_ctxt.triple = target_triple;
493490
load_ctxt.filesearch = self.sess.target_filesearch(PathKind::Crate);
494491
load_ctxt.load_library_crate()

‎trunk/src/librustc/metadata/loader.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ use metadata::filesearch::{FileSearch, FileMatches, FileDoesntMatch};
225225
use syntax::codemap::Span;
226226
use syntax::diagnostic::SpanHandler;
227227
use util::fs;
228-
use rustc_back::target::Target;
229228

230229
use std::ffi::CString;
231230
use std::cmp;
@@ -249,8 +248,6 @@ pub struct Context<'a> {
249248
pub ident: &'a str,
250249
pub crate_name: &'a str,
251250
pub hash: Option<&'a Svh>,
252-
// points to either self.sess.target.target or self.sess.host, must match triple
253-
pub target: &'a Target,
254251
pub triple: &'a str,
255252
pub filesearch: FileSearch<'a>,
256253
pub root: &'a Option<CratePaths>,
@@ -502,7 +499,7 @@ impl<'a> Context<'a> {
502499

503500
for lib in m.into_iter() {
504501
info!("{} reading metadata from: {}", flavor, lib.display());
505-
let metadata = match get_metadata_section(self.target.options.is_like_osx,
502+
let metadata = match get_metadata_section(self.sess.target.target.options.is_like_osx,
506503
&lib) {
507504
Ok(blob) => {
508505
if self.crate_matches(blob.as_slice(), &lib) {
@@ -591,7 +588,7 @@ impl<'a> Context<'a> {
591588
// Returns the corresponding (prefix, suffix) that files need to have for
592589
// dynamic libraries
593590
fn dylibname(&self) -> (String, String) {
594-
let t = &self.target;
591+
let t = &self.sess.target.target;
595592
(t.options.dll_prefix.clone(), t.options.dll_suffix.clone())
596593
}
597594

0 commit comments

Comments
 (0)