Skip to content

Commit 43d5481

Browse files
nrcnrc
committed
---
yaml --- r: 107262 b: refs/heads/dist-snap c: 40d8a12 h: refs/heads/master v: v3
1 parent e6f6fce commit 43d5481

File tree

30 files changed

+246
-396
lines changed

30 files changed

+246
-396
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: f411b94ce1b3d4b6751093beeb7d9674e45db0d3
9+
refs/heads/dist-snap: 40d8a12b68426a39456548902c71e002ae71c0b8
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[submodule "src/llvm"]
22
path = src/llvm
3-
url = https://github.com/rust-lang/llvm.git
3+
url = https://github.com/luqmana/llvm.git
44
branch = master
55
[submodule "src/libuv"]
66
path = src/libuv
7-
url = https://github.com/rust-lang/libuv.git
7+
url = https://github.com/alexcrichton/libuv.git
88
branch = master
99
[submodule "src/gyp"]
1010
path = src/gyp
11-
url = https://github.com/rust-lang/gyp.git
11+
url = https://github.com/alexcrichton/gyp.git

‎branches/dist-snap/configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,11 @@ do
782782
# target lib dir
783783
make_dir $h/stage$i/$LIBDIR_RELATIVE/$CFG_RUSTLIBDIR/$t/lib
784784
done
785+
786+
# Fix stage0:
787+
make_dir $h/stage0/$LIBDIR_RELATIVE/rustc/$t/bin
788+
make_dir $h/stage0/$LIBDIR_RELATIVE/rustc/$t/$LIBDIR_RELATIVE
789+
785790
done
786791

787792
make_dir $h/test/run-pass

‎branches/dist-snap/doc/guide-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ A typical mutable container will implement at least `iter()`, `mut_iter()` and
130130
### Freezing
131131
132132
Unlike most other languages with external iterators, Rust has no *iterator
133-
invalidation*. As long as an iterator is still in scope, the compiler will prevent
133+
invalidation*. As long an iterator is still in scope, the compiler will prevent
134134
modification of the container through another handle.
135135
136136
~~~

‎branches/dist-snap/mk/target.mk

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,25 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)): \
5454
@$$(call E, cp: $$@)
5555
$$(Q)cp $$< $$@
5656

57+
# SNAP a5fa1d9 remove this after the stage0 snapshot from rules below
58+
ifeq ($(1),0)
59+
ifeq ($(3),$$(findstring $(3),$$(NON_BUILD_HOST)))
60+
LFLAGS_$(1)_$(2)_$(3) :=
61+
else
62+
LFLAGS_$(1)_$(2)_$(3) := -L $$(TLIB$(1)_T_$(2)_H_$(3))
63+
endif
64+
else
65+
LFLAGS_$(1)_$(2)_$(3) :=
66+
endif
67+
5768
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)): \
5869
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
5970
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
6071
| $$(TLIB$(1)_T_$(2)_H_$(3))/
6172
@$$(call E, compile_and_link: $$@)
6273
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(2)),$$(notdir $$@))
6374
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_RGLOB_$(2)),$$(notdir $$@))
64-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
75+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) $$(LFLAGS_$(1)_$(2)_$(3)) \
6576
--out-dir $$(@D) $$< && touch $$@
6677
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(2)),$$(notdir $$@))
6778
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_RGLOB_$(2)),$$(notdir $$@))
@@ -74,7 +85,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
7485
@$$(call E, compile_and_link: $$@)
7586
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
7687
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_RGLOB_$(2)),$$(notdir $$@))
77-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
88+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) $$(LFLAGS_$(1)_$(2)_$(3)) \
7889
--out-dir $$(@D) $$< && touch $$@
7990
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
8091
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_RGLOB_$(2)),$$(notdir $$@))
@@ -92,6 +103,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)): \
92103
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
93104
-L $$(UV_SUPPORT_DIR_$(2)) \
94105
-L $$(dir $$(LIBUV_LIB_$(2))) \
106+
$$(LFLAGS_$(1)_$(2)_$(3)) \
95107
--out-dir $$(@D) $$< && touch $$@
96108
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
97109
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(2)),$$(notdir $$@))
@@ -105,6 +117,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBGREEN_$(2)): \
105117
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_GLOB_$(2)),$$(notdir $$@))
106118
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_RGLOB_$(2)),$$(notdir $$@))
107119
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
120+
$$(LFLAGS_$(1)_$(2)_$(3)) \
108121
--out-dir $$(@D) $$< && touch $$@
109122
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_GLOB_$(2)),$$(notdir $$@))
110123
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_RGLOB_$(2)),$$(notdir $$@))
@@ -118,6 +131,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBNATIVE_$(2)): \
118131
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_GLOB_$(2)),$$(notdir $$@))
119132
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_RGLOB_$(2)),$$(notdir $$@))
120133
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
134+
$$(LFLAGS_$(1)_$(2)_$(3)) \
121135
--out-dir $$(@D) $$< && touch $$@
122136
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_GLOB_$(2)),$$(notdir $$@))
123137
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_RGLOB_$(2)),$$(notdir $$@))
@@ -132,6 +146,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
132146
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
133147
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_RGLOB_$(2)),$$(notdir $$@))
134148
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) $(BORROWCK) \
149+
$$(LFLAGS_$(1)_$(2)_$(3)) \
135150
--out-dir $$(@D) $$< && touch $$@
136151
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
137152
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_RGLOB_$(2)),$$(notdir $$@))
@@ -159,6 +174,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
159174
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_RGLOB_$(2)),$$(notdir $$@))
160175
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
161176
-L "$$(LLVM_LIBDIR_$(2))" \
177+
$$(LFLAGS_$(1)_$(2)_$(3)) \
162178
--out-dir $$(@D) $$< && touch $$@
163179
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
164180
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_RGLOB_$(2)),$$(notdir $$@))
@@ -169,7 +185,8 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
169185
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
170186
| $$(TBIN$(1)_T_$(2)_H_$(3))/
171187
@$$(call E, compile_and_link: $$@)
172-
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
188+
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$< \
189+
$$(LFLAGS_$(1)_$(2)_$(3))
173190
ifdef CFG_ENABLE_PAX_FLAGS
174191
@$$(call E, apply PaX flags: $$@)
175192
@"$(CFG_PAXCTL)" -cm "$$@"

‎branches/dist-snap/src/libgreen/simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Runtime for SimpleTask {
7575
fail!()
7676
}
7777
fn local_io<'a>(&'a mut self) -> Option<rtio::LocalIo<'a>> { None }
78-
fn stack_bounds(&self) -> (uint, uint) { fail!() }
78+
fn stack_bounds(&self) -> Option<(uint, uint)> { None }
7979
fn wrap(~self) -> ~Any { fail!() }
8080
}
8181

‎branches/dist-snap/src/libgreen/task.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,11 @@ impl Runtime for GreenTask {
454454
}
455455
}
456456

457-
fn stack_bounds(&self) -> (uint, uint) {
458-
let c = self.coroutine.as_ref()
459-
.expect("GreenTask.stack_bounds called without a coroutine");
460-
461-
(c.current_stack_segment.start() as uint,
462-
c.current_stack_segment.end() as uint)
457+
fn stack_bounds(&self) -> Option<(uint, uint)> {
458+
self.coroutine.as_ref().map(|c| {
459+
(c.current_stack_segment.start() as uint,
460+
c.current_stack_segment.end() as uint)
461+
})
463462
}
464463

465464
fn wrap(~self) -> ~Any { self as ~Any }

‎branches/dist-snap/src/libnative/lib.rs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ mod bookeeping;
3333
pub mod io;
3434
pub mod task;
3535

36-
#[cfg(windows)]
37-
#[cfg(android)]
38-
static OS_DEFAULT_STACK_ESTIMATE: uint = 1 << 20;
39-
#[cfg(unix, not(android))]
40-
static OS_DEFAULT_STACK_ESTIMATE: uint = 2 * (1 << 20);
41-
42-
4336
// XXX: this should not exist here
4437
#[cfg(stage0, nativestart)]
4538
#[lang = "start"]
@@ -73,19 +66,10 @@ pub fn lang_start(main: *u8, argc: int, argv: **u8) -> int {
7366
/// This function will only return once *all* native threads in the system have
7467
/// exited.
7568
pub fn start(argc: int, argv: **u8, main: proc()) -> int {
76-
let something_around_the_top_of_the_stack = 1;
77-
let addr = &something_around_the_top_of_the_stack as *int;
78-
let my_stack_top = addr as uint;
79-
80-
// FIXME #11359 we just assume that this thread has a stack of a
81-
// certain size, and estimate that there's at most 20KB of stack
82-
// frames above our current position.
83-
let my_stack_bottom = my_stack_top + 20000 - OS_DEFAULT_STACK_ESTIMATE;
84-
8569
rt::init(argc, argv);
8670
let mut exit_code = None;
8771
let mut main = Some(main);
88-
task::new((my_stack_bottom, my_stack_top)).run(|| {
72+
task::new().run(|| {
8973
exit_code = Some(run(main.take_unwrap()));
9074
});
9175
unsafe { rt::cleanup(); }

‎branches/dist-snap/src/libnative/task.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ use task;
3030
use bookeeping;
3131

3232
/// Creates a new Task which is ready to execute as a 1:1 task.
33-
pub fn new(stack_bounds: (uint, uint)) -> ~Task {
33+
pub fn new() -> ~Task {
3434
let mut task = ~Task::new();
35-
let mut ops = ops();
36-
ops.stack_bounds = stack_bounds;
37-
task.put_runtime(ops as ~rt::Runtime);
35+
task.put_runtime(ops() as ~rt::Runtime);
3836
return task;
3937
}
4038

@@ -43,8 +41,7 @@ fn ops() -> ~Ops {
4341
lock: unsafe { Mutex::new() },
4442
awoken: false,
4543
io: io::IoFactory::new(),
46-
// these *should* get overwritten
47-
stack_bounds: (0, 0),
44+
stack_bounds: None,
4845
}
4946
}
5047

@@ -98,7 +95,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc()) {
9895
stack::record_stack_bounds(my_stack - stack + 1024, my_stack);
9996
}
10097
let mut ops = ops;
101-
ops.stack_bounds = (my_stack - stack + 1024, my_stack);
98+
ops.stack_bounds = Some((my_stack - stack + 1024, my_stack));
10299

103100
let mut f = Some(f);
104101
let mut task = task;
@@ -118,7 +115,7 @@ struct Ops {
118115
// This field holds the known bounds of the stack in (lo, hi) form. Not all
119116
// native tasks necessarily know their precise bounds, hence this is
120117
// optional.
121-
stack_bounds: (uint, uint),
118+
stack_bounds: Option<(uint, uint)>,
122119
}
123120

124121
impl rt::Runtime for Ops {
@@ -140,7 +137,7 @@ impl rt::Runtime for Ops {
140137
self as ~Any
141138
}
142139

143-
fn stack_bounds(&self) -> (uint, uint) { self.stack_bounds }
140+
fn stack_bounds(&self) -> Option<(uint, uint)> { self.stack_bounds }
144141

145142
// This function gets a little interesting. There are a few safety and
146143
// ownership violations going on here, but this is all done in the name of

‎branches/dist-snap/src/librustc/back/link.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ use syntax::attr::AttrMetaMethods;
4545
use syntax::crateid::CrateId;
4646

4747
#[deriving(Clone, Eq)]
48-
pub enum OutputType {
49-
OutputTypeNone,
50-
OutputTypeBitcode,
51-
OutputTypeAssembly,
52-
OutputTypeLlvmAssembly,
53-
OutputTypeObject,
54-
OutputTypeExe,
48+
pub enum output_type {
49+
output_type_none,
50+
output_type_bitcode,
51+
output_type_assembly,
52+
output_type_llvm_assembly,
53+
output_type_object,
54+
output_type_exe,
5555
}
5656

5757
pub fn llvm_err(sess: Session, msg: ~str) -> ! {
@@ -86,10 +86,10 @@ pub fn WriteOutputFile(
8686
pub mod write {
8787

8888
use back::lto;
89-
use back::link::{WriteOutputFile, OutputType};
90-
use back::link::{OutputTypeAssembly, OutputTypeBitcode};
91-
use back::link::{OutputTypeExe, OutputTypeLlvmAssembly};
92-
use back::link::{OutputTypeObject};
89+
use back::link::{WriteOutputFile, output_type};
90+
use back::link::{output_type_assembly, output_type_bitcode};
91+
use back::link::{output_type_exe, output_type_llvm_assembly};
92+
use back::link::{output_type_object};
9393
use driver::driver::CrateTranslation;
9494
use driver::session::Session;
9595
use driver::session;
@@ -107,7 +107,7 @@ pub mod write {
107107

108108
pub fn run_passes(sess: Session,
109109
trans: &CrateTranslation,
110-
output_type: OutputType,
110+
output_type: output_type,
111111
output: &Path) {
112112
let llmod = trans.module;
113113
let llcx = trans.context;
@@ -225,20 +225,20 @@ pub mod write {
225225

226226
time(sess.time_passes(), "codegen passes", (), |()| {
227227
match output_type {
228-
OutputTypeNone => {}
229-
OutputTypeBitcode => {
228+
output_type_none => {}
229+
output_type_bitcode => {
230230
output.with_c_str(|buf| {
231231
llvm::LLVMWriteBitcodeToFile(llmod, buf);
232232
})
233233
}
234-
OutputTypeLlvmAssembly => {
234+
output_type_llvm_assembly => {
235235
output.with_c_str(|output| {
236236
with_codegen(tm, llmod, |cpm| {
237237
llvm::LLVMRustPrintModule(cpm, llmod, output);
238238
})
239239
})
240240
}
241-
OutputTypeAssembly => {
241+
output_type_assembly => {
242242
with_codegen(tm, llmod, |cpm| {
243243
WriteOutputFile(sess, tm, cpm, llmod, output,
244244
lib::llvm::AssemblyFile);
@@ -248,7 +248,7 @@ pub mod write {
248248
// could be invoked specially with output_type_assembly,
249249
// so in this case we still want the metadata object
250250
// file.
251-
if sess.opts.output_type != OutputTypeAssembly {
251+
if sess.opts.output_type != output_type_assembly {
252252
with_codegen(tm, trans.metadata_module, |cpm| {
253253
let out = output.with_extension("metadata.o");
254254
WriteOutputFile(sess, tm, cpm,
@@ -257,7 +257,7 @@ pub mod write {
257257
})
258258
}
259259
}
260-
OutputTypeExe | OutputTypeObject => {
260+
output_type_exe | output_type_object => {
261261
with_codegen(tm, llmod, |cpm| {
262262
WriteOutputFile(sess, tm, cpm, llmod, output,
263263
lib::llvm::ObjectFile);

‎branches/dist-snap/src/librustc/driver/driver.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ pub fn phase_5_run_llvm_passes(sess: Session,
362362
outputs: &OutputFilenames) {
363363

364364
if sess.no_integrated_as() {
365-
let output_type = link::OutputTypeAssembly;
365+
let output_type = link::output_type_assembly;
366366
let asm_filename = outputs.obj_filename.with_extension("s");
367367

368368
time(sess.time_passes(), "LLVM passes", (), |_|
@@ -424,7 +424,7 @@ pub fn stop_after_phase_2(sess: Session) -> bool {
424424
}
425425

426426
pub fn stop_after_phase_5(sess: Session) -> bool {
427-
if sess.opts.output_type != link::OutputTypeExe {
427+
if sess.opts.output_type != link::output_type_exe {
428428
debug!("not building executable, returning early from compile_input");
429429
return true;
430430
}
@@ -765,17 +765,17 @@ pub fn build_session_options(binary: ~str,
765765

766766
let output_type =
767767
if parse_only || no_trans {
768-
link::OutputTypeNone
768+
link::output_type_none
769769
} else if matches.opt_present("S") &&
770770
matches.opt_present("emit-llvm") {
771-
link::OutputTypeLlvmAssembly
771+
link::output_type_llvm_assembly
772772
} else if matches.opt_present("S") {
773-
link::OutputTypeAssembly
773+
link::output_type_assembly
774774
} else if matches.opt_present("c") {
775-
link::OutputTypeObject
775+
link::output_type_object
776776
} else if matches.opt_present("emit-llvm") {
777-
link::OutputTypeBitcode
778-
} else { link::OutputTypeExe };
777+
link::output_type_bitcode
778+
} else { link::output_type_exe };
779779
let sysroot_opt = matches.opt_str("sysroot").map(|m| @Path::new(m));
780780
let target = matches.opt_str("target").unwrap_or(host_triple());
781781
let target_cpu = matches.opt_str("target-cpu").unwrap_or(~"generic");
@@ -1039,15 +1039,15 @@ pub fn build_output_filenames(input: &input,
10391039
let obj_path;
10401040
let out_path;
10411041
let sopts = sess.opts;
1042-
let stop_after_codegen = sopts.output_type != link::OutputTypeExe;
1042+
let stop_after_codegen = sopts.output_type != link::output_type_exe;
10431043

10441044
let obj_suffix = match sopts.output_type {
1045-
link::OutputTypeNone => ~"none",
1046-
link::OutputTypeBitcode => ~"bc",
1047-
link::OutputTypeAssembly => ~"s",
1048-
link::OutputTypeLlvmAssembly => ~"ll",
1045+
link::output_type_none => ~"none",
1046+
link::output_type_bitcode => ~"bc",
1047+
link::output_type_assembly => ~"s",
1048+
link::output_type_llvm_assembly => ~"ll",
10491049
// Object and exe output both use the '.o' extension here
1050-
link::OutputTypeObject | link::OutputTypeExe => ~"o"
1050+
link::output_type_object | link::output_type_exe => ~"o"
10511051
};
10521052

10531053
match *ofile {

0 commit comments

Comments
 (0)