Move LLVM tool definitions to Makefile.rules

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

diff --git a/Makefile.rules b/Makefile.rules
index d198d683f2f49d21e43f41818a5d228584330b47..ba9716e4c8256d4b54b7dfadc2e7b8d0e0ffffa2 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -256,10 +256,23 @@ LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/gcc
 LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++
 
 #--------------------------------------------------------------------------
-# Some of the compiled LLVM tools which are used for compilation of runtime
-# libraries.
+# The compiled LLVM tools
 #
+
 LLVMAS  := $(LLVMTOOLCURRENT)/llvm-as$(EXEEXT)
+# Find the location of the platform specific LLVM GCC libraries
+LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
+# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by
+# Makefile.rules) LLI      = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
+LLC      = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
+LGCCAS   = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
+LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
+LDIS     = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
+LOPT     = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
+LLINK    = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
+LPROF    = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
+LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
+LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 
 
 ###########################################################################

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 5c908c043e8125c7e87d2c88fb11066c73fa0be4..c49cedd5cf897e1ec76f29d2f247967024bd2378 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -34,21 +34,6 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-# Find the location of the platform specific LLVM GCC libraries
-LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
-
-# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
-LLC      = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
-LGCCAS   = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
-LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
-LDIS     = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
-LOPT     = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
-LLINK    = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
-LPROF    = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
-LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
-LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
-
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =