From 7a73b80b9052136c8cd2234eb3433a07df7cf38e Mon Sep 17 00:00:00 2001 From: John Criswell Date: Mon, 30 Jun 2003 21:59:07 +0000 Subject: Merged in autoconf branch. This provides configuration via the autoconf system. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7014 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.common | 411 +- Makefile.config | 79 +- Makefile.config.in | 159 + Makefile.rules | 411 +- aclocal.m4 | 3865 ++++++ config.guess | 1317 ++ config.sub | 1411 +++ configure | 12628 +++++++++++++++++++ configure.ac | 236 + docs/GettingStarted.html | 197 +- include/Config/alloca.h | 46 + include/Config/assert.h | 23 + include/Config/config.h.in | 210 + include/Config/dlfcn.h | 27 + include/Config/errno.h | 18 + include/Config/fcntl.h | 18 + include/Config/limits.h | 18 + include/Config/link.h | 18 + include/Config/malloc.h | 20 + include/Config/memory.h | 18 + include/Config/stdint.h | 18 + include/Config/stdio.h | 22 + include/Config/stdlib.h | 18 + include/Config/string.h | 18 + include/Config/strings.h | 18 + include/Config/sys/mman.h | 24 + include/Config/sys/resource.h | 33 + include/Config/sys/stat.h | 19 + include/Config/sys/time.h | 18 + include/Config/sys/types.h | 19 + include/Config/sys/wait.h | 19 + include/Config/time.h | 28 + include/Config/unistd.h | 18 + include/Support/Alloca.h | 18 +- include/Support/Annotation.h | 2 +- include/Support/BitSetVector.h | 1 - include/Support/Casting.h | 2 - include/Support/CommandLine.h | 1 - include/Support/DataTypes.h | 58 +- include/Support/SCCIterator.h | 1 - include/Support/Signals.h | 5 + include/Support/Timer.h | 1 - include/Support/Tree.h | 1 - include/Support/hash_map | 22 +- include/Support/hash_set | 22 +- include/Support/ilist | 1 - include/Support/iterator | 5 +- include/Support/slist | 17 +- include/llvm/ADT/BitSetVector.h | 1 - include/llvm/ADT/SCCIterator.h | 1 - include/llvm/ADT/Tree.h | 1 - include/llvm/ADT/ilist | 1 - include/llvm/AbstractTypeUser.h | 11 +- include/llvm/Analysis/DependenceGraph.h | 1 - include/llvm/Analysis/Dominators.h | 1 + include/llvm/CodeGen/InstrSelection.h | 1 + include/llvm/CodeGen/MachineFrameInfo.h | 1 - include/llvm/CodeGen/SSARegMap.h | 1 + include/llvm/Config/alloca.h | 46 + include/llvm/Config/config.h.in | 210 + include/llvm/Config/dlfcn.h | 27 + include/llvm/Config/fcntl.h | 18 + include/llvm/Config/limits.h | 18 + include/llvm/Config/malloc.h | 20 + include/llvm/Config/memory.h | 18 + include/llvm/Config/stdint.h | 18 + include/llvm/Config/sys/mman.h | 24 + include/llvm/Config/sys/resource.h | 33 + include/llvm/Config/sys/stat.h | 19 + include/llvm/Config/sys/time.h | 18 + include/llvm/Config/sys/types.h | 19 + include/llvm/Config/sys/wait.h | 19 + include/llvm/Config/time.h | 28 + include/llvm/Config/unistd.h | 18 + include/llvm/GlobalVariable.h | 1 + include/llvm/Instruction.h | 1 + include/llvm/Pass.h | 1 - include/llvm/Support/Annotation.h | 2 +- include/llvm/Support/Casting.h | 2 - include/llvm/Support/CommandLine.h | 1 - include/llvm/Support/Timer.h | 1 - include/llvm/System/Signals.h | 5 + include/llvm/Target/TargetCacheInfo.h | 1 - include/llvm/Target/TargetInstrInfo.h | 1 - include/llvm/Target/TargetRegInfo.h | 1 - install-sh | 251 + lib/Archive/ArchiveReader.cpp | 6 +- lib/AsmParser/Lexer.l | 2 +- lib/AsmParser/Makefile | 6 + lib/Bytecode/Archive/ArchiveReader.cpp | 6 +- lib/Bytecode/Reader/ArchiveReader.cpp | 6 +- lib/Bytecode/Reader/Reader.cpp | 10 +- lib/Bytecode/Writer/Writer.cpp | 2 +- lib/CodeGen/InstrSelection/InstrForest.cpp | 1 + lib/CodeGen/MachineFunction.cpp | 2 +- lib/ExecutionEngine/ExecutionEngine.cpp | 2 +- .../Interpreter/ExternalFunctions.cpp | 6 +- lib/ExecutionEngine/JIT/Intercept.cpp | 2 +- lib/ExecutionEngine/JIT/JITEmitter.cpp | 3 +- lib/ExecutionEngine/Makefile | 2 +- lib/Makefile | 4 +- lib/Support/PluginLoader.cpp | 4 +- lib/Support/Signals.cpp | 2 +- lib/Support/SystemUtils.cpp | 12 +- lib/Support/Timer.cpp | 21 +- lib/Target/SparcV9/InstrSelection/InstrForest.cpp | 1 + lib/Target/SparcV9/Makefile | 23 +- lib/Target/SparcV9/SparcV9InstrInfo.cpp | 2 +- lib/Target/SparcV9/SparcV9Internals.h | 2 +- lib/Target/X86/X86CodeEmitter.cpp | 2 +- .../Instrumentation/ProfilePaths/EdgeCode.cpp | 2 +- .../Instrumentation/ProfilePaths/ProfilePaths.cpp | 2 +- lib/VMCore/Pass.cpp | 8 +- ltmain.sh | 4993 ++++++++ mkinstalldirs | 101 + support/lib/Support/PluginLoader.cpp | 4 +- support/lib/Support/Signals.cpp | 2 +- support/lib/Support/SystemUtils.cpp | 12 +- support/lib/Support/Timer.cpp | 21 +- support/tools/Burg/Makefile | 2 +- support/tools/TableGen/Makefile | 7 + tools/bugpoint/SystemUtils.cpp | 12 +- tools/lli/Makefile | 2 +- utils/Burg/Makefile | 2 +- utils/TableGen/Makefile | 7 + 125 files changed, 27225 insertions(+), 481 deletions(-) create mode 100644 Makefile.config.in create mode 100644 aclocal.m4 create mode 100755 config.guess create mode 100755 config.sub create mode 100755 configure create mode 100644 configure.ac create mode 100644 include/Config/alloca.h create mode 100644 include/Config/assert.h create mode 100644 include/Config/config.h.in create mode 100644 include/Config/dlfcn.h create mode 100644 include/Config/errno.h create mode 100644 include/Config/fcntl.h create mode 100644 include/Config/limits.h create mode 100644 include/Config/link.h create mode 100644 include/Config/malloc.h create mode 100644 include/Config/memory.h create mode 100644 include/Config/stdint.h create mode 100644 include/Config/stdio.h create mode 100644 include/Config/stdlib.h create mode 100644 include/Config/string.h create mode 100644 include/Config/strings.h create mode 100644 include/Config/sys/mman.h create mode 100644 include/Config/sys/resource.h create mode 100644 include/Config/sys/stat.h create mode 100644 include/Config/sys/time.h create mode 100644 include/Config/sys/types.h create mode 100644 include/Config/sys/wait.h create mode 100644 include/Config/time.h create mode 100644 include/Config/unistd.h create mode 100644 include/llvm/Config/alloca.h create mode 100644 include/llvm/Config/config.h.in create mode 100644 include/llvm/Config/dlfcn.h create mode 100644 include/llvm/Config/fcntl.h create mode 100644 include/llvm/Config/limits.h create mode 100644 include/llvm/Config/malloc.h create mode 100644 include/llvm/Config/memory.h create mode 100644 include/llvm/Config/stdint.h create mode 100644 include/llvm/Config/sys/mman.h create mode 100644 include/llvm/Config/sys/resource.h create mode 100644 include/llvm/Config/sys/stat.h create mode 100644 include/llvm/Config/sys/time.h create mode 100644 include/llvm/Config/sys/types.h create mode 100644 include/llvm/Config/sys/wait.h create mode 100644 include/llvm/Config/time.h create mode 100644 include/llvm/Config/unistd.h create mode 100644 install-sh create mode 100644 ltmain.sh create mode 100755 mkinstalldirs diff --git a/Makefile.common b/Makefile.common index 88cdd97c00..e8a0697e60 100644 --- a/Makefile.common +++ b/Makefile.common @@ -30,14 +30,24 @@ # are in, if they are not in the current directory. This should include a # trailing / character. # -# 6. PROJ_COMPILE - If set to 1, then this makefile can also be used to -# compile other projects using llvm. Note if this option is set then the -# following *must* hold -# PROJLEVEL should be set to the top of the source directory for the -# project files -# LEVEL should be set to the top of LLVM source tree -# LLVM_LIB_DIR should be set to the top of the LLVM build tree +# 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree. # +# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM +# object files are placed. +# +# 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles +# and usually the source code too (unless SourceDir is set). +# +# 9. BUILD_SRC_ROOT - The root directory of the source code being compiled. +# +# 10. BUILD_OBJ_DIR - The directory where object code should be placed. +# +# 11. BUILD_OBJ_ROOT - The root directory for where object code should be +# placed. +# +# For building, +# LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and +# LLVM_OBJ_ROOT = BUILD_OBJ_ROOT. #===-----------------------------------------------------------------------==== # @@ -75,15 +85,21 @@ ifndef BUILD_SRC_ROOT BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd) endif +# +# Determine the path of the source tree relative from $HOME (the mythical +# home directory). +# +HOME_OBJ_ROOT := $(OBJ_ROOT)/$(patsubst $(HOME)%,%,$(BUILD_SRC_ROOT)) + # # Set the object build directory. Its location depends upon the source path # and where object files should go. # ifndef BUILD_OBJ_DIR ifeq ($(OBJ_ROOT),.) -BUILD_OBJ_DIR = $(shell pwd) +BUILD_OBJ_DIR = $(BUILD_SRC_DIR) else -BUILD_OBJ_DIR := $(OBJ_ROOT)$(patsubst $(shell dirname $(BUILD_SRC_ROOT))%,%,$(shell cd $(BUILD_SRC_DIR); pwd)) +BUILD_OBJ_DIR := $(HOME_OBJ_ROOT)$(patsubst $(BUILD_SRC_ROOT)%,%,$(BUILD_SRC_DIR)) endif endif @@ -92,9 +108,9 @@ endif # ifndef BUILD_OBJ_ROOT ifeq ($(OBJ_ROOT),.) -BUILD_OBJ_ROOT = $(shell cd $(LEVEL); pwd) +BUILD_OBJ_ROOT = $(BUILD_SRC_ROOT) else -BUILD_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(shell dirname $(BUILD_SRC_ROOT))%,%,$(shell cd $(BUILD_SRC_ROOT); pwd)) +BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT) endif endif @@ -113,16 +129,15 @@ ifndef LLVM_OBJ_ROOT LLVM_OBJ_ROOT = $(BUILD_OBJ_ROOT) endif -# Figure out how to do platform specific stuff on this platform. This is really -# gross and should be autoconfiscated (automake actually), but should hopefully -# work on Linux and solaris (SunOS). -# -UNAME := $(shell uname) -include $(LLVM_SRC_ROOT)/Makefile.$(UNAME) +########################################################################### +# Default Targets: +# The following targets are the standard top level targets for +# building. +########################################################################### ifdef SHARED_LIBRARY # if SHARED_LIBRARY is specified, the default is to build the dynamic lib -dynamic :: +all:: dynamic endif # Default Rule: Make sure it's also a :: rule @@ -134,6 +149,22 @@ install :: # Default rule for test. It ensures everything has a test rule test:: +# Print out the directories used for building +prdirs:: + echo "Home Offset : " $(HOME_OBJ_ROOT); + echo "Build Source Root: " $(BUILD_SRC_ROOT); + echo "Build Source Dir : " $(BUILD_SRC_DIR); + echo "Build Object Root: " $(BUILD_OBJ_ROOT); + echo "Build Object Dir : " $(BUILD_OBJ_DIR); + echo "LLVM Source Root: " $(LLVM_SRC_ROOT); + echo "LLVM Object Root: " $(LLVM_OBJ_ROOT); + +########################################################################### +# Miscellaneous paths and commands: +# This section defines various configuration macros, such as where +# to find burg, tblgen, and libtool. +########################################################################### + #-------------------------------------------------------------------- # Variables derived from configuration options... #-------------------------------------------------------------------- @@ -157,8 +188,21 @@ else endif endif +# +# Enable this for profiling support with 'gprof' +# This automatically enables optimized builds. +# +ifdef ENABLE_PROFILING + PROFILE = -pg +endif + +# +# Suffixes for library compilation rules +# +.SUFFIXES: .so + ########################################################################### -# Library Locations +# Library Locations: # These variables describe various library locations: # # DEST* = Location of where libraries that are built will be placed. @@ -208,36 +252,45 @@ PROJTOOLRELEASE := $(BUILD_OBJ_ROOT)/tools/Release PROJTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION) +# +# Libtool is found in the current directory. +# +ifdef VERBOSE +LIBTOOL=$(LLVM_SRC_ROOT)/libtool +else +LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent +endif + +# # Verbosity levels +# ifndef VERBOSE VERB := @ endif -#--------------------------------------------------------- -# Compilation options... -#--------------------------------------------------------- - ########################################################################### -# Special tools used while building the LLVM tree. Burg is built as part of the -# utils directory. +# Miscellaneous paths and commands (part deux): +# This section defines various configuration macros, such as where +# to find burg, tblgen, and libtool. ########################################################################### + +#-------------------------------------------------------------------------- +# Special tools used while building the LLVM tree. Burg is built as part +# of the utils directory. +#-------------------------------------------------------------------------- BURG := $(LLVMTOOLCURRENT)/burg RunBurg := $(BURG) $(BURG_OPTS) TBLGEN := $(LLVMTOOLCURRENT)/tblgen -# Enable this for profiling support with 'gprof' -# This automatically enables optimized builds. -ifdef ENABLE_PROFILING - PROFILE = -pg -endif ########################################################################### # Compile Time Flags ########################################################################### # -# Include both the project headers and the LLVM headers for compilation +# Include both the project headers and the LLVM headers for compilation and +# dependency computation. # CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include @@ -254,47 +307,71 @@ CPPFLAGS += -D_GNU_SOURCE CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums +# +# Compile commands with libtool. +# +Compile := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) +CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts) + +# +# Add the LLVM specific "-only-static" option so that we only compile .o files +# once when not building a shared library. +# +# For shared libraries, we will end up building twice, but that doesn't happen +# very often, so we'll let it go. +# +ifndef SHARED_LIBRARY +Compile := $(Compile) -only-static +CompileC := $(CompileC) -only-static +endif + # Compile a cpp file, don't link... -Compile := $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) CompileG := $(Compile) -g -D_DEBUG CompileO := $(Compile) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer CompileP := $(Compile) $(CompileOptimizeOpts) -felide-constructors $(PROFILE) # Compile a c file, don't link... -CompileC := $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts) CompileCG := $(CompileC) -g -D_DEBUG CompileCO := $(CompileC) $(CompileOptimizeOpts) -fomit-frame-pointer CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE) +########################################################################### +# Link Time Options +########################################################################### +# # Link final executable - +# (Note that we always link with the C++ compiler). +# ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1' -Link := $(PURIFY) $(CXX) -static +Link := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static else -Link := $(CXX) +Link := $(LIBTOOL) --mode=link $(CXX) endif -ifdef PROJ_COMPILE -# include both projlib source and llvmlib source +# link both projlib and llvmlib libraries LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP) LinkO := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE) LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE) -else -LinkG := $(Link) -g -L$(LLVMLIBDEBUGSOURCE) $(STRIP) -LinkO := $(Link) -O3 -L$(LLVMLIBRELEASESOURCE) -LinkP := $(Link) -O3 -L$(LLVMLIBPROFILESOURCE) $(PROFILE) -endif - - # Create one .o file from a bunch of .o files... -Relink = ${LD} -r +Relink = ${LIBTOOL} --mode=link $(CXX) # MakeSO - Create a .so file from a .o files... -MakeSO := $(CXX) $(MakeSharedObjectOption) -MakeSOO := $(MakeSO) -O3 -MakeSOP := $(MakeSOO) $(PROFILE) +#MakeSO := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption) +#MakeSOO := $(MakeSO) -O3 +#MakeSOP := $(MakeSOO) $(PROFILE) + +# +# Configure where the item being compiled should go. +# +ifdef SHARED_LIBRARY +Link := $(Link) -rpath $(DESTLIBCURRENT) +endif + +ifdef TOOLNAME +Link := $(Link) -rpath $(DESTTOOLCURRENT) +endif # Create dependancy file from CPP file, send to stdout. Depend := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) @@ -313,11 +390,10 @@ ifndef Source Source := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l) endif -Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(notdir $(basename $(Source)))))) -ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs)) -ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs)) -ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs)) - +LObjs := $(sort $(patsubst Debug/%.lo, %.lo, $(addsuffix .lo,$(notdir $(basename $(Source)))))) +LObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(LObjs)) +LObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(LObjs)) +LObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(LObjs)) #--------------------------------------------------------- # Handle the DIRS and PARALLEL_DIRS options @@ -341,6 +417,7 @@ test :: $(addsuffix /.maketest , $(PARALLEL_DIRS)) $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@) endif +# Handle directories that may or may not exist ifdef OPTIONAL_DIRS all install clean test :: $(VERB) for dir in ${OPTIONAL_DIRS}; do \ @@ -351,6 +428,9 @@ all install clean test :: done endif +########################################################################### +# Library Build Rules: +# #--------------------------------------------------------- # Handle the LIBRARYNAME option - used when building libs... #--------------------------------------------------------- @@ -367,6 +447,7 @@ endif # it's built as a .o file, then all of the constituent .o files in it will be # linked into tools (for example gccas) even if they only use one of the parts # of it. For this reason, sometimes it's useful to use libraries as .a files. +########################################################################### ifdef LIBRARYNAME @@ -383,6 +464,11 @@ LIBNAME_OBJO := $(DESTLIBRELEASE)/$(LIBRARYNAME).o LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o +#-------------------------------------------------------------------- +# Library Targets +# Modify the top level targets to build the desired libraries. +#-------------------------------------------------------------------- + # dynamic target builds a shared object version of the library... dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so @@ -396,44 +482,60 @@ ifdef BUILD_ARCHIVE all:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).a endif -$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir - @echo ======= Linking $(LIBRARYNAME) release library ======= - $(VERB) $(MakeSOO) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts) +#-------------------------------------------------------------------- +# Rules for building libraries +#-------------------------------------------------------------------- + +# +# Rules for building dynamically linked libraries. +# +$(LIBNAME_O): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir + @echo ======= Linking $(LIBRARYNAME) dynamic release library ======= + $(VERB) $(Link) -o $*.la $(LObjectsO) $(LibSubDirs) $(LibLinkOpts); + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); -$(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir - @echo ======= Linking $(LIBRARYNAME) profile library ======= - $(VERB) $(MakeSOP) -o $@ $(ObjectsP) $(LibSubDirs) $(LibLinkOpts) +$(LIBNAME_P): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir + @echo ======= Linking $(LIBRARYNAME) dynamic profile library ======= + $(VERB) $(Link) -o $*.la $(LObjectsP) $(LibSubDirs) $(LibLinkOpts); + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); -$(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir - @echo ======= Linking $(LIBRARYNAME) debug library ======= - $(VERB) $(MakeSO) -g -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts) +$(LIBNAME_G): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir + @echo ======= Linking $(LIBRARYNAME) dynamic debug library ======= + $(VERB) $(Link) -o $*.la $(LObjectsG) $(LibSubDirs) $(LibLinkOpts); + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); -$(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir - @echo ======= Linking $(LIBRARYNAME) release library ======= - @rm -f $@ - $(VERB) $(AR) $@ $(ObjectsO) $(LibSubDirs) +# +# Rules for building static archive libraries. +# +$(LIBNAME_AO): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir + @echo ======= Linking $(LIBRARYNAME) archive release library ======= + @$(RM) -f $@ + $(VERB) $(Link) -03 -o $@ $(LObjectsO) $(LibSubDirs) -static -$(LIBNAME_AP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir - @echo ======= Linking $(LIBRARYNAME) profile library ======= - @rm -f $@ - $(VERB) $(AR) $@ $(ObjectsP) $(LibSubDirs) +$(LIBNAME_AP): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir + @echo ======= Linking $(LIBRARYNAME) archive profile library ======= + @$(RM) -f $@ + $(VERB) $(Link) -03 $(PROFILE) -o $@ $(LObjectsP) $(LibSubDirs) -static -$(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir - @echo ======= Linking $(LIBRARYNAME) debug library ======= - @rm -f $@ - $(VERB) $(AR) $@ $(ObjectsG) $(LibSubDirs) +$(LIBNAME_AG): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir + @echo ======= Linking $(LIBRARYNAME) archive debug library ======= + @$(RM) -f $@ + $(VERB) $(Link) -g $(STRIP) -o $@ $(LObjectsG) $(LibSubDirs) -static -$(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir +# +# Rules for building .o libraries. +# +$(LIBNAME_OBJO): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsO) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(LObjectsO) $(LibSubDirs) -$(LIBNAME_OBJP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir +$(LIBNAME_OBJP): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsP) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(LObjectsP) $(LibSubDirs) -$(LIBNAME_OBJG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir +$(LIBNAME_OBJG): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsG) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(LObjectsG) $(LibSubDirs) endif @@ -441,11 +543,16 @@ endif # Create a TAGS database for emacs #------------------------------------------------------------------------ +ifdef ETAGS ifeq ($(LEVEL), .) tags: - etags -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'` + $(ETAGS) -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'` all:: tags endif +else +tags: + ${ECHO} "Cannot build $@: The program etags is not installed" +endif #------------------------------------------------------------------------ # Handle the TOOLNAME option - used when building tool executables... @@ -487,8 +594,14 @@ STATICUSEDLIBS := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS))) USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS)) -LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS) +#LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS) +# +# Libtool link options: +# Ensure that all binaries have their symbols exported so that they can +# by dlsym'ed. +# +LINK_OPTS := -export-dynamic $(TOOLLINKOPTS) @@ -502,19 +615,19 @@ $(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \ all:: $(TOOLEXENAMES) clean:: - $(VERB) rm -f $(TOOLEXENAMES) + $(VERB) $(RM) -f $(TOOLEXENAMES) -$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir +$(TOOLEXENAME_G): $(LObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir @echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG)======= - $(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) + $(VERB) $(LinkG) -o $@ $(LObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) $(LIBS) -$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir +$(TOOLEXENAME_O): $(LObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir @echo ======= Linking $(TOOLNAME) release executable ======= - $(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) + $(VERB) $(LinkO) -o $@ $(LObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) $(LIBS) -$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir +$(TOOLEXENAME_P): $(LObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir @echo ======= Linking $(TOOLNAME) profile executable ======= - $(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) + $(VERB) $(LinkP) -o $@ $(LObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS) endif @@ -525,26 +638,74 @@ endif .PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir # Create .o files in the ObjectFiles directory from the .cpp and .c files... -$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir +#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileO) $< -o $@ + +#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir + #$(VERB) $(CompileCO) $< -o $@ + +#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileP) $< -o $@ + +#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileCP) $< -o $@ + +#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileG) $< -o $@ + +#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir + #$(VERB) $(CompileCG) $< -o $@ + +# Create .lo files in the ObjectFiles directory from the .cpp and .c files... +$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir @echo "Compiling $<" $(VERB) $(CompileO) $< -o $@ -$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir +$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir + @echo "Compiling $<" $(VERB) $(CompileCO) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileP) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileCP) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir +$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir @echo "Compiling $<" $(VERB) $(CompileG) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir +$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir + @echo "Compiling $<" + $(VERB) $(CompileCG) $< -o $@ + +# Create .lo files in the ObjectFiles directory from the .cpp and .c files... +$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir + @echo "Compiling $<" + $(VERB) $(CompileO) $< -o $@ + +$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir + $(VERB) $(CompileCO) $< -o $@ + +$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir + @echo "Compiling $<" + $(VERB) $(CompileP) $< -o $@ + +$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir + @echo "Compiling $<" + $(VERB) $(CompileCP) $< -o $@ + +$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir + @echo "Compiling $<" + $(VERB) $(CompileG) $< -o $@ + +$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir $(VERB) $(CompileCG) $< -o $@ # @@ -565,10 +726,10 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output) # FIXME. (f.e. char Buffer[10000]; ) # %.cpp: %.l - $(FLEX) -t $< | sed '/^find_rule/d' | \ - sed 's/void yyunput/inline void yyunput/' | \ - sed 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \ - sed 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@ + $(FLEX) -t $< | $(SED) '/^find_rule/d' | \ + $(SED) 's/void yyunput/inline void yyunput/' | \ + $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \ + $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@ # Rule for building the bison parsers... %.c: %.y # Cancel built-in rules for yacc @@ -576,23 +737,40 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output) %.cpp %.h : %.y @echo Bison\'ing $<... $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y - $(VERB) mv -f $*.tab.c $*.cpp - $(VERB) mv -f $*.tab.h $*.h + $(VERB) ${MV} -f $*.tab.c $*.cpp + $(VERB) ${MV} -f $*.tab.h $*.h # To create the directories... %/.dir: - $(VERB) mkdir -p $* - @date > $@ + $(VERB) ${MKDIR} $* > /dev/null + @$(DATE) > $@ # To create postscript files from dot files... +ifdef DOT +%.ps: %.dot + ${DOT} -Tps < $< > $@ +else %.ps: %.dot - dot -Tps < $< > $@ + ${ECHO} "Cannot build $@: The program dot is not installed" +endif # 'make clean' nukes the tree clean:: - $(VERB) rm -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend - $(VERB) rm -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc - $(VERB) rm -f $(LEX_OUTPUT) $(YACC_OUTPUT) + $(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend + $(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc + $(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT) + +distclean:: clean + $(VERB) (cd $(LLVM_SRC_ROOT); $(RM) -rf $(LEVEL)/Makefile.config \ + $(LEVEL)/include/Config/config.h \ + $(LEVEL)/autom4te.cache \ + $(LEVEL)/config.log) + +########################################################################### +# C/C++ Dependencies +# Define variables and rules that generate header file dependencies +# from C/C++ source files. +########################################################################### # If dependencies were generated for the file that included this file, # include the dependancies now... @@ -600,16 +778,29 @@ clean:: SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source)))) SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d) +# +# Depend target: +# This allows a user to manually ask for an update in the dependencies +# +depend: $(SourceDepend) + + # Create dependencies for the *.cpp files... #$(SourceDepend): \x $(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir - $(VERB) $(Depend) $< | sed 's|$*\.o *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ + $(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ # Create dependencies for the *.c files... #$(SourceDepend): \x $(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir - $(VERB) $(DependC) $< | sed 's|$*\.o *|Release/& Profile/& Debug/& Depend/$(@F)|g' > $@ + $(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ +# +# Include dependencies generated from C/C++ source files, but not if we +# are cleaning (this example taken from the GNU Make Manual). +# +ifneq ($(MAKECMDGOALS),clean) ifneq ($(SourceDepend),) -include $(SourceDepend) endif +endif diff --git a/Makefile.config b/Makefile.config index 8d78ea4130..e293595081 100644 --- a/Makefile.config +++ b/Makefile.config @@ -4,6 +4,11 @@ # values specific to a particular installation of LLVM. #===-----------------------------------------------------------------------==== +# +# Target operating system for which LLVM will be compiled. +# +OS=Linux + # Path to the C++ compiler to use. This is an optional setting, which defaults # to whatever your gmake defaults to. # @@ -11,22 +16,30 @@ # find the system assembler, which breaks if the LLVM assembler is in our path. # Hack it to use the assembler in /usr/bin directly. # -CXX = PATH=/usr/bin /usr/dcs/software/evaluation/bin/g++ +CXX = /home/vadve/criswell/local/Linux/bin/g++ # We have the same problem with the CC binary, which use used by testcases for # native builds. # -CC := PATH=/usr/bin /usr/dcs/software/evaluation/bin/gcc +CC := /home/vadve/criswell/local/Linux/bin/gcc + +# +# Compilation flags for the C and C++ compilers. +# +CPPFLAGS=-DHAVE_CONFIG_H +CCFLAGS=-DHAVE_CONFIG_H +LDFLAGS= +LIBS=-ldl # -# Path to the linker. +# Libraries needed by tools # -LD = ld +TOOLLINKOPTS=-ldl # # Path to the archiver program. # -AR_PATH = ar +AR_PATH = /usr/bin/ar # # The pathnames of the Flex and Bison programs, respectively. @@ -35,17 +48,34 @@ BISON = bison FLEX = flex # -# Path OBJ_ROOT to the directory where object files should be stored during a -# build. Set to "." if you do not want to use a separate place for object -# files. +# Paths to miscellaneous programs. +# +SED = /bin/sed +RM = /bin/rm +ECHO = /bin/echo +MKDIR = /home/vadve/criswell/box/mainline/llvm/mkinstalldirs +DATE = /bin/date +MV = /bin/mv +INSTALL = /usr/dcs/software/supported/bin/ginstall -c +DOT = /home/vadve/lattner/local/x86/bin/dot +ETAGS = /usr/dcs/software/supported/bin/etags + +# +# Determine the target for which LLVM should generate code. +# +LLVMGCCARCH := i686-pc-linux-gnu/3.4-llvm + +# Path to directory where object files should be stored during a build. +# Set OBJ_ROOT to "." if you do not want to use a separate place for +# object files. # #OBJ_ROOT = . -OBJ_ROOT := /localhome/$(USER) +OBJ_ROOT := /localhome/criswell # Path to location for LLVM front-end this should only be specified here if you # want to override the value set in Makefile.$(uname) # -#LLVMGCCDIR := /home/vadve/lattner/local/x86/llvm-gcc/ +LLVMGCCDIR := /home/vadve/lattner/local/x86/llvm-gcc/ # When this setting is set to true, programs in the llvm/test/Programs hierarchy # are not recompiled from source code. Instead, the bytecode for the file is @@ -55,6 +85,7 @@ OBJ_ROOT := /localhome/$(USER) # #USE_PRECOMPILED_BYTECODE := 1 + # This path specifies the cannonical location of bytecode files for compiled # versions of the test/Programs/* programs. This is used as the bytecode source # when USE_PRECOMPILED_BYTECODE is specified or when source code is not @@ -65,24 +96,26 @@ BYTECODE_REPOSITORY := /home/vadve/lattner/LLVMPrograms # Path to location for purify, this is only needed if you build with # ENABLE_PURIFY=1 # -PURIFY = /usr/dcs/applications/purify/bin/purify +PURIFY = # # SPEC benchmarks: -# Set this variable to enable the use of the SPEC benchmarks. You must -# provide the SPEC benchmarks on your own. +# Set the USE_SPEC variable to enable the use of the SPEC benchmarks. +# You must provide the SPEC benchmarks on your own. # -USE_SPEC := 1 + # # Path to the SPEC benchmarks. If you have the SPEC benchmarks, place the # path here. # +#SPEC_ROOT := /home/vadve/shared/benchmarks/speccpu2000/benchspec SPEC_ROOT := /home/vadve/shared/benchmarks/speccpu2000/benchspec # # Path to the PAPI code. This is used by the reoptimizer only. # +#PAPIDIR := /home/vadve/shared/papi-2.3.4.1 PAPIDIR := /home/vadve/shared/papi-2.3.4.1 # These are options that can either be enabled here, or can be enabled on the @@ -94,19 +127,33 @@ PAPIDIR := /home/vadve/shared/papi-2.3.4.1 # #ENABLE_OPTIMIZED = 1 + # When ENABLE_PROFILING is enabled, the llvm source base is built with profile # information to allow gprof to be used to get execution frequencies. # #ENABLE_PROFILING = 1 + # # This open tells the Makefiles to produce verbose output. # It essentially prints the commands that make is executing # #VERBOSE = 1 -# When ENABLE_PURIFY is enabled, the LLVM tools are linked with purify (which + +# When ENABLE_PURIFY is set to 1, the LLVM tools are linked with purify (which # must be locally installed) to allow for some automated memory error debugging. # -#ENABLE_PURIFY = 1 +#ENABLE_PURIFY = 1 + + +# +# Enable JIT for this platform +# + + +# +# Disable LLC diffs for testing. +# +DISABLE_LLC_DIFFS:=1 diff --git a/Makefile.config.in b/Makefile.config.in new file mode 100644 index 0000000000..81fd80d4f2 --- /dev/null +++ b/Makefile.config.in @@ -0,0 +1,159 @@ +#===-- Makefile.config - Local configuration for LLVM ------*- makefile -*--==== +# +# This file is included by Makefile.common. It defines paths and other +# values specific to a particular installation of LLVM. +#===-----------------------------------------------------------------------==== + +# +# Target operating system for which LLVM will be compiled. +# +OS=@OS@ + +# Path to the C++ compiler to use. This is an optional setting, which defaults +# to whatever your gmake defaults to. +# +# Under Linux, for some reason the compiler driver wants to search the PATH to +# find the system assembler, which breaks if the LLVM assembler is in our path. +# Hack it to use the assembler in /usr/bin directly. +# +CXX = @CXX@ + +# We have the same problem with the CC binary, which use used by testcases for +# native builds. +# +CC := @CC@ + +# +# Compilation flags for the C and C++ compilers. +# +CPPFLAGS=@DEFS@ +CCFLAGS=@DEFS@ +LDFLAGS=@LDFLAGS@ +LIBS=@LIBS@ + +# +# Libraries needed by tools +# +TOOLLINKOPTS=@LIBS@ + +# +# Path to the archiver program. +# +AR_PATH = @AR@ + +# +# The pathnames of the Flex and Bison programs, respectively. +# +BISON = @YACC@ +FLEX = @LEX@ + +# +# Paths to miscellaneous programs. +# +SED = @SED@ +RM = @RM@ +ECHO = @ECHO@ +MKDIR = @abs_top_srcdir@/mkinstalldirs +DATE = @DATE@ +MV = @MV@ +INSTALL = @INSTALL@ +DOT = @DOT@ +ETAGS = @ETAGS@ + +# +# Determine the target for which LLVM should generate code. +# +LLVMGCCARCH := @target@/3.4-llvm + +# Path to directory where object files should be stored during a build. +# Set OBJ_ROOT to "." if you do not want to use a separate place for +# object files. +# +#OBJ_ROOT = . +OBJ_ROOT := @OBJROOT@ + +# Path to location for LLVM front-end this should only be specified here if you +# want to override the value set in Makefile.$(uname) +# +LLVMGCCDIR := @LLVMGCCDIR@ + +# When this setting is set to true, programs in the llvm/test/Programs hierarchy +# are not recompiled from source code. Instead, the bytecode for the file is +# pulled from the BYTECODE_REPOSITORY directory. This can be useful when disk +# space is limited or when you just don't want to spend time running the C +# frontend. +# +#USE_PRECOMPILED_BYTECODE := 1 +@UPB@ + +# This path specifies the cannonical location of bytecode files for compiled +# versions of the test/Programs/* programs. This is used as the bytecode source +# when USE_PRECOMPILED_BYTECODE is specified or when source code is not +# available for the program (such as SPEC). +# +BYTECODE_REPOSITORY := @BCR@ + +# Path to location for purify, this is only needed if you build with +# ENABLE_PURIFY=1 +# +PURIFY = @PURIFY@ + +# +# SPEC benchmarks: +# Set the USE_SPEC variable to enable the use of the SPEC benchmarks. +# You must provide the SPEC benchmarks on your own. +# +@USE_SPEC@ + +# +# Path to the SPEC benchmarks. If you have the SPEC benchmarks, place the +# path here. +# +#SPEC_ROOT := /home/vadve/shared/benchmarks/speccpu2000/benchspec +SPEC_ROOT := @SPEC_ROOT@ + +# +# Path to the PAPI code. This is used by the reoptimizer only. +# +#PAPIDIR := /home/vadve/shared/papi-2.3.4.1 +PAPIDIR := @PAPIDIR@ + +# These are options that can either be enabled here, or can be enabled on the +# make command line (ie, make ENABLE_PROFILING=1) +# + +# When ENABLE_OPTIMIZED is enabled, Release builds of all of the LLVM code are +# turned on, and Debug builds are turned off. +# +#ENABLE_OPTIMIZED = 1 +@ENABLE_OPTIMIZED@ + +# When ENABLE_PROFILING is enabled, the llvm source base is built with profile +# information to allow gprof to be used to get execution frequencies. +# +#ENABLE_PROFILING = 1 +@ENABLE_PROFILING@ + +# +# This open tells the Makefiles to produce verbose output. +# It essentially prints the commands that make is executing +# +#VERBOSE = 1 +@ENABLE_VERBOSE@ + +# When ENABLE_PURIFY is set to 1, the LLVM tools are linked with purify (which +# must be locally installed) to allow for some automated memory error debugging. +# +#ENABLE_PURIFY = 1 +@ENABLE_PURIFY@ + +# +# Enable JIT for this platform +# +@JIT@ + +# +# Disable LLC diffs for testing. +# +@DISABLE_LLC_DIFFS@ + diff --git a/Makefile.rules b/Makefile.rules index 88cdd97c00..e8a0697e60 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -30,14 +30,24 @@ # are in, if they are not in the current directory. This should include a # trailing / character. # -# 6. PROJ_COMPILE - If set to 1, then this makefile can also be used to -# compile other projects using llvm. Note if this option is set then the -# following *must* hold -# PROJLEVEL should be set to the top of the source directory for the -# project files -# LEVEL should be set to the top of LLVM source tree -# LLVM_LIB_DIR should be set to the top of the LLVM build tree +# 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree. # +# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM +# object files are placed. +# +# 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles +# and usually the source code too (unless SourceDir is set). +# +# 9. BUILD_SRC_ROOT - The root directory of the source code being compiled. +# +# 10. BUILD_OBJ_DIR - The directory where object code should be placed. +# +# 11. BUILD_OBJ_ROOT - The root directory for where object code should be +# placed. +# +# For building, +# LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and +# LLVM_OBJ_ROOT = BUILD_OBJ_ROOT. #===-----------------------------------------------------------------------==== # @@ -75,15 +85,21 @@ ifndef BUILD_SRC_ROOT BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd) endif +# +# Determine the path of the source tree relative from $HOME (the mythical +# home directory). +# +HOME_OBJ_ROOT := $(OBJ_ROOT)/$(patsubst $(HOME)%,%,$(BUILD_SRC_ROOT)) + # # Set the object build directory. Its location depends upon the source path # and where object files should go. # ifndef BUILD_OBJ_DIR ifeq ($(OBJ_ROOT),.) -BUILD_OBJ_DIR = $(shell pwd) +BUILD_OBJ_DIR = $(BUILD_SRC_DIR) else -BUILD_OBJ_DIR := $(OBJ_ROOT)$(patsubst $(shell dirname $(BUILD_SRC_ROOT))%,%,$(shell cd $(BUILD_SRC_DIR); pwd)) +BUILD_OBJ_DIR := $(HOME_OBJ_ROOT)$(patsubst $(BUILD_SRC_ROOT)%,%,$(BUILD_SRC_DIR)) endif endif @@ -92,9 +108,9 @@ endif # ifndef BUILD_OBJ_ROOT ifeq ($(OBJ_ROOT),.) -BUILD_OBJ_ROOT = $(shell cd $(LEVEL); pwd) +BUILD_OBJ_ROOT = $(BUILD_SRC_ROOT) else -BUILD_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(shell dirname $(BUILD_SRC_ROOT))%,%,$(shell cd $(BUILD_SRC_ROOT); pwd)) +BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT) endif endif @@ -113,16 +129,15 @@ ifndef LLVM_OBJ_ROOT LLVM_OBJ_ROOT = $(BUILD_OBJ_ROOT) endif -# Figure out how to do platform specific stuff on this platform. This is really -# gross and should be autoconfiscated (automake actually), but should hopefully -# work on Linux and solaris (SunOS). -# -UNAME := $(shell uname) -include $(LLVM_SRC_ROOT)/Makefile.$(UNAME) +########################################################################### +# Default Targets: +# The following targets are the standard top level targets for +# building. +########################################################################### ifdef SHARED_LIBRARY # if SHARED_LIBRARY is specified, the default is to build the dynamic lib -dynamic :: +all:: dynamic endif # Default Rule: Make sure it's also a :: rule @@ -134,6 +149,22 @@ install :: # Default rule for test. It ensures everything has a test rule test:: +# Print out the directories used for building +prdirs:: + echo "Home Offset : " $(HOME_OBJ_ROOT); + echo "Build Source Root: " $(BUILD_SRC_ROOT); + echo "Build Source Dir : " $(BUILD_SRC_DIR); + echo "Build Object Root: " $(BUILD_OBJ_ROOT); + echo "Build Object Dir : " $(BUILD_OBJ_DIR); + echo "LLVM Source Root: " $(LLVM_SRC_ROOT); + echo "LLVM Object Root: " $(LLVM_OBJ_ROOT); + +########################################################################### +# Miscellaneous paths and commands: +# This section defines various configuration macros, such as where +# to find burg, tblgen, and libtool. +########################################################################### + #-------------------------------------------------------------------- # Variables derived from configuration options... #-------------------------------------------------------------------- @@ -157,8 +188,21 @@ else endif endif +# +# Enable this for profiling support with 'gprof' +# This automatically enables optimized builds. +# +ifdef ENABLE_PROFILING + PROFILE = -pg +endif + +# +# Suffixes for library compilation rules +# +.SUFFIXES: .so + ########################################################################### -# Library Locations +# Library Locations: # These variables describe various library locations: # # DEST* = Location of where libraries that are built will be placed. @@ -208,36 +252,45 @@ PROJTOOLRELEASE := $(BUILD_OBJ_ROOT)/tools/Release PROJTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION) +# +# Libtool is found in the current directory. +# +ifdef VERBOSE +LIBTOOL=$(LLVM_SRC_ROOT)/libtool +else +LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent +endif + +# # Verbosity levels +# ifndef VERBOSE VERB := @ endif -#--------------------------------------------------------- -# Compilation options... -#--------------------------------------------------------- - ########################################################################### -# Special tools used while building the LLVM tree. Burg is built as part of the -# utils directory. +# Miscellaneous paths and commands (part deux): +# This section defines various configuration macros, such as where +# to find burg, tblgen, and libtool. ########################################################################### + +#-------------------------------------------------------------------------- +# Special tools used while building the LLVM tree. Burg is built as part +# of the utils directory. +#-------------------------------------------------------------------------- BURG := $(LLVMTOOLCURRENT)/burg RunBurg := $(BURG) $(BURG_OPTS) TBLGEN := $(LLVMTOOLCURRENT)/tblgen -# Enable this for profiling support with 'gprof' -# This automatically enables optimized builds. -ifdef ENABLE_PROFILING - PROFILE = -pg -endif ########################################################################### # Compile Time Flags ########################################################################### # -# Include both the project headers and the LLVM headers for compilation +# Include both the project headers and the LLVM headers for compilation and +# dependency computation. # CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include @@ -254,47 +307,71 @@ CPPFLAGS += -D_GNU_SOURCE CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums +# +# Compile commands with libtool. +# +Compile := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) +CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts) + +# +# Add the LLVM specific "-only-static" option so that we only compile .o files +# once when not building a shared library. +# +# For shared libraries, we will end up building twice, but that doesn't happen +# very often, so we'll let it go. +# +ifndef SHARED_LIBRARY +Compile := $(Compile) -only-static +CompileC := $(CompileC) -only-static +endif + # Compile a cpp file, don't link... -Compile := $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) CompileG := $(Compile) -g -D_DEBUG CompileO := $(Compile) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer CompileP := $(Compile) $(CompileOptimizeOpts) -felide-constructors $(PROFILE) # Compile a c file, don't link... -CompileC := $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts) CompileCG := $(CompileC) -g -D_DEBUG CompileCO := $(CompileC) $(CompileOptimizeOpts) -fomit-frame-pointer CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE) +########################################################################### +# Link Time Options +########################################################################### +# # Link final executable - +# (Note that we always link with the C++ compiler). +# ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1' -Link := $(PURIFY) $(CXX) -static +Link := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static else -Link := $(CXX) +Link := $(LIBTOOL) --mode=link $(CXX) endif -ifdef PROJ_COMPILE -# include both projlib source and llvmlib source +# link both projlib and llvmlib libraries LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP) LinkO := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE) LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE) -else -LinkG := $(Link) -g -L$(LLVMLIBDEBUGSOURCE) $(STRIP) -LinkO := $(Link) -O3 -L$(LLVMLIBRELEASESOURCE) -LinkP := $(Link) -O3 -L$(LLVMLIBPROFILESOURCE) $(PROFILE) -endif - - # Create one .o file from a bunch of .o files... -Relink = ${LD} -r +Relink = ${LIBTOOL} --mode=link $(CXX) # MakeSO - Create a .so file from a .o files... -MakeSO := $(CXX) $(MakeSharedObjectOption) -MakeSOO := $(MakeSO) -O3 -MakeSOP := $(MakeSOO) $(PROFILE) +#MakeSO := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption) +#MakeSOO := $(MakeSO) -O3 +#MakeSOP := $(MakeSOO) $(PROFILE) + +# +# Configure where the item being compiled should go. +# +ifdef SHARED_LIBRARY +Link := $(Link) -rpath $(DESTLIBCURRENT) +endif + +ifdef TOOLNAME +Link := $(Link) -rpath $(DESTTOOLCURRENT) +endif # Create dependancy file from CPP file, send to stdout. Depend := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) @@ -313,11 +390,10 @@ ifndef Source Source := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l) endif -Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(notdir $(basename $(Source)))))) -ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs)) -ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs)) -ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs)) - +LObjs := $(sort $(patsubst Debug/%.lo, %.lo, $(addsuffix .lo,$(notdir $(basename $(Source)))))) +LObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(LObjs)) +LObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(LObjs)) +LObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(LObjs)) #--------------------------------------------------------- # Handle the DIRS and PARALLEL_DIRS options @@ -341,6 +417,7 @@ test :: $(addsuffix /.maketest , $(PARALLEL_DIRS)) $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@) endif +# Handle directories that may or may not exist ifdef OPTIONAL_DIRS all install clean test :: $(VERB) for dir in ${OPTIONAL_DIRS}; do \ @@ -351,6 +428,9 @@ all install clean test :: done endif +########################################################################### +# Library Build Rules: +# #--------------------------------------------------------- # Handle the LIBRARYNAME option - used when building libs... #--------------------------------------------------------- @@ -367,6 +447,7 @@ endif # it's built as a .o file, then all of the constituent .o files in it will be # linked into tools (for example gccas) even if they only use one of the parts # of it. For this reason, sometimes it's useful to use libraries as .a files. +########################################################################### ifdef LIBRARYNAME @@ -383,6 +464,11 @@ LIBNAME_OBJO := $(DESTLIBRELEASE)/$(LIBRARYNAME).o LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o +#-------------------------------------------------------------------- +# Library Targets +# Modify the top level targets to build the desired libraries. +#-------------------------------------------------------------------- + # dynamic target builds a shared object version of the library... dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so @@ -396,44 +482,60 @@ ifdef BUILD_ARCHIVE all:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).a endif -$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir - @echo ======= Linking $(LIBRARYNAME) release library ======= - $(VERB) $(MakeSOO) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts) +#-------------------------------------------------------------------- +# Rules for building libraries +#-------------------------------------------------------------------- + +# +# Rules for building dynamically linked libraries. +# +$(LIBNAME_O): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir + @echo ======= Linking $(LIBRARYNAME) dynamic release library ======= + $(VERB) $(Link) -o $*.la $(LObjectsO) $(LibSubDirs) $(LibLinkOpts); + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); -$(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir - @echo ======= Linking $(LIBRARYNAME) profile library ======= - $(VERB) $(MakeSOP) -o $@ $(ObjectsP) $(LibSubDirs) $(LibLinkOpts) +$(LIBNAME_P): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir + @echo ======= Linking $(LIBRARYNAME) dynamic profile library ======= + $(VERB) $(Link) -o $*.la $(LObjectsP) $(LibSubDirs) $(LibLinkOpts); + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); -$(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir - @echo ======= Linking $(LIBRARYNAME) debug library ======= - $(VERB) $(MakeSO) -g -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts) +$(LIBNAME_G): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir + @echo ======= Linking $(LIBRARYNAME) dynamic debug library ======= + $(VERB) $(Link) -o $*.la $(LObjectsG) $(LibSubDirs) $(LibLinkOpts); + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); -$(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir - @echo ======= Linking $(LIBRARYNAME) release library ======= - @rm -f $@ - $(VERB) $(AR) $@ $(ObjectsO) $(LibSubDirs) +# +# Rules for building static archive libraries. +# +$(LIBNAME_AO): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir + @echo ======= Linking $(LIBRARYNAME) archive release library ======= + @$(RM) -f $@ + $(VERB) $(Link) -03 -o $@ $(LObjectsO) $(LibSubDirs) -static -$(LIBNAME_AP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir - @echo ======= Linking $(LIBRARYNAME) profile library ======= - @rm -f $@ - $(VERB) $(AR) $@ $(ObjectsP) $(LibSubDirs) +$(LIBNAME_AP): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir + @echo ======= Linking $(LIBRARYNAME) archive profile library ======= + @$(RM) -f $@ + $(VERB) $(Link) -03 $(PROFILE) -o $@ $(LObjectsP) $(LibSubDirs) -static -$(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir - @echo ======= Linking $(LIBRARYNAME) debug library ======= - @rm -f $@ - $(VERB) $(AR) $@ $(ObjectsG) $(LibSubDirs) +$(LIBNAME_AG): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir + @echo ======= Linking $(LIBRARYNAME) archive debug library ======= + @$(RM) -f $@ + $(VERB) $(Link) -g $(STRIP) -o $@ $(LObjectsG) $(LibSubDirs) -static -$(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir +# +# Rules for building .o libraries. +# +$(LIBNAME_OBJO): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsO) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(LObjectsO) $(LibSubDirs) -$(LIBNAME_OBJP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir +$(LIBNAME_OBJP): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsP) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(LObjectsP) $(LibSubDirs) -$(LIBNAME_OBJG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir +$(LIBNAME_OBJG): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsG) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(LObjectsG) $(LibSubDirs) endif @@ -441,11 +543,16 @@ endif # Create a TAGS database for emacs #------------------------------------------------------------------------ +ifdef ETAGS ifeq ($(LEVEL), .) tags: - etags -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'` + $(ETAGS) -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'` all:: tags endif +else +tags: + ${ECHO} "Cannot build $@: The program etags is not installed" +endif #------------------------------------------------------------------------ # Handle the TOOLNAME option - used when building tool executables... @@ -487,8 +594,14 @@ STATICUSEDLIBS := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS))) USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS)) -LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS) +#LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS) +# +# Libtool link options: +# Ensure that all binaries have their symbols exported so that they can +# by dlsym'ed. +# +LINK_OPTS := -export-dynamic $(TOOLLINKOPTS) @@ -502,19 +615,19 @@ $(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \ all:: $(TOOLEXENAMES) clean:: - $(VERB) rm -f $(TOOLEXENAMES) + $(VERB) $(RM) -f $(TOOLEXENAMES) -$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir +$(TOOLEXENAME_G): $(LObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir @echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG)======= - $(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) + $(VERB) $(LinkG) -o $@ $(LObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) $(LIBS) -$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir +$(TOOLEXENAME_O): $(LObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir @echo ======= Linking $(TOOLNAME) release executable ======= - $(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) + $(VERB) $(LinkO) -o $@ $(LObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) $(LIBS) -$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir +$(TOOLEXENAME_P): $(LObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir @echo ======= Linking $(TOOLNAME) profile executable ======= - $(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) + $(VERB) $(LinkP) -o $@ $(LObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS) endif @@ -525,26 +638,74 @@ endif .PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir # Create .o files in the ObjectFiles directory from the .cpp and .c files... -$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir +#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileO) $< -o $@ + +#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir + #$(VERB) $(CompileCO) $< -o $@ + +#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileP) $< -o $@ + +#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileCP) $< -o $@ + +#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir + #@echo "Compiling $<" + #$(VERB) $(CompileG) $< -o $@ + +#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir + #$(VERB) $(CompileCG) $< -o $@ + +# Create .lo files in the ObjectFiles directory from the .cpp and .c files... +$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir @echo "Compiling $<" $(VERB) $(CompileO) $< -o $@ -$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir +$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir + @echo "Compiling $<" $(VERB) $(CompileCO) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileP) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/P