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