Skip to content

Commit 2779585

Browse files
brsonbrson
committed
---
yaml --- r: 172731 b: refs/heads/try c: df05902 h: refs/heads/master i: 172729: 78fdc4c 172727: 906ba3c v: v3
1 parent 5c17ff0 commit 2779585

30 files changed

+134
-778
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: 170c4399e614fe599c3d41306b3429ca8b3b68c6
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
5-
refs/heads/try: b5571ed71a5879c0495a982506258d5d267744ed
5+
refs/heads/try: df059020c4c1ff61a70288cf32c2259dabb4fecc
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try/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
-----------------------------

‎branches/try/mk/cfg/aarch64-apple-ios.mk

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

‎branches/try/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

‎branches/try/mk/cfg/armv7-apple-ios.mk

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

‎branches/try/mk/cfg/armv7s-apple-ios.mk

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

‎branches/try/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

‎branches/try/mk/cfg/x86_64-apple-ios.mk

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

‎branches/try/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

‎branches/try/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;

‎branches/try/src/librustc_back/target/aarch64_apple_ios.rs

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

‎branches/try/src/librustc_back/target/apple_ios_base.rs

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

0 commit comments

Comments
 (0)