Skip to content

Commit 2b48aae

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 274901 b: refs/heads/stable c: aa23c98 h: refs/heads/master i: 274899: 5c9914f
1 parent 97f5365 commit 2b48aae

File tree

452 files changed

+7476
-11150
lines changed

Some content is hidden

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

452 files changed

+7476
-11150
lines changed

‎[refs]

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

‎branches/stable/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*.elc
1818
*.epub
1919
*.exe
20-
*.pdb
2120
*.fn
2221
*.html
2322
*.kdev4
@@ -94,4 +93,3 @@ tmp.*.rs
9493
version.md
9594
version.ml
9695
version.texi
97-
/target

‎branches/stable/configure

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,6 @@ opt stage0-landing-pads 1 "enable landing pads during bootstrap with stage0"
606606
opt dist-host-only 0 "only install bins for the host architecture"
607607
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
608608
opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
609-
opt rustbuild 0 "use the rust and cargo based build system"
610609

611610
# Optimization and debugging options. These may be overridden by the release channel, etc.
612611
opt_nosave optimize 1 "build optimized rust code"
@@ -626,7 +625,7 @@ valopt llvm-root "" "set LLVM root"
626625
valopt python "" "set path to python"
627626
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
628627
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
629-
valopt android-cross-path "" "Android NDK standalone path (deprecated)"
628+
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path (deprecated)"
630629
valopt i686-linux-android-ndk "" "i686-linux-android NDK standalone path"
631630
valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
632631
valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
@@ -1423,7 +1422,7 @@ done
14231422
step_msg "configuring submodules"
14241423

14251424
# Have to be in the top of src directory for this
1426-
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ] && [ -z $CFG_ENABLE_RUSTBUILD ]
1425+
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
14271426
then
14281427
cd ${CFG_SRC_DIR}
14291428

@@ -1482,11 +1481,7 @@ do
14821481
;;
14831482
esac
14841483

1485-
if [ -n "$CFG_ENABLE_RUSTBUILD" ]
1486-
then
1487-
msg "not configuring LLVM, rustbuild in use"
1488-
do_reconfigure=0
1489-
elif [ -z $CFG_LLVM_ROOT ]
1484+
if [ -z $CFG_LLVM_ROOT ]
14901485
then
14911486
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
14921487
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]
@@ -1817,15 +1812,8 @@ do
18171812
putvar $CFG_LLVM_INST_DIR
18181813
done
18191814

1820-
if [ -n "$CFG_ENABLE_RUSTBUILD" ]
1821-
then
1822-
INPUT_MAKEFILE=src/bootstrap/mk/Makefile.in
1823-
else
1824-
INPUT_MAKEFILE=Makefile.in
1825-
fi
1826-
18271815
msg
1828-
copy_if_changed ${CFG_SRC_DIR}${INPUT_MAKEFILE} ./Makefile
1816+
copy_if_changed ${CFG_SRC_DIR}Makefile.in ./Makefile
18291817
move_if_changed config.tmp config.mk
18301818
rm -f config.tmp
18311819
touch config.stamp

‎branches/stable/mk/cfg/i586-unknown-linux-gnu.mk

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

‎branches/stable/mk/crates.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ TARGET_CRATES += alloc_jemalloc
144144
DEPS_std += alloc_jemalloc
145145
DEPS_alloc_jemalloc := core libc native:jemalloc
146146
ONLY_RLIB_alloc_jemalloc := 1
147-
RUSTFLAGS_rustc_back := --cfg 'feature="jemalloc"'
147+
else
148+
RUSTFLAGS_rustc_back := --cfg disable_jemalloc
148149
endif
149150

150151
################################################################################

‎branches/stable/mk/docs.mk

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
6262
# The error-index-generator executable...
6363
ERR_IDX_GEN_EXE = $(HBIN2_H_$(CFG_BUILD))/error-index-generator$(X_$(CFG_BUILD))
6464
ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
65-
ERR_IDX_GEN_MD = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE) markdown
6665

6766
D := $(S)src/doc
6867

@@ -218,12 +217,6 @@ doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/
218217

219218
error-index: doc/error-index.html
220219

221-
# Metadata used to generate the index is created as a side effect of
222-
# the build so this depends on every crate being up to date.
223-
doc/error-index.html: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
220+
doc/error-index.html: $(ERR_IDX_GEN_EXE) | doc/
224221
$(Q)$(call E, error-index-generator: $@)
225222
$(Q)$(ERR_IDX_GEN)
226-
227-
doc/error-index.md: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
228-
$(Q)$(call E, error-index-generator: $@)
229-
$(Q)$(ERR_IDX_GEN_MD)

‎branches/stable/mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ $(foreach host,$(CFG_HOST), \
102102
define LLVM_LINKAGE_DEPS
103103
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustc_llvm: $$(LLVM_LINKAGE_PATH_$(2))
104104
RUSTFLAGS$(1)_rustc_llvm_T_$(2) += $$(shell echo $$(LLVM_ALL_COMPONENTS_$(2)) | tr '-' '_' |\
105-
sed -e 's/^ //;s/\([^ ]*\)/\-\-cfg "llvm_component=\\"\1\\""/g')
105+
sed -e 's/^ //;s/\([^ ]*\)/\-\-cfg have_component_\1/g')
106106
endef
107107

108108
$(foreach source,$(CFG_HOST), \

‎branches/stable/mk/tests.mk

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
298298
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
299299
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
300300
check-stage$(1)-T-$(2)-H-$(3)-pfail-exec \
301-
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
302-
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
303-
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
301+
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
302+
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
303+
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
304304
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
305305
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
306306
check-stage$(1)-T-$(2)-H-$(3)-rustdocck-exec \
307-
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
308-
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
307+
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
308+
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
309309
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-gdb-exec \
310310
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-lldb-exec \
311311
check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
@@ -673,8 +673,8 @@ CTEST_DEPS_debuginfo-lldb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_LLDB_TESTS) \
673673
CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
674674
CTEST_DEPS_codegen-units_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_UNITS_TESTS)
675675
CTEST_DEPS_rustdocck_$(1)-T-$(2)-H-$(3) = $$(RUSTDOCCK_TESTS) \
676-
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
677-
$(S)src/etc/htmldocck.py
676+
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
677+
$(S)src/etc/htmldocck.py
678678

679679
endef
680680

@@ -892,28 +892,6 @@ $(foreach host,$(CFG_HOST), \
892892
$(foreach crate,$(TEST_DOC_CRATES), \
893893
$(eval $(call DEF_CRATE_DOC_TEST,$(stage),$(target),$(host),$(crate)))))))
894894

895-
define DEF_DOC_TEST_ERROR_INDEX
896-
897-
check-stage$(1)-T-$(2)-H-$(3)-doc-error-index-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-error-index)
898-
899-
ifeq ($(2),$$(CFG_BUILD))
900-
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-error-index): \
901-
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
902-
doc/error-index.md
903-
$$(Q)touch $$@.start_time
904-
$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test doc/error-index.md
905-
$$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
906-
else
907-
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-error-index):
908-
$$(Q)touch $$@
909-
endif
910-
endef
911-
912-
$(foreach host,$(CFG_HOST), \
913-
$(foreach target,$(CFG_TARGET), \
914-
$(foreach stage,$(STAGES), \
915-
$(eval $(call DEF_DOC_TEST_ERROR_INDEX,$(stage),$(target),$(host))))))
916-
917895
######################################################################
918896
# Shortcut rules
919897
######################################################################
@@ -923,7 +901,7 @@ TEST_GROUPS = \
923901
$(foreach crate,$(TEST_CRATES),$(crate)) \
924902
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
925903
rpass \
926-
rpass-valgrind \
904+
rpass-valgrind \
927905
rpass-full \
928906
rfail-full \
929907
cfail-full \
@@ -940,7 +918,7 @@ TEST_GROUPS = \
940918
$(foreach docname,$(DOC_NAMES),doc-$(docname)) \
941919
pretty \
942920
pretty-rpass \
943-
pretty-rpass-valgrind \
921+
pretty-rpass-valgrind \
944922
pretty-rpass-full \
945923
pretty-rfail-full \
946924
pretty-rfail \
@@ -1009,8 +987,7 @@ define DEF_CHECK_DOC_FOR_STAGE
1009987
check-stage$(1)-docs: $$(foreach docname,$$(DOC_NAMES), \
1010988
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \
1011989
$$(foreach crate,$$(TEST_DOC_CRATES), \
1012-
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate)) \
1013-
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-error-index-exec
990+
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate))
1014991
endef
1015992

1016993
$(foreach stage,$(STAGES), \

‎branches/stable/src/bootstrap/Cargo.lock

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

‎branches/stable/src/bootstrap/Cargo.toml

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

0 commit comments

Comments
 (0)