Skip to content

Commit ee49737

Browse files
sanxiynsanxiyn
committed
---
yaml --- r: 212937 b: refs/heads/master c: 5af8b5f h: refs/heads/master i: 212935: b6092f8 v: v3
1 parent 12e9a00 commit ee49737

File tree

622 files changed

+18362
-11500
lines changed

Some content is hidden

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

622 files changed

+18362
-11500
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: d24dd3191a533d4a9cf1193a66141df09f46d17d
2+
refs/heads/master: 5af8b5f72b6cafc4cbe88e449cd53fefbc54c34d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
55
refs/heads/try: 1864973ae17213c5a58c4dd3f9af6d1b6c7d2e05

‎trunk/.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ before_script:
1616
script:
1717
- make tidy
1818

19-
# Real testing happens on http://buildbot.rust-lang.org/
20-
#
21-
# See https://github.com/rust-lang/rust-buildbot
22-
# CONTRIBUTING.md#pull-requests
23-
2419
notifications:
2520
email: false
2621

‎trunk/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ Hajime Morrita <[email protected]>
338338
Hanno Braun <[email protected]>
339339
Harry Marr <[email protected]>
340340
Heather <[email protected]>
341-
Heejong Ahn <[email protected]>
341+
Heejong Ahn <[email protected]
342342
Henrik Schopmans <[email protected]>
343343
Herman J. Radtke III <[email protected]>
344344
HeroesGrave <[email protected]>

‎trunk/RELEASES.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
Version 1.1.0 (July 2015)
2-
========================
3-
4-
* NNNN changes, numerous bugfixes
5-
6-
Libraries
7-
---------
8-
9-
* The [`std::fs` module has been expanded][fs-expand] to expand the set of
10-
functionality exposed:
11-
* `DirEntry` now supports optimizations like `file_type` and `metadata` which
12-
don't incur a syscall on some platforms.
13-
* A `symlink_metadata` function has been added.
14-
* The `fs::Metadata` structure now lowers to its OS counterpart, providing
15-
access to all underlying information.
16-
17-
[fs-expand]: https://github.com/rust-lang/rust/pull/25844
18-
191
Version 1.0.0 (May 2015)
202
========================
213

‎trunk/configure

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ fi
521521
DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}"
522522

523523
CFG_SRC_DIR="$(abs_path $(dirname $0))/"
524-
CFG_SRC_DIR_RELATIVE="$(dirname $0)/"
525524
CFG_BUILD_DIR="$(pwd)/"
526525
CFG_SELF="$0"
527526
CFG_CONFIGURE_ARGS="$@"
@@ -583,7 +582,6 @@ valopt sysconfdir "/etc" "install system configuration files"
583582
valopt datadir "${CFG_PREFIX}/share" "install data"
584583
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
585584
valopt llvm-root "" "set LLVM root"
586-
valopt python "" "set path to python"
587585
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
588586
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
589587
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
@@ -697,9 +695,7 @@ putvar CFG_BOOTSTRAP_KEY
697695
step_msg "looking for build programs"
698696

699697
probe_need CFG_CURLORWGET curl wget
700-
if [ -z "$CFG_PYTHON_PROVIDED" ]; then
701-
probe_need CFG_PYTHON python2.7 python2.6 python2 python
702-
fi
698+
probe_need CFG_PYTHON python2.7 python2.6 python2 python
703699

704700
python_version=$($CFG_PYTHON -V 2>&1)
705701
if [ $(echo $python_version | grep -c '^Python 2\.[4567]') -ne 1 ]; then
@@ -853,6 +849,13 @@ then
853849
putvar CFG_LOCAL_RUST_ROOT
854850
fi
855851

852+
# Force freebsd to build with clang; gcc doesn't like us there
853+
if [ $CFG_OSTYPE = unknown-freebsd ]
854+
then
855+
step_msg "on FreeBSD, forcing use of clang"
856+
CFG_ENABLE_CLANG=1
857+
fi
858+
856859
# Force bitrig to build with clang; gcc doesn't like us there
857860
if [ $CFG_OSTYPE = unknown-bitrig ]
858861
then
@@ -970,8 +973,8 @@ fi
970973

971974
if [ ! -z "$CFG_ENABLE_CLANG" ]
972975
then
973-
case "$CC" in
974-
(''|*clang)
976+
if [ -z "$CC" ] || [[ $CC == *clang ]]
977+
then
975978
CFG_CLANG_VERSION=$($CFG_CC \
976979
--version \
977980
| grep version \
@@ -991,11 +994,9 @@ then
991994
err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn"
992995
;;
993996
esac
994-
;;
995-
(*)
997+
else
996998
msg "skipping CFG_ENABLE_CLANG version check; provided CC=$CC"
997-
;;
998-
esac
999+
fi
9991000
fi
10001001

10011002
if [ ! -z "$CFG_ENABLE_CCACHE" ]
@@ -1308,12 +1309,6 @@ CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
13081309
for t in $CFG_HOST
13091310
do
13101311
do_reconfigure=1
1311-
is_msvc=0
1312-
case "$t" in
1313-
(*-msvc)
1314-
is_msvc=1
1315-
;;
1316-
esac
13171312

13181313
if [ -z $CFG_LLVM_ROOT ]
13191314
then
@@ -1333,13 +1328,7 @@ do
13331328
LLVM_ASSERTION_OPTS="--disable-assertions"
13341329
else
13351330
LLVM_ASSERTION_OPTS="--enable-assertions"
1336-
1337-
# Apparently even if we request assertions be enabled for MSVC,
1338-
# LLVM's CMake build system ignore this and outputs in `Release`
1339-
# anyway.
1340-
if [ ${is_msvc} -eq 0 ]; then
1341-
LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
1342-
fi
1331+
LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
13431332
fi
13441333
else
13451334
msg "not reconfiguring LLVM, external LLVM root"
@@ -1369,7 +1358,14 @@ do
13691358
done
13701359
fi
13711360

1372-
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -ne 0 ]
1361+
use_cmake=0
1362+
case "$t" in
1363+
(*-msvc)
1364+
use_cmake=1
1365+
;;
1366+
esac
1367+
1368+
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -ne 0 ]
13731369
then
13741370
msg "configuring LLVM for $t with cmake"
13751371

@@ -1394,7 +1390,7 @@ do
13941390
need_ok "LLVM cmake configure failed"
13951391
fi
13961392

1397-
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -eq 0 ]
1393+
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -eq 0 ]
13981394
then
13991395
# LLVM's configure doesn't recognize the new Windows triples yet
14001396
gnu_t=$(to_gnu_triple $t)
@@ -1559,7 +1555,6 @@ done
15591555
step_msg "writing configuration"
15601556

15611557
putvar CFG_SRC_DIR
1562-
putvar CFG_SRC_DIR_RELATIVE
15631558
putvar CFG_BUILD_DIR
15641559
putvar CFG_OSTYPE
15651560
putvar CFG_CPUTYPE

‎trunk/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
66
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo
77
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
9-
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
9+
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD
13-
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -MD
12+
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc :=
13+
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc :=
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_x86_64-pc-windows-msvc :=
@@ -80,8 +80,3 @@ CUSTOM_DEPS_rustc_llvm_T_x86_64-pc-windows-msvc += \
8080
x86_64-pc-windows-msvc/rt/rustc_llvm.def: $(S)src/etc/mklldef.py \
8181
$(S)src/librustc_llvm/lib.rs
8282
$(CFG_PYTHON) $^ $@ rustc_llvm-$(CFG_FILENAME_EXTRA)
83-
84-
# All windows nightiles are currently a GNU triple, so this MSVC triple is not
85-
# bootstrapping from itself. This is relevant during stage0, and other parts of
86-
# the build system take this into account.
87-
BOOTSTRAP_FROM_x86_64-pc-windows-msvc := x86_64-pc-windows-gnu

‎trunk/mk/cfg/x86_64-unknown-linux-musl.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CC_x86_64-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc
33
CXX_x86_64-unknown-linux-musl=notaprogram
44
CPP_x86_64-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc -E
55
AR_x86_64-unknown-linux-musl=$(AR)
6-
CFG_INSTALL_ONLY_RLIB_x86_64-unknown-linux-musl = 1
76
CFG_LIB_NAME_x86_64-unknown-linux-musl=lib$(1).so
87
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-musl=lib$(1).a
98
CFG_LIB_GLOB_x86_64-unknown-linux-musl=lib$(1)-*.so

‎trunk/mk/crates.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ DOC_CRATES := std alloc collections core libc rustc_unicode
134134
#
135135
# $(1) is the crate to generate variables for
136136
define RUST_CRATE
137-
CRATEFILE_$(1) := $$(SREL)src/lib$(1)/lib.rs
137+
CRATEFILE_$(1) := $$(S)src/lib$(1)/lib.rs
138138
RSINPUTS_$(1) := $$(call rwildcard,$(S)src/lib$(1)/,*.rs)
139139
RUST_DEPS_$(1) := $$(filter-out native:%,$$(DEPS_$(1)))
140140
NATIVE_DEPS_$(1) := $$(patsubst native:%,%,$$(filter native:%,$$(DEPS_$(1))))

‎trunk/mk/debuggers.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
## GDB ##
1717
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB=gdb_load_rust_pretty_printers.py \
18-
gdb_rust_pretty_printing.py \
19-
debugger_pretty_printers_common.py
18+
gdb_rust_pretty_printing.py
2019
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS=\
2120
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB), \
2221
$(CFG_SRC_DIR)src/etc/$(script))
@@ -28,8 +27,7 @@ DEBUGGER_BIN_SCRIPTS_GDB_ABS=\
2827

2928

3029
## LLDB ##
31-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py \
32-
debugger_pretty_printers_common.py
30+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py
3331
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS=\
3432
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB), \
3533
$(CFG_SRC_DIR)src/etc/$(script))

‎trunk/mk/docs.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ DOC_TARGETS += doc/not_found.html
169169
doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
170170
@$(call E, rustdoc: $@)
171171
$(Q)$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) \
172-
--markdown-no-toc \
173172
--markdown-css http://doc.rust-lang.org/rust.css $<
174173

175174
define DEF_DOC
@@ -266,7 +265,7 @@ endef
266265
$(foreach crate,$(CRATES),$(eval $(call DEF_LIB_DOC,$(crate))))
267266

268267
COMPILER_DOC_TARGETS := $(CRATES:%=doc/%/index.html)
269-
ifdef CFG_ENABLE_COMPILER_DOCS
268+
ifdef CFG_COMPILER_DOCS
270269
DOC_TARGETS += $(COMPILER_DOC_TARGETS)
271270
else
272271
DOC_TARGETS += $(DOC_CRATES:%=doc/%/index.html)

‎trunk/mk/main.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
7474
endif
7575
endif
7676

77+
CFG_BUILD_DATE = $(shell date +%F)
78+
CFG_VERSION += (built $(CFG_BUILD_DATE))
79+
7780
# Windows exe's need numeric versions - don't use anything but
7881
# numbers and dots here
7982
CFG_VERSION_WIN = $(CFG_RELEASE_NUM)
@@ -127,7 +130,9 @@ CFG_JEMALLOC_FLAGS += $(JEMALLOC_FLAGS)
127130

128131
ifdef CFG_ENABLE_DEBUG_ASSERTIONS
129132
$(info cfg: enabling debug assertions (CFG_ENABLE_DEBUG_ASSERTIONS))
130-
CFG_RUSTC_FLAGS += -C debug-assertions=on
133+
CFG_RUSTC_FLAGS += --cfg debug -C debug-assertions=on
134+
else
135+
CFG_RUSTC_FLAGS += --cfg ndebug
131136
endif
132137

133138
ifdef CFG_ENABLE_DEBUGINFO
@@ -322,14 +327,14 @@ $(foreach host,$(CFG_HOST), \
322327
# exported
323328

324329
export CFG_SRC_DIR
325-
export CFG_SRC_DIR_RELATIVE
326330
export CFG_BUILD_DIR
327331
ifdef CFG_VER_DATE
328332
export CFG_VER_DATE
329333
endif
330334
ifdef CFG_VER_HASH
331335
export CFG_VER_HASH
332336
endif
337+
export CFG_BUILD_DATE
333338
export CFG_VERSION
334339
export CFG_VERSION_WIN
335340
export CFG_RELEASE

‎trunk/mk/prepare.mk

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,30 @@ DEFAULT_PREPARE_MAN_CMD = install -m644
2929

3030
# Create a directory
3131
# $(1) is the directory
32-
#
33-
# XXX: These defines are called to generate make steps.
34-
# Adding blank lines means two steps from different defines will not end up on
35-
# the same line.
3632
define PREPARE_DIR
37-
38-
@$(call E, prepare: $(1))
33+
@$(Q)$(call E, prepare: $(1))
3934
$(Q)$(PREPARE_DIR_CMD) $(1)
40-
4135
endef
4236

4337
# Copy an executable
4438
# $(1) is the filename/libname-glob
4539
#
46-
# See above for an explanation on the surrounding blank lines
40+
# Gee, what's up with that $(nop)? See comment below.
4741
define PREPARE_BIN
48-
42+
$(nop)
4943
@$(call E, prepare: $(PREPARE_DEST_BIN_DIR)/$(1))
5044
$(Q)$(PREPARE_BIN_CMD) $(PREPARE_SOURCE_BIN_DIR)/$(1) $(PREPARE_DEST_BIN_DIR)/$(1)
51-
5245
endef
5346

5447
# Copy a dylib or rlib
5548
# $(1) is the filename/libname-glob
5649
#
57-
# See above for an explanation on the surrounding blank lines
50+
# XXX: Don't remove the $(nop) command below!
51+
# Yeah, that's right, it's voodoo. Something in the way this macro is being expanded
52+
# causes it to parse incorrectly. Throwing in that empty command seems to fix the
53+
# problem. I'm sorry, just don't remove the $(nop), alright?
5854
define PREPARE_LIB
59-
55+
$(nop)
6056
@$(call E, prepare: $(PREPARE_WORKING_DEST_LIB_DIR)/$(1))
6157
$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
6258
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)))), \
@@ -67,19 +63,14 @@ define PREPARE_LIB
6763
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
6864
echo $$MATCHES ; \
6965
fi
70-
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)` $(PREPARE_WORKING_DEST_LIB_DIR)/
71-
66+
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/
7267
endef
7368

7469
# Copy a man page
7570
# $(1) - source dir
76-
#
77-
# See above for an explanation on the surrounding blank lines
7871
define PREPARE_MAN
79-
8072
@$(call E, prepare: $(PREPARE_DEST_MAN_DIR)/$(1))
8173
$(Q)$(PREPARE_MAN_CMD) $(PREPARE_SOURCE_MAN_DIR)/$(1) $(PREPARE_DEST_MAN_DIR)/$(1)
82-
8374
endef
8475

8576
PREPARE_TOOLS = $(filter-out compiletest rustbook error-index-generator, $(TOOLS))

‎trunk/mk/reconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ Makefile config.mk: config.stamp
3434

3535
config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
3636
@$(call E, cfg: reconfiguring)
37-
$(SREL)configure $(CFG_CONFIGURE_ARGS)
37+
$(S)configure $(CFG_CONFIGURE_ARGS)

0 commit comments

Comments
 (0)