From 3473ff3bff2ed2286080812417068552d6b9df31 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 7 Mar 2011 18:03:33 -0800
Subject: rustc: Cast dynamically-sized tags in iter_structural_ty_full() to
 opaque tag types. Un-XFAIL generic-recursive-tag.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 8855a2d1..a239329f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -453,7 +453,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         foreach-simple-outer-slot.rs \
                         generic-fn-twice.rs \
                         generic-iter-frame.rs \
-                        generic-recursive-tag.rs \
                         generic-tag-alt.rs \
                         generic-tag-values.rs \
                         iter-range.rs \
-- 
cgit v1.2.3


From 55c80e763bfd850682b3217fcfc5cdb516eafae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Tue, 8 Mar 2011 15:32:42 -0500
Subject: Move the glue asm code to a .o file. This reduces how much asm we
 print in each "translation unit".

---
 src/Makefile | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index a239329f..cafd8d18 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -90,6 +90,7 @@ ifdef CFG_WINDOWSY
   CFG_EXE_SUFFIX := .exe
   CFG_BOOT := ./rustboot.exe
   CFG_RUSTC := ./rustc.exe
+  CFG_GLUE := ./glue.exe
   CFG_GCC_CFLAGS += -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC
   CFG_RUN_TARG = $(1)
@@ -101,6 +102,7 @@ ifdef CFG_UNIXY
   CFG_INFO := $(info cfg: unix-y environment)
   CFG_BOOT := ./rustboot
   CFG_RUSTC := ./rustc
+  CFG_GLUE := ./glue
   CFG_OBJ_SUFFIX := .o
   CFG_RUN_TARG = LD_LIBRARY_PATH=. $(CFG_VALGRIND) $(1)
   CFG_GCC := 1
@@ -111,6 +113,7 @@ ifdef CFG_UNIXY
     CFG_RUNTIME := rustrt.dll
     CFG_STDLIB := std.dll
     CFG_RUSTC := ./rustc.exe
+    CFG_GLUE := ./glue
     ifdef CFG_VALGRIND
       CFG_VALGRIND += wine
     endif
@@ -308,11 +311,13 @@ RUNTIME_LIBS := $(CFG_RUNTIME_LIBS)
 STDLIB_CRATE := lib/std.rc
 STDLIB_INPUTS := $(wildcard lib/*.rc lib/*.rs lib/*/*.rs)
 COMPILER_CRATE := comp/rustc.rc
-COMPILER_INPUTS := $(wildcard comp/*.rc comp/*.rs comp/*/*.rs)
+COMPILER_INPUTS := $(wildcard comp/rustc.rc comp/*.rs comp/*/*.rs)
+GLUE_CRATE := comp/glue.rc
+GLUE_INPUTS := $(wildcard comp/glue.rc comp/*.rs comp/*/*.rs)
 
 GENERATED := boot/fe/lexer.ml boot/util/version.ml
 
-all: $(CFG_RUSTC) $(MKFILES) $(GENERATED)
+all: $(CFG_RUSTC) $(CFG_GLUE) $(MKFILES) $(GENERATED) glue.o
 
 boot/util/version.ml: Makefile
 	$(CFG_QUIET)git log -1 \
@@ -368,6 +373,16 @@ $(CFG_RUSTC): $(COMPILER_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
 	$(BOOT) -minimal -o $@ $<
 	$(CFG_QUIET)chmod 0755 $@
 
+$(CFG_GLUE): $(GLUE_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
+	@$(call CFG_ECHO, compile: $<)
+	$(BOOT) -minimal -o $@ $<
+	$(CFG_QUIET)chmod 0755 $@
+
+glue.o: glue.s
+
+glue.s: $(CFG_GLUE)
+	$(CFG_GLUE) > $@
+
 self: $(CFG_RUSTC)
 	@$(call CFG_ECHO, compile: $<)
 	$(RUSTC) $(COMPILER_CRATE)
@@ -763,9 +778,9 @@ test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \
 	@$(call CFG_ECHO, assemble [llvm]: $<)
 	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) -o $@ -c $<
 
-%.rustc$(CFG_EXE_SUFFIX): %.o $(CFG_RUNTIME)
+%.rustc$(CFG_EXE_SUFFIX): %.o $(CFG_RUNTIME) glue.o
 	@$(call CFG_ECHO, link [llvm]: $<)
-	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) -o $@ $< -L. -lrustrt
+	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) glue.o -o $@ $< -L. -lrustrt
 	@# dsymutil sometimes fails or prints a warning, but the
 	@# program still runs.  Since it simplifies debugging other
 	@# programs, I\'ll live with the noise.
-- 
cgit v1.2.3


From 27547c6514cf4f358ef2c8d935bd296eb0312ac1 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 8 Mar 2011 13:20:16 -0800
Subject: Revert "Move the glue asm code to a .o file. This reduces how much
 asm we print"

This reverts commit 55c80e763bfd850682b3217fcfc5cdb516eafae0.
---
 src/Makefile | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index cafd8d18..a239329f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -90,7 +90,6 @@ ifdef CFG_WINDOWSY
   CFG_EXE_SUFFIX := .exe
   CFG_BOOT := ./rustboot.exe
   CFG_RUSTC := ./rustc.exe
-  CFG_GLUE := ./glue.exe
   CFG_GCC_CFLAGS += -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC
   CFG_RUN_TARG = $(1)
@@ -102,7 +101,6 @@ ifdef CFG_UNIXY
   CFG_INFO := $(info cfg: unix-y environment)
   CFG_BOOT := ./rustboot
   CFG_RUSTC := ./rustc
-  CFG_GLUE := ./glue
   CFG_OBJ_SUFFIX := .o
   CFG_RUN_TARG = LD_LIBRARY_PATH=. $(CFG_VALGRIND) $(1)
   CFG_GCC := 1
@@ -113,7 +111,6 @@ ifdef CFG_UNIXY
     CFG_RUNTIME := rustrt.dll
     CFG_STDLIB := std.dll
     CFG_RUSTC := ./rustc.exe
-    CFG_GLUE := ./glue
     ifdef CFG_VALGRIND
       CFG_VALGRIND += wine
     endif
@@ -311,13 +308,11 @@ RUNTIME_LIBS := $(CFG_RUNTIME_LIBS)
 STDLIB_CRATE := lib/std.rc
 STDLIB_INPUTS := $(wildcard lib/*.rc lib/*.rs lib/*/*.rs)
 COMPILER_CRATE := comp/rustc.rc
-COMPILER_INPUTS := $(wildcard comp/rustc.rc comp/*.rs comp/*/*.rs)
-GLUE_CRATE := comp/glue.rc
-GLUE_INPUTS := $(wildcard comp/glue.rc comp/*.rs comp/*/*.rs)
+COMPILER_INPUTS := $(wildcard comp/*.rc comp/*.rs comp/*/*.rs)
 
 GENERATED := boot/fe/lexer.ml boot/util/version.ml
 
-all: $(CFG_RUSTC) $(CFG_GLUE) $(MKFILES) $(GENERATED) glue.o
+all: $(CFG_RUSTC) $(MKFILES) $(GENERATED)
 
 boot/util/version.ml: Makefile
 	$(CFG_QUIET)git log -1 \
@@ -373,16 +368,6 @@ $(CFG_RUSTC): $(COMPILER_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
 	$(BOOT) -minimal -o $@ $<
 	$(CFG_QUIET)chmod 0755 $@
 
-$(CFG_GLUE): $(GLUE_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
-	@$(call CFG_ECHO, compile: $<)
-	$(BOOT) -minimal -o $@ $<
-	$(CFG_QUIET)chmod 0755 $@
-
-glue.o: glue.s
-
-glue.s: $(CFG_GLUE)
-	$(CFG_GLUE) > $@
-
 self: $(CFG_RUSTC)
 	@$(call CFG_ECHO, compile: $<)
 	$(RUSTC) $(COMPILER_CRATE)
@@ -778,9 +763,9 @@ test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \
 	@$(call CFG_ECHO, assemble [llvm]: $<)
 	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) -o $@ -c $<
 
-%.rustc$(CFG_EXE_SUFFIX): %.o $(CFG_RUNTIME) glue.o
+%.rustc$(CFG_EXE_SUFFIX): %.o $(CFG_RUNTIME)
 	@$(call CFG_ECHO, link [llvm]: $<)
-	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) glue.o -o $@ $< -L. -lrustrt
+	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) -o $@ $< -L. -lrustrt
 	@# dsymutil sometimes fails or prints a warning, but the
 	@# program still runs.  Since it simplifies debugging other
 	@# programs, I\'ll live with the noise.
-- 
cgit v1.2.3


From 16344a0145555448fc202a2bb8eebd2477dc10b2 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 8 Mar 2011 14:50:03 -0800
Subject: rustc: Re-XFAIL rec-extend.rs. The typechecker never assigned the
 path expr a type.

---
 src/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index a239329f..2729fc78 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -480,6 +480,7 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         obj-return-polytypes.rs \
                         pred.rs \
                         preempt.rs \
+                        rec-extend.rs \
                         rt-circular-buffer.rs \
                         size-and-align.rs \
                         spawn-fn.rs \
-- 
cgit v1.2.3


From 01bfc3ae8bff5131cfd1db748ca996bdb86e100e Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 8 Mar 2011 16:31:37 -0800
Subject: Fix generic-bind support for bound aliases and generics.

---
 src/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 2729fc78..1572764d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -409,6 +409,7 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     test/run-pass/obj-as.rs \
                     test/run-pass/vec-slice.rs \
                     test/run-pass/fn-lval.rs \
+                    test/run-pass/generic-bind-2.rs \
                     test/run-pass/generic-fn-box.rs \
                     test/run-pass/generic-tup.rs \
                     test/run-pass/iter-ret.rs \
-- 
cgit v1.2.3


From e62424944b197e24025b149e2d4ba2347b76c8d8 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 8 Mar 2011 16:51:23 -0800
Subject: rustc: Have trans get the type parameters from the annotation instead
 of trying to deduce them itself. Un-XFAIL generic-fn-twice.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 1572764d..d66dba1f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -452,7 +452,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         foreach-nested.rs \
                         foreach-put-structured.rs \
                         foreach-simple-outer-slot.rs \
-                        generic-fn-twice.rs \
                         generic-iter-frame.rs \
                         generic-tag-alt.rs \
                         generic-tag-values.rs \
-- 
cgit v1.2.3


From 1a05f99a10dacfbdecc1bf2458f14b10390c1180 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 8 Mar 2011 17:19:06 -0800
Subject: Un-XFAIL obj-return-polytypes.rs

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index d66dba1f..3dcb4461 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -477,7 +477,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         mutable-alias-vec.rs \
                         obj-as.rs \
                         obj-dtor.rs \
-                        obj-return-polytypes.rs \
                         pred.rs \
                         preempt.rs \
                         rec-extend.rs \
-- 
cgit v1.2.3


From 5b7c3b8b5df8292e27943908fd4c16323c7833a8 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 8 Mar 2011 17:34:15 -0800
Subject: rustc: Typecheck the base part of record extension expressions.
 Un-XFAIL rec-extend.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 3dcb4461..43cb1a7f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -479,7 +479,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         obj-dtor.rs \
                         pred.rs \
                         preempt.rs \
-                        rec-extend.rs \
                         rt-circular-buffer.rs \
                         size-and-align.rs \
                         spawn-fn.rs \
-- 
cgit v1.2.3


From 7dc64b45b5149a566ad6d1284f8f90eb10468ca3 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 9 Mar 2011 15:17:06 -0800
Subject: rustc: Make tag pattern translation generic-aware. Un-XFAIL
 generic-tag-alt.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 43cb1a7f..2c35d07f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -453,7 +453,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         foreach-put-structured.rs \
                         foreach-simple-outer-slot.rs \
                         generic-iter-frame.rs \
-                        generic-tag-alt.rs \
                         generic-tag-values.rs \
                         iter-range.rs \
                         iter-ret.rs \
-- 
cgit v1.2.3


From 874e8e35055aff1bb7cb5b8afd9e1c27c8cf20de Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 9 Mar 2011 17:48:07 -0800
Subject: rustc: Have tag patterns use the type parameter information from the
 typechecker instead of trying to deduce it in trans. Un-XFAIL
 test/run-pass/generic-tag-values.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 2c35d07f..70e2330e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -453,7 +453,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         foreach-put-structured.rs \
                         foreach-simple-outer-slot.rs \
                         generic-iter-frame.rs \
-                        generic-tag-values.rs \
                         iter-range.rs \
                         iter-ret.rs \
                         lazychan.rs \
-- 
cgit v1.2.3


From fb246e4e478b487da3a0ad36583217b32f483116 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 9 Mar 2011 19:01:13 -0800
Subject: Un-XFAIL a couple export-related tests.

---
 src/Makefile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 70e2330e..209e1b90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -447,7 +447,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         constrained-type.rs \
                         destructor-ordering.rs \
                         drop-parametric-closure-with-bound-box.rs \
-                        export-non-interference.rs \
                         foreach-nested-2.rs \
                         foreach-nested.rs \
                         foreach-put-structured.rs \
@@ -507,7 +506,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         threads.rs \
                         type-sizes.rs \
                         typestate-cfg-nesting.rs \
-                        use-import-export.rs \
                         user.rs \
                         utf8.rs \
                         vec-alloc-append.rs \
-- 
cgit v1.2.3


From 8e8c336f93becbc394b99e978cc3d8145e7e9d7c Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 9 Mar 2011 20:14:19 -0800
Subject: Implement deep structural comparison through boxes and sequences.

---
 src/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 209e1b90..0bddc0de 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -402,6 +402,7 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     $(NOMINAL_TAG_XFAILS) \
                     $(CONST_TAG_XFAILS) \
                     test/run-pass/arith-unsigned.rs \
+                    test/run-pass/box-compare.rs \
                     test/run-pass/child-outlives-parent.rs \
                     test/run-pass/clone-with-exterior.rs \
                     test/run-pass/constrained-type.rs \
@@ -416,6 +417,7 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     test/run-pass/lib-io.rs \
                     test/run-pass/mlist-cycle.rs \
                     test/run-pass/obj-as.rs \
+                    test/run-pass/seq-compare.rs \
                     test/run-pass/task-comm.rs \
                     test/run-pass/task-comm-3.rs \
                     test/run-pass/vec-slice.rs \
-- 
cgit v1.2.3


From 7505c1fa2319adbd928847ca27f75f5a95eb7c3d Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 10 Mar 2011 11:27:51 -0800
Subject: rustc: Run cleanups on while expressions' condition blocks. Un-XFAIL
 while-prelude-drop.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 0bddc0de..fa4ddd20 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -513,7 +513,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         vec-alloc-append.rs \
                         vec-append.rs \
                         vec-slice.rs \
-                        while-prelude-drop.rs \
                         while-with-break.rs \
                         yield.rs \
                         yield2.rs \
-- 
cgit v1.2.3


From 5f29988a2cf9263631bf79b758d1f5d3e33dbb80 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Thu, 10 Mar 2011 14:15:02 -0800
Subject: Add failing test for tag-leaking case.

---
 src/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index fa4ddd20..929be490 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -414,6 +414,7 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     test/run-pass/generic-fn-box.rs \
                     test/run-pass/generic-tup.rs \
                     test/run-pass/iter-ret.rs \
+                    test/run-pass/leak-tag-copy.rs \
                     test/run-pass/lib-io.rs \
                     test/run-pass/mlist-cycle.rs \
                     test/run-pass/obj-as.rs \
-- 
cgit v1.2.3


From 41d5094a8e0f58221b470a2676a9a1dae287102d Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 10 Mar 2011 14:31:15 -0800
Subject: rustc: Fix off-by-one error and logic error regarding type parameters
 in the translation of bind expressions. Un-XFAIL bind-obj-ctor.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 929be490..f96ad040 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -443,7 +443,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         basic-1.rs \
                         basic-2.rs \
                         basic.rs \
-                        bind-obj-ctor.rs \
                         child-outlives-parent.rs \
                         clone-with-exterior.rs \
                         comm.rs \
-- 
cgit v1.2.3


From 60f86354ad95802da4c861fb8df54abf95f1917b Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 10 Mar 2011 15:14:45 -0800
Subject: rustc: Use the generic info from the item in bind thunks just as
 calls do. Un-XFAIL drop-parametric-closure-with-bound-box.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index f96ad040..83dca299 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -448,7 +448,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         comm.rs \
                         constrained-type.rs \
                         destructor-ordering.rs \
-                        drop-parametric-closure-with-bound-box.rs \
                         foreach-nested-2.rs \
                         foreach-nested.rs \
                         foreach-put-structured.rs \
-- 
cgit v1.2.3


From 3aac5059ee986126851cb4f8bd312f1fb5f9ddea Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Thu, 10 Mar 2011 17:25:11 -0800
Subject: Move the glue code to a .o file. This reduces how much asm we print
 in each "translation unit".

Part of it is not repetitive and should probably be moved to a .ll file, but
for now we autogen all of it.

(Modified somewhat by graydon while integrating).
---
 src/Makefile | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 83dca299..5d3057b5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -86,7 +86,6 @@ ifdef CFG_WINDOWSY
   endif
   CFG_RUNTIME := rustrt.dll
   CFG_STDLIB := std.dll
-  CFG_OBJ_SUFFIX := .o
   CFG_EXE_SUFFIX := .exe
   CFG_BOOT := ./rustboot.exe
   CFG_RUSTC := ./rustc.exe
@@ -101,7 +100,6 @@ ifdef CFG_UNIXY
   CFG_INFO := $(info cfg: unix-y environment)
   CFG_BOOT := ./rustboot
   CFG_RUSTC := ./rustc
-  CFG_OBJ_SUFFIX := .o
   CFG_RUN_TARG = LD_LIBRARY_PATH=. $(CFG_VALGRIND) $(1)
   CFG_GCC := 1
   ifdef MINGW_CROSS
@@ -114,7 +112,6 @@ ifdef CFG_UNIXY
     ifdef CFG_VALGRIND
       CFG_VALGRIND += wine
     endif
-    CFG_OBJ_SUFFIX := .o
     CFG_EXE_SUFFIX := .exe
     CFG_GCC_CFLAGS := -march=i686
     CFG_GCC_LINK_FLAGS := -shared
@@ -302,15 +299,15 @@ RUNTIME_HDR := rt/globals.h \
                rt/test/rust_test_util.h
 
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
-RUNTIME_OBJS := $(RUNTIME_CS:.cpp=$(CFG_OBJ_SUFFIX))
+RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
 RUNTIME_LIBS := $(CFG_RUNTIME_LIBS)
 
 STDLIB_CRATE := lib/std.rc
 STDLIB_INPUTS := $(wildcard lib/*.rc lib/*.rs lib/*/*.rs)
 COMPILER_CRATE := comp/rustc.rc
-COMPILER_INPUTS := $(wildcard comp/*.rc comp/*.rs comp/*/*.rs)
+COMPILER_INPUTS := $(wildcard comp/rustc.rc comp/*.rs comp/*/*.rs)
 
-GENERATED := boot/fe/lexer.ml boot/util/version.ml
+GENERATED := boot/fe/lexer.ml boot/util/version.ml glue.o
 
 all: $(CFG_RUSTC) $(MKFILES) $(GENERATED)
 
@@ -329,7 +326,7 @@ $(CFG_STDLIB): $(STDLIB_CRATE) $(CFG_BOOT) $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(BOOT) -shared -o $@ $(STDLIB_CRATE)
 
-%$(CFG_OBJ_SUFFIX): %.cpp $(MKFILES)
+%.o: %.cpp $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
 
@@ -368,8 +365,12 @@ $(CFG_RUSTC): $(COMPILER_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
 	$(BOOT) -minimal -o $@ $<
 	$(CFG_QUIET)chmod 0755 $@
 
+glue.bc: $(CFG_RUSTC)
+	@$(call CFG_ECHO, generate: $@)
+	$(RUSTC) -o $@ -glue
+
 self: $(CFG_RUSTC)
-	@$(call CFG_ECHO, compile: $<)
+	@$(call CFG_ECHO, compile: $(COMPILER_CRATE))
 	$(RUSTC) $(COMPILER_CRATE)
 
 
@@ -758,9 +759,9 @@ test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \
 	@$(call CFG_ECHO, assemble [llvm]: $<)
 	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) -o $@ -c $<
 
-%.rustc$(CFG_EXE_SUFFIX): %.o $(CFG_RUNTIME)
+%.rustc$(CFG_EXE_SUFFIX): %.o $(CFG_RUNTIME) glue.o
 	@$(call CFG_ECHO, link [llvm]: $<)
-	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) -o $@ $< -L. -lrustrt
+	$(CFG_QUIET)gcc $(CFG_GCC_CFLAGS) glue.o -o $@ $< -L. -lrustrt
 	@# dsymutil sometimes fails or prints a warning, but the
 	@# program still runs.  Since it simplifies debugging other
 	@# programs, I\'ll live with the noise.
@@ -797,7 +798,7 @@ C_DEPFILES := $(RUNTIME_CS:%.cpp=%.d)
 %.d: %.cpp $(MKFILES)
 	@$(call CFG_ECHO, dep: $<)
 	$(CFG_QUIET)$(call CFG_DEPEND_C, $@ \
-      $(patsubst %.cpp, %$(CFG_OBJ_SUFFIX), $<), \
+      $(patsubst %.cpp, %.o, $<), \
       $(RUNTIME_INCS)) $< $(CFG_PATH_MUNGE) >$@.tmp \
       && mv $@.tmp $@
 
@@ -914,12 +915,12 @@ clean:
 	$(CFG_QUIET)rm -f $(ML_DEPFILES:%.d=%.d.tmp)
 	$(CFG_QUIET)rm -f $(C_DEPFILES:%.d=%.d.tmp)
 	$(CFG_QUIET)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
-	$(CFG_QUIET)rm -f $(GENERATED)
+	$(CFG_QUIET)rm -f $(GENERATED) glue.bc glue.s
 	$(CFG_QUIET)rm -f $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
 	$(CFG_QUIET)rm -Rf $(PKG_NAME)-*.tar.gz dist
-	$(CFG_QUIET)rm -f $(foreach ext,cmx cmi cmo cma o a d exe,\
+	$(CFG_QUIET)rm -f $(foreach ext,cmx cmi cmo cma bc o a d exe,\
                         $(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext)))
-	$(CFG_QUIET)rm -Rf $(foreach ext,out llvm x86 boot rustc o s exe dSYM,\
+	$(CFG_QUIET)rm -Rf $(foreach ext,out llvm x86 boot rustc bc o s exe dSYM,\
                         $(wildcard test/*/*.$(ext)))
 
 
-- 
cgit v1.2.3


From bc5a8393e714f05d2dbb5abf1ebb7ff6267f48fe Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Thu, 10 Mar 2011 17:57:22 -0800
Subject: Help extinguish fires.

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 5d3057b5..21366b6b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -365,7 +365,7 @@ $(CFG_RUSTC): $(COMPILER_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
 	$(BOOT) -minimal -o $@ $<
 	$(CFG_QUIET)chmod 0755 $@
 
-glue.bc: $(CFG_RUSTC)
+glue.bc: $(CFG_RUSTC) $(CFG_RUNTIME) $(CFG_STDLIB)
 	@$(call CFG_ECHO, generate: $@)
 	$(RUSTC) -o $@ -glue
 
-- 
cgit v1.2.3


From 37007a4d01c487a4fbd21306796a118c125a8906 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 12:02:51 -0800
Subject: rustc: Populate the upvar environment when calling iterator bodies.
 Un-XFAIL test/run-pass/iter-range.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 21366b6b..ccb09990 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -454,7 +454,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         foreach-put-structured.rs \
                         foreach-simple-outer-slot.rs \
                         generic-iter-frame.rs \
-                        iter-range.rs \
                         iter-ret.rs \
                         lazychan.rs \
                         lib-bitv.rs \
-- 
cgit v1.2.3


From a93ab2e1b1015ca8b0546ab0e706a9e2c1403318 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 12:05:49 -0800
Subject: Un-XFAIL test/run-pass/foreach-nested.rs and
 test/run-pass/foreach-nested-2.rs

---
 src/Makefile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index ccb09990..daf53dd0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -449,8 +449,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         comm.rs \
                         constrained-type.rs \
                         destructor-ordering.rs \
-                        foreach-nested-2.rs \
-                        foreach-nested.rs \
                         foreach-put-structured.rs \
                         foreach-simple-outer-slot.rs \
                         generic-iter-frame.rs \
-- 
cgit v1.2.3


From 2ef57287229218466f87ea99c20f9a16f889e1c7 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 12:11:24 -0800
Subject: rustc: Un-XFAIL generic-iter-frame.rs

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index daf53dd0..e8cf5d19 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -451,7 +451,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         destructor-ordering.rs \
                         foreach-put-structured.rs \
                         foreach-simple-outer-slot.rs \
-                        generic-iter-frame.rs \
                         iter-ret.rs \
                         lazychan.rs \
                         lib-bitv.rs \
-- 
cgit v1.2.3


From fc7cbe31f9639a1d37baf4a35df9719ad155aa2c Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 11 Mar 2011 13:44:13 -0800
Subject: Switch rustboot from element-wise copying to take+drop+memcpy.
 Un-XFAIL size-and-align.rs for rustc.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index e8cf5d19..b0e2e9c7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -475,7 +475,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         pred.rs \
                         preempt.rs \
                         rt-circular-buffer.rs \
-                        size-and-align.rs \
                         spawn-fn.rs \
                         spawn-module-qualified.rs \
                         spawn.rs \
-- 
cgit v1.2.3


From 5c21f039903311a9403b7fe7cfa0d2e455a7c4f0 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 13:48:00 -0800
Subject: rustc: Un-XFAIL test/run-pass/foreach-simple-outer-slot.rs

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index b0e2e9c7..e06bb386 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -450,7 +450,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         constrained-type.rs \
                         destructor-ordering.rs \
                         foreach-put-structured.rs \
-                        foreach-simple-outer-slot.rs \
                         iter-ret.rs \
                         lazychan.rs \
                         lib-bitv.rs \
-- 
cgit v1.2.3


From 6392bd16811f20b71693df62909c465203d4f8d7 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 14:28:49 -0800
Subject: rustc: Load structural loop variables in iterators. Un-XFAIL
 foreach-put-structured.rs.

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index e06bb386..a407f206 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -449,7 +449,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         comm.rs \
                         constrained-type.rs \
                         destructor-ordering.rs \
-                        foreach-put-structured.rs \
                         iter-ret.rs \
                         lazychan.rs \
                         lib-bitv.rs \
-- 
cgit v1.2.3


From 1feaf8ffb54ab2288d83a36391f94b437aa0ec35 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 14:33:54 -0800
Subject: Re-XFAIL size-and-align.rs to put out burning tinderbox

---
 src/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index a407f206..4b449254 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -473,6 +473,7 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         pred.rs \
                         preempt.rs \
                         rt-circular-buffer.rs \
+                        size-and-align.rs \
                         spawn-fn.rs \
                         spawn-module-qualified.rs \
                         spawn.rs \
-- 
cgit v1.2.3


From d24acf733a6fcc22ec53c241311240b950db0b11 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 11 Mar 2011 15:49:03 -0800
Subject: Remove redundant entry from Makefile

---
 src/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 4b449254..dc6a9b7c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -300,7 +300,6 @@ RUNTIME_HDR := rt/globals.h \
 
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
-RUNTIME_LIBS := $(CFG_RUNTIME_LIBS)
 
 STDLIB_CRATE := lib/std.rc
 STDLIB_INPUTS := $(wildcard lib/*.rc lib/*.rs lib/*/*.rs)
-- 
cgit v1.2.3


From a8fbb53d643eada0264aae902adc7f6f453c53b0 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 11 Mar 2011 16:16:35 -0800
Subject: Include glob in crate depfile deps, to handle file-add events with
 cached depfiles. Closes #269.

---
 src/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index dc6a9b7c..bceef7ff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -814,9 +814,15 @@ RUSTBOOT_PROBE := $(wildcard $(CFG_BOOT))
 ifneq ($(RUSTBOOT_PROBE),)
 CFG_INFO := $(info cfg: using built $(CFG_BOOT) for rust deps)
 STDLIB_DEPFILE := $(CFG_STDLIB).d
+RUSTC_DEPFILE := $(CFG_RUSTC).d
 CRATE_DEPFILES := $(ALL_TEST_CRATES:%.rc=%.d) $(STDLIB_DEPFILE)
 
-$(STDLIB_DEPFILE): $(STDLIB_CRATE) $(MKFILES) $(CFG_BOOT)
+$(STDLIB_DEPFILE): $(STDLIB_CRATE) $(MKFILES) $(CFG_BOOT) $(STDLIB_INPUTS)
+	@$(call CFG_ECHO, dep: $<)
+	$(BOOT) -shared -rdeps $< $(CFG_PATH_MUNGE) >$@.tmp \
+    && mv $@.tmp $@
+
+$(RUSTC_DEPFILE): $(STDLIB_CRATE) $(MKFILES) $(CFG_BOOT) $(COMPILER_INPUTS)
 	@$(call CFG_ECHO, dep: $<)
 	$(BOOT) -shared -rdeps $< $(CFG_PATH_MUNGE) >$@.tmp \
     && mv $@.tmp $@
-- 
cgit v1.2.3


From d34e1ff89e067a57921091fbdffe8c13fa38341c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 18:02:09 -0800
Subject: rustc: Add a binding to LLVM's object file reader. Until it's sent
 upstream, add an explicit "support" library for our LLVM extensions.

---
 src/Makefile | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index bceef7ff..dc6a78a5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,6 +34,7 @@ DSYMUTIL := true
 
 ifeq ($(CFG_OSTYPE), FreeBSD)
   CFG_RUNTIME := librustrt.so
+  CFG_SUPPORT := librustsupport.so
   CFG_STDLIB := libstd.so
   CFG_GCC_CFLAGS += -fPIC -march=i686 -I/usr/local/include
   CFG_GCC_LINK_FLAGS += -shared -fPIC -lpthread -lrt
@@ -47,6 +48,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Linux)
   CFG_RUNTIME := librustrt.so
+  CFG_SUPPORT := librustsupport.so
   CFG_STDLIB := libstd.so
   CFG_GCC_CFLAGS += -fPIC -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
@@ -60,6 +62,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Darwin)
   CFG_RUNTIME := librustrt.dylib
+  CFG_SUPPORT := librustsupport.dylib
   CFG_STDLIB := libstd.dylib
   CFG_UNIXY := 1
   CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
@@ -85,6 +88,7 @@ ifdef CFG_WINDOWSY
     CFG_NATIVE := 1
   endif
   CFG_RUNTIME := rustrt.dll
+  CFG_SUPPORT := rustsupport.dll
   CFG_STDLIB := std.dll
   CFG_EXE_SUFFIX := .exe
   CFG_BOOT := ./rustboot.exe
@@ -107,6 +111,7 @@ ifdef CFG_UNIXY
     CFG_GCC_CROSS := i586-mingw32msvc-
     CFG_BOOT_FLAGS += -t win32-x86-pe
     CFG_RUNTIME := rustrt.dll
+    CFG_SUPPORT := rustsupport.dll
     CFG_STDLIB := std.dll
     CFG_RUSTC := ./rustc.exe
     ifdef CFG_VALGRIND
@@ -179,7 +184,7 @@ endif
 ifneq ($(CFG_LLVM_CONFIG),)
   CFG_LLVM_VERSION := $(shell $(CFG_LLVM_CONFIG) --version)
   $(info cfg: found llvm-config at $(CFG_LLVM_CONFIG))
-  CFG_LLVM_ALLOWED_VERSIONS := 2.8svn 2.8 2.9svn
+  CFG_LLVM_ALLOWED_VERSIONS := 2.8svn 2.8 2.9svn 3.0svn
   ifneq ($(findstring $(CFG_LLVM_VERSION),$(CFG_LLVM_ALLOWED_VERSIONS)),)
     $(info cfg: using LLVM version $(CFG_LLVM_VERSION))
   else
@@ -193,6 +198,10 @@ ifdef CFG_LLVM_CONFIG
   LLC := "$(shell $(CFG_LLVM_CONFIG) --bindir)/llc"
   CFG_LLC_CFLAGS := -march=x86
   LLVM-DIS := "$(shell $(CFG_LLVM_CONFIG) --bindir)/llvm-dis"
+  CFG_LLVM_INCDIR := $(shell $(CFG_LLVM_CONFIG) --includedir)
+  CFG_LLVM_CXXFLAGS := $(shell $(CFG_LLVM_CONFIG) --cxxflags)
+  CFG_LLVM_LDFLAGS := $(shell $(CFG_LLVM_CONFIG) --ldflags)
+  CFG_LLVM_LIBS := $(shell $(CFG_LLVM_CONFIG) --libs)
 endif
 
 MKFILES := Makefile
@@ -301,6 +310,14 @@ RUNTIME_HDR := rt/globals.h \
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
 
+SUPPORT_CS := support/Object.cpp
+
+SUPPORT_HDR := support/include/llvm-c/Object.h
+
+SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR)
+SUPPORT_OBJS := $(SUPPORT_CS:.cpp=.o)
+SUPPORT_LIBS := $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS)
+
 STDLIB_CRATE := lib/std.rc
 STDLIB_INPUTS := $(wildcard lib/*.rc lib/*.rs lib/*/*.rs)
 COMPILER_CRATE := comp/rustc.rc
@@ -321,14 +338,24 @@ $(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_LINK_C, $@) $(RUNTIME_OBJS)
 
+$(CFG_SUPPORT): $(SUPPORT_OBJS) $(MKFILES) $(SUPPORT_HDR)
+	@$(call CFG_ECHO, compile: $<)
+	$(CFG_QUIET)$(call CFG_LINK_C, $@ $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS)) \
+		$(SUPPORT_OBJS)
+
 $(CFG_STDLIB): $(STDLIB_CRATE) $(CFG_BOOT) $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(BOOT) -shared -o $@ $(STDLIB_CRATE)
 
-%.o: %.cpp $(MKFILES)
+rt/%.o: rt/%.cpp $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
 
+support/%.o: support/%.cpp $(MKFILES)
+	@$(call CFG_ECHO, compile: $<)
+	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(CFG_LLVM_CXXFLAGS) \
+		$(SUPPORT_INCS)) $<
+
 ifdef CFG_NATIVE
 $(CFG_BOOT): $(BOOT_CMXS) $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
@@ -359,7 +386,8 @@ endif
 # Main compiler targets and rules
 ######################################################################
 
-$(CFG_RUSTC): $(COMPILER_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
+$(CFG_RUSTC): $(COMPILER_INPUTS) $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB) \
+		$(CFG_SUPPORT)
 	@$(call CFG_ECHO, compile: $<)
 	$(BOOT) -minimal -o $@ $<
 	$(CFG_QUIET)chmod 0755 $@
-- 
cgit v1.2.3


From 57c2fa9d11f45618e25798eb2065c1b14b847264 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 18:17:57 -0800
Subject: Rename libsupport to librustllvm

---
 src/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index dc6a78a5..47365a7c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,7 +34,7 @@ DSYMUTIL := true
 
 ifeq ($(CFG_OSTYPE), FreeBSD)
   CFG_RUNTIME := librustrt.so
-  CFG_SUPPORT := librustsupport.so
+  CFG_SUPPORT := librustllvm.so
   CFG_STDLIB := libstd.so
   CFG_GCC_CFLAGS += -fPIC -march=i686 -I/usr/local/include
   CFG_GCC_LINK_FLAGS += -shared -fPIC -lpthread -lrt
@@ -48,7 +48,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Linux)
   CFG_RUNTIME := librustrt.so
-  CFG_SUPPORT := librustsupport.so
+  CFG_SUPPORT := librustllvm.so
   CFG_STDLIB := libstd.so
   CFG_GCC_CFLAGS += -fPIC -march=i686
   CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
@@ -62,7 +62,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Darwin)
   CFG_RUNTIME := librustrt.dylib
-  CFG_SUPPORT := librustsupport.dylib
+  CFG_SUPPORT := librustllvm.dylib
   CFG_STDLIB := libstd.dylib
   CFG_UNIXY := 1
   CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
@@ -88,7 +88,7 @@ ifdef CFG_WINDOWSY
     CFG_NATIVE := 1
   endif
   CFG_RUNTIME := rustrt.dll
-  CFG_SUPPORT := rustsupport.dll
+  CFG_SUPPORT := rustllvm.dll
   CFG_STDLIB := std.dll
   CFG_EXE_SUFFIX := .exe
   CFG_BOOT := ./rustboot.exe
@@ -111,7 +111,7 @@ ifdef CFG_UNIXY
     CFG_GCC_CROSS := i586-mingw32msvc-
     CFG_BOOT_FLAGS += -t win32-x86-pe
     CFG_RUNTIME := rustrt.dll
-    CFG_SUPPORT := rustsupport.dll
+    CFG_SUPPORT := rustllvm.dll
     CFG_STDLIB := std.dll
     CFG_RUSTC := ./rustc.exe
     ifdef CFG_VALGRIND
@@ -310,9 +310,9 @@ RUNTIME_HDR := rt/globals.h \
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
 
-SUPPORT_CS := support/Object.cpp
+SUPPORT_CS := llvmext/Object.cpp
 
-SUPPORT_HDR := support/include/llvm-c/Object.h
+SUPPORT_HDR := llvmext/include/llvm-c/Object.h
 
 SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR)
 SUPPORT_OBJS := $(SUPPORT_CS:.cpp=.o)
@@ -351,7 +351,7 @@ rt/%.o: rt/%.cpp $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<
 
-support/%.o: support/%.cpp $(MKFILES)
+llvmext/%.o: llvmext/%.cpp $(MKFILES)
 	@$(call CFG_ECHO, compile: $<)
 	$(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(CFG_LLVM_CXXFLAGS) \
 		$(SUPPORT_INCS)) $<
-- 
cgit v1.2.3


From fdc22ef1a1cef77dedb9c0429c746a81688a5979 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 11 Mar 2011 18:20:13 -0800
Subject: Add llvmext/include to the list of include directories to hopefully
 put out the burning tinderbox

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 47365a7c..43b66193 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -314,7 +314,7 @@ SUPPORT_CS := llvmext/Object.cpp
 
 SUPPORT_HDR := llvmext/include/llvm-c/Object.h
 
-SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR)
+SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR) -iquote llvmext/include
 SUPPORT_OBJS := $(SUPPORT_CS:.cpp=.o)
 SUPPORT_LIBS := $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS)
 
-- 
cgit v1.2.3