Skip to content

Commit c4908cf

Browse files
eefriedmaneefriedman
committed
---
yaml --- r: 212940 b: refs/heads/master c: a1d2eb8 h: refs/heads/master v: v3
1 parent a116b71 commit c4908cf

File tree

604 files changed

+17708
-10437
lines changed

Some content is hidden

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

604 files changed

+17708
-10437
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: e7a5a1c33a7794a97eb11a38cc576375a3553a64
2+
refs/heads/master: a1d2eb8b1473cb7e013c0e75f79c484ee5428b60
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: 10 additions & 17 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="$@"
@@ -1308,12 +1307,6 @@ CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
13081307
for t in $CFG_HOST
13091308
do
13101309
do_reconfigure=1
1311-
is_msvc=0
1312-
case "$t" in
1313-
(*-msvc)
1314-
is_msvc=1
1315-
;;
1316-
esac
13171310

13181311
if [ -z $CFG_LLVM_ROOT ]
13191312
then
@@ -1333,13 +1326,7 @@ do
13331326
LLVM_ASSERTION_OPTS="--disable-assertions"
13341327
else
13351328
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
1329+
LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
13431330
fi
13441331
else
13451332
msg "not reconfiguring LLVM, external LLVM root"
@@ -1369,7 +1356,14 @@ do
13691356
done
13701357
fi
13711358

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

@@ -1394,7 +1388,7 @@ do
13941388
need_ok "LLVM cmake configure failed"
13951389
fi
13961390

1397-
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -eq 0 ]
1391+
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -eq 0 ]
13981392
then
13991393
# LLVM's configure doesn't recognize the new Windows triples yet
14001394
gnu_t=$(to_gnu_triple $t)
@@ -1559,7 +1553,6 @@ done
15591553
step_msg "writing configuration"
15601554

15611555
putvar CFG_SRC_DIR
1562-
putvar CFG_SRC_DIR_RELATIVE
15631556
putvar CFG_BUILD_DIR
15641557
putvar CFG_OSTYPE
15651558
putvar CFG_CPUTYPE

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

Lines changed: 3 additions & 3 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 :=

‎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/docs.mk

Lines changed: 0 additions & 1 deletion
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

‎trunk/mk/main.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ $(foreach host,$(CFG_HOST), \
322322
# exported
323323

324324
export CFG_SRC_DIR
325-
export CFG_SRC_DIR_RELATIVE
326325
export CFG_BUILD_DIR
327326
ifdef CFG_VER_DATE
328327
export CFG_VER_DATE

‎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)

‎trunk/mk/util.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ print-%:
2020
@echo $*=$($*)
2121

2222
S := $(CFG_SRC_DIR)
23-
SREL := $(CFG_SRC_DIR_RELATIVE)

‎trunk/src/compiletest/common.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ pub struct Config {
124124
// Flags to pass to the compiler when building for the target
125125
pub target_rustcflags: Option<String>,
126126

127+
// Run tests using the JIT
128+
pub jit: bool,
129+
127130
// Target system to be tested
128131
pub target: String,
129132

‎trunk/src/compiletest/compiletest.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
7979
optopt("", "target-rustcflags", "flags to pass to rustc for target", "FLAGS"),
8080
optflag("", "verbose", "run tests verbosely, showing all output"),
8181
optopt("", "logfile", "file to log test execution to", "FILE"),
82+
optflag("", "jit", "run tests under the JIT"),
8283
optopt("", "target", "the target to build for", "TARGET"),
8384
optopt("", "host", "the host to build for", "HOST"),
8485
optopt("", "gdb-version", "the version of GDB used", "VERSION STRING"),
@@ -145,6 +146,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
145146
runtool: matches.opt_str("runtool"),
146147
host_rustcflags: matches.opt_str("host-rustcflags"),
147148
target_rustcflags: matches.opt_str("target-rustcflags"),
149+
jit: matches.opt_present("jit"),
148150
target: opt_str2(matches.opt_str("target")),
149151
host: opt_str2(matches.opt_str("host")),
150152
gdb_version: extract_gdb_version(matches.opt_str("gdb-version")),
@@ -184,6 +186,7 @@ pub fn log_config(config: &Config) {
184186
opt_str(&config.host_rustcflags)));
185187
logv(c, format!("target-rustcflags: {}",
186188
opt_str(&config.target_rustcflags)));
189+
logv(c, format!("jit: {}", config.jit));
187190
logv(c, format!("target: {}", config.target));
188191
logv(c, format!("host: {}", config.host));
189192
logv(c, format!("android-cross-path: {:?}",

0 commit comments

Comments
 (0)