From 3d35f2e11dee9d9201af8aece41054d4456b630e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 5 Feb 2015 10:38:51 +0000 Subject: [PATCH] - merged 3.5.1 from PLD, TLDized --- llvm-config.patch | 177 ++++++++++++++--------- llvm-lld-link.patch | 10 ++ llvm-lldb-atomic.patch | 11 ++ llvm-lldb.patch | 27 ++++ llvm-polly-update.patch | 52 +++++++ llvm-tld.patch | 60 ++++---- llvm.spec | 304 +++++++++++++++++++++++++++++++++++----- 7 files changed, 510 insertions(+), 131 deletions(-) create mode 100644 llvm-lld-link.patch create mode 100644 llvm-lldb-atomic.patch create mode 100644 llvm-lldb.patch create mode 100644 llvm-polly-update.patch diff --git a/llvm-config.patch b/llvm-config.patch index 38dc3ad..87c331c 100644 --- a/llvm-config.patch +++ b/llvm-config.patch @@ -1,6 +1,6 @@ ---- llvm-3.1.src/tools/llvm-config/llvm-config.cpp.orig 2012-05-16 00:06:08.000000000 +0200 -+++ llvm-3.1.src/tools/llvm-config/llvm-config.cpp 2012-10-12 17:44:41.041037043 +0200 -@@ -234,11 +234,11 @@ +--- llvm-3.5.0.src/tools/llvm-config/llvm-config.cpp.orig 2014-03-29 02:08:53.000000000 +0100 ++++ llvm-3.5.0.src/tools/llvm-config/llvm-config.cpp 2014-10-01 20:43:44.679547719 +0200 +@@ -247,12 +247,12 @@ break; case CMakeStyle: ActiveBinDir = ActiveObjRoot + "/bin"; @@ -8,13 +8,14 @@ + ActiveLibDir = LLVM_LIBDIR; break; case CMakeBuildModeStyle: - ActiveBinDir = ActiveObjRoot + "/bin/" + LLVM_BUILDMODE; -- ActiveLibDir = ActiveObjRoot + "/lib/" + LLVM_BUILDMODE; -+ ActiveLibDir = LLVM_LIBDIR "/" LLVM_BUILDMODE; + ActivePrefix = ActiveObjRoot; + ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; +- ActiveLibDir = ActiveObjRoot + "/lib/" + build_mode; ++ ActiveLibDir = std::string(LLVM_LIBDIR "/") + build_mode; break; } -@@ -249,7 +249,7 @@ +@@ -263,7 +263,7 @@ ActivePrefix = CurrentExecPrefix; ActiveIncludeDir = ActivePrefix + "/include"; ActiveBinDir = ActivePrefix + "/bin"; @@ -23,15 +24,9 @@ ActiveIncludeOption = "-I" + ActiveIncludeDir; } ---- llvm-3.1.src/autoconf/configure.ac.orig 2012-05-11 22:48:57.000000000 +0200 -+++ llvm-3.1.src/autoconf/configure.ac 2012-10-12 17:39:00.668599306 +0200 -@@ -1472,13 +1472,13 @@ - fi - eval LLVM_PREFIX="${prefix}"; - eval LLVM_BINDIR="${prefix}/bin"; --eval LLVM_LIBDIR="${prefix}/lib"; -+eval LLVM_LIBDIR="${libdir}"; - eval LLVM_DATADIR="${prefix}/share/llvm"; +--- llvm-3.4.1.src/autoconf/configure.ac.orig 2014-05-21 18:37:05.321379360 +0200 ++++ llvm-3.4.1.src/autoconf/configure.ac 2014-05-21 18:40:49.568041358 +0200 +@@ -1813,8 +1813,9 @@ eval LLVM_DOCSDIR="${prefix}/share/doc/llvm"; eval LLVM_ETCDIR="${prefix}/etc/llvm"; eval LLVM_INCLUDEDIR="${prefix}/include"; @@ -39,60 +34,106 @@ -eval LLVM_MANDIR="${prefix}/man"; +eval LLVM_INFODIR="${datadir}/info"; +eval LLVM_MANDIR="${datadir}/man"; ++eval LLVM_LIBDIR="${libdir}"; LLVM_CONFIGTIME=`date` AC_SUBST(LLVM_PREFIX) AC_SUBST(LLVM_BINDIR) ---- llvm-3.2.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2013-01-26 17:40:15.003203777 +0100 -+++ llvm-3.2.src/tools/clang/lib/Driver/ToolChains.cpp 2013-01-26 18:49:17.313536763 +0100 -@@ -2154,7 +2154,7 @@ Linux::Linux(const Driver &D, const llvm - // host system, and a more minimal sysroot available that is the target of - // the cross. - if (StringRef(LibPath).startswith(SysRoot)) { -- addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib/../" + Multilib, -+ addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/" + Multilib, - Paths); - addPathIfExists(LibPath + "/" + MultiarchTriple, Paths); - addPathIfExists(LibPath + "/../" + Multilib, Paths); -@@ -2166,14 +2166,14 @@ Linux::Linux(const Driver &D, const llvm - } +@@ -1824,6 +1825,7 @@ + AC_SUBST(LLVM_INCLUDEDIR) + AC_SUBST(LLVM_INFODIR) + AC_SUBST(LLVM_MANDIR) ++AC_SUBST(LLVM_LIBDIR) + AC_SUBST(LLVM_CONFIGTIME) + + dnl Disable embedding timestamps in the build directory, with ENABLE_TIMESTAMPS. +@@ -1851,6 +1851,8 @@ + [Installation directory for .info files]) + AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", + [Installation directory for man pages]) ++AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR", ++ [Installation directory for libraries]) + AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", + [Time at which LLVM was configured]) + AC_DEFINE_UNQUOTED(LLVM_HOST_TRIPLE, "$host", +--- llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-08-27 22:07:31.000000000 +0200 ++++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp 2014-10-01 20:56:40.312848502 +0200 +@@ -2999,19 +2999,6 @@ + return Triple.isArch32Bit() ? "lib" : "lib64"; } - addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -+ addPathIfExists(SysRoot + "/" + Multilib, Paths); -+ addPathIfExists(SysRoot + LLVM_LIBDIR "/" + MultiarchTriple, Paths); -+ addPathIfExists(SysRoot + "/usr/" + Multilib, Paths); - // Try walking via the GCC triple path in case of multiarch GCC +- // It happens that only x86 and PPC use the 'lib32' variant of oslibdir, and +- // using that variant while targeting other architectures causes problems +- // because the libraries are laid out in shared system roots that can't cope +- // with a 'lib32' library search path being considered. So we only enable +- // them when we know we may need it. +- // +- // FIXME: This is a bit of a hack. We should really unify this code for +- // reasoning about oslibdir spellings with the lib dir spellings in the +- // GCCInstallationDetector, but that is a more significant refactoring. +- if (Triple.getArch() == llvm::Triple::x86 || +- Triple.getArch() == llvm::Triple::ppc) +- return "lib32"; +- + if (Triple.getArch() == llvm::Triple::x86_64 && + Triple.getEnvironment() == llvm::Triple::GNUX32) + return "libx32"; +@@ -3160,7 +3147,7 @@ + // Try walking via the GCC triple path in case of biarch or multiarch GCC // installations with strange symlinks. - if (GCCInstallation.isValid()) + if (GCCInstallation.isValid()) { - addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -+ addPathIfExists(SysRoot + LLVM_LIBDIR "/" + GCCInstallation.getTriple().str() + - "/../../" + Multilib, Paths); ++ addPathIfExists(SysRoot + "/usr/" + OSLibDir + "/" + GCCInstallation.getTriple().str() + + "/../../" + OSLibDir, Paths); - // Add the non-multilib suffixed paths (if potentially different). -@@ -2342,7 +2342,7 @@ Linux::Linux(const Driver &D, const llvm - } - } - addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); -+ addPathIfExists(SysRoot + LLVM_LIBDIR, Paths); + // Add the 'other' biarch variant path +@@ -3190,10 +3177,10 @@ + // FIXME: It's not clear whether we should use the driver's installed + // directory ('Dir' below) or the ResourceDir. + if (StringRef(D.Dir).startswith(SysRoot)) +- addPathIfExists(D.Dir + "/../lib", Paths); ++ addPathIfExists(D.Dir + "/../" + OSLibDir, Paths); - IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow(); +- addPathIfExists(SysRoot + "/lib", Paths); +- addPathIfExists(SysRoot + "/usr/lib", Paths); ++ addPathIfExists(SysRoot + "/" + OSLibDir, Paths); ++ addPathIfExists(SysRoot + "/usr/" + OSLibDir, Paths); } ---- llvm-3.2.src/tools/clang/lib/Driver/Tools.cpp.orig 2012-11-21 08:56:23.000000000 +0100 -+++ llvm-3.2.src/tools/clang/lib/Driver/Tools.cpp 2013-01-26 18:43:56.952167604 +0100 -@@ -218,7 +218,7 @@ static void addProfileRT(const ToolChain - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ LLVM_LIBDIR "/libprofile_rt.a"; - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); + bool Linux::HasNativeLLVMSupport() const { +--- llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp.orig 2014-08-07 06:51:51.000000000 +0200 ++++ llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp 2014-10-01 21:04:32.002828710 +0200 +@@ -26,6 +26,7 @@ + #include "llvm/ADT/StringExtras.h" + #include "llvm/ADT/StringSwitch.h" + #include "llvm/ADT/Twine.h" ++#include "llvm/Config/config.h" + #include "llvm/Option/Arg.h" + #include "llvm/Option/ArgList.h" + #include "llvm/Option/Option.h" +@@ -1425,7 +1426,7 @@ + // as gold requires -plugin to come before any -plugin-opt that -Wl might + // forward. + CmdArgs.push_back("-plugin"); +- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; ++ std::string Plugin = LLVM_LIBDIR "/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); + + // Try to pass driver level flags relevant to LTO code generation down to +@@ -2037,12 +2038,7 @@ + + static SmallString<128> getCompilerRTLibDir(const ToolChain &TC) { + // The runtimes are located in the OS-specific resource directory. +- SmallString<128> Res(TC.getDriver().ResourceDir); +- const llvm::Triple &Triple = TC.getTriple(); +- // TC.getOS() yield "freebsd10.0" whereas "freebsd" is expected. +- StringRef OSLibName = (Triple.getOS() == llvm::Triple::FreeBSD) ? +- "freebsd" : TC.getOS(); +- llvm::sys::path::append(Res, "lib", OSLibName); ++ SmallString<128> Res(LLVM_LIBDIR); + return Res; } -@@ -4881,9 +4881,9 @@ void solaris::Link::ConstructJob(Compila + +@@ -5899,9 +5895,9 @@ const ArgList &Args, const char *LinkingOutput) const { // FIXME: Find a real GCC, don't hard-code versions here @@ -103,13 +144,15 @@ + std::string LibPath = LLVM_LIBDIR "/"; llvm::Triple::ArchType Arch = T.getArch(); switch (Arch) { - case llvm::Triple::x86: -@@ -6049,7 +6049,7 @@ void linuxtools::Link::ConstructJob(Comp - // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = LLVM_LIBDIR "/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - } + case llvm::Triple::x86: +--- llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile.orig 2014-05-22 23:13:30.000000000 +0200 ++++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile 2014-10-18 22:10:17.008329250 +0200 +@@ -20,7 +20,7 @@ + $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc)) + + ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION) +-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION) ++PROJ_resources := $(DESTDIR)$(PROJ_libdir)/clang/$(CLANG_VERSION) + ResourceLibDir := $(ResourceDir)/lib + ResourceIncludeDir := $(ResourceDir)/include diff --git a/llvm-lld-link.patch b/llvm-lld-link.patch new file mode 100644 index 0000000..b57bfa6 --- /dev/null +++ b/llvm-lld-link.patch @@ -0,0 +1,10 @@ +--- llvm-3.5.0.src/tools/lld/unittests/CoreTests/Makefile.orig 2014-06-04 11:54:07.000000000 +0200 ++++ llvm-3.5.0.src/tools/lld/unittests/CoreTests/Makefile 2014-10-09 21:31:24.823754108 +0200 +@@ -9,6 +9,6 @@ + + LLD_LEVEL = ../.. + TESTNAME = CoreTest +-USEDLIBS = gtest.a LLVMOption.a LLVMSupport.a ++LINK_COMPONENTS = support option + + include $(LLD_LEVEL)/unittests/Makefile diff --git a/llvm-lldb-atomic.patch b/llvm-lldb-atomic.patch new file mode 100644 index 0000000..510864b --- /dev/null +++ b/llvm-lldb-atomic.patch @@ -0,0 +1,11 @@ +--- llvm-3.5.0.src/tools/lldb/lib/Makefile.orig 2014-07-21 19:24:05.000000000 +0200 ++++ llvm-3.5.0.src/tools/lldb/lib/Makefile 2014-10-19 22:11:21.104592254 +0200 +@@ -173,7 +173,7 @@ + # Don't allow unresolved symbols. + LLVMLibsOptions += -Wl,--no-undefined + # Link in python +- LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel ++ LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -latomic + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + endif + diff --git a/llvm-lldb.patch b/llvm-lldb.patch new file mode 100644 index 0000000..0b4ee39 --- /dev/null +++ b/llvm-lldb.patch @@ -0,0 +1,27 @@ +--- llvm-3.5.0.src/tools/lldb/Makefile.orig 2014-03-12 11:35:00.000000000 +0100 ++++ llvm-3.5.0.src/tools/lldb/Makefile 2014-10-04 08:18:52.270545688 +0200 +@@ -41,6 +41,8 @@ + # Disable python and curses on mingw build + ifeq ($(HOST_OS),MingW) + CXXFLAGS += -DLLDB_DISABLE_PYTHON -DLLDB_DISABLE_CURSES ++else ++CPP.Flags += -I/usr/include/ncurses + endif + + ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS))) +--- llvm-3.5.0.src/tools/lldb/scripts/Python/modules/readline/Makefile.orig 2014-02-26 16:05:48.000000000 +0100 ++++ llvm-3.5.0.src/tools/lldb/scripts/Python/modules/readline/Makefile 2014-10-18 20:28:35.057301669 +0200 +@@ -91,9 +91,9 @@ + # Target to move the shared library from the build python lib dir to + # the install python lib dir. + install-local:: $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) +- $(Echo) Installing $(BuildMode) $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to $(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR) +- $(Verb) $(MKDIR) "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)" +- $(Verb) $(ProgInstall) "$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)" "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)" +- $(Verb) $(RM) "$(DESTDIR)$(prefix)/lib/$(LIBRARYNAME)$(SHLIBEXT)" ++ $(Echo) Installing $(BuildMode) $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to $(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR) ++ $(Verb) $(MKDIR) "$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)" ++ $(Verb) $(ProgInstall) "$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)" "$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)" ++ $(Verb) $(RM) "$(DESTDIR)$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)" + + endif # if !defined(LLDB_DISABLE_PYTHON) diff --git a/llvm-polly-update.patch b/llvm-polly-update.patch new file mode 100644 index 0000000..e7c2f5f --- /dev/null +++ b/llvm-polly-update.patch @@ -0,0 +1,52 @@ +--- llvm-3.5.0.src/tools/polly/lib/Transform/Pocc.cpp.orig 2014-06-28 10:59:45.000000000 +0200 ++++ llvm-3.5.0.src/tools/polly/lib/Transform/Pocc.cpp 2014-10-03 22:56:19.591962149 +0200 +@@ -238,8 +238,6 @@ + } + + void Pocc::printScop(raw_ostream &OS) const { +- std::unique_ptr stdoutBuffer; +- std::unique_ptr stderrBuffer; + + OS << "Command line: "; + +@@ -249,20 +247,20 @@ + + OS << "\n"; + +- if (std::error_code ec = +- MemoryBuffer::getFile(PlutoStdout.str(), stdoutBuffer)) +- OS << "Could not open pocc stdout file: " + ec.message() << "\n"; ++ ErrorOr> stdoutResult = MemoryBuffer::getFile(PlutoStdout.str()); ++ if (!stdoutResult) ++ OS << "Could not open pocc stdout file: " + stdoutResult.getError().message() << "\n"; + else { +- OS << "pocc stdout: " << stdoutBuffer->getBufferIdentifier() << "\n"; +- OS << stdoutBuffer->getBuffer() << "\n"; ++ OS << "pocc stdout: " << stdoutResult.get()->getBufferIdentifier() << "\n"; ++ OS << stdoutResult.get()->getBuffer() << "\n"; + } + +- if (std::error_code ec = +- MemoryBuffer::getFile(PlutoStderr.str(), stderrBuffer)) +- OS << "Could not open pocc stderr file: " + ec.message() << "\n"; ++ ErrorOr> stderrResult = MemoryBuffer::getFile(PlutoStderr.str()); ++ if (!stderrResult) ++ OS << "Could not open pocc stderr file: " + stderrResult.getError().message() << "\n"; + else { + OS << "pocc stderr: " << PlutoStderr << "\n"; +- OS << stderrBuffer->getBuffer() << "\n"; ++ OS << stderrResult.get()->getBuffer() << "\n"; + } + } + +--- llvm-3.5.0.src/tools/polly/autoconf/configure.ac.orig 2014-04-11 11:47:45.000000000 +0200 ++++ llvm-3.5.0.src/tools/polly/autoconf/configure.ac 2014-10-06 16:37:55.052037462 +0200 +@@ -93,7 +93,7 @@ + + dnl Check that we have libpluto. + saved_CXXFLAGS=$CXXFLAGS +-CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc" ++CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc -std=c++0x" + find_lib_and_headers([pluto], [pluto/libpluto.h], [pluto]) + CXXFLAGS=$saved_CXXFLAGS + AS_IF([test "x$pluto_found" = "xyes"], diff --git a/llvm-tld.patch b/llvm-tld.patch index b9ee46f..fb62e20 100644 --- a/llvm-tld.patch +++ b/llvm-tld.patch @@ -1,22 +1,22 @@ ---- llvm-3.3.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-09-16 11:54:43.000000000 +0000 -+++ llvm-3.3.src/tools/clang/lib/Driver/ToolChains.cpp 2014-09-16 11:53:47.000000000 +0000 -@@ -1091,6 +1091,7 @@ +--- llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-10-01 21:07:02.242822402 +0200 ++++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp 2014-10-01 21:29:07.449433463 +0200 +@@ -1333,6 +1333,7 @@ static const char *const X86_64LibDirs[] = { "/lib64", "/lib" }; static const char *const X86_64Triples[] = { -+ "x86_64-tld-linux", - "x86_64-linux-gnu", - "x86_64-unknown-linux-gnu", - "x86_64-pc-linux-gnu", -@@ -1103,6 +1104,7 @@ - }; ++ "x86_64-pld-linux", + "x86_64-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-pc-linux-gnu", + "x86_64-redhat-linux6E", "x86_64-redhat-linux", "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux", +@@ -1341,6 +1342,7 @@ + static const char *const X32LibDirs[] = { "/libx32" }; static const char *const X86LibDirs[] = { "/lib32", "/lib" }; static const char *const X86Triples[] = { -+ "i686-tld-linux", - "i686-linux-gnu", - "i686-pc-linux-gnu", - "i486-linux-gnu", -@@ -1981,6 +1983,7 @@ ++ "i686-pld-linux", + "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu", "i386-linux-gnu", + "i386-redhat-linux6E", "i686-redhat-linux", "i586-redhat-linux", + "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux", +@@ -2778,6 +2781,7 @@ enum Distro { ArchLinux, @@ -24,8 +24,8 @@ DebianLenny, DebianSqueeze, DebianWheezy, -@@ -2029,6 +2032,10 @@ - return Distro >= UbuntuHardy && Distro <= UbuntuRaring; +@@ -2820,6 +2824,10 @@ + return Distro >= UbuntuHardy && Distro <= UbuntuTrusty; } +static bool IsTLD(enum Distro Distro) { @@ -33,37 +33,37 @@ +} + static Distro DetectDistro(llvm::Triple::ArchType Arch) { - OwningPtr File; - if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) { -@@ -2109,6 +2116,9 @@ - if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists) + llvm::ErrorOr> File = + llvm::MemoryBuffer::getFile("/etc/lsb-release"); +@@ -2888,6 +2896,9 @@ + if (llvm::sys::fs::exists("/etc/arch-release")) return ArchLinux; -+ if (!llvm::sys::fs::exists("/etc/tld-release", Exists) && Exists) ++ if (!llvm::sys::fs::exists("/etc/tld-release")) + return TLDLinux; + return UnknownDistro; } -@@ -2224,7 +2234,7 @@ +@@ -3029,7 +3040,7 @@ Distro Distro = DetectDistro(Arch); -- if (IsOpenSuse(Distro) || IsUbuntu(Distro)) { -+ if (IsOpenSuse(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) { +- if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { ++ if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -2244,7 +2254,7 @@ +@@ -3049,7 +3060,7 @@ // ABI requires a mapping between the GOT and the symbol table. // Android loader does not support .gnu.hash. if (!IsMips && !IsAndroid) { -- if (IsRedhat(Distro) || IsOpenSuse(Distro) || -+ if (IsRedhat(Distro) || IsOpenSuse(Distro) || IsTLD(Distro) || +- if (IsRedhat(Distro) || IsOpenSUSE(Distro) || ++ if (IsRedhat(Distro) || IsOpenSUSE(Distro) || IsTLD(Distro) || (IsUbuntu(Distro) && Distro >= UbuntuMaverick)) ExtraOpts.push_back("--hash-style=gnu"); -@@ -2253,11 +2263,11 @@ +@@ -3058,11 +3069,11 @@ ExtraOpts.push_back("--hash-style=both"); } @@ -72,8 +72,8 @@ ExtraOpts.push_back("--no-add-needed"); if (Distro == DebianSqueeze || Distro == DebianWheezy || -- Distro == DebianJessie || IsOpenSuse(Distro) || -+ Distro == DebianJessie || IsOpenSuse(Distro) || IsTLD(Distro) || +- Distro == DebianJessie || IsOpenSUSE(Distro) || ++ Distro == DebianJessie || IsOpenSUSE(Distro) || IsTLD(Distro) || (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) || (IsUbuntu(Distro) && Distro >= UbuntuKarmic)) ExtraOpts.push_back("--build-id"); diff --git a/llvm.spec b/llvm.spec index 85d3135..3e37047 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,35 +1,43 @@ # -# TODO: -# - fix include search path to support libdir/gcc/platform/version/include. -# current error: /usr/include/wchar.h:39:11: fatal error: 'stdarg.h' file not found# include -# # Conditional build: -%bcond_without ocaml # ocaml binding -%bcond_with apidocs # The doxygen docs are HUGE, so they are not built by default. -%bcond_without man # man pages +%bcond_without lldb # LLDB debugger +%bcond_without polly # Polly cache-locality optimization, auto-parallelism and vectorization +%bcond_without rt # compiler-rt libraries +%bcond_without ocaml # OCaml binding +%bcond_without doc # HTML docs and man pages +%bcond_with apidocs # doxygen docs (HUGE, so they are not built by default) %bcond_with tests # run tests -%ifarch s390 s390x sparc64 -# No ocaml on these arches -%undefine with_ocaml -%endif - Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure) Summary(pl.UTF-8): Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego) Name: llvm -Version: 3.3 +Version: 3.5.1 Release: 1 License: University of Illinois/NCSA Open Source License Group: Development/Languages #Source0Download: http://llvm.org/releases/download.html -Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.gz -# Source0-md5: 40564e1dc390f9844f1711c08b08e391 -Source1: http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.gz -# Source1-md5: 8284891e3e311829b8e44ac813d0c9ef +Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz +# Source0-md5: 2d3d8004f38852aa679e5945b8ce0b14 +Source1: http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz +# Source1-md5: 93f9532f8f7e6f1d8e5c1116907051cb +Source2: http://llvm.org/releases/%{version}/compiler-rt-%{version}.src.tar.xz +# Source2-md5: d626cfb8a9712cb92b820798ab5bc1f8 +Source3: http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz +# Source3-md5: cc5ea8a414c62c33e760517f8929a204 +Source4: http://llvm.org/releases/%{version}/polly-%{version}.src.tar.xz +# Source4-md5: b02e005a54e0911ccd8b7f1ca039cb51 +Source5: http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.tar.xz +# Source5-md5: f13f31ed3038acadc6fa63fef812a246 +Source6: http://llvm.org/releases/%{version}/lld-%{version}.src.tar.xz +# Source6-md5: 173be02b7ff4e5e31fbb0a591a03d7a3 Patch0: %{name}-config.patch # Data files should be installed with timestamps preserved Patch1: %{name}-2.6-timestamp.patch Patch2: %{name}-tld.patch +Patch3: %{name}-polly-update.patch +Patch4: %{name}-lldb.patch +Patch5: %{name}-lldb-atomic.patch +Patch6: %{name}-lld-link.patch URL: http://llvm.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.9.6 @@ -49,7 +57,9 @@ BuildRequires: ocaml-ocamldoc BuildRequires: perl-base >= 1:5.6 BuildRequires: perl-tools-pod BuildRequires: rpm-pythonprov -%{?with_man:BuildRequires: sphinx-pdg} +%{?with_doc:BuildRequires: sphinx-pdg} +BuildRequires: tar >= 1:1.22 +BuildRequires: xz %if %{with apidocs} BuildRequires: doxygen BuildRequires: graphviz @@ -59,16 +69,27 @@ BuildRequires: dejagnu BuildRequires: python BuildRequires: tcl-devel %endif +%if %{with lldb} +BuildRequires: libedit-devel +BuildRequires: libxml2-devel >= 2 +BuildRequires: ncurses-ext-devel +BuildRequires: python-devel >= 2 +%endif +%if %{with polly} +BuildRequires: cloog-isl-devel +# >= 0.18.2-2 +BuildRequires: gmp-devel +BuildRequires: isl-devel >= 0.13 +# optional +BuildRequires: pluto-devel +BuildRequires: scoplib-devel >= 0.2.1-2 +#cuda-devel +%endif Requires: %{name}-libs = %{version}-%{release} -# LLVM is not supported on PPC64 -# http://llvm.org/bugs/show_bug.cgi?id=3729 -ExcludeArch: ppc64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/%{name} -%define specflags_ppc -fno-var-tracking-assignments - # strip corrupts: $RPM_BUILD_ROOT/usr/lib64/llvm-gcc/bin/llvm-c++ ... %define _noautostrip .*/\\(libmud.*\\.a\\|bin/llvm-.*\\|lib.*++\\.a\\) @@ -139,6 +160,39 @@ API documentation for the LLVM compiler infrastructure. %description apidocs -l pl.UTF-8 Dokumentacja API infrastruktury kompilatorów LLVM. +%package polly +Summary: Polyhedral optimizations for LLVM +Summary(pl.UTF-8): Optymalizacje wielościanowe dla LLVM-a +Group: Development/Tools +URL: http://polly.llvm.org/ +Requires: %{name} = %{version}-%{release} + +%description polly +Polly is a high-level loop and data-locality optimizer and +optimization infrastructure for LLVM. It uses an abstract mathematical +representation based on integer polyhedra to analyze and optimize the +memory access pattern of a program. + +%description polly -l pl.UTF-8 +Polly to wysokopoziomowy optymalizator i infrastruktura LLVM-a do +optymalizacji pętli i położenia danych. Wykorzystuje abstrakcyjną +reprezentację matematyczną opartą na wielościanach całkowitoliczbowych +do analizy i optymalizacji wzorców dostępu do pamięci przez program. + +%package polly-devel +Summary: Header files for LLVM Polly optimization infrastructure +Summary(pl.UTF-8): Pliki nagłówkowe infrastruktury optymalizacji LLVM-a Polly +Group: Development/Libraries +URL: http://polly.llvm.org/ +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-polly = %{version}-%{release} + +%description polly-devel +Header files for LLVM Polly optimization infrastructure. + +%description polly-devel -l pl.UTF-8 +Pliki nagłówkowe infrastruktury optymalizacji LLVM-a Polly. + %package -n clang Summary: A C language family frontend for LLVM Summary(pl.UTF-8): Frontend LLVM-a do języków z rodziny C @@ -223,6 +277,80 @@ API documentation for the Clang compiler. %description -n clang-apidocs -l pl.UTF-8 Dokumentacja API kompilatora Clang. +%package -n clang-tools-extra +Summary: Extra tools for Clang +Summary(pl.UTF-8): Dodatkowe narzędzia do kompilatora Clang +Group: Development/Tools +URL: http://clang.llvm.org/docs/ClangTools.html +Requires: clang = %{version}-%{release} + +%description -n clang-tools-extra +Extra tools for Clang. + +%description -n clang-tools-extra -l pl.UTF-8 +Dodatkowe narzędzia do kompilatora Clang. + +%package -n lld +Summary: The LLVM linker +Summary(pl.UTF-8): Konsolidator z projektu LLVM +Group: Development/Libraries +URL: http://lld.llvm.org/ +Requires: %{name} = %{version}-%{release} + +%description -n lld +lld is a new set of modular code for creating linker tools. + +%description -n lld -l pl.UTF-8 +lld to nowy zbiór modularnego kodu do tworzenia narzędzi +konsolidujących. + +%package -n lld-devel +Summary: Development files for LLD linker tools +Summary(pl.UTF-8): Pliki programistyczne narzędzi konsolidujących LLD +Group: Development/Tools +URL: http://lld.llvm.org/ +Requires: %{name}-devel = %{version}-%{release} + +%description -n lld-devel +Development files for LLD linker tools. + +%description -n lld-devel -l pl.UTF-8 +Pliki programistyczne narzędzi konsolidujących LLD. + +%package -n lldb +Summary: Next generation high-performance debugger +Summary(pl.UTF-8): Wydajny debugger nowej generacji +Group: Development/Debuggers +URL: http://lldb.llvm.org/ +Requires: %{name} = %{version}-%{release} + +%description -n lldb +LLDB is a next generation, high-performance debugger. It is built as a +set of reusable components which highly leverage existing libraries in +the larger LLVM Project, such as the Clang expression parser and LLVM +disassembler. + +%description -n lldb -l pl.UTF-8 +LLDB to wydajny debugger nowej generacji. Jest zbudowany w oparciu o +komponenty wielokrotnego użytku, wykorzystujące istniejące biblioteki +w projekcie LLVM, takie jak analizator wyrażeń kompilatora Clang oraz +disasembler LLVM. + +%package -n lldb-devel +Summary: Development files for LLDB debugger +Summary(pl.UTF-8): Pliki programistyczne debuggera LLDB +Group: Development/Libraries +URL: http://lldb.llvm.org/ +Requires: %{name}-devel = %{version}-%{release} +Requires: clang-devel = %{version}-%{release} +Requires: lldb = %{version}-%{release} + +%description -n lldb-devel +Development files for LLDB debugger. + +%description -n lldb-devel -l pl.UTF-8 +Pliki programistyczne debuggera LLDB. + %package ocaml Summary: OCaml binding for LLVM Summary(pl.UTF-8): Wiązanie OCamla do LLVM-a @@ -264,15 +392,25 @@ HTML documentation for LLVM's OCaml binding. Dokumentacja HTML wiązania OCamla do LLVM-a. %prep -%setup -q -a1 -n %{name}-%{version}.src +%setup -q -n %{name}-%{version}.src -a1 %{?with_rt:-a2} %{?with_lldb:-a3} %{?with_polly:-a4} -a5 -a6 mv cfe-%{version}.src tools/clang +%{?with_rt:mv compiler-rt-%{version}.src projects/compiler-rt} +%{?with_lldb:mv lldb-%{version}.src tools/lldb} +%{?with_polly:mv polly-%{version}.src tools/polly} +mv clang-tools-extra-%{version}.src tools/clang/tools/extra +mv lld-%{version}.src tools/lld + %patch0 -p1 %patch1 -p1 %patch2 -p1 +%{?with_polly:%patch3 -p1} +%if %{with lldb} +%patch4 -p1 +%endif +%patch6 -p1 # configure does not properly specify libdir %{__sed} -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in -%{__sed} -i 's|/lib/|/%{_lib}/|' lib/Support/Unix/Path.inc # clang resources %{__sed} -i 's|(PROJ_prefix)/lib/|(PROJ_prefix)/%{_lib}/|g' tools/clang/lib/Headers/Makefile %{__sed} -i 's|"lib"|"%{_lib}"|' tools/clang/lib/Driver/Driver.cpp @@ -282,23 +420,38 @@ grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{ s,^#!.*bin/env perl,#!%{__perl}, }' +%build install -d obj +%if "%{_lib}" != "lib" +# workaround for clang relative search paths building +install -d obj/Release +ln -snf lib obj/Release/%{_lib} +%endif -%build cd autoconf %{__aclocal} -I m4 %{__autoconf} -o ../configure configure.ac cd .. %{__autoheader} -I autoconf -I autoconf/m4 autoconf/configure.ac +%if %{with polly} +cd tools/polly/autoconf +%{__aclocal} -I m4 -I ../../../autoconf/m4 +%{__autoconf} -o ../configure configure.ac +cd .. +%{__autoheader} -I autoconf -I autoconf/m4 -I ../../../autoconf/m4 autoconf/configure.ac +cd ../.. +%endif # Disabling assertions now, rec. by pure and needed for OpenGTL # TESTFIX no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3801 # # bash specific 'test a < b' cd obj +CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64" bash ../%configure \ --datadir=%{_datadir}/%{name}-%{version} \ --disable-assertions \ + --enable-cxx11 \ %ifarch %{ix86} --disable-pic \ %endif @@ -326,8 +479,9 @@ bash ../%configure \ cd .. -%if %{with man} +%if %{with doc} %{__make} -C docs -f Makefile.sphinx man +%{__make} -C tools/clang/tools/extra/docs html %endif %install @@ -349,11 +503,13 @@ done %py_ocomp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view %py_postclean %{_libdir}/clang-analyzer/scan-view -%if %{with man} +%if %{with doc} install -d $RPM_BUILD_ROOT%{_mandir}/man1 cp -p docs/_build/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 # these tools are not installed %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{FileCheck,llvm-build}.1 +# make links +echo '.so llvm-ar.1' > $RPM_BUILD_ROOT%{_mandir}/man1/llvm-ranlib.1 %endif # Move documentation back to build directory @@ -378,6 +534,9 @@ done # Get rid of erroneously installed example files. %{__rm} -v $RPM_BUILD_ROOT%{_libdir}/*LLVMHello.* +# parts of test suite +%{__rm} $RPM_BUILD_ROOT%{_bindir}/{FileCheck,count,not} +%{__rm} $RPM_BUILD_ROOT%{_bindir}/linker-script-test # remove documentation makefiles: # they require the build directory to work @@ -391,12 +550,19 @@ rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%post -n clang -p /sbin/ldconfig +%postun -n clang -p /sbin/ldconfig + +%post -n lldb -p /sbin/ldconfig +%postun -n lldb -p /sbin/ldconfig + %files %defattr(644,root,root,755) %doc CREDITS.TXT LICENSE.TXT README.txt %{?with_tests:llvm-testlog.txt} %attr(755,root,root) %{_bindir}/bugpoint %attr(755,root,root) %{_bindir}/llc %attr(755,root,root) %{_bindir}/lli +%attr(755,root,root) %{_bindir}/lli-child-target %attr(755,root,root) %{_bindir}/llvm-ar %attr(755,root,root) %{_bindir}/llvm-as %attr(755,root,root) %{_bindir}/llvm-bcanalyzer @@ -410,7 +576,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/llvm-mcmarkup %attr(755,root,root) %{_bindir}/llvm-nm %attr(755,root,root) %{_bindir}/llvm-objdump -%attr(755,root,root) %{_bindir}/llvm-prof +%attr(755,root,root) %{_bindir}/llvm-profdata %attr(755,root,root) %{_bindir}/llvm-ranlib %attr(755,root,root) %{_bindir}/llvm-readobj %attr(755,root,root) %{_bindir}/llvm-rtdyld @@ -420,6 +586,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/llvm-tblgen %attr(755,root,root) %{_bindir}/macho-dump %attr(755,root,root) %{_bindir}/opt +%if %{with doc} %{_mandir}/man1/bugpoint.1* %{_mandir}/man1/lit.1* %{_mandir}/man1/llc.1* @@ -430,27 +597,28 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/llvm-cov.1* %{_mandir}/man1/llvm-diff.1* %{_mandir}/man1/llvm-dis.1* +%{_mandir}/man1/llvm-dwarfdump.1* %{_mandir}/man1/llvm-extract.1* %{_mandir}/man1/llvm-link.1* %{_mandir}/man1/llvm-nm.1* -%{_mandir}/man1/llvm-prof.1* +%{_mandir}/man1/llvm-profdata.1* %{_mandir}/man1/llvm-ranlib.1* %{_mandir}/man1/llvm-readobj.1* %{_mandir}/man1/llvm-stress.1* %{_mandir}/man1/llvm-symbolizer.1* %{_mandir}/man1/opt.1* %{_mandir}/man1/tblgen.1* +%endif %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libLLVM-%{version}.so +%attr(755,root,root) %{_libdir}/libLLVM-3.5.so %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/llvm-config -%attr(755,root,root) %{_libdir}/libprofile_rt.so %{_libdir}/libLLVM*.a -%{_libdir}/libprofile_rt.a %ifarch %{x8664} %attr(755,root,root) %{_libdir}/BugpointPasses.so %attr(755,root,root) %{_libdir}/libLTO.so @@ -458,7 +626,11 @@ rm -rf $RPM_BUILD_ROOT %endif %{_includedir}/llvm %{_includedir}/llvm-c +%dir %{_datadir}/llvm +%{_datadir}/llvm/cmake +%if %{with doc} %{_mandir}/man1/llvm-config.1* +%endif %files doc %defattr(644,root,root,755) @@ -470,6 +642,17 @@ rm -rf $RPM_BUILD_ROOT %doc apidoc/* %endif +%if %{with polly} +%files polly +%defattr(644,root,root,755) +%doc tools/polly/{CREDITS.txt,LICENSE.txt,README} +%attr(755,root,root) %{_libdir}/LLVMPolly.so + +%files polly-devel +%defattr(644,root,root,755) +%{_includedir}/polly +%endif + %files -n clang %defattr(644,root,root,755) %doc clang-docs/{LICENSE.TXT,NOTES.txt,README.txt} %{?with_tests:clang-testlog.txt} @@ -480,7 +663,12 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/clang-format %attr(755,root,root) %{_bindir}/clang-tblgen %attr(755,root,root) %{_libdir}/libclang.so -%{_libdir}/clang +%dir %{_libdir}/clang +%dir %{_libdir}/clang/%{version} +%{_libdir}/clang/%{version}/include +%if %{with rt} +%{_libdir}/clang/%{version}/lib +%endif %{_mandir}/man1/clang.1* %files -n clang-analyzer @@ -517,10 +705,58 @@ rm -rf $RPM_BUILD_ROOT %doc clang-apidoc/* %endif +%files -n clang-tools-extra +%defattr(644,root,root,755) +%doc tools/clang/tools/extra/{CODE_OWNERS.TXT,README.txt,docs/_build/html/{*.html,*.js,_static}} +%attr(755,root,root) %{_bindir}/clang-apply-replacements +%attr(755,root,root) %{_bindir}/clang-modernize +%attr(755,root,root) %{_bindir}/clang-query +%attr(755,root,root) %{_bindir}/clang-tidy +%attr(755,root,root) %{_bindir}/pp-trace +%{_libdir}/libmodernizeCore.a + +%files -n lld +%defattr(644,root,root,755) +%doc tools/lld/{LICENSE.TXT,README.md} +%attr(755,root,root) %{_bindir}/lld + +%files -n lld-devel +%defattr(644,root,root,755) +%{_libdir}/liblldCore.a +%{_libdir}/liblldDriver.a +%{_libdir}/liblldELF.a +%{_libdir}/liblldMachO.a +%{_libdir}/liblldNative.a +%{_libdir}/liblldPECOFF.a +%{_libdir}/liblldPasses.a +%{_libdir}/liblldReaderWriter.a +%{_libdir}/liblldYAML.a +%{_libdir}/liblld*ELFTarget.a +%{_includedir}/lld + +%if %{with lldb} +%files -n lldb +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/lldb +%attr(755,root,root) %{_bindir}/lldb-gdbserver +%attr(755,root,root) %{_bindir}/lldb-mi +%attr(755,root,root) %{_bindir}/lldb-platform +%attr(755,root,root) %{_libdir}/liblldb.so +%dir %{py_sitedir}/lldb +%attr(755,root,root) %{py_sitedir}/lldb/_lldb.so +%attr(755,root,root) %{py_sitedir}/readline.so + +%files -n lldb-devel +%defattr(644,root,root,755) +%{_libdir}/liblldb*.a +%{_includedir}/lldb +%endif + %if %{with ocaml} %files ocaml %defattr(644,root,root,755) -%{_libdir}/ocaml/META.llvm +%{_libdir}/ocaml/META.llvm* +%attr(755,root,root) %{_libdir}/ocaml/dllllvm*.so %{_libdir}/ocaml/llvm*.cma %{_libdir}/ocaml/llvm*.cmi -- 2.46.0