Changes in directory llvm:
Makefile.rules updated: 1.424 -> 1.425
---
Log message:
Don't use gccld or gccas
---
Diffs of the changes: (+11 -13)
Makefile.rules | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.424 llvm/Makefile.rules:1.425
--- llvm/Makefile.rules:1.424 Wed Feb 7 13:13:19 2007
+++ llvm/Makefile.rules Fri Feb 9 09:52:07 2007
@@ -312,11 +312,8 @@
endif
endif
LLVM_CONFIG := $(LLVMToolDir)/llvm-config
-ifndef GCCAS
-GCCAS := $(LLVMToolDir)/gccas$(EXEEXT)
-endif
-ifndef GCCLD
-GCCLD := $(LLVMToolDir)/gccld$(EXEEXT)
+ifndef LLVMLD
+LLVMLD := $(LLVMToolDir)/gccld$(EXEEXT)
endif
ifndef LLVMDIS
LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT)
@@ -712,14 +709,14 @@
else
Module := $(LibDir)/$(MODULE_NAME).bc
-LinkModule := $(GCCLD) -L$(CFERuntimeLibDir)
+LinkModule := $(LLVMLD) -L$(CFERuntimeLibDir)
ifdef EXPORTED_SYMBOL_FILE
LinkModule += -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
endif
-$(Module): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD)
+$(Module): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(LLVMLD)
$(Echo) Building $(BuildMode) Bytecode Module $(notdir $@)
$(Verb) $(LinkModule) -o $@ $(ObjectsBC)
@@ -842,10 +839,10 @@
all-local:: $(LibName.BCA)
ifdef EXPORTED_SYMBOL_FILE
-BCLinkLib = $(GCCLD) -L$(CFERuntimeLibDir) \
+BCLinkLib = $(LLVMLD) -L$(CFERuntimeLibDir) \
-internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
-$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \
+$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMLD) \
$(LLVMToolDir)/llvm-ar
$(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) \
"(internalize)"
@@ -1182,13 +1179,14 @@
# make the C and C++ compilers strip debug info out of bytecode libraries.
ifdef DEBUG_RUNTIME
-$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(GCCAS)
+$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(LLVMAS) $(LOPT)
$(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
- $(Verb) $(GCCAS) $< -o $@
+ $(Verb) $(LLVMAS) $< -o - | $(LOPT) -std-compile-opts $< -o $@
else
-$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(GCCAS)
+$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(LLVMAS) $(LOPT)
$(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
- $(Verb) $(GCCAS) -strip-debug $< -o $@
+ $(Verb) $(LLVMAS) $< -o - | \
+ $(LOPT) -std-compile-opts -strip-debug $< -o $@
endif
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
