Skip to content

Commit e8c4c13

Browse files
borsbors
committed
---
yaml --- r: 114582 b: refs/heads/master c: bee4e6a h: refs/heads/master v: v3
1 parent 8abd550 commit e8c4c13

File tree

150 files changed

+1959
-2481
lines changed

Some content is hidden

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

150 files changed

+1959
-2481
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: 2e8bc9924c096cb8f889d3f46ecce7ebe622b964
2+
refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
55
refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

‎trunk/configure

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,11 @@ case $CFG_CPUTYPE in
348348
CFG_CPUTYPE=arm
349349
;;
350350

351+
armv7l)
352+
CFG_CPUTYPE=arm
353+
CFG_OSTYPE="${CFG_OSTYPE}eabihf"
354+
;;
355+
351356
x86_64 | x86-64 | x64 | amd64)
352357
CFG_CPUTYPE=x86_64
353358
;;
@@ -401,6 +406,7 @@ opt optimize 1 "build optimized rust code"
401406
opt optimize-cxx 1 "build optimized C++ code"
402407
opt optimize-llvm 1 "build optimized LLVM"
403408
opt optimize-tests 1 "build tests with optimizations"
409+
opt libcpp 1 "build with llvm with libc++ instead of libstdc++ when using clang"
404410
opt llvm-assertions 1 "build LLVM with assertions"
405411
opt debug 1 "build with extra debug fun"
406412
opt ratchet-bench 0 "ratchet benchmarks"
@@ -1043,53 +1049,71 @@ do
10431049

10441050
case "$CFG_CC" in
10451051
("ccache clang")
1046-
LLVM_CXX_32="ccache clang++ -m32 -Qunused-arguments"
1047-
LLVM_CC_32="ccache clang -m32 -Qunused-arguments"
1052+
LLVM_CXX_32="ccache clang++ -Qunused-arguments"
1053+
LLVM_CC_32="ccache clang -Qunused-arguments"
10481054

10491055
LLVM_CXX_64="ccache clang++ -Qunused-arguments"
10501056
LLVM_CC_64="ccache clang -Qunused-arguments"
1051-
LLVM_OPTS="$LLVM_OPTS --enable-libcpp"
10521057
;;
10531058
("clang")
1054-
LLVM_CXX_32="clang++ -m32 -Qunused-arguments"
1055-
LLVM_CC_32="clang -m32 -Qunused-arguments"
1059+
LLVM_CXX_32="clang++ -Qunused-arguments"
1060+
LLVM_CC_32="clang -Qunused-arguments"
10561061

10571062
LLVM_CXX_64="clang++ -Qunused-arguments"
10581063
LLVM_CC_64="clang -Qunused-arguments"
1059-
LLVM_OPTS="$LLVM_OPTS --enable-libcpp"
10601064
;;
10611065
("ccache gcc")
1062-
LLVM_CXX_32="ccache g++ -m32"
1063-
LLVM_CC_32="ccache gcc -m32"
1066+
LLVM_CXX_32="ccache g++"
1067+
LLVM_CC_32="ccache gcc"
10641068

10651069
LLVM_CXX_64="ccache g++"
10661070
LLVM_CC_64="ccache gcc"
10671071
;;
10681072
("gcc")
1069-
LLVM_CXX_32="g++ -m32"
1070-
LLVM_CC_32="gcc -m32"
1073+
LLVM_CXX_32="g++"
1074+
LLVM_CC_32="gcc"
10711075

10721076
LLVM_CXX_64="g++"
10731077
LLVM_CC_64="gcc"
10741078
;;
10751079

10761080
(*)
10771081
msg "inferring LLVM_CXX/CC from CXX/CC = $CXX/$CC"
1078-
LLVM_CXX_32="$CXX -m32"
1079-
LLVM_CC_32="$CC -m32"
1082+
LLVM_CXX_32="$CXX"
1083+
LLVM_CC_32="$CC"
10801084

10811085
LLVM_CXX_64="$CXX"
10821086
LLVM_CC_64="$CC"
10831087
;;
10841088
esac
10851089

1086-
LLVM_CFLAGS_32="-m32"
1087-
LLVM_CXXFLAGS_32="-m32"
1088-
LLVM_LDFLAGS_32="-m32"
1090+
case "$CFG_CPUTYPE" in
1091+
(x86*)
1092+
LLVM_CXX_32="$LLVM_CXX_32 -m32"
1093+
LLVM_CC_32="$LLVM_CC_32 -m32"
1094+
1095+
LLVM_CFLAGS_32="-m32"
1096+
LLVM_CXXFLAGS_32="-m32"
1097+
LLVM_LDFLAGS_32="-m32"
1098+
1099+
LLVM_CFLAGS_64=""
1100+
LLVM_CXXFLAGS_64=""
1101+
LLVM_LDFLAGS_64=""
1102+
1103+
LLVM_CXX_32="$LLVM_CXX_32 -m32"
1104+
LLVM_CC_32="$LLVM_CC_32 -m32"
1105+
;;
1106+
1107+
(*)
1108+
LLVM_CFLAGS_32=""
1109+
LLVM_CXXFLAGS_32=""
1110+
LLVM_LDFLAGS_32=""
10891111

1090-
LLVM_CFLAGS_64=""
1091-
LLVM_CXXFLAGS_64=""
1092-
LLVM_LDFLAGS_64=""
1112+
LLVM_CFLAGS_64=""
1113+
LLVM_CXXFLAGS_64=""
1114+
LLVM_LDFLAGS_64=""
1115+
;;
1116+
esac
10931117

10941118
if echo $t | grep -q x86_64
10951119
then
@@ -1112,6 +1136,10 @@ do
11121136
CXXFLAGS=$LLVM_CXXFLAGS
11131137
LDFLAGS=$LLVM_LDFLAGS
11141138

1139+
if [ "$CFG_DISABLE_LIBCPP" != 1 ] && [ "$CFG_USING_CLANG" == 1 ]; then
1140+
LLVM_OPTS="$LLVM_OPTS --enable-libcpp"
1141+
fi
1142+
11151143
LLVM_FLAGS="$LLVM_TARGETS $LLVM_OPTS $LLVM_BUILD \
11161144
$LLVM_HOST $LLVM_TARGET --with-python=$CFG_PYTHON"
11171145

‎trunk/mk/docs.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ $(foreach crate,$(COMPILER_DOC_CRATES),$(eval $(call DEF_LIB_DOC,$(crate),COMPIL
287287
ifdef CFG_DISABLE_DOCS
288288
$(info cfg: disabling doc build (CFG_DISABLE_DOCS))
289289
DOC_TARGETS :=
290+
COMPILER_DOC_TARGETS :=
290291
endif
291292

292293
docs: $(DOC_TARGETS)

‎trunk/src/compiletest/compiletest.rs

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -188,41 +188,41 @@ pub fn parse_config(args: Vec<String> ) -> Config {
188188

189189
pub fn log_config(config: &Config) {
190190
let c = config;
191-
logv(c, format_strbuf!("configuration:"));
192-
logv(c, format_strbuf!("compile_lib_path: {}", config.compile_lib_path));
193-
logv(c, format_strbuf!("run_lib_path: {}", config.run_lib_path));
194-
logv(c, format_strbuf!("rustc_path: {}", config.rustc_path.display()));
195-
logv(c, format_strbuf!("src_base: {}", config.src_base.display()));
196-
logv(c, format_strbuf!("build_base: {}", config.build_base.display()));
197-
logv(c, format_strbuf!("stage_id: {}", config.stage_id));
198-
logv(c, format_strbuf!("mode: {}", config.mode));
199-
logv(c, format_strbuf!("run_ignored: {}", config.run_ignored));
200-
logv(c, format_strbuf!("filter: {}",
201-
opt_str(&config.filter
202-
.as_ref()
203-
.map(|re| {
204-
re.to_str().into_string()
205-
}))));
206-
logv(c, format_strbuf!("runtool: {}", opt_str(&config.runtool)));
207-
logv(c, format_strbuf!("host-rustcflags: {}",
208-
opt_str(&config.host_rustcflags)));
209-
logv(c, format_strbuf!("target-rustcflags: {}",
210-
opt_str(&config.target_rustcflags)));
211-
logv(c, format_strbuf!("jit: {}", config.jit));
212-
logv(c, format_strbuf!("target: {}", config.target));
213-
logv(c, format_strbuf!("host: {}", config.host));
214-
logv(c, format_strbuf!("android-cross-path: {}",
215-
config.android_cross_path.display()));
216-
logv(c, format_strbuf!("adb_path: {}", config.adb_path));
217-
logv(c, format_strbuf!("adb_test_dir: {}", config.adb_test_dir));
218-
logv(c, format_strbuf!("adb_device_status: {}",
219-
config.adb_device_status));
191+
logv(c, format!("configuration:"));
192+
logv(c, format!("compile_lib_path: {}", config.compile_lib_path));
193+
logv(c, format!("run_lib_path: {}", config.run_lib_path));
194+
logv(c, format!("rustc_path: {}", config.rustc_path.display()));
195+
logv(c, format!("src_base: {}", config.src_base.display()));
196+
logv(c, format!("build_base: {}", config.build_base.display()));
197+
logv(c, format!("stage_id: {}", config.stage_id));
198+
logv(c, format!("mode: {}", config.mode));
199+
logv(c, format!("run_ignored: {}", config.run_ignored));
200+
logv(c, format!("filter: {}",
201+
opt_str(&config.filter
202+
.as_ref()
203+
.map(|re| {
204+
re.to_str().into_string()
205+
}))));
206+
logv(c, format!("runtool: {}", opt_str(&config.runtool)));
207+
logv(c, format!("host-rustcflags: {}",
208+
opt_str(&config.host_rustcflags)));
209+
logv(c, format!("target-rustcflags: {}",
210+
opt_str(&config.target_rustcflags)));
211+
logv(c, format!("jit: {}", config.jit));
212+
logv(c, format!("target: {}", config.target));
213+
logv(c, format!("host: {}", config.host));
214+
logv(c, format!("android-cross-path: {}",
215+
config.android_cross_path.display()));
216+
logv(c, format!("adb_path: {}", config.adb_path));
217+
logv(c, format!("adb_test_dir: {}", config.adb_test_dir));
218+
logv(c, format!("adb_device_status: {}",
219+
config.adb_device_status));
220220
match config.test_shard {
221221
None => logv(c, "test_shard: (all)".to_string()),
222-
Some((a,b)) => logv(c, format_strbuf!("test_shard: {}.{}", a, b))
222+
Some((a,b)) => logv(c, format!("test_shard: {}.{}", a, b))
223223
}
224-
logv(c, format_strbuf!("verbose: {}", config.verbose));
225-
logv(c, format_strbuf!("\n"));
224+
logv(c, format!("verbose: {}", config.verbose));
225+
logv(c, format!("\n"));
226226
}
227227

228228
pub fn opt_str<'a>(maybestr: &'a Option<String>) -> &'a str {
@@ -356,12 +356,10 @@ pub fn make_test_name(config: &Config, testfile: &Path) -> test::TestName {
356356
let filename = path.filename_str();
357357
let p = path.dir_path();
358358
let dir = p.filename_str();
359-
format_strbuf!("{}/{}", dir.unwrap_or(""), filename.unwrap_or(""))
359+
format!("{}/{}", dir.unwrap_or(""), filename.unwrap_or(""))
360360
}
361361

362-
test::DynTestName(format_strbuf!("[{}] {}",
363-
config.mode,
364-
shorten(testfile)))
362+
test::DynTestName(format!("[{}] {}", config.mode, shorten(testfile)))
365363
}
366364

367365
pub fn make_test_closure(config: &Config, testfile: &Path) -> test::TestFn {

‎trunk/src/compiletest/header.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ pub fn load_props(testfile: &Path) -> TestProps {
120120

121121
pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
122122
fn ignore_target(config: &Config) -> String {
123-
format_strbuf!("ignore-{}", util::get_os(config.target.as_slice()))
123+
format!("ignore-{}", util::get_os(config.target.as_slice()))
124124
}
125125
fn ignore_stage(config: &Config) -> String {
126-
format_strbuf!("ignore-{}",
127-
config.stage_id.as_slice().split('-').next().unwrap())
126+
format!("ignore-{}",
127+
config.stage_id.as_slice().split('-').next().unwrap())
128128
}
129129

130130
let val = iter_header(testfile, |ln| {
@@ -243,7 +243,7 @@ fn parse_name_directive(line: &str, directive: &str) -> bool {
243243

244244
pub fn parse_name_value_directive(line: &str, directive: String)
245245
-> Option<String> {
246-
let keycolon = format_strbuf!("{}:", directive);
246+
let keycolon = format!("{}:", directive);
247247
match line.find_str(keycolon.as_slice()) {
248248
Some(colon) => {
249249
let value = line.slice(colon + keycolon.len(),

0 commit comments

Comments
 (0)