---

yaml
---
r: 1832
b: refs/heads/master
c: a2b9a7c
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c34ae9d8319c29413d9fb3339af8d26ad663f61
+refs/heads/master: a2b9a7ce8f1246e9d8b0d65ba3d989a2b2d25451

trunk/Makefile.in

@@ -31,32 +31,37 @@ ifeq ($(CFG_OSTYPE), FreeBSD)
   endif
   CFG_UNIXY := 1
   CFG_LDENV := LD_LIBRARY_PATH
+  CFG_DEF_SUFFIX := .bsd.def
 endif
 
 ifeq ($(CFG_OSTYPE), Linux)
   CFG_LIB_NAME=lib$(1).so
   CFG_GCC_CFLAGS += -fPIC -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
+  CFG_GCC_DEF_FLAG :=
   ifeq ($(CFG_CPUTYPE), x86_64)
     CFG_GCC_CFLAGS += -m32
     CFG_GCC_LINK_FLAGS += -m32
   endif
   CFG_UNIXY := 1
   CFG_LDENV := LD_LIBRARY_PATH
+  CFG_DEF_SUFFIX := .linux.def
 endif
 
 ifeq ($(CFG_OSTYPE), Darwin)
   CFG_LIB_NAME=lib$(1).dylib
   CFG_UNIXY := 1
   CFG_LDENV := DYLD_LIBRARY_PATH
   CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
+  CFG_GCC_DEF_FLAG := -exported_symbols_list
   # Darwin has a very blurry notion of "64 bit", and claims it's running
   # "on an i386" when the whole userspace is 64-bit and the compiler
   # emits 64-bit binaries by default. So we just force -m32 here. Smarter
   # approaches welcome!
   CFG_GCC_CFLAGS += -m32
   CFG_GCC_LINK_FLAGS += -m32
   CFG_DSYMUTIL := dsymutil
+  CFG_DEF_SUFFIX := .darwin.def
 endif
 
 ifneq ($(findstring MINGW,$(CFG_OSTYPE)),)
@@ -84,6 +89,7 @@ ifdef CFG_WINDOWSY
   endif
   CFG_GCC_CFLAGS += -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC
+  CFG_DEF_SUFFIX := .def
 endif
 
 ifdef CFG_UNIXY
@@ -141,16 +147,12 @@ ifdef CFG_GCC
   CFG_GCC_LINK_FLAGS += -g
   CFG_COMPILE_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -c -o $(1) $(2)
   CFG_DEPEND_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -MT "$(1)" -MM $(2)
+  CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) \
+               $(CFG_GCC_DEF_FLAG) $(3) $(2)
 else
   CFG_ERR := $(error please try on a system with gcc)
 endif
 
-ifdef CFG_WINDOWSY
-  CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(3) $(2)
-else
-  CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(2)
-endif
-
 ifdef CFG_OCAMLC_OPT
   $(info cfg: have ocaml native compiler)
   OPT=.opt
@@ -342,7 +344,7 @@ RUNTIME_HDR := rt/globals.h \
                rt/test/rust_test_runtime.h \
                rt/test/rust_test_util.h
 
-RUNTIME_DEF := $(S)src/rt/rustrt.def
+RUNTIME_DEF := $(S)src/rt/rustrt$(CFG_DEF_SUFFIX)
 RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
 
@@ -354,7 +356,7 @@ RUSTLLVM_CS := $(addprefix rustllvm/, \
                 MachOObjectFile.cpp Object.cpp RustWrapper.cpp)
 
 RUSTLLVM_HDR := rustllvm/include/llvm-c/Object.h
-RUSTLLVM_DEF := $(S)src/rustllvm/rustllvm.def
+RUSTLLVM_DEF := $(S)src/rustllvm/rustllvm$(CFG_DEF_SUFFIX)
 
 RUSTLLVM_INCS := -iquote $(CFG_LLVM_INCDIR) \
                  -iquote $(S)src/rustllvm/include

trunk/src/rt/rustrt.darwin.def

@@ -0,0 +1,68 @@
+_align_of
+_debug_box
+_debug_fn
+_debug_obj
+_debug_opaque
+_debug_ptrcast
+_debug_tag
+_debug_trap
+_debug_tydesc
+_do_gc
+_last_os_error
+_rand_free
+_rand_new
+_rand_next
+_refcount
+_rust_file_is_dir
+_rust_get_stdin
+_rust_get_stdout
+_rust_run_program
+_rust_start
+_size_of
+_str_alloc
+_str_buf
+_str_byte_len
+_str_from_buf
+_str_from_cstr
+_str_from_vec
+_task_sleep
+_unsupervise
+_upcall_clone_chan
+_upcall_del_chan
+_upcall_del_port
+_upcall_exit
+_upcall_fail
+_upcall_flush_chan
+_upcall_free
+_upcall_get_type_desc
+_upcall_grow_task
+_upcall_join
+_upcall_kill
+_upcall_log_int
+_upcall_log_str
+_upcall_malloc
+_upcall_mark
+_upcall_new_chan
+_upcall_new_port
+_upcall_new_str
+_upcall_new_task
+_upcall_new_thread
+_upcall_new_vec
+_upcall_recv
+_upcall_require_c_sym
+_upcall_require_rust_sym
+_upcall_send
+_upcall_sleep
+_upcall_start_task
+_upcall_start_thread
+_upcall_trace_str
+_upcall_trace_word
+_upcall_vec_grow
+_upcall_yield
+_vec_alloc
+_vec_alloc_mut
+_vec_buf
+_vec_len
+_vec_len_set
+_vec_print_debug_info
+