Skip to content

Commit 388507b

Browse files
ubsanubsan
committed
---
yaml --- r: 275230 b: refs/heads/stable c: e12b1f9 h: refs/heads/master
1 parent 3471ed6 commit 388507b

File tree

407 files changed

+1901
-5087
lines changed

Some content is hidden

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

407 files changed

+1901
-5087
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: 9c6a0088fbdae5a6554c39f8db9207c1b878eb05
32+
refs/heads/stable: e12b1f9424512e39c3d64f955a3bb913707b41d8
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
url = https://github.com/rust-lang/rust-installer.git
1717
[submodule "src/liblibc"]
1818
path = src/liblibc
19-
url = https://github.com/rust-lang/libc.git
19+
url = https://github.com/rust-lang-nursery/libc.git

‎branches/stable/.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Gareth Daniel Smith <garethdanielsmith@gmail.com> Gareth Smith <garethdanielsmit
8282
Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
8383
Graham Fawcett <graham.fawcett@gmail.com> Graham Fawcett <fawcett@uwindsor.ca>
8484
Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
85-
Guillaume Gomez <guillaume1.gomez@gmail.com> Guillaume Gomez <ggomez@ggo.ifr.lan>
85+
Guillaume Gomez <guillaume1.gomez@gmail.com>
8686
Heather <heather@cynede.net> <Cynede@Gentoo.org>
8787
Heather <heather@cynede.net> <Heather@cynede.net>
8888
Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtke@gmail.com>

‎branches/stable/configure

Lines changed: 81 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,101 +1327,97 @@ then
13271327
fi
13281328
fi
13291329

1330-
if [ -z "$CFG_ENABLE_RUSTBUILD" ]; then
1330+
step_msg "making directories"
13311331

1332-
step_msg "making directories"
1333-
1334-
for i in \
1335-
doc doc/std doc/extra \
1336-
dl tmp dist
1337-
do
1338-
make_dir $i
1339-
done
1332+
for i in \
1333+
doc doc/std doc/extra \
1334+
dl tmp dist
1335+
do
1336+
make_dir $i
1337+
done
13401338

1341-
for t in $CFG_HOST
1342-
do
1343-
make_dir $t/llvm
1344-
done
1339+
for t in $CFG_HOST
1340+
do
1341+
make_dir $t/llvm
1342+
done
13451343

1346-
for t in $CFG_HOST
1347-
do
1348-
make_dir $t/rustllvm
1349-
done
1344+
for t in $CFG_HOST
1345+
do
1346+
make_dir $t/rustllvm
1347+
done
13501348

1351-
for t in $CFG_TARGET
1349+
for t in $CFG_TARGET
1350+
do
1351+
make_dir $t/rt
1352+
for s in 0 1 2 3
13521353
do
1353-
make_dir $t/rt
1354-
for s in 0 1 2 3
1354+
make_dir $t/rt/stage$s
1355+
make_dir $t/rt/jemalloc
1356+
make_dir $t/rt/compiler-rt
1357+
for i in \
1358+
isaac sync test \
1359+
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
13551360
do
1356-
make_dir $t/rt/stage$s
1357-
make_dir $t/rt/jemalloc
1358-
make_dir $t/rt/compiler-rt
1359-
for i in \
1360-
isaac sync test \
1361-
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
1362-
do
1363-
make_dir $t/rt/stage$s/$i
1364-
done
1361+
make_dir $t/rt/stage$s/$i
13651362
done
13661363
done
1364+
done
13671365

1368-
for h in $CFG_HOST
1369-
do
1370-
for t in $CFG_TARGET
1371-
do
1372-
# host bin dir stage0
1373-
make_dir $h/stage0/bin
1374-
1375-
# host lib dir stage0
1376-
make_dir $h/stage0/lib
1377-
1378-
# host test dir stage0
1379-
make_dir $h/stage0/test
1380-
1381-
# target bin dir stage0
1382-
make_dir $h/stage0/lib/rustlib/$t/bin
1383-
1384-
# target lib dir stage0
1385-
make_dir $h/stage0/lib/rustlib/$t/lib
1386-
1387-
for i in 1 2 3
1388-
do
1389-
# host bin dir
1390-
make_dir $h/stage$i/bin
1391-
1392-
# host lib dir
1393-
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
1394-
1395-
# host test dir
1396-
make_dir $h/stage$i/test
1397-
1398-
# target bin dir
1399-
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
1400-
1401-
# target lib dir
1402-
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
1403-
done
1404-
done
1405-
1406-
make_dir $h/test/run-pass
1407-
make_dir $h/test/run-pass-valgrind
1408-
make_dir $h/test/run-pass-fulldeps
1409-
make_dir $h/test/run-fail
1410-
make_dir $h/test/run-fail-fulldeps
1411-
make_dir $h/test/compile-fail
1412-
make_dir $h/test/parse-fail
1413-
make_dir $h/test/compile-fail-fulldeps
1414-
make_dir $h/test/bench
1415-
make_dir $h/test/perf
1416-
make_dir $h/test/pretty
1417-
make_dir $h/test/debuginfo-gdb
1418-
make_dir $h/test/debuginfo-lldb
1419-
make_dir $h/test/codegen
1420-
make_dir $h/test/codegen-units
1421-
make_dir $h/test/rustdoc
1422-
done
1366+
for h in $CFG_HOST
1367+
do
1368+
for t in $CFG_TARGET
1369+
do
1370+
# host bin dir stage0
1371+
make_dir $h/stage0/bin
14231372

1424-
fi
1373+
# host lib dir stage0
1374+
make_dir $h/stage0/lib
1375+
1376+
# host test dir stage0
1377+
make_dir $h/stage0/test
1378+
1379+
# target bin dir stage0
1380+
make_dir $h/stage0/lib/rustlib/$t/bin
1381+
1382+
# target lib dir stage0
1383+
make_dir $h/stage0/lib/rustlib/$t/lib
1384+
1385+
for i in 1 2 3
1386+
do
1387+
# host bin dir
1388+
make_dir $h/stage$i/bin
1389+
1390+
# host lib dir
1391+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE
1392+
1393+
# host test dir
1394+
make_dir $h/stage$i/test
1395+
1396+
# target bin dir
1397+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/bin
1398+
1399+
# target lib dir
1400+
make_dir $h/stage$i/$CFG_LIBDIR_RELATIVE/rustlib/$t/lib
1401+
done
1402+
done
1403+
1404+
make_dir $h/test/run-pass
1405+
make_dir $h/test/run-pass-valgrind
1406+
make_dir $h/test/run-pass-fulldeps
1407+
make_dir $h/test/run-fail
1408+
make_dir $h/test/run-fail-fulldeps
1409+
make_dir $h/test/compile-fail
1410+
make_dir $h/test/parse-fail
1411+
make_dir $h/test/compile-fail-fulldeps
1412+
make_dir $h/test/bench
1413+
make_dir $h/test/perf
1414+
make_dir $h/test/pretty
1415+
make_dir $h/test/debuginfo-gdb
1416+
make_dir $h/test/debuginfo-lldb
1417+
make_dir $h/test/codegen
1418+
make_dir $h/test/codegen-units
1419+
make_dir $h/test/rustdoc
1420+
done
14251421

14261422
# Configure submodules
14271423
step_msg "configuring submodules"

‎branches/stable/mk/cfg/arm-unknown-linux-gnueabi.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
88
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
99
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
1010
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfloat-abi=soft $(CFLAGS) -march=armv6 -marm
12-
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfloat-abi=soft $(CFLAGS) -march=armv6 -marm
11+
CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfloat-abi=soft $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfloat-abi=soft $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
1515
CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list=

‎branches/stable/mk/cfg/arm-unknown-linux-gnueabihf.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
88
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
99
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
1010
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
11-
CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv6 -marm
12-
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv6 -marm
11+
CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
1515
CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=

‎branches/stable/mk/cfg/armv7-unknown-linux-gnueabihf.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ CFG_UNIXY_armv7-unknown-linux-gnueabihf := 1
2121
CFG_LDPATH_armv7-unknown-linux-gnueabihf :=
2222
CFG_RUN_armv7-unknown-linux-gnueabihf=$(2)
2323
CFG_RUN_TARG_armv7-unknown-linux-gnueabihf=$(call CFG_RUN_armv7-unknown-linux-gnueabihf,,$(2))
24-
RUSTC_FLAGS_armv7-unknown-linux-gnueabihf :=
24+
RUSTC_FLAGS_armv7-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp2,+neon
2525
RUSTC_CROSS_FLAGS_armv7-unknown-linux-gnueabihf :=
2626
CFG_GNU_TRIPLE_armv7-unknown-linux-gnueabihf := armv7-unknown-linux-gnueabihf

‎branches/stable/mk/dist.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ PKG_FILES := \
4848
$(S)configure $(S)Makefile.in \
4949
$(S)man \
5050
$(addprefix $(S)src/, \
51-
bootstrap \
52-
build_helper \
5351
compiletest \
5452
doc \
5553
driver \
@@ -62,7 +60,6 @@ PKG_FILES := \
6260
rt \
6361
rtstartup \
6462
rustllvm \
65-
rustc \
6663
snapshots.txt \
6764
rust-installer \
6865
rustbook \

‎branches/stable/mk/tests.mk

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -458,22 +458,21 @@ $(foreach host,$(CFG_HOST), \
458458
# Rules for the compiletest tests (rpass, rfail, etc.)
459459
######################################################################
460460

461-
RPASS_RS := $(call rwildcard,$(S)src/test/run-pass/,*.rs)
462-
RPASS_VALGRIND_RS := $(call rwildcard,$(S)src/test/run-pass-valgrind/,*.rs)
463-
RPASS_FULL_RS := $(call rwildcard,$(S)src/test/run-pass-fulldeps/,*.rs)
464-
RFAIL_FULL_RS := $(call rwildcard,$(S)src/test/run-fail-fulldeps/,*.rs)
465-
CFAIL_FULL_RS := $(call rwildcard,$(S)src/test/compile-fail-fulldeps/,*.rs)
466-
RFAIL_RS := $(call rwildcard,$(S)src/test/run-fail/,*.rs)
467-
RFAIL_RS := $(call rwildcard,$(S)src/test/run-fail/,*.rs)
468-
CFAIL_RS := $(call rwildcard,$(S)src/test/compile-fail/,*.rs)
469-
PFAIL_RS := $(call rwildcard,$(S)src/test/parse-fail/,*.rs)
470-
PRETTY_RS := $(call rwildcard,$(S)src/test/pretty/,*.rs)
471-
DEBUGINFO_GDB_RS := $(call rwildcard,$(S)src/test/debuginfo/,*.rs)
472-
DEBUGINFO_LLDB_RS := $(call rwildcard,$(S)src/test/debuginfo/,*.rs)
473-
CODEGEN_RS := $(call rwildcard,$(S)src/test/codegen/,*.rs)
474-
CODEGEN_CC := $(call rwildcard,$(S)src/test/codegen/,*.cc)
475-
CODEGEN_UNITS_RS := $(call rwildcard,$(S)src/test/codegen-units/,*.rs)
476-
RUSTDOCCK_RS := $(call rwildcard,$(S)src/test/rustdoc/,*.rs)
461+
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
462+
RPASS_VALGRIND_RS := $(wildcard $(S)src/test/run-pass-valgrind/*.rs)
463+
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
464+
RFAIL_FULL_RS := $(wildcard $(S)src/test/run-fail-fulldeps/*.rs)
465+
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
466+
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
467+
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
468+
PFAIL_RS := $(wildcard $(S)src/test/parse-fail/*.rs)
469+
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
470+
DEBUGINFO_GDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
471+
DEBUGINFO_LLDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
472+
CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
473+
CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
474+
CODEGEN_UNITS_RS := $(wildcard $(S)src/test/codegen-units/*.rs)
475+
RUSTDOCCK_RS := $(wildcard $(S)src/test/rustdoc/*.rs)
477476

478477
RPASS_TESTS := $(RPASS_RS)
479478
RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)

‎branches/stable/src/bootstrap/build/mod.rs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,25 +160,24 @@ impl Build {
160160
if fs::metadata(self.src.join(".git")).is_err() {
161161
return
162162
}
163-
let git_submodule = || {
164-
let mut cmd = Command::new("git");
165-
cmd.current_dir(&self.src).arg("submodule");
166-
return cmd
167-
};
168-
let out = output(git_submodule().arg("status"));
163+
let out = output(Command::new("git").arg("submodule").arg("status"));
169164
if !out.lines().any(|l| l.starts_with("+") || l.starts_with("-")) {
170165
return
171166
}
172167

173-
self.run(git_submodule().arg("sync"));
174-
self.run(git_submodule().arg("init"));
175-
self.run(git_submodule().arg("update"));
176-
self.run(git_submodule().arg("update").arg("--recursive"));
177-
self.run(git_submodule().arg("status").arg("--recursive"));
178-
self.run(git_submodule().arg("foreach").arg("--recursive")
179-
.arg("git").arg("clean").arg("-fdx"));
180-
self.run(git_submodule().arg("foreach").arg("--recursive")
181-
.arg("git").arg("checkout").arg("."));
168+
self.run(Command::new("git").arg("submodule").arg("sync"));
169+
self.run(Command::new("git").arg("submodule").arg("init"));
170+
self.run(Command::new("git").arg("submodule").arg("update"));
171+
self.run(Command::new("git").arg("submodule").arg("update")
172+
.arg("--recursive"));
173+
self.run(Command::new("git").arg("submodule").arg("status")
174+
.arg("--recursive"));
175+
self.run(Command::new("git").arg("submodule").arg("foreach")
176+
.arg("--recursive")
177+
.arg("git").arg("clean").arg("-fdx"));
178+
self.run(Command::new("git").arg("submodule").arg("foreach")
179+
.arg("--recursive")
180+
.arg("git").arg("checkout").arg("."));
182181
}
183182

184183
/// Clear out `dir` if our build has been flagged as dirty, and also set

0 commit comments

Comments
 (0)