Index: llvm/trunk/cmake/modules/AddLLVM.cmake =================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake +++ llvm/trunk/cmake/modules/AddLLVM.cmake @@ -913,13 +913,8 @@ set(cppflags "${cppflags} -I${d}") endforeach(d) set(ldflags "${CMAKE_EXE_LINKER_FLAGS}") - if (LLVM_LINK_LLVM_DYLIB) - set(linkmode "dylib") - else() - set(linkmode "component-libs") - endif() add_custom_command(OUTPUT ${binpath} - COMMAND ${CMAKE_BINARY_DIR}/bin/llvm-go "go=${GO_EXECUTABLE}" "cc=${cc}" "cxx=${cxx}" "cppflags=${cppflags}" "ldflags=${ldflags}" "linkmode=${linkmode}" + COMMAND ${CMAKE_BINARY_DIR}/bin/llvm-go "go=${GO_EXECUTABLE}" "cc=${cc}" "cxx=${cxx}" "cppflags=${cppflags}" "ldflags=${ldflags}" ${ARG_GOFLAGS} build -o ${binpath} ${pkgpath} DEPENDS llvm-config ${CMAKE_BINARY_DIR}/bin/llvm-go${CMAKE_EXECUTABLE_SUFFIX} ${llvmlibs} ${ARG_DEPENDS} Index: llvm/trunk/tools/llvm-config/BuildVariables.inc.in =================================================================== --- llvm/trunk/tools/llvm-config/BuildVariables.inc.in +++ llvm/trunk/tools/llvm-config/BuildVariables.inc.in @@ -29,5 +29,7 @@ #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" #define LLVM_HAS_RTTI "@LLVM_HAS_RTTI@" #define LLVM_ENABLE_DYLIB "@LLVM_BUILD_LLVM_DYLIB@" +#define LLVM_LINK_DYLIB "@LLVM_LINK_LLVM_DYLIB@" #define LLVM_ENABLE_SHARED "@LLVM_ENABLE_SHARED@" #define LLVM_DYLIB_COMPONENTS "@LLVM_DYLIB_COMPONENTS@" +#define LLVM_DYLIB_VERSION "@LLVM_DYLIB_VERSION@" Index: llvm/trunk/tools/llvm-config/CMakeLists.txt =================================================================== --- llvm/trunk/tools/llvm-config/CMakeLists.txt +++ llvm/trunk/tools/llvm-config/CMakeLists.txt @@ -26,6 +26,7 @@ set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") set(LLVM_BUILD_SYSTEM cmake) set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) +set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}") # Use the C++ link flags, since they should be a superset of C link flags. set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") Index: llvm/trunk/tools/llvm-config/Makefile =================================================================== --- llvm/trunk/tools/llvm-config/Makefile +++ llvm/trunk/tools/llvm-config/Makefile @@ -44,6 +44,8 @@ LLVM_HAS_RTTI := YES endif +LLVM_DYLIB_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX) + # This is blank for now. We need to be careful about adding stuff here: # LDFLAGS tend not to be portable, and we don't currently require the # user to use libtool when linking against LLVM. @@ -83,6 +85,8 @@ >> temp.sed $(Verb) $(ECHO) 's/@LLVM_HAS_RTTI@/$(LLVM_HAS_RTTI)/' \ >> temp.sed + $(Verb) $(ECHO) 's/@LLVM_DYLIB_VERSION@/$(LLVM_DYLIB_VERSION)/' \ + >> temp.sed $(Verb) $(SED) -f temp.sed < $< > $@ $(Verb) $(RM) temp.sed Index: llvm/trunk/tools/llvm-config/llvm-config.cpp =================================================================== --- llvm/trunk/tools/llvm-config/llvm-config.cpp +++ llvm/trunk/tools/llvm-config/llvm-config.cpp @@ -29,8 +29,8 @@ #include "llvm/Support/raw_ostream.h" #include #include -#include #include +#include using namespace llvm; @@ -46,6 +46,22 @@ // create entries for pseudo groups like x86 or all-targets. #include "LibraryDependencies.inc" +// LinkMode determines what libraries and flags are returned by llvm-config. +enum LinkMode { + // LinkModeAuto will link with the default link mode for the installation, + // which is dependent on the value of LLVM_LINK_LLVM_DYLIB, and fall back + // to the alternative if the required libraries are not available. + LinkModeAuto = 0, + + // LinkModeShared will link with the dynamic component libraries if they + // exist, and return an error otherwise. + LinkModeShared = 1, + + // LinkModeStatic will link with the static component libraries if they + // exist, and return an error otherwise. + LinkModeStatic = 2, +}; + /// \brief Traverse a single component adding to the topological ordering in /// \arg RequiredLibs. /// @@ -56,12 +72,14 @@ /// libraries. /// \param GetComponentNames - Get the component names instead of the /// library name. -static void VisitComponent(const std::string& Name, - const StringMap &ComponentMap, - std::set &VisitedComponents, +static void VisitComponent(const std::string &Name, + const StringMap &ComponentMap, + std::set &VisitedComponents, std::vector &RequiredLibs, bool IncludeNonInstalled, bool GetComponentNames, - const std::string *ActiveLibDir, bool *HasMissing) { + const std::function + *GetComponentLibraryPath, + std::vector *Missing) { // Lookup the component. AvailableComponent *AC = ComponentMap.lookup(Name); assert(AC && "Invalid component name!"); @@ -80,7 +98,7 @@ for (unsigned i = 0; AC->RequiredLibraries[i]; ++i) { VisitComponent(AC->RequiredLibraries[i], ComponentMap, VisitedComponents, RequiredLibs, IncludeNonInstalled, GetComponentNames, - ActiveLibDir, HasMissing); + GetComponentLibraryPath, Missing); } if (GetComponentNames) { @@ -90,8 +108,10 @@ // Add to the required library list. if (AC->Library) { - if (!IncludeNonInstalled && HasMissing && !*HasMissing && ActiveLibDir) { - *HasMissing = !sys::fs::exists(*ActiveLibDir + "/" + AC->Library); + if (Missing && GetComponentLibraryPath) { + std::string path = (*GetComponentLibraryPath)(AC->Library); + if (!sys::fs::exists(path)) + Missing->push_back(path); } RequiredLibs.push_back(AC->Library); } @@ -108,12 +128,14 @@ static std::vector ComputeLibsForComponents(const std::vector &Components, bool IncludeNonInstalled, bool GetComponentNames, - const std::string *ActiveLibDir, bool *HasMissing) { + const std::function + *GetComponentLibraryPath, + std::vector *Missing) { std::vector RequiredLibs; std::set VisitedComponents; // Build a map of component names to information. - StringMap ComponentMap; + StringMap ComponentMap; for (unsigned i = 0; i != array_lengthof(AvailableComponents); ++i) { AvailableComponent *AC = &AvailableComponents[i]; ComponentMap[AC->Name] = AC; @@ -133,7 +155,7 @@ VisitComponent(ComponentLower, ComponentMap, VisitedComponents, RequiredLibs, IncludeNonInstalled, GetComponentNames, - ActiveLibDir, HasMissing); + GetComponentLibraryPath, Missing); } // The list is now ordered with leafs first, we want the libraries to printed @@ -179,6 +201,8 @@ --build-system Print the build system used to build LLVM (autoconf or cmake).\n\ --has-rtti Print whether or not LLVM was built with rtti (YES or NO).\n\ --shared-mode Print how the provided components can be collectively linked (`shared` or `static`).\n\ + --link-shared Link the components as shared libraries.\n\ + --link-static Link the component libraries statically.\n\ Typical components:\n\ all All LLVM libraries (default).\n\ engine Either a native JIT or a bitcode interpreter.\n"; @@ -189,7 +213,7 @@ std::string GetExecutablePath(const char *Argv0) { // This just needs to be some symbol in the binary; C++ doesn't // allow taking the address of ::main however. - void *P = (void*) (intptr_t) GetExecutablePath; + void *P = (void *)(intptr_t)GetExecutablePath; return llvm::sys::fs::getMainExecutable(Argv0, P); } @@ -243,8 +267,8 @@ // Create an absolute path, and pop up one directory (we expect to be inside a // bin dir). sys::fs::make_absolute(CurrentPath); - CurrentExecPrefix = sys::path::parent_path( - sys::path::parent_path(CurrentPath)).str(); + CurrentExecPrefix = + sys::path::parent_path(sys::path::parent_path(CurrentPath)).str(); // Check to see if we are inside a development tree by comparing to possible // locations (prefix style or CMake style). @@ -305,8 +329,8 @@ } // We need to include files from both the source and object trees. - ActiveIncludeOption = ("-I" + ActiveIncludeDir + " " + - "-I" + ActiveObjRoot + "/include"); + ActiveIncludeOption = + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); } else { ActivePrefix = CurrentExecPrefix; ActiveIncludeDir = ActivePrefix + "/include"; @@ -323,25 +347,25 @@ /// in the first place. This can't be done at configure/build time. StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, - StaticPrefix, StaticDir = "lib"; + StaticPrefix, StaticDir = "lib"; const Triple HostTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); if (HostTriple.isOSWindows()) { SharedExt = "dll"; - SharedVersionedExt = PACKAGE_VERSION ".dll"; + SharedVersionedExt = LLVM_DYLIB_VERSION ".dll"; StaticExt = "a"; SharedDir = ActiveBinDir; StaticDir = ActiveLibDir; StaticPrefix = SharedPrefix = "lib"; } else if (HostTriple.isOSDarwin()) { SharedExt = "dylib"; - SharedVersionedExt = PACKAGE_VERSION ".dylib"; + SharedVersionedExt = LLVM_DYLIB_VERSION ".dylib"; StaticExt = "a"; StaticDir = SharedDir = ActiveLibDir; StaticPrefix = SharedPrefix = "lib"; } else { // default to the unix values: SharedExt = "so"; - SharedVersionedExt = PACKAGE_VERSION ".so"; + SharedVersionedExt = LLVM_DYLIB_VERSION ".so"; StaticExt = "a"; StaticDir = SharedDir = ActiveLibDir; StaticPrefix = SharedPrefix = "lib"; @@ -362,11 +386,23 @@ bool DyLibExists = false; const std::string DyLibName = - (SharedPrefix + "LLVM-" + SharedVersionedExt).str(); + (SharedPrefix + "LLVM-" + SharedVersionedExt).str(); + + // If LLVM_LINK_DYLIB is ON, the single shared library will be returned + // for "--libs", etc, if they exist. This behaviour can be overridden with + // --link-static or --link-shared. + bool LinkDyLib = (std::strcmp(LLVM_LINK_DYLIB, "ON") == 0); if (BuiltDyLib) { DyLibExists = sys::fs::exists(SharedDir + "/" + DyLibName); + if (!DyLibExists) { + // The shared library does not exist: don't error unless the user + // explicitly passes --link-shared. + LinkDyLib = false; + } } + LinkMode LinkMode = + (LinkDyLib || BuiltSharedLibs) ? LinkModeShared : LinkModeAuto; /// Get the component's library name without the lib prefix and the /// extension. Returns true if Lib is in a recognized format. @@ -392,11 +428,11 @@ }; /// Maps Unixizms to the host platform. auto GetComponentLibraryFileName = [&](const StringRef &Lib, - const bool ForceShared) { + const bool Shared) { std::string LibFileName = Lib; StringRef LibName; if (GetComponentLibraryNameSlice(Lib, LibName)) { - if (BuiltSharedLibs || ForceShared) { + if (Shared) { LibFileName = (SharedPrefix + LibName + "." + SharedExt).str(); } else { // default to static @@ -407,10 +443,9 @@ return LibFileName; }; /// Get the full path for a possibly shared component library. - auto GetComponentLibraryPath = [&](const StringRef &Name, - const bool ForceShared) { - auto LibFileName = GetComponentLibraryFileName(Name, ForceShared); - if (BuiltSharedLibs || ForceShared) { + auto GetComponentLibraryPath = [&](const StringRef &Name, const bool Shared) { + auto LibFileName = GetComponentLibraryFileName(Name, Shared); + if (Shared) { return (SharedDir + "/" + LibFileName).str(); } else { return (StaticDir + "/" + LibFileName).str(); @@ -501,6 +536,10 @@ OS << ActivePrefix << '\n'; } else if (Arg == "--src-root") { OS << LLVM_SRC_ROOT << '\n'; + } else if (Arg == "--link-shared") { + LinkMode = LinkModeShared; + } else if (Arg == "--link-static") { + LinkMode = LinkModeStatic; } else { usage(); } @@ -512,6 +551,11 @@ if (!HasAnyOption) usage(); + if (LinkMode == LinkModeShared && !DyLibExists && !BuiltSharedLibs) { + errs() << "llvm-config: error: " << DyLibName << " is missing\n"; + return 1; + } + if (PrintLibs || PrintLibNames || PrintLibFiles || PrintSystemLibs || PrintSharedMode) { @@ -525,11 +569,40 @@ Components.push_back("all"); // Construct the list of all the required libraries. - bool HasMissing = false; - std::vector RequiredLibs = - ComputeLibsForComponents(Components, - /*IncludeNonInstalled=*/IsInDevelopmentTree, - false, &ActiveLibDir, &HasMissing); + std::function + GetComponentLibraryPathFunction = [&](const StringRef &Name) { + return GetComponentLibraryPath(Name, LinkMode == LinkModeShared); + }; + std::vector MissingLibs; + std::vector RequiredLibs = ComputeLibsForComponents( + Components, + /*IncludeNonInstalled=*/IsInDevelopmentTree, false, + &GetComponentLibraryPathFunction, &MissingLibs); + if (!MissingLibs.empty()) { + switch (LinkMode) { + case LinkModeShared: + if (DyLibExists && !BuiltSharedLibs) + break; + // Using component shared libraries. + for (auto &Lib : MissingLibs) + errs() << "llvm-config: error: missing: " << Lib << "\n"; + return 1; + case LinkModeAuto: + if (DyLibExists) { + LinkMode = LinkModeShared; + break; + } + errs() + << "llvm-config: error: component libraries and shared library\n\n"; + // fall through + case LinkModeStatic: + for (auto &Lib : MissingLibs) + errs() << "llvm-config: error: missing: " << Lib << "\n"; + return 1; + } + } else if (LinkMode == LinkModeAuto) { + LinkMode = LinkModeStatic; + } if (PrintSharedMode) { std::unordered_set FullDyLibComponents; @@ -549,7 +622,7 @@ } FullDyLibComponents.clear(); - if (HasMissing && DyLibExists) { + if (LinkMode == LinkModeShared) { OS << "shared\n"; return 0; } else { @@ -560,11 +633,12 @@ if (PrintLibs || PrintLibNames || PrintLibFiles) { - auto PrintForLib = [&](const StringRef &Lib, const bool ForceShared) { + auto PrintForLib = [&](const StringRef &Lib) { + const bool Shared = LinkMode == LinkModeShared; if (PrintLibNames) { - OS << GetComponentLibraryFileName(Lib, ForceShared); + OS << GetComponentLibraryFileName(Lib, Shared); } else if (PrintLibFiles) { - OS << GetComponentLibraryPath(Lib, ForceShared); + OS << GetComponentLibraryPath(Lib, Shared); } else if (PrintLibs) { // If this is a typical library name, include it using -l. StringRef LibName; @@ -572,24 +646,24 @@ if (GetComponentLibraryNameSlice(Lib, LibName)) { OS << "-l" << LibName; } else { - OS << "-l:" << GetComponentLibraryFileName(Lib, ForceShared); + OS << "-l:" << GetComponentLibraryFileName(Lib, Shared); } } else { // Otherwise, print the full path. - OS << GetComponentLibraryPath(Lib, ForceShared); + OS << GetComponentLibraryPath(Lib, Shared); } } }; - if (HasMissing && DyLibExists) { - PrintForLib(DyLibName, true); + if (LinkMode == LinkModeShared && !BuiltSharedLibs) { + PrintForLib(DyLibName); } else { for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) { auto Lib = RequiredLibs[i]; if (i) OS << ' '; - PrintForLib(Lib, false); + PrintForLib(Lib); } } OS << '\n'; Index: llvm/trunk/tools/llvm-go/llvm-go.go =================================================================== --- llvm/trunk/tools/llvm-go/llvm-go.go +++ llvm/trunk/tools/llvm-go/llvm-go.go @@ -88,17 +88,8 @@ return outstr } -func llvmFlags(linkmode string) compilerFlags { - ldflags := llvmConfig("--ldflags") - switch linkmode { - case linkmodeComponentLibs: - ldflags += " " + llvmConfig(append([]string{"--libs"}, components...)...) - case linkmodeDylib: - ldflags += " -lLLVM" - default: - panic("invalid linkmode: " + linkmode) - } - ldflags += " " + llvmConfig("--system-libs") +func llvmFlags() compilerFlags { + ldflags := llvmConfig("--ldflags", "--libs", "--system-libs") if runtime.GOOS != "darwin" { // OS X doesn't like -rpath with cgo. See: // https://code.google.com/p/go/issues/detail?id=7293 @@ -133,8 +124,8 @@ fmt.Println(strings.Join(components, " ")) } -func printConfig(linkmode string) { - flags := llvmFlags(linkmode) +func printConfig() { + flags := llvmFlags() fmt.Printf(`// +build !byollvm @@ -153,7 +144,7 @@ `, flags.cpp, flags.cxx, flags.ld) } -func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, linkmode string) { +func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags string) { args = addTag(args, "byollvm") srcdir := llvmConfig("--src-root") @@ -182,7 +173,7 @@ newgopathlist = append(newgopathlist, filepath.SplitList(os.Getenv("GOPATH"))...) newgopath := strings.Join(newgopathlist, string(filepath.ListSeparator)) - flags := llvmFlags(linkmode) + flags := llvmFlags() newenv := []string{ "CC=" + cc, @@ -250,7 +241,6 @@ ldflags := os.Getenv("CGO_LDFLAGS") gocmd := "go" llgo := "" - linkmode := linkmodeComponentLibs flags := []struct { name string @@ -262,7 +252,6 @@ {"llgo", &llgo}, {"cppflags", &cppflags}, {"ldflags", &ldflags}, - {"linkmode", &linkmode}, } args := os.Args[1:] @@ -283,11 +272,11 @@ switch args[0] { case "build", "get", "install", "run", "test": - runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, linkmode) + runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags) case "print-components": printComponents() case "print-config": - printConfig(linkmode) + printConfig() default: usage() }