---

yaml
---
r: 6782
b: refs/heads/master
c: f8d06a2
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 648b69d69229a0a82f09a494a81444a38ba87333
+refs/heads/master: f8d06a2a84bd92ff5b32eb5182f48a33fd348bc6

trunk/LICENSE.txt

@@ -223,9 +223,32 @@ included:
   details.
 
 
+* Additional copyright may be retained by contributors other
+  than Mozilla or the parties enumerated in this file. Such
+  copyright can be determined on a case-by-case basis by
+  examining the author of each portion of a file in the
+  revision-control commit records of the project, or by
+  consulting representative comments claiming copyright
+  ownership for a file.
+
+   For example, the text:
+
+      "Copyright (c) 2011 Google Inc."
+
+   appears in some files, and these files thereby denote
+   that their author and copyright-holder is Google Inc.
+
+   In all such cases, the absence of explicit licensing text
+   indicates that the contributor chose to license their
+   work for distribution under identical terms to those
+   Mozilla has chosen for the collective work, enumerated
+   below.  The only difference is the retention of copyright
+   itself, held by the contributor.
+
+
 The remaining code and documentation in the collective work
 presented here, as well as the collective work itslf, is
-distributed under the following terms:
+distributed under the following terms ("The Rust License"):
 
     Copyright (c) 2006-2011 Graydon Hoare
     Copyright (c) 2009-2011 Mozilla Foundation

trunk/Makefile.in

@@ -289,19 +289,31 @@ ifdef CFG_DISABLE_SHAREDSTD
     $$(HLIB$(1)_H_$(3))/libcore.rlib
   TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/libcore.rlib
+
   HSTDLIB_DEFAULT$(1)_H_$(3) = \
     $$(HLIB$(1)_H_$(3))/libstd.rlib
   TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
+
+  HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
+    $$(HLIB$(1)_H_$(3))/librustc.rlib
+  TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
+    $$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
 else
   HCORELIB_DEFAULT$(1)_H_$(3) = \
     $$(HLIB$(1)_H_$(3))/$(CFG_CORELIB)
   TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
+
   HSTDLIB_DEFAULT$(1)_H_$(3) = \
     $$(HLIB$(1)_H_$(3))/$(CFG_STDLIB)
   TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
     $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
+
+  HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
+    $$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC)
+  TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
+    $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
 endif
 
 # Preqrequisites for using the stageN compiler
@@ -311,6 +323,7 @@ HSREQ$(1)_H_$(3) = \
 	$$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLLVM) \
 	$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
 	$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
+	$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
 	$$(MKFILE_DEPS)
 
 # Prerequisites for using the stageN compiler to build target artifacts
@@ -324,7 +337,8 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
 SREQ$(1)_T_$(2)_H_$(3) = \
 	$$(TSREQ$(1)_T_$(2)_H_$(3)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
-	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
+	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)  \
+	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
 
 ifeq ($(1),0)
 # Don't run the the stage0 compiler under valgrind - that ship has sailed

trunk/doc/tutorial/ffi.md

@@ -189,7 +189,7 @@ microsecond-resolution timer.
     use std;
     type timeval = {mutable tv_sec: u32,
                     mutable tv_usec: u32};
-    #[link_name = ""]
+    #[nolink]
     native mod libc {
         fn gettimeofday(tv: *timeval, tz: *()) -> i32;
     }
@@ -199,7 +199,7 @@ microsecond-resolution timer.
         ret (x.tv_sec as u64) * 1000_000_u64 + (x.tv_usec as u64);
     }
 
-The `#[link_name = ""]` sets the name of the native module to the
+The `#[nolink]` sets the name of the native module to the
 empty string to prevent the rust compiler from trying to link it.
 The standard C library is already linked with Rust programs.
 

trunk/mk/host.mk

@@ -68,6 +68,14 @@ $$(HLIB$(2)_H_$(4))/libstd.rlib: \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
+$$(HLIB$(2)_H_$(4))/librustc.rlib: \
+	$$(TLIB$(1)_T_$(4)_H_$(3))/librustc.rlib \
+	$$(HLIB$(2)_H_$(4))/libcore.rlib \
+	$$(HLIB$(2)_H_$(4))/libstd.rlib \
+	$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$< $$@
+
 $$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM): \
 	$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)

trunk/mk/install.mk

@@ -40,6 +40,8 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB))
 	$$(Q)$$(call INSTALL_LIB, \
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
+	$$(Q)$$(call INSTALL_LIB, \
+		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),intrinsics.bc)
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
 endef
@@ -66,9 +68,11 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
 	$(Q)mkdir -p $(PREFIX_LIB)
 	$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
 	$(Q)$(call INSTALL,$(HB),$(PHB),rustc$(X))
+	$(Q)$(call INSTALL,$(HB),$(PHB),cargo$(X))
 	$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
+	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
 	$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
 	$(Q)$(call INSTALL,$(S)/man, \
 	     $(PREFIX_ROOT)/share/man/man1,rustc.1)

trunk/mk/stage0.mk

@@ -21,6 +21,10 @@ $(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_STDLIB): \
 		$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
 	$(Q)touch $@
 
+$(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_LIBRUSTC): \
+		$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
+	$(Q)touch $@
+
 $(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_RUSTLLVM): \
 		$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
 	$(Q)touch $@
@@ -52,6 +56,11 @@ $$(HLIB0_H_$(1))/$(CFG_STDLIB): \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$$(STDLIB_GLOB) $$@
 
+$$(HLIB0_H_$(1))/$(CFG_LIBRUSTC): \
+		$$(TLIB$(2)_T_$(1)_H_$(3))/$$(CFG_LIBRUSTC)
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$$(LIBRUSTC_GLOB) $$@
+
 $$(HLIB0_H_$(1))/$(CFG_RUSTLLVM): \
 		$$(TLIB$(2)_T_$(1)_H_$(3))/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)

trunk/mk/target.mk

@@ -49,14 +49,17 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
 		$$(TSREQ$(1)_T_$(2)_H_$(3))					\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
-		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
+		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
+		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))       \
+		$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3))  -o $$@ $$<
 
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC):		\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
 		$$(TSREQ$(1)_T_$(2)_H_$(3))					\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
+		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
 		$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3))  --lib -o $$@ $$< && touch $$@

trunk/src/comp/metadata/creader.rs

@@ -57,18 +57,31 @@ fn visit_item(e: env, i: @ast::item) {
           }
           either::left(msg) { e.sess.span_fatal(i.span, msg); }
         }
+
         let cstore = e.sess.get_cstore();
         let native_name = i.ident;
-        alt attr::get_meta_item_value_str_by_name(i.attrs, "link_name") {
-          some(nn) { native_name = nn; }
-          none. { }
+        let already_added = false;
+        if vec::len(attr::find_attrs_by_name(i.attrs, "nolink")) == 0u {
+            alt attr::get_meta_item_value_str_by_name(i.attrs, "link_name") {
+              some(nn) { native_name = nn; }
+              none. { }
+            }
+            if native_name == "" {
+                e.sess.span_fatal(i.span,
+                    "empty #[link_name] not allowed; use #[nolink].");
+            }
+            already_added = !cstore::add_used_library(cstore, native_name);
         }
-        if !cstore::add_used_library(cstore, native_name) { ret; }
-        for a: ast::attribute in
-            attr::find_attrs_by_name(i.attrs, "link_args") {
-
+        let link_args = attr::find_attrs_by_name(i.attrs, "link_args");
+        if vec::len(link_args) > 0u && already_added {
+            e.sess.span_fatal(i.span, "library '" + native_name +
+                              "' already added: can't specify link_args.");
+        }
+        for a: ast::attribute in link_args {
             alt attr::get_meta_item_value_str(attr::attr_meta(a)) {
-              some(linkarg) { cstore::add_used_link_args(cstore, linkarg); }
+              some(linkarg) {
+                cstore::add_used_link_args(cstore, linkarg);
+              }
               none. {/* fallthrough */ }
             }
         }

trunk/src/comp/metadata/cstore.rs

@@ -90,10 +90,9 @@ fn get_used_crate_files(cstore: cstore) -> [str] {
 }
 
 fn add_used_library(cstore: cstore, lib: str) -> bool {
-    if lib == "" { ret false; }
+    assert lib != "";
 
     if vec::member(lib, p(cstore).used_libraries) { ret false; }
-
     p(cstore).used_libraries += [lib];
     ret true;
 }

trunk/src/etc/snapshot.py

@@ -17,18 +17,24 @@ def scrub(b):
 
 snapshot_files = {
     "linux": ["bin/rustc",
+              "bin/cargo",
               "lib/libcore-*.so",
               "lib/libstd-*.so",
+              "lib/librustc-*.so",
               "lib/librustrt.so",
               "lib/librustllvm.so"],
     "macos": ["bin/rustc",
+              "bin/cargo",
               "lib/libcore-*.dylib",
               "lib/libstd-*.dylib",
+              "lib/librustc-*.dylib",
               "lib/librustrt.dylib",
               "lib/librustllvm.dylib"],
     "winnt": ["bin/rustc.exe",
+              "bin/cargo.exe",
               "lib/core-*.dll",
               "lib/std-*.dll",
+              "lib/rustc-*.dll",
               "lib/rustrt.dll",
               "lib/rustllvm.dll"]
     }

trunk/src/libstd/linux_os.rs

@@ -24,7 +24,8 @@ export fsync_fd;
 // FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
 // by https://github.com/graydon/rust/issues#issue/268
 
-#[link_name = ""]
+#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
+#[nolink]
 #[abi = "cdecl"]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;

trunk/src/libstd/macos_os.rs

@@ -18,7 +18,8 @@ export fsync_fd;
 // FIXME Refactor into unix_os module or some such. Doesn't
 // seem to work right now.
 
-#[link_name = ""]
+#[link_name = ""] // FIXME: Remove after snapshotting
+#[nolink]
 #[abi = "cdecl"]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;
@@ -118,7 +119,8 @@ native mod rustrt {
 
 fn getcwd() -> str { ret rustrt::rust_getcwd(); }
 
-#[link_name = ""]
+#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
+#[nolink]
 #[abi = "cdecl"]
 native mod mac_libc {
     fn _NSGetExecutablePath(buf: str::sbuf,

trunk/src/libstd/win32_os.rs

@@ -2,7 +2,8 @@ import core::option;
 import ctypes::*;
 
 #[abi = "cdecl"]
-#[link_name = ""]
+#[link_name = ""]               // FIXME remove after #[nolink] is snapshotted
+#[nolink]
 native mod libc {
     fn read(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;
     fn write(fd: fd_t, buf: *u8, count: size_t) -> ssize_t;

trunk/src/rt/arch/i386/morestack.S

@@ -62,11 +62,19 @@ MORESTACK:
 #endif
 
 	// NB: This can be called with the fastcc convention so we
-	// have to preserve any argument registers we want to use
+	// have to preserve any argument registers
+
+	// NB: __morestack is called misaligned by 4 bytes, i.e.
+	// subl $4, %esp would get us to a normal alignment
+
+	subl $44,%esp
+
+	// Save fastcc arguments
+	movl %ecx, 28(%esp)
+	movl %edx, 24(%esp)
 
 	// FIXME (1226): main is compiled with the split-stack prologue,
 	// causing it to call __morestack, so we have to jump back out
-	subl $28,%esp
 	calll RUST_GET_TASK
 	testl %eax,%eax
 	jz .L$bail
@@ -85,13 +93,13 @@ MORESTACK:
 	// for the unwinder
 	leal 20(%ebp), %eax
 	movl %eax, -4(%ebp)
-	
+
 	// The arguments to rust_new_stack2
-	movl 40(%esp),%eax  // Size of stack arguments
+	movl 56(%esp),%eax  // Size of stack arguments
 	movl %eax,20(%esp)
-	leal 48(%esp),%eax // Address of stack arguments
+	leal 64(%esp),%eax // Address of stack arguments
 	movl %eax,16(%esp)
-	movl 36(%esp),%eax // The amount of stack needed
+	movl 52(%esp),%eax // The amount of stack needed
 	movl %eax,12(%esp)
 	movl $0, 8(%esp)   // Out pointer
 
@@ -108,19 +116,25 @@ MORESTACK:
 	movl %eax,(%esp)
 	call UPCALL_CALL_C
 
-	movl 32(%esp),%eax          // Grab the return pointer.
+	movl 48(%esp),%eax          // Grab the return pointer.
 	inc  %eax    // Skip past the ret instruction in the parent fn
 
+	// Restore fastcc arguments
+	movl 28(%esp), %ecx
+	movl 24(%esp), %edx
+
 	movl 8(%esp),%esp          // Switch stacks.
-	call *%eax             // Re-enter the function that called us.
+	call *%eax                 // Re-enter the function that called us.
 
 	// Now the function that called us has returned, so we need to delete the
 	// old stack space.
 
 	// Switch back to the rust stack
 	movl %ebp, %esp
 
-	subl $8, %esp // Alignment
+	// Remember that __morestack is called misaligned so %ebp
+	// is not aligned to a 16-byte boundary, these 4 bytes realign.
+	subl $4, %esp
 
 	// Now that we're on the return path we want to avoid
 	// stomping on %eax. FIXME: Need to save and restore
@@ -137,7 +151,7 @@ MORESTACK:
 	pushl $0
 	call UPCALL_CALL_C
 
-	addl $16,%esp
+	addl $12,%esp
 
 	popl %ebp
 #if defined(__linux__) || defined(__APPLE__)
@@ -150,7 +164,7 @@ MORESTACK:
 	movl 32(%esp),%eax
 	inc %eax
 
-	addl $28, %esp
+	addl $44, %esp
 	popl %ebp
 	addl $4+8,%esp