X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.rules;h=56d3a8739edefb302cc6c641d73dcb36a7aaa32f;hb=f45a82890e34984ad1e1e259f8fb902caddfb0b1;hp=3fdae66c413e716c6242cc68ae049e94e091eabe;hpb=eb909ca524f89a24c9bc668aebd9204783576ff2;p=oota-llvm.git diff --git a/Makefile.rules b/Makefile.rules index 3fdae66c413..56d3a8739ed 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -4,7 +4,7 @@ # # This file is distributed under the University of Illinois Open Source # License. See LICENSE.TXT for details. -# +# #===------------------------------------------------------------------------===# # # This file is included by all of the LLVM makefiles. For details on how to use @@ -22,9 +22,9 @@ RecursiveTargets := all clean clean-all install uninstall install-bytecode LocalTargets := all-local clean-local clean-all-local check-local \ install-local printvars uninstall-local \ - install-bytecode-local + install-bytecode-local unittests TopLevelTargets := check dist dist-check dist-clean dist-gzip dist-bzip2 \ - dist-zip + dist-zip unittests UserTargets := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets) InternalTargets := preconditions distdir dist-hook @@ -41,7 +41,7 @@ VPATH=$(PROJ_SRC_DIR) # Reset the list of suffixes we know how to build. #-------------------------------------------------------------------- .SUFFIXES: -.SUFFIXES: .c .cpp .cc .h .hpp .y .l .lo .o .a .bc .td .ps .dot .ll +.SUFFIXES: .c .cpp .cc .h .hpp .o .a .bc .td .ps .dot .ll .SUFFIXES: $(SHLIBEXT) $(SUFFIXES) #-------------------------------------------------------------------- @@ -50,7 +50,7 @@ VPATH=$(PROJ_SRC_DIR) .PHONY: $(UserTargets) $(InternalTargets) #-------------------------------------------------------------------- -# Make sure all the user-target rules are double colon rules and +# Make sure all the user-target rules are double colon rules and # they are defined first. #-------------------------------------------------------------------- @@ -184,11 +184,11 @@ endif $(UserTargets):: $(PreConditions) all:: all-local -clean:: clean-local +clean:: clean-local clean-all:: clean-local clean-all-local install:: install-local uninstall:: uninstall-local -install-local:: all-local +install-local:: all-local install-bytecode:: install-bytecode-local ############################################################################### @@ -269,17 +269,41 @@ else CPP.Defines += -D_DEBUG endif -# If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or -# configured), then enable expensive checks by defining the +# If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or +# configured), then enable expensive checks by defining the # appropriate preprocessor symbols. ifdef ENABLE_EXPENSIVE_CHECKS BuildMode := $(BuildMode)+Checks - CPP.Defines += -D_GLIBCXX_DEBUG + CPP.Defines += -D_GLIBCXX_DEBUG -DXDEBUG +endif + +# LOADABLE_MODULE implies several other things so we force them to be +# defined/on. +ifdef LOADABLE_MODULE + SHARED_LIBRARY := 1 + DONT_BUILD_RELINKED := 1 + LINK_LIBS_IN_SHARED := 1 +endif + +ifdef SHARED_LIBRARY + ENABLE_PIC := 1 + PIC_FLAG = "(PIC)" endif ifeq ($(ENABLE_PIC),1) - CXX.Flags += -fPIC - C.Flags += -fPIC + ifeq ($(LLVM_ON_WIN32),1) + # Nothing. Win32 defaults to PIC and warns when given -fPIC + else + ifeq ($(OS),Darwin) + # Common symbols not allowed in dylib files + CXX.Flags += -fno-common + C.Flags += -fno-common + else + # Linux and others; pass -fPIC + CXX.Flags += -fPIC + C.Flags += -fPIC + endif + endif endif CXX.Flags += $(CXXFLAGS) -Woverloaded-virtual @@ -288,7 +312,6 @@ CPP.Defines += $(CPPFLAGS) CPP.BaseFlags += $(CPP.Defines) LD.Flags += $(LDFLAGS) AR.Flags := cru -LibTool.Flags := --tag=CXX # Make Floating point IEEE compliant on Alpha. ifeq ($(ARCH),Alpha) @@ -309,29 +332,17 @@ endif #-------------------------------------------------------------------- TargetMode := ifeq ($(LLVM_CROSS_COMPILING),1) - ifeq ($(BUILD_COMPONENT),1) - TargetMode := Build - else - TargetMode := Host - endif - BuildLLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/Build/bin + BuildLLVMToolDir := $(LLVM_OBJ_ROOT)/BuildTools/$(BuildMode)/bin endif ObjRootDir := $(PROJ_OBJ_DIR)/$(BuildMode) -# It is very important that ObjDir not have an extra trailing -# slash. This ends up changing the rules so that dependency file (.d) -# information is not used at all! -ifeq ($(TargetMode),) - ObjDir := $(ObjRootDir) -else - ObjDir := $(ObjRootDir)/$(TargetMode) -endif -LibDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/lib -ToolDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin -ExmplDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples -LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/lib -LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin -LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples +ObjDir := $(ObjRootDir) +LibDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib +ToolDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/bin +ExmplDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/examples +LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib +LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin +LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples CFERuntimeLibDir := $(LLVMGCCDIR)/lib #-------------------------------------------------------------------- @@ -339,20 +350,17 @@ CFERuntimeLibDir := $(LLVMGCCDIR)/lib #-------------------------------------------------------------------- EchoCmd = $(ECHO) llvm[$(MAKELEVEL)]: Echo = @$(EchoCmd) -ifndef LIBTOOL -LIBTOOL := $(LLVM_OBJ_ROOT)/mklib -endif ifndef LLVMAS LLVMAS := $(LLVMToolDir)/llvm-as$(EXEEXT) endif ifndef TBLGEN ifeq ($(LLVM_CROSS_COMPILING),1) - TBLGEN := $(BuildLLVMToolDir)/tblgen$(EXEEXT) + TBLGEN := $(BuildLLVMToolDir)/tblgen$(BUILD_EXEEXT) else TBLGEN := $(LLVMToolDir)/tblgen$(EXEEXT) endif endif -LLVM_CONFIG := $(LLVMToolDir)/llvm-config +LLVM_CONFIG := $(LLVMToolDir)/llvm-config ifndef LLVMLD LLVMLD := $(LLVMToolDir)/llvm-ld$(EXEEXT) endif @@ -390,21 +398,15 @@ endif # Adjust to user's request #-------------------------------------------------------------------- -# Adjust LD.Flags and Libtool.Flags depending on the kind of library that is -# to be built. Note that if LOADABLE_MODULE is specified then the resulting -# shared library can be opened with dlopen. Also, LOADABLE_MODULE implies -# several other things so we force them to be defined/on. +# Adjust LD.Flags depending on the kind of library that is to be built. Note +# that if LOADABLE_MODULE is specified then the resulting shared library can +# be opened with dlopen. ifdef LOADABLE_MODULE - SHARED_LIBRARY := 1 - DONT_BUILD_RELINKED := 1 - LINK_LIBS_IN_SHARED := 1 LD.Flags += -module endif ifdef SHARED_LIBRARY - LD.Flags += -rpath $(LibDir) -else - LibTool.Flags += --tag=disable-shared + LD.Flags += -Wl,-rpath -Wl,$(LibDir) endif ifdef TOOL_VERBOSE @@ -417,11 +419,10 @@ endif # Adjust settings for verbose mode ifndef VERBOSE Verb := @ - LibTool.Flags += --silent AR.Flags += >/dev/null 2>/dev/null ConfigureScriptFLAGS += >$(PROJ_OBJ_DIR)/configure.out 2>&1 else - ConfigureScriptFLAGS := + ConfigureScriptFLAGS := endif # By default, strip symbol information from executable @@ -432,19 +433,30 @@ ifndef KEEP_SYMBOLS endif # Adjust linker flags for building an executable +ifneq ($(OS),Darwin) ifdef TOOLNAME ifdef EXAMPLE_TOOL - LD.Flags += -rpath $(ExmplDir) -export-dynamic + LD.Flags += -Wl,-rpath -Wl,$(ExmplDir) -export-dynamic else - LD.Flags += -rpath $(ToolDir) -export-dynamic + LD.Flags += -Wl,-rpath -Wl,$(ToolDir) -export-dynamic +endif endif endif +ifeq ($(OS),Darwin) + DARWIN_VERSION := `sw_vers -productVersion` + SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress -bundle \ + -mmacosx-version-min=$(DARWIN_VERSION) + CompileCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION) +else + SharedLinkOptions=-shared +endif + #---------------------------------------------------------- # Options To Invoke Tools #---------------------------------------------------------- -CompileCommonOpts := -pedantic -Wall -W -Wwrite-strings -Wno-long-long \ +CompileCommonOpts += -pedantic -Wall -W -Wwrite-strings -Wno-long-long \ -Wunused -Wno-unused-parameter $(EXTRA_OPTIONS) ifeq ($(OS),HP-UX) @@ -468,10 +480,10 @@ ifdef UNIVERSAL endif UNIVERSAL_ARCH_OPTIONS := $(UNIVERSAL_ARCH:%=-arch %) CompileCommonOpts += $(UNIVERSAL_ARCH_OPTIONS) - Relink.Flags := $(UNIVERSAL_ARCH_OPTIONS:%=-XCClinker %) + Relink.Flags := $(UNIVERSAL_ARCH_OPTIONS) ifdef UNIVERSAL_SDK_PATH CompileCommonOpts += -isysroot $(UNIVERSAL_SDK_PATH) - Relink.Flags += -XCClinker -isysroot -XCClinker $(UNIVERSAL_SDK_PATH) + Relink.Flags += -isysroot $(UNIVERSAL_SDK_PATH) endif # Building universal cannot compute dependencies automatically. @@ -482,7 +494,7 @@ ifeq ($(OS),SunOS) CPP.BaseFlags += -include llvm/System/Solaris.h endif -LD.Flags += -L$(LibDir) -L$(LLVMLibDir) +LD.Flags += -L$(LibDir) -L$(LLVMLibDir) CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS # All -I flags should go here, so that they don't confuse llvm-config. CPP.Flags += $(sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \ @@ -509,26 +521,21 @@ else $(Relink.Flags) endif -LTCompile.C = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C) BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -E -LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX) BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CXX.Flags) \ $(CompileCommonOpts) -LTLink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(Link) -LTRelink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(Relink) -LTInstall = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \ - $(Install.Flags) -ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755 -ScriptInstall = $(INSTALL) -m 0755 +ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755 +ScriptInstall = $(INSTALL) -m 0755 DataInstall = $(INSTALL) -m 0644 # When compiling under Mingw/Cygwin, the tblgen tool expects Windows # paths. In this case, the SYSPATH function (defined in # Makefile.config) transforms Unix paths into Windows paths. TableGen = $(TBLGEN) -I $(call SYSPATH, $(PROJ_SRC_DIR)) \ + -I $(call SYSPATH, $(LLVM_SRC_ROOT)/include) \ -I $(call SYSPATH, $(PROJ_SRC_ROOT)/include) \ -I $(call SYSPATH, $(PROJ_SRC_ROOT)/lib/Target) @@ -541,26 +548,24 @@ Ranlib = ranlib endif #---------------------------------------------------------- -# Get the list of source files and compute object file -# names from them. +# Get the list of source files and compute object file +# names from them. #---------------------------------------------------------- ifndef SOURCES Sources := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp \ - $(PROJ_SRC_DIR)/*.cc $(PROJ_SRC_DIR)/*.c $(PROJ_SRC_DIR)/*.y \ - $(PROJ_SRC_DIR)/*.l)) + $(PROJ_SRC_DIR)/*.cc $(PROJ_SRC_DIR)/*.c)) else Sources := $(SOURCES) -endif +endif ifdef BUILT_SOURCES -Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES)) +Sources += $(filter %.cpp %.c %.cc,$(BUILT_SOURCES)) endif BaseNameSources := $(sort $(basename $(Sources))) ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o) -ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo) ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) ############################################################################### @@ -572,10 +577,8 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) # in the file so they get built before dependencies #--------------------------------------------------------- -$(PROJ_bindir): $(PROJ_bindir)/.dir -$(PROJ_libdir): $(PROJ_libdir)/.dir -$(PROJ_includedir): $(PROJ_includedir)/.dir -$(PROJ_etcdir): $(PROJ_etcdir)/.dir +$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir):: + $(Verb) $(MKDIR) $@ # To create other directories, as needed, and timestamp their creation %/.dir: @@ -589,21 +592,11 @@ $(PROJ_etcdir): $(PROJ_etcdir)/.dir # Handle the DIRS options for sequential construction #--------------------------------------------------------- -SubDirs := +SubDirs := ifdef DIRS SubDirs += $(DIRS) ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT)) -ifdef BUILD_TARGET_DIRS -$(RecursiveTargets):: - $(Verb) for dir in $(BUILD_TARGET_DIRS); do \ - if [ ! -f $$dir/Makefile ]; then \ - $(MKDIR) $$dir; \ - $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ - fi; \ - ($(MAKE) -C $$dir $@ BUILD_COMPONENT=1 NO_INSTALL=1 ) || exit 1; \ - done -endif $(RecursiveTargets):: $(Verb) for dir in $(DIRS); do \ if [ ! -f $$dir/Makefile ]; then \ @@ -613,12 +606,6 @@ $(RecursiveTargets):: ($(MAKE) -C $$dir $@ ) || exit 1; \ done else -ifdef BUILD_TARGET_DIRS -$(RecursiveTargets):: - $(Verb) for dir in $(BUILD_TARGET_DIRS); do \ - ($(MAKE) -C $$dir $@ BUILD_COMPONENT=1 NO_INSTALL=1 ) || exit 1; \ - done -endif $(RecursiveTargets):: $(Verb) for dir in $(DIRS); do \ ($(MAKE) -C $$dir $@ ) || exit 1; \ @@ -642,6 +629,13 @@ $(RecursiveTargets):: done endif +#----------------------------------------------------------- +# Handle the OPTIONAL_PARALLEL_DIRS options for optional parallel construction +#----------------------------------------------------------- +ifdef OPTIONAL_PARALLEL_DIRS + PARALLEL_DIRS += $(foreach T,$(OPTIONAL_PARALLEL_DIRS),$(shell test -d $(PROJ_SRC_DIR)/$(T) && echo "$(T)")) +endif + #----------------------------------------------------------- # Handle the PARALLEL_DIRS options for parallel construction #----------------------------------------------------------- @@ -732,8 +726,8 @@ endif #--------------------------------------------------------- # Define various command line options pertaining to the -# libraries needed when linking. There are "Proj" libs -# (defined by the user's project) and "LLVM" libs (defined +# libraries needed when linking. There are "Proj" libs +# (defined by the user's project) and "LLVM" libs (defined # by the LLVM project). #--------------------------------------------------------- @@ -821,7 +815,7 @@ DestModule := $(ModuleDestDir)/$(MODULE_NAME).bc install-module:: $(DestModule) install-local:: $(DestModule) -$(DestModule): $(ModuleDestDir) $(Module) +$(DestModule): $(ModuleDestDir) $(Module) $(Echo) Installing $(BuildMode) Bytecode Module $(DestModule) $(Verb) $(DataInstall) $(Module) $(DestModule) @@ -839,11 +833,12 @@ ifdef LIBRARYNAME # Make sure there isn't any extranous whitespace on the LIBRARYNAME option LIBRARYNAME := $(strip $(LIBRARYNAME)) ifdef LOADABLE_MODULE -LibName.LA := $(LibDir)/$(LIBRARYNAME).la +LibName.A := $(LibDir)/$(LIBRARYNAME).a +LibName.SO := $(LibDir)/$(LIBRARYNAME)$(SHLIBEXT) else -LibName.LA := $(LibDir)/lib$(LIBRARYNAME).la -endif LibName.A := $(LibDir)/lib$(LIBRARYNAME).a +LibName.SO := $(LibDir)/lib$(LIBRARYNAME)$(SHLIBEXT) +endif LibName.O := $(LibDir)/$(LIBRARYNAME).o LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca @@ -855,7 +850,7 @@ LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca #--------------------------------------------------------- ifdef SHARED_LIBRARY -all-local:: $(LibName.LA) +all-local:: $(LibName.SO) ifdef LINK_LIBS_IN_SHARED ifdef LOADABLE_MODULE @@ -863,22 +858,20 @@ SharedLibKindMessage := "Loadable Module" else SharedLibKindMessage := "Shared Library" endif -$(LibName.LA): $(ObjectsLO) $(ProjLibsPaths) $(LLVMLibsPaths) $(LibDir)/.dir +$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(LibDir)/.dir $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ $(LIBRARYNAME)$(SHLIBEXT) - $(Verb) $(LTLink) -o $@ $(ObjectsLO) $(ProjLibsOptions) \ - $(LLVMLibsOptions) - $(Verb) $(LTInstall) $@ $(LibDir) + $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ + $(ProjLibsOptions) $(LLVMLibsOptions) else -$(LibName.LA): $(ObjectsLO) $(LibDir)/.dir +$(LibName.SO): $(ObjectsO) $(LibDir)/.dir $(Echo) Linking $(BuildMode) Shared Library $(LIBRARYNAME)$(SHLIBEXT) - $(Verb) $(LTLink) -o $@ $(ObjectsLO) - $(Verb) $(LTInstall) $@ $(LibDir) + $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) endif clean-local:: -ifneq ($(strip $(LibName.LA)),) - -$(Verb) $(RM) -f $(LibName.LA) +ifneq ($(strip $(LibName.SO)),) + -$(Verb) $(RM) -f $(LibName.SO) endif ifdef NO_INSTALL @@ -891,12 +884,11 @@ DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT) install-local:: $(DestSharedLib) -$(DestSharedLib): $(PROJ_libdir) $(LibName.LA) +$(DestSharedLib): $(LibName.SO) $(PROJ_libdir) $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib) - $(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib) - $(Verb) $(LIBTOOL) --finish $(PROJ_libdir) + $(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib) -uninstall-local:: +uninstall-local:: $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib) -$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).* endif @@ -905,7 +897,7 @@ endif #--------------------------------------------------------- # Bytecode Library Targets: # If the user asked for a bytecode library to be built -# with the BYTECODE_LIBRARY variable, then we provide +# with the BYTECODE_LIBRARY variable, then we provide # targets for building them. #--------------------------------------------------------- ifdef BYTECODE_LIBRARY @@ -958,7 +950,7 @@ uninstall-local:: else install-local:: $(DestBytecodeLib) -$(DestBytecodeLib): $(BytecodeDestDir) $(LibName.BCA) +$(DestBytecodeLib): $(LibName.BCA) $(BytecodeDestDir) $(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib) $(Verb) $(DataInstall) $(LibName.BCA) $(DestBytecodeLib) @@ -988,7 +980,7 @@ all-local:: $(LibName.O) $(LibName.O): $(ObjectsO) $(LibDir)/.dir $(Echo) Linking $(BuildMode) Object Library $(notdir $@) - $(Verb) $(LTRelink) -o $@ $(ObjectsO) + $(Verb) $(Relink) -Wl,-r -nodefaultlibs -nostdlib -nostartfiles -o $@ $(ObjectsO) clean-local:: ifneq ($(strip $(LibName.O)),) @@ -1005,9 +997,9 @@ DestRelinkedLib = $(PROJ_libdir)/$(LIBRARYNAME).o install-local:: $(DestRelinkedLib) -$(DestRelinkedLib): $(PROJ_libdir) $(LibName.O) +$(DestRelinkedLib): $(LibName.O) $(PROJ_libdir) $(Echo) Installing $(BuildMode) Object Library $(DestRelinkedLib) - $(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib) + $(Verb) $(INSTALL) $(LibName.O) $(DestRelinkedLib) uninstall-local:: $(Echo) Uninstalling $(BuildMode) Object Library $(DestRelinkedLib) @@ -1017,7 +1009,7 @@ endif #--------------------------------------------------------- # Archive Library Targets: -# If the user wanted a regular archive library built, +# If the user wanted a regular archive library built, # then we provide targets for building them. #--------------------------------------------------------- ifdef BUILD_ARCHIVE @@ -1045,10 +1037,10 @@ DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a install-local:: $(DestArchiveLib) -$(DestArchiveLib): $(PROJ_libdir) $(LibName.A) +$(DestArchiveLib): $(LibName.A) $(PROJ_libdir) $(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib) $(Verb) $(MKDIR) $(PROJ_libdir) - $(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib) + $(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib) uninstall-local:: $(Echo) Uninstalling $(BuildMode) Archive Library $(DestArchiveLib) @@ -1057,7 +1049,7 @@ endif endif # endif LIBRARYNAME -endif +endif ############################################################################### # Tool Build Rules: Build executable tool based on TOOLNAME option @@ -1074,6 +1066,24 @@ else ToolBuildPath := $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT) endif +#--------------------------------------------------------- +# Prune Exports +#--------------------------------------------------------- + +# If the tool opts in with TOOL_NO_EXPORTS, optimize startup time of the app by +# not exporting all of the weak symbols from the binary. This reduces dyld +# startup time by 4x on darwin in some cases. +ifdef TOOL_NO_EXPORTS +ifeq ($(OS),Darwin) +LD.Flags += -Wl,-exported_symbol -Wl,_main +endif + +ifeq ($(OS), $(filter $(OS), Linux NetBSD FreeBSD)) +LD.Flags += -Wl,--version-script=$(LLVM_SRC_ROOT)/autoconf/ExportMap.map +endif +endif + + #--------------------------------------------------------- # Provide targets for building the tools #--------------------------------------------------------- @@ -1092,10 +1102,10 @@ endif $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) - $(Verb) $(LTLink) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) $(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) \ - $(StripWarnMsg) + $(StripWarnMsg) ifdef NO_INSTALL install-local:: @@ -1107,7 +1117,7 @@ DestTool = $(PROJ_bindir)/$(TOOLNAME) install-local:: $(DestTool) -$(DestTool): $(PROJ_bindir) $(ToolBuildPath) +$(DestTool): $(ToolBuildPath) $(PROJ_bindir) $(Echo) Installing $(BuildMode) $(DestTool) $(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool) @@ -1118,7 +1128,7 @@ endif endif ############################################################################### -# Object Build Rules: Build object files based on sources +# Object Build Rules: Build object files based on sources ############################################################################### # FIXME: This should be checking for "if not GCC or ICC", not for "if HP-UX" @@ -1126,43 +1136,34 @@ ifeq ($(OS),HP-UX) DISABLE_AUTO_DEPENDENCIES=1 endif -ifdef SHARED_LIBRARY -PIC_FLAG = "(PIC)" -MAYBE_PIC_Compile.CXX = $(LTCompile.CXX) -MAYBE_PIC_Compile.C = $(LTCompile.C) -else -MAYBE_PIC_Compile.CXX = $(Compile.CXX) -MAYBE_PIC_Compile.C = $(Compile.C) -endif - # Provide rule sets for when dependency generation is enabled ifndef DISABLE_AUTO_DEPENDENCIES #--------------------------------------------------------- -# Create .lo files in the ObjDir directory from the .cpp and .c files... +# Create .o files in the ObjDir directory from the .cpp and .c files... #--------------------------------------------------------- DEPEND_OPTIONS = -MMD -MP -MF "$(ObjDir)/$*.d.tmp" \ - -MT "$(ObjDir)/$*.lo" -MT "$(ObjDir)/$*.o" -MT "$(ObjDir)/$*.d" + -MT "$(ObjDir)/$*.o" -MT "$(ObjDir)/$*.d" # If the build succeeded, move the dependency file over. If it failed, put an # empty file there. DEPEND_MOVEFILE = then $(MV) -f "$(ObjDir)/$*.d.tmp" "$(ObjDir)/$*.d"; \ else $(RM) "$(ObjDir)/$*.d.tmp"; exit 1; fi -$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) +$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cpp for $(BuildMode) build " $(PIC_FLAG) - $(Verb) if $(MAYBE_PIC_Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \ + $(Verb) if $(Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \ $(DEPEND_MOVEFILE) -$(ObjDir)/%.lo $(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) +$(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cc for $(BuildMode) build" $(PIC_FLAG) - $(Verb) if $(MAYBE_PIC_Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \ + $(Verb) if $(Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \ $(DEPEND_MOVEFILE) -$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) +$(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.c for $(BuildMode) build" $(PIC_FLAG) - $(Verb) if $(MAYBE_PIC_Compile.C) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \ + $(Verb) if $(Compile.C) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \ $(DEPEND_MOVEFILE) #--------------------------------------------------------- @@ -1175,7 +1176,7 @@ $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX) $< -o $@ -S -emit-llvm ; \ then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi - $(call UPGRADE_MSG,$@) + $(call UPGRADE_MSG,$@) $(call UPGRADE_LL,$@) $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX) @@ -1184,7 +1185,7 @@ $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX) $< -o $@ -S -emit-llvm ; \ then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi - $(call UPGRADE_MSG,$@) + $(call UPGRADE_MSG,$@) $(call UPGRADE_LL,$@) $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGCC) @@ -1193,40 +1194,40 @@ $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGCC) $< -o $@ -S -emit-llvm ; \ then $(MV) -f "$(ObjDir)/$*.BCCd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.BCCd"; exit 1; fi - $(call UPGRADE_MSG,$@) + $(call UPGRADE_MSG,$@) $(call UPGRADE_LL,$@) # Provide alternate rule sets if dependencies are disabled else -$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) +$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cpp for $(BuildMode) build" $(PIC_FLAG) - $(MAYBE_PIC_Compile.CXX) $< -o $@ + $(Compile.CXX) $< -o $@ -$(ObjDir)/%.lo $(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) +$(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cc for $(BuildMode) build" $(PIC_FLAG) - $(MAYBE_PIC_Compile.CXX) $< -o $@ + $(Compile.CXX) $< -o $@ -$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) +$(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.c for $(BuildMode) build" $(PIC_FLAG) - $(MAYBE_PIC_Compile.C) $< -o $@ + $(Compile.C) $< -o $@ $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX) $(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)" $(BCCompile.CXX) $< -o $@ -S -emit-llvm - $(call UPGRADE_MSG,$@) + $(call UPGRADE_MSG,$@) $(call UPGRADE_LL,$@) $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX) $(Echo) "Compiling $*.cc for $(BuildMode) build (bytecode)" $(BCCompile.CXX) $< -o $@ -S -emit-llvm - $(call UPGRADE_MSG,$@) + $(call UPGRADE_MSG,$@) $(call UPGRADE_LL,$@) $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGCC) $(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)" $(BCCompile.C) $< -o $@ -S -emit-llvm - $(call UPGRADE_MSG,@) + $(call UPGRADE_MSG,@) $(call UPGRADE_LL,@) endif @@ -1248,15 +1249,15 @@ $(BuildMode)/%.i: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(ObjDir)/%.s: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cpp to asm for $(BuildMode) build" $(PIC_FLAG) - $(MAYBE_PIC_Compile.CXX) $< -o $@ -S + $(Compile.CXX) $< -o $@ -S $(ObjDir)/%.s: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cc to asm for $(BuildMode) build" $(PIC_FLAG) - $(MAYBE_PIC_Compile.CXX) $< -o $@ -S + $(Compile.CXX) $< -o $@ -S $(ObjDir)/%.s: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.c to asm for $(BuildMode) build" $(PIC_FLAG) - $(MAYBE_PIC_Compile.C) $< -o $@ -S + $(Compile.C) $< -o $@ -S # make the C and C++ compilers strip debug info out of bytecode libraries. @@ -1287,9 +1288,10 @@ $(ObjDir)/%.bc: %.ll $(ObjDir)/.dir $(LLVMAS) ifdef TARGET TDFiles := $(strip $(wildcard $(PROJ_SRC_DIR)/*.td) \ - $(LLVM_SRC_ROOT)/lib/Target/Target.td \ - $(LLVM_SRC_ROOT)/lib/Target/TargetCallingConv.td \ - $(LLVM_SRC_ROOT)/lib/Target/TargetSelectionDAG.td \ + $(LLVM_SRC_ROOT)/include/llvm/Target/Target.td \ + $(LLVM_SRC_ROOT)/include/llvm/Target/TargetCallingConv.td \ + $(LLVM_SRC_ROOT)/include/llvm/Target/TargetSchedule.td \ + $(LLVM_SRC_ROOT)/include/llvm/Target/TargetSelectionDAG.td \ $(LLVM_SRC_ROOT)/include/llvm/CodeGen/ValueTypes.td) \ $(wildcard $(LLVM_SRC_ROOT)/include/llvm/Intrinsics*.td) INCFiles := $(filter %.inc,$(BUILT_SOURCES)) @@ -1299,7 +1301,7 @@ INCTMPFiles := $(INCFiles:%=$(ObjDir)/%.tmp) # All of these files depend on tblgen and the .td files. $(INCTMPFiles) : $(TBLGEN) $(TDFiles) -# INCFiles rule: All of the tblgen generated files are emitted to +# INCFiles rule: All of the tblgen generated files are emitted to # $(ObjDir)/%.inc.tmp, instead of emitting them directly to %.inc. This allows # us to only "touch" the real file if the contents of it change. IOW, if # tblgen is modified, all of the .inc.tmp files are regenerated, but no @@ -1341,7 +1343,7 @@ $(ObjDir)/%GenAsmWriter.inc.tmp : %.td $(ObjDir)/.dir $(TARGET:%=$(ObjDir)/%GenAsmWriter1.inc.tmp): \ $(ObjDir)/%GenAsmWriter1.inc.tmp : %.td $(ObjDir)/.dir $(Echo) "Building $( $(PROJ_SRC_DIR)/$*.cpp - -# IFF the .l file has changed since it was last checked into SVN, copy the .l -# file to .l.cvs and the generated .cpp file to .cpp.cvs. We use this mechanism -# so that people without flex can build LLVM by copying the .cvs files to the -# source location and building them. -$(LexFiles:%.l=$(PROJ_SRC_DIR)/%.cpp.cvs): \ -$(PROJ_SRC_DIR)/%.cpp.cvs: $(PROJ_SRC_DIR)/%.cpp - $(Verb) $(CMP) -s $(PROJ_SRC_DIR)/$*.l $(PROJ_SRC_DIR)/$*.l.cvs || \ - ($(CP) $< $@; $(CP) $(PROJ_SRC_DIR)/$*.l $(PROJ_SRC_DIR)/$*.l.cvs) - -$(LexFiles:%.l=$(ObjDir)/%.o) : \ -$(ObjDir)/%.o : $(PROJ_SRC_DIR)/%.cpp +$(TARGET:%=$(ObjDir)/%GenIntrinsics.inc.tmp): \ +$(ObjDir)/%GenIntrinsics.inc.tmp : Intrinsics%.td $(ObjDir)/.dir + $(Echo) "Building $(