Skip to content

Commit c22a730

Browse files
luqmanaluqmana
committed
---
yaml --- r: 93410 b: refs/heads/try c: 12222f9 h: refs/heads/master v: v3
1 parent 5c15535 commit c22a730

File tree

22 files changed

+718
-594
lines changed

22 files changed

+718
-594
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: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: fa2bb970d1c3085861ad0b1f88c2f7b4fb82464c
5+
refs/heads/try: 12222f98259467e17c276ca70b9d5047b1e21634
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/configure

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,9 @@ valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
401401
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
402402

403403
#Deprecated opts to keep compatibility
404-
valopt build-triple "${CFG_BUILD}" "LLVM build triple"
405-
valopt host-triples "${CFG_HOST}" "LLVM host triples"
406-
valopt target-triples "${CFG_TARGET}" "LLVM target triples"
404+
valopt build-triple "" "LLVM build triple"
405+
valopt host-triples "" "LLVM host triples"
406+
valopt target-triples "" "LLVM target triples"
407407

408408
# Validate Options
409409
step_msg "validating $CFG_SELF args"
@@ -602,6 +602,18 @@ fi
602602

603603
# a little post-processing of various config values
604604

605+
# XXX: Support for deprecated syntax, should be dropped.
606+
if [ ! -z "$CFG_BUILD_TRIPLE" ]; then
607+
CFG_BUILD=${CFG_BUILD_TRIPLE}
608+
fi
609+
if [ ! -z "$CFG_HOST_TRIPLES" ]; then
610+
CFG_HOST=${CFG_HOST_TRIPLES}
611+
fi
612+
if [ ! -z "$CFG_TARGET_TRIPLES" ]; then
613+
CFG_TARGET=${CFG_TARGET_TRIPLES}
614+
fi
615+
616+
605617
CFG_PREFIX=${CFG_PREFIX%/}
606618
CFG_MANDIR=${CFG_MANDIR%/}
607619
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
@@ -616,26 +628,6 @@ do
616628
done
617629
CFG_TARGET=$V_TEMP
618630

619-
# copy host-triples to target-triples so that hosts are a subset of targets
620-
# XXX: remove deprecated variables here
621-
V_TEMP=""
622-
for i in $CFG_HOST_TRIPLES $CFG_TARGET_TRIPLES;
623-
do
624-
echo "$V_TEMP" | grep -qF $i || V_TEMP="$V_TEMP${V_TEMP:+ }$i"
625-
done
626-
CFG_TARGET_TRIPLES=$V_TEMP
627-
628-
# XXX: Support for deprecated syntax, should be dropped.
629-
if [ ! -z "$CFG_BUILD_TRIPLE" ]; then
630-
CFG_BUILD=${CFG_BUILD_TRIPLE}
631-
fi
632-
if [ ! -z "$CFG_HOST_TRIPLES" ]; then
633-
CFG_HOST=${CFG_HOST_TRIPLES}
634-
fi
635-
if [ ! -z "$CFG_TARGET_TRIPLES" ]; then
636-
CFG_TARGET=${CFG_TARGET_TRIPLES}
637-
fi
638-
639631
# check target-specific tool-chains
640632
for i in $CFG_TARGET
641633
do
@@ -670,13 +662,6 @@ do
670662
fi
671663
;;
672664

673-
arm-apple-darwin)
674-
if [ $CFG_OSTYPE != apple-darwin ]
675-
then
676-
err "The iOS target is only supported on Mac OS X"
677-
fi
678-
;;
679-
680665
*)
681666
;;
682667
esac

‎branches/try/mk/platform.mk

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -193,35 +193,6 @@ CFG_LDPATH_i686-unknown-linux-gnu :=
193193
CFG_RUN_i686-unknown-linux-gnu=$(2)
194194
CFG_RUN_TARG_i686-unknown-linux-gnu=$(call CFG_RUN_i686-unknown-linux-gnu,,$(2))
195195

196-
# arm-apple-darwin configuration
197-
ifeq ($(CFG_OSTYPE),apple-darwin)
198-
CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos)
199-
CFG_IOS_FLAGS = -target arm-apple-darwin -isysroot $(CFG_IOS_SDK) -I $(CFG_IOS_SDK)/usr/include -I $(CFG_IOS_SDK)/usr/include/c++/4.2.1 -I /usr/include
200-
CC_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang)
201-
CXX_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
202-
CPP_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
203-
AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
204-
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
205-
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
206-
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
207-
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS)
208-
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS)
209-
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
210-
CFG_GCCISH_DEF_FLAG_arm-apple-darwin := -Wl,-exported_symbols_list,
211-
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-darwin :=
212-
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-darwin :=
213-
CFG_DEF_SUFFIX_arm-apple-darwin := .darwin.def
214-
CFG_INSTALL_NAME_arm-apple-darwin = -Wl,-install_name,@rpath/$(1)
215-
CFG_LIBUV_LINK_FLAGS_arm-apple-darwin =
216-
CFG_EXE_SUFFIX_arm-apple-darwin :=
217-
CFG_WINDOWSY_arm-apple-darwin :=
218-
CFG_UNIXY_arm-apple-darwin := 1
219-
CFG_PATH_MUNGE_arm-apple-darwin := true
220-
CFG_LDPATH_arm-apple-darwin :=
221-
CFG_RUN_arm-apple-darwin = $(2)
222-
CFG_RUN_TARG_arm-apple-darwin = $(call CFG_RUN_arm-apple-darwin,,$(2))
223-
endif
224-
225196
# x86_64-apple-darwin configuration
226197
CC_x86_64-apple-darwin=$(CC)
227198
CXX_x86_64-apple-darwin=$(CXX)

‎branches/try/mk/stage0.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ $(HLIB0_H_$(CFG_BUILD))/$(CFG_EXTRALIB_$(CFG_BUILD)): \
4242
| $(HLIB0_H_$(CFG_BUILD))/
4343
$(Q)touch $@
4444

45-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTUV_$(CFG_BUILD)): \
46-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD)) \
47-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
45+
$(HLIB0_H_$(CFG_BUILD))/$(CFG_LIBRUSTUV_$(CFG_BUILD)): \
46+
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
47+
| $(HLIB0_H_$(CFG_BUILD))/
4848
$(Q)touch $@
4949

50-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTC_$(CFG_BUILD)): \
51-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD)) \
52-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
50+
$(HLIB0_H_$(CFG_BUILD))/$(CFG_LIBRUSTC_$(CFG_BUILD)): \
51+
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
52+
| $(HLIB0_H_$(CFG_BUILD))/
5353
$(Q)touch $@
5454

5555
$(HLIB0_H_$(CFG_BUILD))/$(CFG_RUSTLLVM_$(CFG_BUILD)): \
@@ -124,5 +124,5 @@ endef
124124

125125
# Use stage1 to build other architectures: then you don't have to wait
126126
# for stage2, but you get the latest updates to the compiler source.
127-
$(foreach t,$(NON_BUILD_HOSTS), \
127+
$(foreach t,$(NON_BUILD_HOST), \
128128
$(eval $(call BOOTSTRAP_STAGE0,$(t),1,$(CFG_BUILD))))

‎branches/try/mk/tests.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
164164
$(CFG_ADB_TEST_DIR)) \
165165
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(EXTRALIB_GLOB_arm-linux-androideabi) \
166166
$(CFG_ADB_TEST_DIR)) \
167-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(LIBRUSTUV_GLOB_arm-linux-androideabi) \
167+
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBRUSTUV_GLOB_arm-linux-androideabi) \
168168
$(CFG_ADB_TEST_DIR)) \
169169
)
170170
else
@@ -471,8 +471,8 @@ define DEF_RUSTPKG_STACK_FIX
471471
$$(call TEST_OK_FILE,$(1),$(2),$(3),rustpkg): export RUST_MIN_STACK=8000000
472472
endef
473473

474-
$(foreach host,$(CFG_HOST_TRIPLES), \
475-
$(foreach target,$(CFG_TARGET_TRIPLES), \
474+
$(foreach host,$(CFG_HOST), \
475+
$(foreach target,$(CFG_TARGET), \
476476
$(foreach stage,$(STAGES), \
477477
$(eval $(call DEF_RUSTPKG_STACK_FIX,$(stage),$(target),$(host))))))
478478

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import random
2020

2121
# The order should match the return value of `tables`
22-
TABLE_NAMES = ['X', 'F']
22+
TABLE_NAMES = ['X', 'F', 'F_DIFF']
2323

2424
# The actual length of the table is 1 more, to stop
2525
# index-out-of-bounds errors. This should match the bitwise operation
@@ -43,10 +43,13 @@ def tables(r, v, f, f_inv):
4343

4444
# cache the f's
4545
fvec = [0]*(TABLE_LEN+1)
46+
fdiff = [0]*(TABLE_LEN+1)
4647
for i in range(TABLE_LEN+1):
4748
fvec[i] = f(xvec[i])
49+
if i > 0:
50+
fdiff[i] = fvec[i] - fvec[i-1]
4851

49-
return xvec, fvec
52+
return xvec, fvec, fdiff
5053

5154
# Distributions
5255
# N(0, 1)

‎branches/try/src/libextra/test.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,10 +869,6 @@ pub fn run_test(force_ignore: bool,
869869
do task::spawn {
870870
let mut task = task::task();
871871
task.unlinked();
872-
task.name(match desc.name {
873-
DynTestName(ref name) => SendStrOwned(name.clone()),
874-
StaticTestName(name) => SendStrStatic(name),
875-
});
876872
let result_future = task.future_result();
877873
task.spawn(testfn_cell.take());
878874

‎branches/try/src/librustc/middle/trans/base.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@ pub fn decl_fn(llmod: ModuleRef, name: &str, cc: lib::llvm::CallConv, ty: Type)
182182
};
183183

184184
lib::llvm::SetFunctionCallConv(llfn, cc);
185-
// Function addresses in Rust are never significant, allowing functions to be merged.
186-
lib::llvm::SetUnnamedAddr(llfn, true);
187185
return llfn;
188186
}
189187

‎branches/try/src/librustc/middle/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4560,14 +4560,14 @@ pub fn count_traits_and_supertraits(tcx: ctxt,
45604560
}
45614561

45624562
pub fn get_tydesc_ty(tcx: ctxt) -> Result<t, ~str> {
4563-
do tcx.lang_items.require(TyDescStructLangItem).map |tydesc_lang_item| {
4563+
do tcx.lang_items.require(TyDescStructLangItem).map_move |tydesc_lang_item| {
45644564
tcx.intrinsic_defs.find_copy(&tydesc_lang_item)
45654565
.expect("Failed to resolve TyDesc")
45664566
}
45674567
}
45684568

45694569
pub fn get_opaque_ty(tcx: ctxt) -> Result<t, ~str> {
4570-
do tcx.lang_items.require(OpaqueStructLangItem).map |opaque_lang_item| {
4570+
do tcx.lang_items.require(OpaqueStructLangItem).map_move |opaque_lang_item| {
45714571
tcx.intrinsic_defs.find_copy(&opaque_lang_item)
45724572
.expect("Failed to resolve Opaque")
45734573
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2464,7 +2464,7 @@ fn test_timer_sleep_simple() {
24642464
unsafe {
24652465
let io = local_io();
24662466
let timer = io.timer_init();
2467-
do timer.map |mut t| { t.sleep(1) };
2467+
do timer.map_move |mut t| { t.sleep(1) };
24682468
}
24692469
}
24702470
}

0 commit comments

Comments
 (0)