On Thu, Oct 16, 2014 at 09:55:28AM -0400, Tom Stellard wrote: > On Wed, Oct 15, 2014 at 02:19:28PM -0700, Eric Christopher wrote: > > No real objections, appears to be a bit of cut and paste from somewhere? > > > > It's mostly cut and paste from the llvm-shlib Makefile. If you have any > suggestions for ways to share code between the two, I can look into it. > Usually, I get nervous about making major changes to the Makefiles, > because it seems like it is really easy to break things. >
Hi Eric, Is this patch OK as is or would you like me to try to refactor some things? Thanks, Tom > > > > -eric > > > > On Thu, Sep 18, 2014 at 6:07 PM, Tom Stellard <[email protected]> > > wrote: > > > This patch just adds support for building and installing the shared > > > library. All the tools still link against the static libraries. > > > --- > > > tools/Makefile | 4 ++ > > > tools/clang-shlib/Makefile | 116 > > > +++++++++++++++++++++++++++++++++++++++++++++ > > > 2 files changed, 120 insertions(+) > > > create mode 100644 tools/clang-shlib/Makefile > > > > > > diff --git a/tools/Makefile b/tools/Makefile > > > index 2ee1299..55c19c3 100644 > > > --- a/tools/Makefile > > > +++ b/tools/Makefile > > > @@ -23,6 +23,10 @@ ifeq ($(ENABLE_CLANG_ARCMT), 1) > > > PARALLEL_DIRS += arcmt-test > > > endif > > > > > > +ifeq ($(ENABLE_SHARED), 1) > > > + DIRS += clang-shlib > > > +endif > > > + > > > # Recurse into the extra repository of tools if present. > > > OPTIONAL_PARALLEL_DIRS := extra > > > > > > diff --git a/tools/clang-shlib/Makefile b/tools/clang-shlib/Makefile > > > new file mode 100644 > > > index 0000000..947259a > > > --- /dev/null > > > +++ b/tools/clang-shlib/Makefile > > > @@ -0,0 +1,116 @@ > > > +##===- tools/shlib/Makefile --------------------------------*- Makefile > > > -*-===## > > > +# > > > +# The LLVM Compiler Infrastructure > > > +# > > > +# This file is distributed under the University of Illinois Open Source > > > +# License. See LICENSE.TXT for details. > > > +# > > > +##===----------------------------------------------------------------------===## > > > + > > > +CLANG_LEVEL := ../../ > > > + > > > +LIBRARYNAME = > > > clang-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX) > > > +LIBRARYALIASNAME = clang-$(LLVMVersion) > > > + > > > +NO_BUILD_ARCHIVE := 1 > > > +LINK_LIBS_IN_SHARED := 1 > > > +SHARED_LIBRARY := 1 > > > +SHARED_ALIAS := 1 > > > + > > > +include $(CLANG_LEVEL)/Makefile > > > + > > > +ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) > > > + EXPORTED_SYMBOL_FILE = $(ObjDir)/$(LIBRARYNAME).exports > > > + > > > + ifeq (1,$(ENABLE_EMBED_STDCXX)) > > > + # It is needed to force static-stdc++.a linked. > > > + SHLIB_FRAG_NAMES += stdc++.a.o > > > + endif > > > + > > > +endif > > > + > > > +# Include all archives in libclang.(so|dylib) except the ones that have > > > +# their own dynamic libraries and TableGen. > > > +Archives := $(wildcard $(LibDir)/libclang*.a) > > > +SharedLibraries := $(wildcard $(LibDir)/libclang*$(SHLIBEXT)) > > > +IncludeInLibLlvm := $(Archives) > > > +LLVMLibsOptions := $(IncludeInLibLlvm:$(LibDir)/lib%.a=-l%) > > > +LLVMLibsPaths := $(IncludeInLibLlvm) > > > + > > > +$(LibName.SO): $(LLVMLibsPaths) > > > + > > > +ifeq ($(HOST_OS),Darwin) > > > + # set dylib internal version number to llvmCore submission number > > > + ifdef LLVM_SUBMIT_VERSION > > > + LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \ > > > + > > > -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) \ > > > + -Wl,-compatibility_version -Wl,1 > > > + endif > > > + # Include everything from the .a's into the shared library. > > > + LLVMLibsOptions := $(LLVMLibsOptions) -all_load > > > +endif > > > + > > > +ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD > > > GNU/kFreeBSD OpenBSD GNU Bitrig)) > > > + # Include everything from the .a's into the shared library. > > > + LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ > > > + -Wl,--no-whole-archive > > > +endif > > > + > > > +ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD > > > GNU/kFreeBSD GNU)) > > > + # Add soname to the library. > > > + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) > > > +endif > > > + > > > +ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) > > > + # Don't allow unresolved symbols. > > > + LLVMLibsOptions += -Wl,--no-undefined > > > +endif > > > + > > > +ifeq ($(HOST_OS),SunOS) > > > + # add -z allextract ahead of other libraries on Solaris > > > + LLVMLibsOptions := -Wl,-z -Wl,allextract $(LLVMLibsOptions) > > > +endif > > > + > > > +ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) > > > + > > > +SHLIB_STUBS := $(addprefix $(ObjDir)/, $(SHLIB_FRAG_NAMES)) > > > +SHLIB_FRAGS := $(patsubst %.a.o, $(ObjDir)/%.syms.txt, > > > $(LIBRARYNAME).a.o $(SHLIB_FRAG_NAMES)) > > > +LLVMLibsOptions := $(SHLIB_STUBS) $(LLVMLibsOptions) > > > + > > > +$(LibName.SO): $(SHLIB_STUBS) > > > + > > > +%.syms.txt: %.a.o > > > + $(Echo) Collecting global symbols of $(notdir $*) > > > + $(Verb) $(NM_PATH) -g $< > $@ > > > + > > > +$(ObjDir)/$(LIBRARYNAME).exports: $(SHLIB_FRAGS) $(ObjDir)/.dir > > > + $(Echo) Generating exports for $(LIBRARYNAME) > > > + $(Verb) ($(SED) -n \ > > > + -e "s/^.* T _\([^.][^.]*\)$$/\1/p" \ > > > + -e "s/^.* [BDR] _\([^.][^.]*\)$$/\1 DATA/p" \ > > > + $(SHLIB_FRAGS) \ > > > + | sort -u) > $@ > > > + > > > +$(ObjDir)/$(LIBRARYNAME).a.o: $(LLVMLibsPaths) $(ObjDir)/.dir > > > + $(Echo) Linking all LLVMLibs together for $(LIBRARYNAME) > > > + $(Verb) $(Link) -nostartfiles -Wl,-r -nodefaultlibs -o $@ \ > > > + -Wl,--whole-archive $(LLVMLibsPaths) \ > > > + -Wl,--no-whole-archive > > > + > > > +$(ObjDir)/stdc++.a.o: $(ObjDir)/.dir > > > + $(Echo) Linking all libs together for static libstdc++.a > > > + $(Verb) $(Link) -nostartfiles -Wl,-r -nodefaultlibs -o $@ \ > > > + -Wl,--whole-archive -lstdc++ \ > > > + -Wl,--no-whole-archive > > > +# FIXME: workaround to invalidate -lstdc++ > > > + $(Echo) Making dummy -lstdc++ to lib > > > + $(Verb) $(AR) rc $(ToolDir)/libstdc++.dll.a > > > +# FIXME: Is install-local needed? > > > + > > > +clean-local:: > > > + $(Verb) $(RM) -f $(ToolDir)/libstdc++.dll.a > > > + > > > +endif > > > + > > > +LLVMLibsOptions += > > > -lLLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX) > > > + > > > -- > > > 1.8.1.5 > > > > > _______________________________________________ > > cfe-commits mailing list > > [email protected] > > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
