Skip to content

Commit 0ff9c13

Browse files
committed
---
yaml --- r: 1833 b: refs/heads/master c: 8c9f5ff h: refs/heads/master i: 1831: fdd012f v: v3
1 parent e6f45ea commit 0ff9c13

File tree

4 files changed

+664
-4
lines changed

4 files changed

+664
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a2b9a7ce8f1246e9d8b0d65ba3d989a2b2d25451
2+
refs/heads/master: 8c9f5ffc773233c94ac6b712d2d10f991ad2b0bf

trunk/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ifeq ($(CFG_OSTYPE), Linux)
3838
CFG_LIB_NAME=lib$(1).so
3939
CFG_GCC_CFLAGS += -fPIC -march=i686
4040
CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
41-
CFG_GCC_DEF_FLAG :=
41+
CFG_GCC_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list=
4242
ifeq ($(CFG_CPUTYPE), x86_64)
4343
CFG_GCC_CFLAGS += -m32
4444
CFG_GCC_LINK_FLAGS += -m32
@@ -53,7 +53,7 @@ ifeq ($(CFG_OSTYPE), Darwin)
5353
CFG_UNIXY := 1
5454
CFG_LDENV := DYLD_LIBRARY_PATH
5555
CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
56-
CFG_GCC_DEF_FLAG := -exported_symbols_list
56+
CFG_GCC_DEF_FLAG := -Wl,-exported_symbols_list,
5757
# Darwin has a very blurry notion of "64 bit", and claims it's running
5858
# "on an i386" when the whole userspace is 64-bit and the compiler
5959
# emits 64-bit binaries by default. So we just force -m32 here. Smarter
@@ -148,7 +148,7 @@ ifdef CFG_GCC
148148
CFG_COMPILE_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -c -o $(1) $(2)
149149
CFG_DEPEND_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -MT "$(1)" -MM $(2)
150150
CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) \
151-
$(CFG_GCC_DEF_FLAG) $(3) $(2)
151+
$(CFG_GCC_DEF_FLAG)$(3) $(2)
152152
else
153153
CFG_ERR := $(error please try on a system with gcc)
154154
endif

trunk/src/rt/rustrt.linux.def

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
align_of;
3+
debug_box;
4+
debug_fn;
5+
debug_obj;
6+
debug_opaque;
7+
debug_ptrcast;
8+
debug_tag;
9+
debug_trap;
10+
debug_tydesc;
11+
do_gc;
12+
last_os_error;
13+
rand_free;
14+
rand_new;
15+
rand_next;
16+
refcount;
17+
rust_file_is_dir;
18+
rust_get_stdin;
19+
rust_get_stdout;
20+
rust_run_program;
21+
rust_start;
22+
size_of;
23+
str_alloc;
24+
str_buf;
25+
str_byte_len;
26+
str_from_buf;
27+
str_from_cstr;
28+
str_from_vec;
29+
task_sleep;
30+
unsupervise;
31+
upcall_clone_chan;
32+
upcall_del_chan;
33+
upcall_del_port;
34+
upcall_exit;
35+
upcall_fail;
36+
upcall_flush_chan;
37+
upcall_free;
38+
upcall_get_type_desc;
39+
upcall_grow_task;
40+
upcall_join;
41+
upcall_kill;
42+
upcall_log_int;
43+
upcall_log_str;
44+
upcall_malloc;
45+
upcall_mark;
46+
upcall_new_chan;
47+
upcall_new_port;
48+
upcall_new_str;
49+
upcall_new_task;
50+
upcall_new_thread;
51+
upcall_new_vec;
52+
upcall_recv;
53+
upcall_require_c_sym;
54+
upcall_require_rust_sym;
55+
upcall_send;
56+
upcall_sleep;
57+
upcall_start_task;
58+
upcall_start_thread;
59+
upcall_trace_str;
60+
upcall_trace_word;
61+
upcall_vec_grow;
62+
upcall_yield;
63+
vec_alloc;
64+
vec_alloc_mut;
65+
vec_buf;
66+
vec_len;
67+
vec_len_set;
68+
vec_print_debug_info;
69+
}
70+

0 commit comments

Comments
 (0)