Fix some bugs in module building that broke llvm-stacker project.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34099 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 90dec2ccc48fb9abc1f81a201936a52bcc6fba5b..3b72b183f6483968c5545c8390917a8c095f3ad3 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -313,7 +313,7 @@ ifndef TBLGEN
 endif
 LLVM_CONFIG := $(LLVMToolDir)/llvm-config 
 ifndef LLVMLD
-LLVMLD    := $(LLVMToolDir)/gccld$(EXEEXT)
+LLVMLD    := $(LLVMToolDir)/llvm-ld$(EXEEXT)
 endif
 ifndef LLVMDIS
 LLVMDIS  := $(LLVMToolDir)/llvm-dis$(EXEEXT)
@@ -1181,12 +1181,12 @@ $(ObjDir)/%.s: %.c $(ObjDir)/.dir $(BUILT_SOURCES)
 ifdef DEBUG_RUNTIME
 $(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(LLVMAS) $(LOPT)
        $(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
-       $(Verb) $(LLVMAS) $< -o - | $(LOPT) -std-compile-opts $< -o $@
+       $(Verb) $(LLVMAS) $< -o - | $(LOPT) -std-compile-opts -o $@ -f
 else
 $(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(LLVMAS) $(LOPT)
        $(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
        $(Verb) $(LLVMAS) $< -o - | \
-         $(LOPT) -std-compile-opts -strip-debug $< -o $@
+          $(LOPT) -std-compile-opts -strip-debug -o $@ -f
 endif