Skip to content

Commit 155151c

Browse files
thestingerthestinger
committed
---
yaml --- r: 146395 b: refs/heads/try2 c: ddbd89b h: refs/heads/master i: 146393: 427c8d6 146391: ac84db7 v: v3
1 parent 2e281a9 commit 155151c

File tree

18 files changed

+198
-135
lines changed

18 files changed

+198
-135
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4910b7ac28a8c489672573696e81ef6c8d54d1b3
8+
refs/heads/try2: ddbd89b33e7516f1620d2f47b23fcab5f1b4b6fe
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,10 @@ config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
625625
# new definitions), make sure definitions always precede their uses,
626626
# especially for the dependency lists of recipes.
627627

628-
include $(CFG_SRC_DIR)mk/rt.mk
629628
include $(CFG_SRC_DIR)mk/target.mk
630629
include $(CFG_SRC_DIR)mk/host.mk
631630
include $(CFG_SRC_DIR)mk/stage0.mk
631+
include $(CFG_SRC_DIR)mk/rt.mk
632632
include $(CFG_SRC_DIR)mk/rustllvm.mk
633633
include $(CFG_SRC_DIR)mk/tools.mk
634634
include $(CFG_SRC_DIR)mk/docs.mk

‎branches/try2/mk/rt.mk

Lines changed: 15 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,19 @@ RUNTIME_CXXS_$(1)_$(2) := \
8787
rt/sync/rust_thread.cpp \
8888
rt/rust_builtin.cpp \
8989
rt/rust_upcall.cpp \
90+
rt/rust_uv.cpp \
9091
rt/miniz.cpp \
9192
rt/rust_android_dummy.cpp \
9293
rt/rust_test_helpers.cpp
9394

94-
RUNTIME_CS_$(1)_$(2) :=
95+
RUNTIME_CS_$(1)_$(2) := rt/sundown/src/autolink.c \
96+
rt/sundown/src/buffer.c \
97+
rt/sundown/src/stack.c \
98+
rt/sundown/src/markdown.c \
99+
rt/sundown/html/houdini_href_e.c \
100+
rt/sundown/html/houdini_html_e.c \
101+
rt/sundown/html/html_smartypants.c \
102+
rt/sundown/html/html.c
95103

96104
RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
97105
rt/arch/$$(HOST_$(1))/record_sp.S
@@ -100,7 +108,10 @@ RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
100108

101109
RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
102110
RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
103-
-I $$(S)src/rt/arch/$$(HOST_$(1))
111+
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
112+
-I $$(S)src/rt/sundown/src \
113+
-I $$(S)src/rt/sundown/html \
114+
-I $$(S)src/libuv/include
104115
RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
105116
$$(RUNTIME_CS_$(1)_$(2):rt/%.c=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
106117
$$(RUNTIME_S_$(1)_$(2):rt/%.S=$$(RT_BUILD_DIR_$(1)_$(2))/%.o)
@@ -129,9 +140,10 @@ $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJS_
129140
$$(Q)$(AR_$(1)) rcs $$@ $$^
130141

131142
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
132-
$$(RUNTIME_DEF_$(1)_$(2))
143+
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1))
133144
@$$(call E, link: $$@)
134145
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
146+
$$(LIBUV_LIB_$(1)) \
135147
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
136148

137149
# These could go in rt.mk or rustllvm.mk, they're needed for both.
@@ -230,54 +242,6 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1))
230242
NO_LOAD="$$(LIBUV_NO_LOAD)" \
231243
V=$$(VERBOSE)
232244
endif
233-
234-
# libuv support functionality (extra C/C++ that we need to use libuv)
235-
236-
UV_SUPPORT_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),uv_support)
237-
UV_SUPPORT_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/uv_support
238-
UV_SUPPORT_LIB_$(1) := $$(UV_SUPPORT_DIR_$(1))/$$(UV_SUPPORT_NAME_$(1))
239-
UV_SUPPORT_CS_$(1) := rt/rust_uv.cpp
240-
UV_SUPPORT_OBJS_$(1) := $$(UV_SUPPORT_CS_$(1):rt/%.cpp=$$(UV_SUPPORT_DIR_$(1))/%.o)
241-
242-
$$(UV_SUPPORT_DIR_$(1))/%.o: rt/%.cpp
243-
@$$(call E, compile: $$@)
244-
@mkdir -p $$(@D)
245-
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, \
246-
-I $$(S)src/libuv/include \
247-
$$(RUNTIME_CFLAGS_$(1))) $$<
248-
249-
$$(UV_SUPPORT_LIB_$(1)): $$(UV_SUPPORT_OBJS_$(1))
250-
@$$(call E, link: $$@)
251-
$$(Q)$$(AR_$(1)) rcs $$@ $$^
252-
253-
# sundown markdown library (used by librustdoc)
254-
255-
SUNDOWN_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),sundown)
256-
SUNDOWN_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/sundown
257-
SUNDOWN_LIB_$(1) := $$(SUNDOWN_DIR_$(1))/$$(SUNDOWN_NAME_$(1))
258-
259-
SUNDOWN_CS_$(1) := rt/sundown/src/autolink.c \
260-
rt/sundown/src/buffer.c \
261-
rt/sundown/src/stack.c \
262-
rt/sundown/src/markdown.c \
263-
rt/sundown/html/houdini_href_e.c \
264-
rt/sundown/html/houdini_html_e.c \
265-
rt/sundown/html/html_smartypants.c \
266-
rt/sundown/html/html.c
267-
268-
SUNDOWN_OBJS_$(1) := $$(SUNDOWN_CS_$(1):rt/%.c=$$(SUNDOWN_DIR_$(1))/%.o)
269-
270-
$$(SUNDOWN_DIR_$(1))/%.o: rt/%.c
271-
@$$(call E, compile: $$@)
272-
@mkdir -p $$(@D)
273-
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, \
274-
-I $$(S)src/rt/sundown/src -I $$(S)src/rt/sundown/html \
275-
$$(RUNTIME_CFLAGS_$(1))) $$<
276-
277-
$$(SUNDOWN_LIB_$(1)): $$(SUNDOWN_OBJS_$(1))
278-
@$$(call E, link: $$@)
279-
$$(Q)$$(AR_$(1)) rcs $$@ $$^
280-
281245
endef
282246

283247
# Instantiate template for all stages/targets

‎branches/try2/mk/target.mk

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,10 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)): \
7777
$$(LIBRUSTUV_CRATE) $$(LIBRUSTUV_INPUTS) \
7878
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
7979
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
80-
$$(LIBUV_LIB_$(2)) \
81-
$$(UV_SUPPORT_LIB_$(2)) \
8280
| $$(TLIB$(1)_T_$(2)_H_$(3))/
8381
@$$(call E, compile_and_link: $$@)
8482
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
85-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
86-
-L $$(UV_SUPPORT_DIR_$(2)) \
87-
-L $$(dir $$(LIBUV_LIB_$(2))) \
88-
--out-dir $$(@D) $$< && touch $$@
83+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
8984
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
9085

9186
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
@@ -122,16 +117,13 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
122117
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
123118
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
124119

125-
# NOTE: after the next snapshot remove these '-L' flags
126120
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
127121
$$(DRIVER_CRATE) \
128122
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
129123
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
130124
| $$(TBIN$(1)_T_$(2)_H_$(3))/
131125
@$$(call E, compile_and_link: $$@)
132-
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$< \
133-
-L $$(UV_SUPPORT_DIR_$(2)) \
134-
-L $$(dir $$(LIBUV_LIB_$(2)))
126+
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
135127
ifdef CFG_ENABLE_PAX_FLAGS
136128
@$$(call E, apply PaX flags: $$@)
137129
@"$(CFG_PAXCTL)" -cm "$$@"

‎branches/try2/mk/tests.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,7 @@ $(3)/stage$(1)/test/rustuvtest-$(2)$$(X_$(2)): \
358358
$$(LIBRUSTUV_CRATE) $$(LIBRUSTUV_INPUTS) \
359359
$$(STDTESTDEP_$(1)_$(2)_$(3))
360360
@$$(call E, compile_and_link: $$@)
361-
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
362-
-L $$(UV_SUPPORT_DIR_$(2)) \
363-
-L $$(dir $$(LIBUV_LIB_$(2)))
361+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
364362

365363
$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
366364
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
@@ -394,8 +392,7 @@ $(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
394392
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
395393
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
396394
@$$(call E, compile_and_link: $$@)
397-
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
398-
-L $$(SUNDOWN_DIR_$(2))
395+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
399396

400397
endef
401398

‎branches/try2/mk/tools.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,10 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
5757
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
5858
$$(SREQ$(1)_T_$(4)_H_$(3)) \
5959
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
60-
$$(SUNDOWN_LIB_$(4)) \
6160
| $$(TLIB$(1)_T_$(4)_H_$(3))/
6261
@$$(call E, compile_and_link: $$@)
6362
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
64-
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) \
65-
-L $$(SUNDOWN_DIR_$(4)) --out-dir $$(@D) $$< && touch $$@
63+
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
6664
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOC_GLOB_$(4)),$$(notdir $$@))
6765

6866
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)): \

‎branches/try2/src/librustc/back/link.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use lib::llvm::llvm;
1616
use lib::llvm::ModuleRef;
1717
use lib;
1818
use metadata::common::LinkMeta;
19-
use metadata::{encoder, cstore, filesearch};
19+
use metadata::{encoder, csearch, cstore, filesearch};
2020
use middle::trans::context::CrateContext;
2121
use middle::trans::common::gensym_name;
2222
use middle::ty;
@@ -1043,6 +1043,14 @@ pub fn link_args(sess: Session,
10431043
let ula = cstore::get_used_link_args(cstore);
10441044
for arg in ula.iter() { args.push(arg.to_owned()); }
10451045

1046+
// Add all the link args for external crates.
1047+
do cstore::iter_crate_data(cstore) |crate_num, _| {
1048+
let link_args = csearch::get_link_args_for_crate(cstore, crate_num);
1049+
for link_arg in link_args.move_iter() {
1050+
args.push(link_arg);
1051+
}
1052+
}
1053+
10461054
// # Extern library linking
10471055

10481056
// User-supplied library search paths (-L on the cammand line) These are

‎branches/try2/src/librustc/lib/llvm.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ pub mod llvm {
304304
use super::debuginfo::*;
305305
use std::libc::{c_char, c_int, c_longlong, c_ushort, c_uint, c_ulonglong};
306306

307-
#[link_args = "-lrustllvm"]
307+
#[link_args = "-Lrustllvm -lrustllvm"]
308+
#[link_name = "rustllvm"]
308309
extern {
309310
/* Create and destroy contexts. */
310311
pub fn LLVMContextCreate() -> ContextRef;

‎branches/try2/src/librustc/metadata/csearch.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,13 @@ pub fn get_item_visibility(cstore: @mut cstore::CStore,
261261
decoder::get_item_visibility(cdata, def_id.node)
262262
}
263263

264+
pub fn get_link_args_for_crate(cstore: @mut cstore::CStore,
265+
crate_num: ast::CrateNum)
266+
-> ~[~str] {
267+
let cdata = cstore::get_crate_data(cstore, crate_num);
268+
decoder::get_link_args_for_crate(cdata)
269+
}
270+
264271
pub fn each_impl(cstore: @mut cstore::CStore,
265272
crate_num: ast::CrateNum,
266273
callback: &fn(ast::DefId)) {

‎branches/try2/src/librustc/metadata/decoder.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,16 @@ pub fn translate_def_id(cdata: Cmd, did: ast::DefId) -> ast::DefId {
14561456
}
14571457
}
14581458

1459+
pub fn get_link_args_for_crate(cdata: Cmd) -> ~[~str] {
1460+
let link_args = reader::get_doc(reader::Doc(cdata.data), tag_link_args);
1461+
let mut result = ~[];
1462+
do reader::tagged_docs(link_args, tag_link_args_arg) |arg_doc| {
1463+
result.push(arg_doc.as_str());
1464+
true
1465+
};
1466+
result
1467+
}
1468+
14591469
pub fn each_impl(cdata: Cmd, callback: &fn(ast::DefId)) {
14601470
let impls_doc = reader::get_doc(reader::Doc(cdata.data), tag_impls);
14611471
let _ = do reader::tagged_docs(impls_doc, tag_impls_impl) |impl_doc| {

‎branches/try2/src/librustc/metadata/encoder.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ struct Stats {
7575
attr_bytes: u64,
7676
dep_bytes: u64,
7777
lang_item_bytes: u64,
78+
link_args_bytes: u64,
7879
impl_bytes: u64,
7980
misc_bytes: u64,
8081
item_bytes: u64,
@@ -1609,6 +1610,19 @@ fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
16091610
ebml_w.end_tag(); // tag_lang_items
16101611
}
16111612

1613+
fn encode_link_args(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
1614+
ebml_w.start_tag(tag_link_args);
1615+
1616+
let link_args = cstore::get_used_link_args(ecx.cstore);
1617+
for link_arg in link_args.iter() {
1618+
ebml_w.start_tag(tag_link_args_arg);
1619+
ebml_w.writer.write(link_arg.as_bytes());
1620+
ebml_w.end_tag();
1621+
}
1622+
1623+
ebml_w.end_tag();
1624+
}
1625+
16121626
struct ImplVisitor<'self> {
16131627
ecx: &'self EncodeContext<'self>,
16141628
ebml_w: &'self mut writer::Encoder,
@@ -1726,6 +1740,7 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
17261740
attr_bytes: 0,
17271741
dep_bytes: 0,
17281742
lang_item_bytes: 0,
1743+
link_args_bytes: 0,
17291744
impl_bytes: 0,
17301745
misc_bytes: 0,
17311746
item_bytes: 0,
@@ -1782,6 +1797,11 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
17821797
encode_lang_items(&ecx, &mut ebml_w);
17831798
ecx.stats.lang_item_bytes = wr.tell() - i;
17841799

1800+
// Encode the link args.
1801+
i = wr.tell();
1802+
encode_link_args(&ecx, &mut ebml_w);
1803+
ecx.stats.link_args_bytes = wr.tell() - i;
1804+
17851805
// Encode the def IDs of impls, for coherence checking.
17861806
i = wr.tell();
17871807
encode_impls(&ecx, crate, &mut ebml_w);
@@ -1818,6 +1838,7 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
18181838
println!(" attribute bytes: {}", ecx.stats.attr_bytes);
18191839
println!(" dep bytes: {}", ecx.stats.dep_bytes);
18201840
println!(" lang item bytes: {}", ecx.stats.lang_item_bytes);
1841+
println!(" link args bytes: {}", ecx.stats.link_args_bytes);
18211842
println!(" impl bytes: {}", ecx.stats.impl_bytes);
18221843
println!(" misc bytes: {}", ecx.stats.misc_bytes);
18231844
println!(" item bytes: {}", ecx.stats.item_bytes);

‎branches/try2/src/librustc/middle/trans/base.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -523,23 +523,16 @@ pub fn get_res_dtor(ccx: @mut CrateContext,
523523
substs: &[ty::t])
524524
-> ValueRef {
525525
let _icx = push_ctxt("trans_res_dtor");
526-
let did = if did.crate != ast::LOCAL_CRATE {
527-
inline::maybe_instantiate_inline(ccx, did)
528-
} else {
529-
did
530-
};
531526
if !substs.is_empty() {
527+
let did = if did.crate != ast::LOCAL_CRATE {
528+
inline::maybe_instantiate_inline(ccx, did)
529+
} else {
530+
did
531+
};
532532
assert_eq!(did.crate, ast::LOCAL_CRATE);
533533
let tsubsts = ty::substs {regions: ty::ErasedRegions,
534534
self_ty: None,
535535
tps: /*bad*/ substs.to_owned() };
536-
537-
// FIXME: #4252: Generic destructors with type bounds are broken.
538-
//
539-
// Since the vtables aren't passed to `monomorphic_fn` here, generic destructors with type
540-
// bounds are broken. Sadly, the `typeck` pass isn't outputting the necessary metadata
541-
// because it does so based on method calls present in the AST. Destructor calls are not yet
542-
// known about at that stage of compilation, since `trans` handles cleanups.
543536
let (val, _) = monomorphize::monomorphic_fn(ccx,
544537
did,
545538
&tsubsts,

‎branches/try2/src/librustc/middle/trans/intrinsic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
221221
"abort" => {
222222
let llfn = bcx.ccx().intrinsics.get_copy(&("llvm.trap"));
223223
Call(bcx, llfn, [], []);
224-
RetVoid(bcx);
224+
Unreachable(bcx);
225225
}
226226
"size_of" => {
227227
let tp_ty = substs.tys[0];

‎branches/try2/src/librustdoc/html/markdown.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ struct buf {
6969
}
7070

7171
// sundown FFI
72-
#[link_args = "-lsundown"]
7372
extern {
7473
fn sdhtml_renderer(callbacks: *sd_callbacks,
7574
options_ptr: *html_renderopt,

‎branches/try2/src/librustuv/uvll.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,6 @@ pub struct uv_err_data {
10031003
err_msg: ~str,
10041004
}
10051005

1006-
// uv_support is the result of compiling rust_uv.cpp
1007-
#[link_args = "-luv_support -luv"]
10081006
extern {
10091007

10101008
fn rust_uv_handle_size(type_: uintptr_t) -> size_t;
@@ -1174,13 +1172,3 @@ extern {
11741172
signum: c_int) -> c_int;
11751173
fn rust_uv_signal_stop(handle: *uv_signal_t) -> c_int;
11761174
}
1177-
1178-
// libuv requires various system libraries to successfully link on some
1179-
// platforms
1180-
#[cfg(target_os = "linux")]
1181-
#[link_args = "-lpthread"]
1182-
extern {}
1183-
1184-
#[cfg(target_os = "win32")]
1185-
#[link_args = "-lWs2_32 -lpsapi -liphlpapi"]
1186-
extern {}

0 commit comments

Comments
 (0)