---

yaml
---
r: 13495
b: refs/heads/master
c: e5dea14
h: refs/heads/master
i:
  13493: 4d5c54e
  13491: 874e655
  13487: d7c8386
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a214e3abd23fa68e358ff4647aab6c34f91f3d9b
+refs/heads/master: e5dea1412223f8ed1389c385198bdbc4c5d454ea
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/Makefile.in

@@ -55,10 +55,6 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) \
 
 include config.mk
 
-# We track all of the object files we might build so that we can find
-# and include all of the .d files in one fell swoop.
-ALL_OBJ_FILES :=
-
 MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)
 NON_HOST_TRIPLES = $(filter-out $(CFG_HOST_TRIPLE),$(CFG_TARGET_TRIPLES))
 
@@ -531,8 +527,3 @@ ifneq ($(strip $(findstring TAGS.emacs,$(MAKECMDGOALS)) \
   CFG_INFO := $(info cfg: including ctags rules)
   include $(CFG_SRC_DIR)mk/ctags.mk
 endif
-
-# Find all of the .d files and include them to add information about
-# header file dependencies.
-ALL_DEP_FILES := $(ALL_OBJ_FILES:%.o=%.d)
--include $(ALL_DEP_FILES)

trunk/mk/platform.mk

@@ -210,20 +210,18 @@ ifeq ($(CFG_C_COMPILER),clang)
     CXX=clang++
   endif
   ifeq ($(origin CPP),default)
-    CPP=clang -E
+    CPP=cpp
   endif
   CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
   CFG_GCCISH_LINK_FLAGS += -g
-  # These flags will cause the compiler to produce a .d file
-  # next to the .o file that lists header deps.
-  CFG_DEPEND_FLAGS = -MMD -MP -MT $(1) -MF $(1:%.o=%.d)
+  CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
+    -MM $(2)
 
   define CFG_MAKE_CC
 	CFG_COMPILE_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX)	\
 		$$(CFG_GCCISH_CFLAGS) $$(CFG_CLANG_CFLAGS)		\
 		$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1)))				\
 	    $$(CFG_CLANG_CFLAGS_$$(HOST_$(1)))				\
-        $$(CFG_DEPEND_FLAGS)                            \
 		-c -o $$(1) $$(2)
     CFG_LINK_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX)	\
 		$$(CFG_GCCISH_LINK_FLAGS) -o $$(1)			\
@@ -243,21 +241,19 @@ ifeq ($(CFG_C_COMPILER),gcc)
     CXX=g++
   endif
   ifeq ($(origin CPP),default)
-    CPP=gcc -E
+    CPP=cpp
   endif
   CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
   CFG_GCCISH_LINK_FLAGS += -g
-  # These flags will cause the compiler to produce a .d file
-  # next to the .o file that lists header deps.
-  CFG_DEPEND_FLAGS = -MMD -MP -MT $(1) -MF $(1:%.o=%.d)
+  CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
+    -MM $(2)
 
   define CFG_MAKE_CC
 	CFG_COMPILE_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX)	\
         $$(CFG_GCCISH_CFLAGS)							\
 	    $$(CFG_GCCISH_CFLAGS_$$(HOST_$(1)))				\
         $$(CFG_GCC_CFLAGS)								\
         $$(CFG_GCC_CFLAGS_$$(HOST_$(1)))				\
-        $$(CFG_DEPEND_FLAGS)                            \
         -c -o $$(1) $$(2)
     CFG_LINK_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX)	\
         $$(CFG_GCCISH_LINK_FLAGS) -o $$(1)			\
@@ -276,7 +272,7 @@ endif
 # We're using llvm-mc as our assembler because it supports
 # .cfi pseudo-ops on mac
 define CFG_MAKE_ASSEMBLER
-  CFG_ASSEMBLE_$(1)=$$(CPP) $$(CFG_DEPEND_FLAGS) $$(2) | \
+  CFG_ASSEMBLE_$(1)=$$(CPP) $$(2) | \
                     $$(LLVM_MC_$$(CFG_HOST_TRIPLE)) \
                     -assemble \
                     -filetype=obj \

trunk/mk/rt.mk

@@ -79,6 +79,17 @@ RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
                   rt/arch/$$(HOST_$(1))/ccall.S \
                   rt/arch/$$(HOST_$(1))/record_sp.S
 
+RUNTIME_HDR_$(1) := $$(wildcard \
+                       rt/*.h \
+                       rt/bigint/*.h \
+                       rt/isaac/*.h \
+                       rt/msvc/*.h \
+                       rt/sync/*.h \
+                       rt/uthash/*.h \
+                       rt/util/*.h \
+                       rt/vg/*.h \
+                       rt/arch/$$(HOST_$(1))/*.h)
+
 ifeq ($$(HOST_$(1)), i386)
   LIBUV_ARCH_$(1) := ia32
 else
@@ -105,28 +116,25 @@ RUNTIME_INCS_$(1) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
 				-I $$(S)src/libuv/include
 RUNTIME_OBJS_$(1) := $$(RUNTIME_CS_$(1):rt/%.cpp=rt/$(1)/%.o) \
                      $$(RUNTIME_S_$(1):rt/%.S=rt/$(1)/%.o)
-ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1))
-
-MORESTACK_OBJ_$(1) := rt/$(1)/arch/$$(HOST_$(1))/morestack.o
-ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1))
-
 RUNTIME_LIBS_$(1) := $$(LIBUV_LIB_$(1))
 
-rt/$(1)/%.o: rt/%.cpp $$(MKFILE_DEPS)
+rt/$(1)/%.o: rt/%.cpp $$(RUNTIME_HDR_$(1)) $$(MKFILE_DEPS)
 	@$$(call E, compile: $$@)
 	$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(RUNTIME_INCS_$(1)) \
                  $$(SNAP_DEFINES)) $$<
 
-rt/$(1)/%.o: rt/%.S  $$(MKFILE_DEPS) \
+rt/$(1)/%.o: rt/%.S  $$(RUNTIME_HDR_$(1)) $$(MKFILE_DEPS) \
                      $$(LLVM_CONFIG_$$(CFG_HOST_TRIPLE))
 	@$$(call E, compile: $$@)
 	$$(Q)$$(call CFG_ASSEMBLE_$(1),$$@,$$<)
 
-rt/$(1)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1))
+rt/$(1)/arch/$$(HOST_$(1))/libmorestack.a: \
+		rt/$(1)/arch/$$(HOST_$(1))/morestack.o
 	@$$(call E, link: $$@)
 	$$(Q)ar rcs $$@ $$<
 
 rt/$(1)/$(CFG_RUNTIME): $$(RUNTIME_OBJS_$(1)) $$(MKFILE_DEPS) \
+                        $$(RUNTIME_HDR_$(1)) \
                         $$(RUNTIME_DEF_$(1)) \
                         $$(RUNTIME_LIBS_$(1))
 	@$$(call E, link: $$@)

trunk/mk/rustllvm.mk

@@ -20,7 +20,6 @@ RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \
                      -iquote $$(LLVM_INCDIR_$(1)) \
                      -iquote $$(S)src/rustllvm/include
 RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=rustllvm/$(1)/%.o)
-ALL_OBJ_FILES += $$(RUSTLLVM_OBJS_OBJS_$(1))
 
 rustllvm/$(1)/$(CFG_RUSTLLVM): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
                           $$(MKFILE_DEPS) $$(RUSTLLVM_DEF_$(1))

trunk/src/libcore/dvec.rs

@@ -129,7 +129,7 @@ impl extensions<A> for dvec<A> {
     #[doc = "Overwrite the current contents"]
     fn set(+w: [mut A]) {
         self.check_not_borrowed();
-        self.data <- w; //FIXME check for recursive use (#2607)
+        self.data <- w; //FIXME check for recursive use
     }
 }
 
@@ -177,28 +177,25 @@ impl extensions<A:copy> for dvec<A> {
         }
     }
 
-    #[doc = "
-        Append all elements of an iterable.
-
-        Failure will occur if the iterable's `each()` method
-        attempts to access this vector.
-    "]
-    fn append_iter<A, I:iter::base_iter<A>>(ts: I) {
-       self.swap { |v|
-           let mut v = alt ts.size_hint() {
-             none { v }
-             some(h) {
-               let len = v.len() + h;
-               let mut v <- v;
-               vec::reserve(v, len);
-               v
-            }
-           };
-
-           for ts.each { |t| v += [t] };
-           v
-        }
-    }
+    //FIXME--
+    //#[doc = "
+    //    Append all elements of an iterable.
+    //
+    //    Failure will occur if the iterable's `each()` method
+    //    attempts to access this vector.
+    //"]
+    //fn append_iter<I:iter::base<A>>(ts: I) {
+    //    self.data.swap { |v|
+    //        alt ts.size_hint() {
+    //          none {}
+    //          some(h) { vec::reserve(v, len(v) + h) }
+    //        }
+    //
+    //        for ts.each { |t| v = v + [t] };
+    //
+    //        v
+    //    }
+    //}
 
     #[doc = "
         Gets a copy of the current contents.

trunk/src/libcore/float.rs

@@ -109,7 +109,7 @@ fn to_str_common(num: float, digits: uint, exact: bool) -> str {
     // stack of digits
     let mut fractionalParts = [];
 
-    // FIXME: (#2608)
+    // FIXME:
     // This used to return right away without rounding, as "[-]num",
     // but given epsilon like in f64.rs, I don't see how the comparison
     // to epsilon did much when only used there.

trunk/src/libcore/int-template.rs

@@ -137,7 +137,7 @@ impl num of num::num for T {
 }
 
 
-// FIXME: Has alignment issues on windows and 32-bit linux (#2609)
+// FIXME: Has alignment issues on windows and 32-bit linux
 #[test]
 #[ignore]
 fn test_from_str() {
@@ -157,7 +157,7 @@ fn test_from_str() {
     assert from_str("x") == none;
 }
 
-// FIXME: Has alignment issues on windows and 32-bit linux (#2609)
+// FIXME: Has alignment issues on windows and 32-bit linux
 #[test]
 #[ignore]
 fn test_parse_buf() {

trunk/src/libcore/iter-trait.rs

@@ -25,7 +25,7 @@ impl extensions<A:copy> for IMPL_T<A> {
     fn map_to_vec<B>(op: fn(A) -> B) -> [B] { iter::map_to_vec(self, op) }
     fn to_vec() -> [A] { iter::to_vec(self) }
 
-    // FIXME--bug in resolve prevents this from working (#2611)
+    // FIXME--bug in resolve prevents this from working
     // fn flat_map_to_vec<B:copy,IB:base_iter<B>>(op: fn(A) -> IB) -> [B] {
     //     iter::flat_map_to_vec(self, op)
     // }

trunk/src/libcore/num.rs

@@ -1,8 +1,8 @@
 #[doc="An interface for numbers."]
 
 iface num {
-    // FIXME: Cross-crate overloading doesn't work yet. (#2615)
-    // FIXME: Interface inheritance. (#2616)
+    // FIXME: Cross-crate overloading doesn't work yet.
+    // FIXME: Interface inheritance.
     fn add(&&other: self) -> self;
     fn sub(&&other: self) -> self;
     fn mul(&&other: self) -> self;

trunk/src/libcore/os.rs

@@ -36,7 +36,7 @@ export last_os_error;
 export set_exit_status;
 export walk_dir;
 
-// FIXME: move these to str perhaps? #2620
+// FIXME: move these to str perhaps?
 export as_c_charp, fill_charp_buf;
 
 native mod rustrt {
@@ -86,7 +86,7 @@ mod win32 {
     fn fill_utf16_buf_and_decode(f: fn(*mut u16, dword) -> dword)
         -> option<str> {
 
-        // FIXME: remove these when export globs work properly. #1238
+        // FIXME: remove these when export globs work properly.
         import libc::funcs::extra::kernel32::*;
         import libc::consts::os::extra::*;
 
@@ -167,7 +167,7 @@ mod global_env {
                 sched:  some({
                     mode: task::single_threaded,
                     // FIXME: This would be a good place to use
-                    // a very small native stack (#2621)
+                    // a very small native stack
                     native_stack_size: none
                 })
                 with task::get_opts(builder)
@@ -227,7 +227,7 @@ mod global_env {
         #[cfg(unix)]
         fn setenv(n: str, v: str) {
 
-            // FIXME: remove this when export globs work properly. #1238
+            // FIXME: remove this when export globs work properly.
             import libc::funcs::posix01::unistd::setenv;
             str::as_c_str(n) {|nbuf|
                 str::as_c_str(v) {|vbuf|
@@ -239,7 +239,7 @@ mod global_env {
 
         #[cfg(windows)]
         fn setenv(n: str, v: str) {
-            // FIXME: remove imports when export globs work properly. #1238
+            // FIXME: remove imports when export globs work properly.
             import libc::funcs::extra::kernel32::*;
             import win32::*;
             as_utf16_p(n) {|nbuf|
@@ -329,7 +329,7 @@ fn pipe() -> {in: c_int, out: c_int} {
 
 #[cfg(windows)]
 fn pipe() -> {in: c_int, out: c_int} {
-    // FIXME: remove this when export globs work properly. #1238
+    // FIXME: remove this when export globs work properly.
     import libc::consts::os::extra::*;
     // Windows pipes work subtly differently than unix pipes, and their
     // inheritance has to be handled in a different way that I do not fully
@@ -387,7 +387,7 @@ fn self_exe_path() -> option<path> {
 
     #[cfg(target_os = "macos")]
     fn load_self() -> option<path> unsafe {
-        // FIXME: remove imports when export globs work properly. #1238
+        // FIXME: remove imports when export globs work properly.
         import libc::funcs::extra::*;
         fill_charp_buf() {|buf, sz|
             _NSGetExecutablePath(buf, ptr::mut_addr_of(sz as u32))
@@ -397,7 +397,7 @@ fn self_exe_path() -> option<path> {
 
     #[cfg(windows)]
     fn load_self() -> option<path> unsafe {
-        // FIXME: remove imports when export globs work properly. #1238
+        // FIXME: remove imports when export globs work properly.
         import libc::types::os::arch::extra::*;
         import libc::funcs::extra::kernel32::*;
         import win32::*;
@@ -500,7 +500,7 @@ fn path_exists(p: path) -> bool {
 }
 
 // FIXME: under Windows, we should prepend the current drive letter to paths
-// that start with a slash. #2622
+// that start with a slash.
 #[doc = "
 Convert a relative path to an absolute path
 
@@ -526,11 +526,11 @@ fn make_dir(p: path, mode: c_int) -> bool {
 
     #[cfg(windows)]
     fn mkdir(p: path, _mode: c_int) -> bool unsafe {
-        // FIXME: remove imports when export globs work properly. #1238
+        // FIXME: remove imports when export globs work properly.
         import libc::types::os::arch::extra::*;
         import libc::funcs::extra::kernel32::*;
         import win32::*;
-        // FIXME: turn mode into something useful? #2623
+        // FIXME: turn mode into something useful?
         as_utf16_p(p) {|buf|
             CreateDirectoryW(buf, unsafe::reinterpret_cast(0))
                 != (0 as BOOL)
@@ -588,7 +588,7 @@ fn remove_dir(p: path) -> bool {
 
     #[cfg(windows)]
     fn rmdir(p: path) -> bool {
-        // FIXME: remove imports when export globs work properly. #1238
+        // FIXME: remove imports when export globs work properly.
         import libc::funcs::extra::kernel32::*;
         import libc::types::os::arch::extra::*;
         import win32::*;
@@ -610,7 +610,7 @@ fn change_dir(p: path) -> bool {
 
     #[cfg(windows)]
     fn chdir(p: path) -> bool {
-        // FIXME: remove imports when export globs work properly. #1238
+        // FIXME: remove imports when export globs work properly.
         import libc::funcs::extra::kernel32::*;
         import libc::types::os::arch::extra::*;
         import win32::*;
@@ -633,7 +633,7 @@ fn copy_file(from: path, to: path) -> bool {
 
     #[cfg(windows)]
     fn do_copy_file(from: path, to: path) -> bool {
-        // FIXME: remove imports when export globs work properly. #1238
+        // FIXME: remove imports when export globs work properly.
         import libc::funcs::extra::kernel32::*;
         import libc::types::os::arch::extra::*;
         import win32::*;