From b7972d34ed489f54e14972c176c2d335ed4f26c2 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 18 Mar 2011 18:32:31 -0700
Subject: [PATCH] Add support for building glue.o.

---
 Makefile.in | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index b273884f285..f1c4ef2eeaf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ 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
 
@@ -113,6 +113,8 @@ 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