#--------------------------------------------------------------------
# Define the various target sets
#--------------------------------------------------------------------
-RecursiveTargets := all clean clean-all check install uninstall
-LocalTargets := all-local clean-local clean-all-local check-local \
- install-local printvars uninstall-local
+RecursiveTargets := all clean clean-all install uninstall install-bytecode
+LocalTargets := all-local clean-local clean-all-local \
+ install-local printvars uninstall-local \
+ install-bytecode-local
TopLevelTargets := dist dist-check dist-clean tags dist-gzip dist-bzip2 \
dist-zip
UserTargets := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets)
# PRECONDITIONS: that which must be built/checked first
################################################################################
-SrcMakefiles := $(filter %Makefile %Makefile.tests %Makefile.JIT,\
+SrcMakefiles := $(filter %Makefile %Makefile.tests,\
$(wildcard $(BUILD_SRC_DIR)/Makefile*))
ObjMakefiles := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SrcMakefiles))
ConfigureScript := $(LLVM_SRC_ROOT)/configure
.PRECIOUS: $(ConfigStatusScript)
$(ConfigStatusScript): $(ConfigureScript)
$(Echo) Reconfiguring with $<
- $(Verb) $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS)
- $(Verb) $(ConfigStatusScript)
+ $(Verb) cd $(BUILD_OBJ_ROOT) && \
+ $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
+ $(ConfigStatusScript)
#------------------------------------------------------------------------
# Make sure the configuration makefile is up to date
$(UserTargets):: $(PreConditions)
all:: all-local
-check:: check-local
clean:: clean-local
clean-all:: clean-local clean-all-local
install:: install-local
uninstall:: uninstall-local
-check-local:: all-local
install-local:: all-local
+install-bytecode:: install-bytecode-local
###############################################################################
# VARIABLES: Set up various variables based on configuration data
ifndef TBLGEN
TBLGEN := $(LLVMToolDir)/tblgen$(EXEEXT)
endif
+ifndef GCCAS
+GCCAS := $(LLVMToolDir)/gccas$(EXEEXT)
+endif
ifndef GCCLD
GCCLD := $(LLVMToolDir)/gccld$(EXEEXT)
endif
C.Flags += -v
CXX.Flags += -v
LD.Flags += -v
- BCLinkLib.Flags += -v
VERBOSE := 1
+else
endif
# Adjust settings for verbose mode
$(CompileCommonOpts) $(LD.Flags) $(Strip)
Relink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
$(CompileCommonOpts)
-BCLinkLib = $(LLVMGCC) -shared -nostdlib $(BCLinkLib.Flags)
LTInstall = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL)
Burg = $(BURG) -I $(BUILD_SRC_DIR)
TableGen = $(TBLGEN) -I $(BUILD_SRC_DIR)
Archive = $(AR) $(AR.Flags)
-LArchive = $(ToolDir)/llvm-ar rcsf
+LArchive = $(LLVMToolDir)/llvm-ar rcsf
ifdef RANLIB
Ranlib = $(RANLIB)
else
endif
#----------------------------------------------------------
-# Get the list of source files
+# Get the list of source files and compute object file
+# names from them.
#----------------------------------------------------------
-ifndef SOURCES
- Sources := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.cpp \
- $(BUILD_SRC_DIR)/*.cc $(BUILD_SRC_DIR)/*.c $(BUILD_SRC_DIR)/*.y \
- $(BUILD_SRC_DIR)/*.l))
+ifdef FAKE_SOURCES
+ Sources :=
+ FakeSources := $(FAKE_SOURCES)
+ ifdef BUILT_SOURCES
+ FakeSources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES))
+ endif
+ BaseNameSources := $(sort $(basename $(FakeSources)))
+ ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o)
+ ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo)
+ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
else
- Sources := $(SOURCES)
-endif
+ ifndef SOURCES
+ Sources := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.cpp \
+ $(BUILD_SRC_DIR)/*.cc $(BUILD_SRC_DIR)/*.c $(BUILD_SRC_DIR)/*.y \
+ $(BUILD_SRC_DIR)/*.l))
+ else
+ Sources := $(SOURCES)
+ endif
-ifdef BUILT_SOURCES
-Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES))
-endif
+ ifdef BUILT_SOURCES
+ Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES))
+ endif
-#----------------------------------------------------------
-# Types of objects that can be built from sources
-#----------------------------------------------------------
-BaseNameSources := $(sort $(basename $(Sources)))
-ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o)
-ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo)
-ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+ BaseNameSources := $(sort $(basename $(Sources)))
+ ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o)
+ ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo)
+ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+endif
###############################################################################
# DIRECTORIES: Handle recursive descent of directory structure
SubDirs += $(PARALLEL_DIRS)
-# Unfortunately, this list must be maintained if new
-# recursive targets are added.
+# Unfortunately, this list must be maintained if new recursive targets are added
all :: $(addsuffix /.makeall ,$(PARALLEL_DIRS))
clean :: $(addsuffix /.makeclean ,$(PARALLEL_DIRS))
clean-all:: $(addsuffix /.makeclean-all,$(PARALLEL_DIRS))
-check :: $(addsuffix /.makecheck ,$(PARALLEL_DIRS))
install :: $(addsuffix /.makeinstall ,$(PARALLEL_DIRS))
uninstall:: $(addsuffix /.makeuninstall,$(PARALLEL_DIRS))
+install-bytecode :: $(addsuffix /.makeinstall-bytecode,$(PARALLEL_DIRS))
-Parallel_Targets := $(foreach T,$(RecursiveTargets),%/.make$(T))
+ParallelTargets := $(foreach T,$(RecursiveTargets),%/.make$(T))
-$(Parallel_Targets) :
+$(ParallelTargets) :
$(Verb) if [ ! -f $(@D)/Makefile ]; then \
$(MKDIR) $(@D); \
cp $(BUILD_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
LibName.LA := $(LibDir)/lib$(LIBRARYNAME).la
LibName.A := $(LibDir)/lib$(LIBRARYNAME).a
LibName.O := $(LibDir)/$(LIBRARYNAME).o
-LibName.BC := $(LibDir)/lib$(LIBRARYNAME).bc
+LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca
#---------------------------------------------------------
# Shared Library Targets:
#---------------------------------------------------------
ifdef BYTECODE_LIBRARY
-ifdef EXPORTED_SYMBOL_LIST
- BCLinkLib += -Xlinker -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST)
-else
- ifdef EXPORTED_SYMBOL_FILE
- BCLinkLib += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
- else
- BCLinkLib += -Xlinker -disable-internalize
- endif
-endif
+# make the C and C++ compilers strip debug info out of bytecode libraries.
+BCCompile.C += -Wa,-strip-debug
+BCCompile.CXX += -Wa,-strip-debug
+
+all-local:: $(LibName.BCA)
+
+ifdef EXPORTED_SYMBOL_FILE
+BCLinkLib = $(LLVMGCC) -shared -nostdlib -Xlinker \
+ -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
-all-local:: $(LibName.BC)
+$(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD)
+ $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) \
+ "(internalize)"
+ $(Verb) $(BCLinkLib) -o $(ObjDir)/$(LIBRARYNAME).o $(ObjectsBC)
+ $(Verb) $(LArchive) $@ $(ObjDir)/$(LIBRARYNAME).o
+else
+$(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir
+ $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@)
+ $(Verb) $(LArchive) $@ $(ObjectsBC)
-$(LibName.BC): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir
- $(Echo) Linking $(BuildMode) Bytecode Library $(notdir $@)
- $(Verb) $(BCLinkLib) -o $@ $(ObjectsBC)
+endif
clean-local::
-ifneq ($(strip $(LibName.BC)),)
- -$(Verb) $(RM) -f $(LibName.BC)
+ifneq ($(strip $(LibName.BCA)),)
+ -$(Verb) $(RM) -f $(LibName.BCA)
endif
-DestBytecodeLib = $(bytecode_libdir)/lib$(LIBRARYNAME).bc
+DestBytecodeLib = $(bytecode_libdir)/lib$(LIBRARYNAME).a
+
+install-bytecode-local:: $(DestBytecodeLib)
install-local:: $(DestBytecodeLib)
-$(DestBytecodeLib): $(bytecode_libdir) $(LibName.BC)
- $(Echo) Installing $(BuildMode) Bytecode Library $(DestBytecodeLib)
- $(Verb) $(INSTALL) $(LibName.BC) $@
+$(DestBytecodeLib): $(bytecode_libdir) $(LibName.BCA)
+ $(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib)
+ $(Verb) $(INSTALL) $(LibName.BCA) $@
uninstall-local::
- $(Echo) Uninstalling $(BuildMode) Bytecode Library $(DestBytecodeLib)
+ $(Echo) Uninstalling $(BuildMode) Bytecode Archive $(DestBytecodeLib)
-$(Verb) $(RM) -f $(DestBytecodeLib)
endif
#---------------------------------------------------------
# Create .bc files in the ObjDir directory from .cpp and .c files...
#---------------------------------------------------------
-$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir
+$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS)
$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
$(Verb) if $(BCCompile.CXX) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCXXd" $< -o $@ ; \
then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \
else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi
-$(ObjDir)/%.bc: %.c $(ObjDir)/.dir
+$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS)
$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
$(Verb) if $(BCCompile.C) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCd" $< -o $@ ; \
then $(MV) -f "$(ObjDir)/$*.BCCd" "$(ObjDir)/$*.d"; \
$(Compile.C) $< -o $@
endif
-$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir
+$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS)
$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
$(BCCompile.CXX) $< -o $@
-$(ObjDir)/%.bc: %.c $(ObjDir)/.dir
+$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS)
$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
$(BCCompile.C) $< -o $@
dist dist-check dist-clean dist-gzip dist-bzip2 dist-zip ::
$(Echo) ERROR: Target $@ only available with OBJ_DIR != SRC_DIR
-DistCheckTop :=
else
-DistCheckTop := check
-
#------------------------------------------------------------------------
# Prevent catastrophic remove
#------------------------------------------------------------------------
dist-gzip:: $(DistTarGZip)
-$(DistTarGZip) : distdir
+$(DistTarGZip) : $(TopDistDir)/.makedistdir
$(Echo) Packing gzipped distribution tar file.
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | \
$(GZIP) -c > "$(DistTarGZip)"
dist-bzip2:: $(DistTarBZ2)
-$(DistTarBZ2) : distdir
+$(DistTarBZ2) : $(TopDistDir)/.makedistdir
$(Echo) Packing bzipped distribution tar file.
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | \
$(BZIP2) -c >$(DistTarBZ2)
dist-zip:: $(DistZip)
-$(DistZip) : distdir
+$(DistZip) : $(TopDistDir)/.makedistdir
$(Echo) Packing zipped distribution file.
$(Verb) rm -f $(DistZip)
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(ZIP) -rq $(DistZip) $(DistName)
DistCheckDir := $(LLVM_OBJ_ROOT)/_distcheckdir
-dist-check:: $(DistCheckTop) $(DistTarGZip)
+dist-check:: $(DistTarGZip)
$(Echo) Checking distribution tar file.
$(Verb) if test -d $(DistCheckDir) ; then \
$(RM) -rf $(DistCheckDir) ; \
cd build && \
../$(DistName)/configure --prefix="$(DistCheckDir)/install" \
--srcdir=../$(DistName) --with-llvmgccdir="$(LLVMGCCDIR)" && \
+ $(MAKE) all && \
$(MAKE) check && \
$(MAKE) install && \
$(MAKE) uninstall && \
dist-clean::
$(Echo) Cleaning distribution files
- -$(Verb) $(RM) -rf $(DistTarGZip) $(DistTarBZ2) $(DistZip) $(DistName) $(DistCheckDir)
+ -$(Verb) $(RM) -rf $(DistTarGZip) $(DistTarBZ2) $(DistZip) $(DistName) \
+ $(DistCheckDir)
endif
#------------------------------------------------------------------------
# Provide the recursive distdir target for building the distribution directory
#------------------------------------------------------------------------
-distdir : $(DistSources)
+distdir: $(DistDir)/.makedistdir
+$(DistDir)/.makedistdir: $(DistSources)
$(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
if test -d "$(DistDir)" ; then \
find $(DistDir) -type d ! -perm -200 -exec chmod u+w {} ';' || \
exit 1 ; \
fi ; \
- $(EchoCmd) Removing $(DistDir) ; \
+ $(EchoCmd) Removing old $(DistDir) ; \
$(RM) -rf $(DistDir); \
+ $(EchoCmd) Making 'all' to be sure. ; \
+ $(MAKE) all ; \
fi
$(Echo) Building Distribution Directory $(DistDir)
$(Verb) $(MKDIR) $(DistDir)
srcrootstrip=`echo "$(BUILD_SRC_ROOT)" | sed 's|.|.|g'`; \
for file in $(DistFiles) ; do \
case "$$file" in \
- $(BUILD_SRC_DIR)/*) file=`echo "$$file" | sed "s#^$$srcdirstrip/##"`;; \
- $(BUILD_SRC_ROOT)/*) file=`echo "$$file" | sed "s#^$$srcrootstrip/#$(BUILD_OBJ_ROOT)/#"`;; \
+ $(BUILD_SRC_DIR)/*) \
+ file=`echo "$$file" | sed "s#^$$srcdirstrip/##"` \
+ ;; \
+ $(BUILD_SRC_ROOT)/*) \
+ file=`echo "$$file" | \
+ sed "s#^$$srcrootstrip/##"` \
+ ;; \
esac; \
- if test -f "$$file" || test -d "$$file" ; then \
+ if test -f "$(BUILD_SRC_DIR)/$$file" || \
+ test -d "$(BUILD_SRC_DIR)/$$file" ; then \
+ from_dir="$(BUILD_SRC_DIR)" ; \
+ elif test -f "$$file" || test -d "$$file" ; then \
from_dir=. ; \
- else \
- from_dir=$(BUILD_SRC_DIR); \
- fi; \
- to_dir=`echo "$$file" | sed -e 's#/[^/]*$$##'`; \
+ fi ; \
+ to_dir=`echo "$$file" | sed -e 's#/[^/]*$$##'` ; \
if test "$$to_dir" != "$$file" && test "$$to_dir" != "."; then \
to_dir="$(DistDir)/$$dir"; \
$(MKDIR) "$$to_dir" ; \
elif test -L "$$from_dir/$$file" ; then \
cp -pd "$$from_dir/$$file" $(DistDir)/$$file || exit 1; \
elif echo "$(DistAlways)" | grep -v "$$file" >/dev/null ; then \
- $(EchoCmd) "===== WARNING: Distribution Source $$from_dir/$$file Not Found!" ; \
+ $(EchoCmd) "===== WARNING: Distribution Source " \
+ "$$from_dir/$$file Not Found!" ; \
elif test "$(Verb)" != '@' ; then \
$(EchoCmd) "Skipping non-existent $$from_dir/$$file" ; \
fi; \
if test "$$subdir" \!= "." ; then \
new_distdir="$(DistDir)/$$subdir" ; \
test -d "$$new_distdir" || $(MKDIR) "$$new_distdir" || exit 1; \
- ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || exit 1; \
+ ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || \
+ exit 1; \
fi; \
done
- $(Verb) $(MAKE) DistDir="$(DistDir)" dist-hook || exit 1
- -$(Verb) find $(DistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(INSTALL_SH) -c -m a+r {} {} \; \
- || chmod -R a+r $(DistDir)
+ $(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
+ $(EchoCmd) Eliminating CVS directories from distribution ; \
+ $(RM) -rf `find $(TopDistDir) -type d -name CVS -print` ;\
+ $(MAKE) dist-hook ; \
+ $(FIND) $(TopDistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; \
+ -o ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; \
+ -o ! -type d ! -perm -400 -exec chmod a+r {} \; \
+ -o ! -type d ! -perm -444 -exec \
+ $(SHELL) $(INSTALL_SH) -c -m a+r {} {} \; \
+ || chmod -R a+r $(DistDir) ; \
+ fi
# This is invoked by distdir target, define it as a no-op to avoid errors if not
# defined by user.