---

yaml
---
r: 1721
b: refs/heads/master
c: b7972d3
h: refs/heads/master
i:
  1719: b45a6b7
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29d7cb88335845ce22e019d091ed1332af531650
+refs/heads/master: b7972d34ed489f54e14972c176c2d335ed4f26c2

trunk/Makefile.in

@@ -105,14 +105,16 @@ ifdef CFG_UNIXY
     CFG_VALGRIND += --leak-check=full \
                     --error-exitcode=1 \
                     --quiet --vex-iropt-level=0 \
-                    --suppressions=etc/x86.supp
+                    --suppressions=$(S)src/etc/x86.supp
   endif
 endif
 
 CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
 CFG_LLVMEXT :=$(call CFG_LIB_NAME,llvmext)
 CFG_STDLIB :=$(call CFG_LIB_NAME,std)
 
+CFG_LLC_CFLAGS := -march=x86
+
 ifdef CFG_GCC
   CFG_INFO := $(info cfg: using gcc)
   CFG_GCC_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g
@@ -331,6 +333,7 @@ all: boot/rustboot$(X)          \
      rt/$(CFG_RUNTIME)          \
      llvmext/$(CFG_LLVMEXT)     \
      stage0/rustc$(X)           \
+     stage0/glue.o              \
      $(GENERATED)
 
 rt/$(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR)
@@ -400,6 +403,19 @@ llvmext/%.o: llvmext/%.cpp $(MKFILES)
 	@$(call E, lex-gen: $@)
 	$(Q)ocamllex$(OPT) -q -o $@ $<
 
+%.o: %.s
+	@$(call E, assemble [llvm]: $@)
+	$(Q)gcc $(CFG_GCC_CFLAGS) -o $@ -c $<
+
+%.ll: %.bc
+	@$(call E, dis [llvm]: $@)
+	$(Q)$(CFG_LLVM_BINDIR)/llvm-dis -o $@ $<
+
+
+%.s: %.bc
+	@$(call E, compile [llvm]: $@)
+	$(Q)$(CFG_LLVM_BINDIR)/llc $(CFG_LLC_CFLAGS) -o $@ $<
+
 
 ######################################################################
 # Cleanup