From 9444547a02350424e740b4ca65361b05fe0b2b7c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 5 Apr 2017 12:59:04 +0000 Subject: [PATCH] - merged 3.9.1 from PLD, TLDized --- cmake-buildtype.patch | 16 ++ libdir.patch | 34 +++ llvm-2.6-timestamp.patch | 11 - llvm-config.patch | 158 ------------- llvm-lld-link.patch | 49 +++- llvm-lldb-atomic.patch | 11 - llvm-lldb.patch | 27 --- llvm-ocaml-shared.patch | 26 +++ llvm-tld.patch | 67 +++--- llvm.spec | 493 +++++++++++++++++++++++++-------------- x32-gcc-toolchain.patch | 37 +++ 11 files changed, 499 insertions(+), 430 deletions(-) create mode 100644 cmake-buildtype.patch create mode 100644 libdir.patch delete mode 100644 llvm-2.6-timestamp.patch delete mode 100644 llvm-config.patch delete mode 100644 llvm-lldb-atomic.patch delete mode 100644 llvm-lldb.patch create mode 100644 llvm-ocaml-shared.patch create mode 100644 x32-gcc-toolchain.patch diff --git a/cmake-buildtype.patch b/cmake-buildtype.patch new file mode 100644 index 0000000..5dbe193 --- /dev/null +++ b/cmake-buildtype.patch @@ -0,0 +1,16 @@ +allow CMAKE_BUILD_TYPE=PLD + +--- llvm-3.8.0.src/CMakeLists.txt~ 2016-01-13 21:03:44.000000000 +0200 ++++ llvm-3.8.0.src/CMakeLists.txt 2016-10-01 15:54:42.749630541 +0300 +@@ -174,11 +174,6 @@ + + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + +-if (CMAKE_BUILD_TYPE AND +- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-endif() +- + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + + # They are used as destination of target generators. diff --git a/libdir.patch b/libdir.patch new file mode 100644 index 0000000..9fefe00 --- /dev/null +++ b/libdir.patch @@ -0,0 +1,34 @@ +--- llvm-3.7.0.src/bindings/ocaml/llvm/CMakeLists.txt.orig 2014-12-30 04:24:07.000000000 +0100 ++++ llvm-3.7.0.src/bindings/ocaml/llvm/CMakeLists.txt 2015-10-03 17:47:47.253164926 +0200 +@@ -8,4 +8,4 @@ + "${LLVM_LIBRARY_DIR}/ocaml/META.llvm") + + install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" +- DESTINATION lib/ocaml) ++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml) +--- llvm-3.7.0.src/bindings/ocaml/backends/CMakeLists.txt.orig 2014-12-30 04:24:07.000000000 +0100 ++++ llvm-3.7.0.src/bindings/ocaml/backends/CMakeLists.txt 2015-10-03 17:48:57.483480254 +0200 +@@ -23,5 +23,5 @@ + "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}") + + install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" +- DESTINATION lib/ocaml) ++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml) + endforeach() +--- llvm-3.7.0.src/cmake/modules/AddOCaml.cmake.orig 2015-06-07 21:22:22.000000000 +0200 ++++ llvm-3.7.0.src/cmake/modules/AddOCaml.cmake 2015-10-03 18:13:42.583970785 +0200 +@@ -183,12 +183,12 @@ + endforeach() + + install(FILES ${install_files} +- DESTINATION lib/ocaml) ++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml) + install(FILES ${install_shlibs} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +- DESTINATION lib/ocaml) ++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml) + + foreach( install_file ${install_files} ${install_shlibs} ) + get_filename_component(filename "${install_file}" NAME) diff --git a/llvm-2.6-timestamp.patch b/llvm-2.6-timestamp.patch deleted file mode 100644 index ab0979e..0000000 --- a/llvm-2.6-timestamp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- llvm-2.6/Makefile.rules.timestamp 2009-08-19 18:04:44.000000000 -0400 -+++ llvm-2.6/Makefile.rules 2009-09-09 02:10:38.287389725 -0400 -@@ -672,7 +672,7 @@ - - ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755 - ScriptInstall = $(INSTALL) -m 0755 --DataInstall = $(INSTALL) -m 0644 -+DataInstall = $(INSTALL) -p -m 0644 - - # When compiling under Mingw/Cygwin, the tblgen tool expects Windows - # paths. In this case, the SYSPATH function (defined in diff --git a/llvm-config.patch b/llvm-config.patch deleted file mode 100644 index 87c331c..0000000 --- a/llvm-config.patch +++ /dev/null @@ -1,158 +0,0 @@ ---- 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"; -- ActiveLibDir = ActiveObjRoot + "/lib"; -+ ActiveLibDir = LLVM_LIBDIR; - break; - case CMakeBuildModeStyle: - ActivePrefix = ActiveObjRoot; - ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; -- ActiveLibDir = ActiveObjRoot + "/lib/" + build_mode; -+ ActiveLibDir = std::string(LLVM_LIBDIR "/") + build_mode; - break; - } - -@@ -263,7 +263,7 @@ - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib"; -+ ActiveLibDir = LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - ---- 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"; --eval LLVM_INFODIR="${prefix}/info"; --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) -@@ -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"; - } - -- // 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()) { -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -+ addPathIfExists(SysRoot + "/usr/" + OSLibDir + "/" + GCCInstallation.getTriple().str() + - "/../../" + OSLibDir, 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); - -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); -+ addPathIfExists(SysRoot + "/" + OSLibDir, Paths); -+ addPathIfExists(SysRoot + "/usr/" + OSLibDir, Paths); - } - - 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; - } - -@@ -5899,9 +5895,9 @@ - const ArgList &Args, - const char *LinkingOutput) const { - // FIXME: Find a real GCC, don't hard-code versions here -- std::string GCCLibPath = "/usr/gcc/4.5/lib/gcc/"; -+ std::string GCCLibPath = LLVM_LIBDIR "/gcc/"; - const llvm::Triple &T = getToolChain().getTriple(); -- std::string LibPath = "/usr/lib/"; -+ std::string LibPath = LLVM_LIBDIR "/"; - llvm::Triple::ArchType Arch = T.getArch(); - switch (Arch) { - 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 index b57bfa6..7449a54 100644 --- a/llvm-lld-link.patch +++ b/llvm-lld-link.patch @@ -1,10 +1,43 @@ ---- 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 @@ +diff -dur -x '*~' -x '*.orig' -x '*.rej' llvm-3.9.0.src.orig/tools/lld/COFF/CMakeLists.txt llvm-3.9.0.src/tools/lld/COFF/CMakeLists.txt +--- llvm-3.9.0.src.orig/tools/lld/COFF/CMakeLists.txt 2016-07-13 05:19:27.000000000 +0200 ++++ llvm-3.9.0.src/tools/lld/COFF/CMakeLists.txt 2016-11-03 12:20:24.000000000 +0100 +@@ -18,6 +18,9 @@ + Symbols.cpp + Writer.cpp - LLD_LEVEL = ../.. - TESTNAME = CoreTest --USEDLIBS = gtest.a LLVMOption.a LLVMSupport.a -+LINK_COMPONENTS = support option ++ LINK_LIBS ++ pthread ++ + LINK_COMPONENTS + ${LLVM_TARGETS_TO_BUILD} + Core +diff -dur -x '*~' -x '*.orig' -x '*.rej' llvm-3.9.0.src.orig/tools/lld/lib/Core/CMakeLists.txt llvm-3.9.0.src/tools/lld/lib/Core/CMakeLists.txt +--- llvm-3.9.0.src.orig/tools/lld/lib/Core/CMakeLists.txt 2016-01-07 01:14:09.000000000 +0100 ++++ llvm-3.9.0.src/tools/lld/lib/Core/CMakeLists.txt 2016-11-03 12:20:10.000000000 +0100 +@@ -12,5 +12,5 @@ + ${LLD_INCLUDE_DIR}/lld/Core - include $(LLD_LEVEL)/unittests/Makefile + LINK_LIBS +- LLVMSupport ++ LLVMSupport pthread + ) +diff -dur -x '*~' -x '*.orig' -x '*.rej' llvm-3.9.0.src.orig/tools/lld/lib/Driver/CMakeLists.txt llvm-3.9.0.src/tools/lld/lib/Driver/CMakeLists.txt +--- llvm-3.9.0.src.orig/tools/lld/lib/Driver/CMakeLists.txt 2016-03-02 20:08:05.000000000 +0100 ++++ llvm-3.9.0.src/tools/lld/lib/Driver/CMakeLists.txt 2016-11-03 12:20:10.000000000 +0100 +@@ -17,6 +17,7 @@ + LLVMObject + LLVMOption + LLVMSupport ++ pthread + ) + + add_dependencies(lldDriver DriverOptionsTableGen) +diff -dur -x '*~' -x '*.orig' -x '*.rej' llvm-3.9.0.src.orig/tools/lld/lib/ReaderWriter/CMakeLists.txt llvm-3.9.0.src/tools/lld/lib/ReaderWriter/CMakeLists.txt +--- llvm-3.9.0.src.orig/tools/lld/lib/ReaderWriter/CMakeLists.txt 2016-03-02 01:37:50.000000000 +0100 ++++ llvm-3.9.0.src/tools/lld/lib/ReaderWriter/CMakeLists.txt 2016-11-03 12:20:10.000000000 +0100 +@@ -16,4 +16,5 @@ + lldYAML + LLVMObject + LLVMSupport ++ pthread + ) diff --git a/llvm-lldb-atomic.patch b/llvm-lldb-atomic.patch deleted file mode 100644 index 510864b..0000000 --- a/llvm-lldb-atomic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 0b4ee39..0000000 --- a/llvm-lldb.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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-ocaml-shared.patch b/llvm-ocaml-shared.patch new file mode 100644 index 0000000..0ab5cac --- /dev/null +++ b/llvm-ocaml-shared.patch @@ -0,0 +1,26 @@ +--- llvm-3.8.1.src/cmake/modules/AddOCaml.cmake.orig 2016-10-11 22:03:29.695199936 +0200 ++++ llvm-3.8.1.src/cmake/modules/AddOCaml.cmake 2016-10-12 20:14:25.327621462 +0200 +@@ -37,11 +37,13 @@ + + set(ocaml_inputs) + ++ option(OCAML_BUILD_SHARED_LIBS "Build ocaml shared libraries" ON) ++ + set(ocaml_outputs "${bin}/${name}.cma") + if( ARG_C ) + list(APPEND ocaml_outputs + "${bin}/lib${name}${CMAKE_STATIC_LIBRARY_SUFFIX}") +- if ( BUILD_SHARED_LIBS ) ++ if ( OCAML_BUILD_SHARED_LIBS ) + list(APPEND ocaml_outputs + "${bin}/dll${name}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() +@@ -62,7 +64,7 @@ + list(APPEND ocaml_flags ${dep_ocaml_flags}) + endforeach() + +- if( NOT BUILD_SHARED_LIBS ) ++ if( NOT OCAML_BUILD_SHARED_LIBS ) + list(APPEND ocaml_flags "-custom") + endif() + diff --git a/llvm-tld.patch b/llvm-tld.patch index fb62e20..fd7cbe3 100644 --- a/llvm-tld.patch +++ b/llvm-tld.patch @@ -1,42 +1,44 @@ ---- 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 @@ +diff -dur -x '*~' -x '*.orig' -x '*.rej' llvm-3.9.0.src.orig/tools/clang/lib/Driver/ToolChains.cpp llvm-3.9.0.src/tools/clang/lib/Driver/ToolChains.cpp +--- llvm-3.9.0.src.orig/tools/clang/lib/Driver/ToolChains.cpp 2016-08-18 19:56:48.000000000 +0200 ++++ llvm-3.9.0.src/tools/clang/lib/Driver/ToolChains.cpp 2016-11-03 12:18:35.000000000 +0100 +@@ -1498,6 +1498,7 @@ - static const char *const X86_64LibDirs[] = { "/lib64", "/lib" }; + static const char *const X86_64LibDirs[] = {"/lib64", "/lib"}; static const char *const X86_64Triples[] = { -+ "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" }; ++ "x86_64-tld-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", +@@ -1507,6 +1508,7 @@ + static const char *const X32LibDirs[] = {"/libx32"}; + static const char *const X86LibDirs[] = {"/lib32", "/lib"}; static const char *const X86Triples[] = { -+ "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 { ++ "i686-tld-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", + static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; +@@ -3716,6 +3719,7 @@ + // in this enum, because some tests are done by integer comparison against + // the first and last known member in the family, e.g. IsRedHat(). ArchLinux, + TLDLinux, DebianLenny, DebianSqueeze, DebianWheezy, -@@ -2820,6 +2824,10 @@ - return Distro >= UbuntuHardy && Distro <= UbuntuTrusty; +@@ -3761,6 +3765,10 @@ + return Distro >= UbuntuHardy && Distro <= UbuntuXenial; } +static bool IsTLD(enum Distro Distro) { + return Distro == TLDLinux; +} + - static Distro DetectDistro(llvm::Triple::ArchType Arch) { + static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) { llvm::ErrorOr> File = llvm::MemoryBuffer::getFile("/etc/lsb-release"); -@@ -2888,6 +2896,9 @@ - if (llvm::sys::fs::exists("/etc/arch-release")) +@@ -3837,6 +3845,9 @@ + if (D.getVFS().exists("/etc/arch-release")) return ArchLinux; + if (!llvm::sys::fs::exists("/etc/tld-release")) @@ -45,16 +47,16 @@ return UnknownDistro; } -@@ -3029,7 +3040,7 @@ +@@ -4012,7 +4023,7 @@ - Distro Distro = DetectDistro(Arch); + Distro Distro = DetectDistro(D, Arch); - if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { + if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -3049,7 +3060,7 @@ +@@ -4032,7 +4043,7 @@ // ABI requires a mapping between the GOT and the symbol table. // Android loader does not support .gnu.hash. if (!IsMips && !IsAndroid) { @@ -63,17 +65,12 @@ (IsUbuntu(Distro) && Distro >= UbuntuMaverick)) ExtraOpts.push_back("--hash-style=gnu"); -@@ -3058,11 +3069,11 @@ +@@ -4041,7 +4052,7 @@ ExtraOpts.push_back("--hash-style=both"); } -- if (IsRedhat(Distro)) -+ if (IsRedhat(Distro) || IsTLD(Distro)) +- if (IsRedhat(Distro) && Distro != RHEL5 && Distro != RHEL6) ++ if ((IsRedhat(Distro) && Distro != RHEL5 && Distro != RHEL6) || IsTLD(Distro)) ExtraOpts.push_back("--no-add-needed"); - if (Distro == DebianSqueeze || Distro == DebianWheezy || -- 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"); + #ifdef ENABLE_LINKER_BUILD_ID diff --git a/llvm.spec b/llvm.spec index d4ecdd5..235a4ec 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,98 +1,150 @@ +# TODO: +# - move and package: +# %{_datadir}/clang/clang-format-sublime.py - sublime plugin +# %{_datadir}/clang/clang-format.el - emacs mode +# %{_datadir}/clang/clang-format.py - vim plugin +# - no content in doc package (it used to contain parts of clang apidocs and some examples) +# - system isl in polly? # # Conditional build: -%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 +%bcond_without lldb # LLDB debugger +%bcond_without polly # Polly cache-locality optimization, auto-parallelism and vectorization +%bcond_without rt # compiler-rt libraries +%bcond_without multilib # compiler-rt multilib libraries +%bcond_with 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 + +# No ocaml on other arches or no native ocaml (required for ocaml-ctypes) +%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9 +%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.5.1 -Release: 3 +Version: 3.9.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.xz -# Source0-md5: 2d3d8004f38852aa679e5945b8ce0b14 +# Source0-md5: 3259018a7437e157f3642df80f1983ea Source1: http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz -# Source1-md5: 93f9532f8f7e6f1d8e5c1116907051cb +# Source1-md5: 45713ec5c417ed9cad614cd283d786a1 Source2: http://llvm.org/releases/%{version}/compiler-rt-%{version}.src.tar.xz -# Source2-md5: d626cfb8a9712cb92b820798ab5bc1f8 +# Source2-md5: aadc76e7e180fafb10fb729444e287a3 Source3: http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz -# Source3-md5: cc5ea8a414c62c33e760517f8929a204 +# Source3-md5: 91399402f287d3f637db1207113deecb Source4: http://llvm.org/releases/%{version}/polly-%{version}.src.tar.xz -# Source4-md5: b02e005a54e0911ccd8b7f1ca039cb51 +# Source4-md5: 2cc7fe2bd9539775ba140abfd375bec6 Source5: http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.tar.xz -# Source5-md5: f13f31ed3038acadc6fa63fef812a246 +# Source5-md5: 1a01d545a064fcbc46a2f05f6880d3d7 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 +# Source6-md5: 6254dd138e23b098df4ef7840c11e2c8 +Patch0: %{name}-lld-link.patch +Patch1: %{name}-tld.patch +Patch2: libdir.patch +Patch3: x32-gcc-toolchain.patch +Patch4: cmake-buildtype.patch +Patch5: %{name}-ocaml-shared.patch URL: http://llvm.org/ -BuildRequires: autoconf >= 2.60 -BuildRequires: automake >= 1:1.9.6 BuildRequires: bash BuildRequires: bison +BuildRequires: cmake >= 3.4.3 BuildRequires: flex BuildRequires: gcc >= 5:3.4 # gcc4 might be installed, but not current __cc %if "%(echo %{cc_version} | cut -d. -f1,2)" < "3.4" BuildRequires: __cc >= 3.4 %endif +%ifarch x32 +BuildRequires: glibc-devel(x86_64) +%endif BuildRequires: groff +BuildRequires: libedit-devel BuildRequires: libltdl-devel -BuildRequires: libtool >= 2:1.5.22 BuildRequires: libstdc++-devel >= 5:3.4 +BuildRequires: ncurses-devel +%if %{with ocaml} +BuildRequires: ocaml-ctypes-devel >= 0.4 +BuildRequires: ocaml-findlib BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-ounit +%endif BuildRequires: perl-base >= 1:5.6 BuildRequires: perl-tools-pod +BuildRequires: python >= 1:2.7 BuildRequires: rpm-pythonprov %{?with_doc:BuildRequires: sphinx-pdg} BuildRequires: tar >= 1:1.22 BuildRequires: xz +BuildRequires: zlib-devel %if %{with apidocs} BuildRequires: doxygen BuildRequires: graphviz %endif %if %{with tests} BuildRequires: dejagnu -BuildRequires: python BuildRequires: tcl-devel %endif +%if %{with rt} && %{with multilib} +%ifarch %{x8664} +BuildRequires: gcc-c++-multilib +BuildRequires: libstdc++-multilib-devel +%endif +%ifarch x32 +BuildRequires: gcc-c++-multilib +BuildRequires: libstdc++-multilib-devel +%endif +%endif %if %{with lldb} -BuildRequires: libedit-devel +BuildRequires: epydoc +%ifarch i386 i486 +BuildRequires: libatomic-devel +%endif BuildRequires: libxml2-devel >= 2 BuildRequires: ncurses-ext-devel BuildRequires: python-devel >= 2 +BuildRequires: swig-python %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 +#BuildRequires: gmp-devel or imath-devel (private copy in polly/lib/External/isl/imath) +# private copy in polly/lib/External/isl +#BuildRequires: isl-devel >= 0.17.1 +#TODO (bcond): cuda-devel (with POLLY_ENABLE_GPGPU_CODEGEN=ON) +%endif +%if %{with ocaml} +BuildConflicts: llvm-ocaml %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 abi 3.9 %define _sysconfdir /etc/%{name} +%define specflags_ppc -fno-var-tracking-assignments +# ix86 and x32 - the same issue as https://llvm.org/bugs/show_bug.cgi?id=27237 +%define specflags_ia32 -gsplit-dwarf +%define specflags_x32 -gsplit-dwarf + # strip corrupts: $RPM_BUILD_ROOT/usr/lib64/llvm-gcc/bin/llvm-c++ ... %define _noautostrip .*/\\(libmud.*\\.a\\|bin/llvm-.*\\|lib.*++\\.a\\) +# clang doesn't know -fvar-tracking-assignments, and leaving it here would pollute llvm-config +# -Werror=format-security is for swig +# TODO: add - -Werror=format-security to tools/lldb/scripts/LLDBWrapPython.cpp +%define filterout_c -fvar-tracking-assignments +%define filterout_cxx -fvar-tracking-assignments -Werror=format-security +%define filterout_ccpp -fvar-tracking-assignments + +# std::__once_call, std::__once_callable non-function symbols +%define skip_post_check_so liblldb.so.* + %description LLVM is a compiler infrastructure designed for compile-time, link-time, runtime, and idle-time optimization of programs from @@ -109,16 +161,16 @@ roku 2000 przez Uniwersytet w Illinois i Apple. Aktualnie obsługuje kompilację programów w C i C++ przy użyciu frontendu clang. %package libs -Summary: LLVM shared library -Summary(pl.UTF-8): Biblioteka współdzielona LLVM-a +Summary: LLVM shared libraries +Summary(pl.UTF-8): Biblioteki współdzielone LLVM-a Group: Libraries Conflicts: llvm < 3.2 %description libs -LLVM shared library. +LLVM shared libraries. %description libs -l pl.UTF-8 -Biblioteka współdzielona LLVM-a. +Biblioteki współdzielone LLVM-a. %package devel Summary: Static libraries and header files for LLVM @@ -199,6 +251,7 @@ Summary(pl.UTF-8): Frontend LLVM-a do języków z rodziny C License: NCSA Group: Development/Languages Requires: %{name} = %{version}-%{release} +Requires: clang-libs = %{version}-%{release} %description -n clang clang: noun 1. A loud, resonant, metallic sound. 2. The strident call @@ -218,6 +271,48 @@ LLVM do języków C, C++, Objective C i Objective C++. Narzędzia są budowane jako biblioteki i zaprojektowane z myślą o swobodnym łączeniu i rozszerzaniu. +%package -n clang-libs +Summary: Clang shared libraries +Summary(pl.UTF-8): Biblioteki współdzielone Clanga +Group: Libraries + +%description -n clang-libs +Clang shared libraries. + +%description -n clang-libs -l pl.UTF-8 +Biblioteki współdzielone Clanga. + +%package -n clang-multilib +Summary: A C language family frontend for LLVM - 32-bit support +Summary(pl.UTF-8): Frontend LLVM-a do języków z rodziny C - obsługa binariów 32-bitowych +License: NCSA +Group: Development/Languages +Requires: clang = %{version}-%{release} + +%description -n clang-multilib +clang: noun 1. A loud, resonant, metallic sound. 2. The strident call +of a crane or goose. 3. C-language family front-end toolkit. + +The goal of the Clang project is to create a new C, C++, Objective C +and Objective C++ front-end for the LLVM compiler. Its tools are built +as libraries and designed to be loosely-coupled and extendable. + +This package contains the C compiler support for producing 32-bit +programs on 64-bit host. + +%description -n clang-multilib -l pl.UTF-8 +clang (z angielskiego): 1. głośny, rezonujący, metaliczny dźwięk; 2. +piskliwy odgłos żurawia lub gęsi; 3. narzędzia frontendowe dla języków +z rodziny C. + +Celem projektu Clang jest utworzenie nowego frontendu dla kompilatora +LLVM do języków C, C++, Objective C i Objective C++. Narzędzia są +budowane jako biblioteki i zaprojektowane z myślą o swobodnym łączeniu +i rozszerzaniu. + +Ten pakiet zawiera rozszerzenie kompilatora C o obsługę tworzenia +programów 32-bitowych na maszynie 64-bitowej. + %package -n clang-analyzer Summary: A source code analysis framework Summary(pl.UTF-8): Szkielet do analizy kodu źródłowego @@ -323,6 +418,7 @@ Summary(pl.UTF-8): Wydajny debugger nowej generacji Group: Development/Debuggers URL: http://lldb.llvm.org/ Requires: %{name} = %{version}-%{release} +Requires: python-six %description -n lldb LLDB is a next generation, high-performance debugger. It is built as a @@ -356,7 +452,9 @@ Summary: OCaml binding for LLVM Summary(pl.UTF-8): Wiązanie OCamla do LLVM-a Group: Libraries Requires: %{name} = %{version}-%{release} +%if %{with ocaml} %requires_eq ocaml-runtime +%endif %description ocaml OCaml binding for LLVM. @@ -393,27 +491,19 @@ Dokumentacja HTML wiązania OCamla do LLVM-a. %prep %setup -q -n %{name}-%{version}.src -a1 %{?with_rt:-a2} %{?with_lldb:-a3} %{?with_polly:-a4} -a5 -a6 -mv cfe-%{version}.src tools/clang +%{__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 +%{__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} +%patch3 -p1 %patch4 -p1 -%endif -%patch6 -p1 - -# configure does not properly specify libdir -%{__sed} -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in -# 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 +%patch5 -p1 grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{ s,^#!.*bin/env python,#!%{__python}, @@ -421,51 +511,36 @@ grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{ }' %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 - -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 +install -d build # 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 +cd build CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64" -bash ../%configure \ - --datadir=%{_datadir}/%{name}-%{version} \ - --disable-assertions \ - --enable-cxx11 \ -%ifarch %{ix86} - --disable-pic \ + +%cmake \ +%ifarch %{x8664} + -DLLVM_LIBDIR_SUFFIX:STRING=64 \ +%endif +%ifarch x32 + -DLLVM_LIBDIR_SUFFIX:STRING=x32 \ %endif - --disable-static \ - --enable-bindings=%{?with_ocaml:ocaml}%{!?with_ocaml:none} \ - --enable-debug-runtime \ %if %{with apidocs} - --enable-doxygen \ + -DLLVM_ENABLE_DOXYGEN:BOOL=ON \ +%endif +%if %{with doc} + -DLLVM_ENABLE_SPHINX:BOOL=ON \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ %endif - --enable-experimental-targets=R600 \ - --enable-jit \ - --enable-optimized \ - --enable-shared \ - --with-pic + -DLLVM_ENABLE_PIC:BOOL=ON \ + -DLLVM_ENABLE_ASSERTIONS:BOOL=OFF \ + -DLLVM_ENABLE_CXX1Y:BOOL=ON \ + -DLLVM_BINDINGS_LIST:LIST="%{?with_ocaml:ocaml}" \ + -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \ + -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DENABLE_LINKER_BUILD_ID:BOOL=ON \ + ../ %{__make} \ VERBOSE=1 \ @@ -477,35 +552,42 @@ bash ../%configure \ %{__make} -C tools/clang test 2>&1 | tee clang-testlog.txt %endif -cd .. - %if %{with doc} -%{__make} -C docs -f Makefile.sphinx man -%{__make} -C tools/clang/tools/extra/docs html +%{__make} -C docs docs-llvm-html +%{__make} -C docs docs-llvm-man +%if %{with ocaml} +%{__make} -C docs ocaml_doc +%endif +%{__make} -C tools/clang/docs docs-clang-html +%{__make} -C tools/clang/docs docs-clang-man +%{__make} -C tools/lld/docs docs-lld-html +%{__make} -C tools/lldb/docs lldb-python-doc +%{__make} -C tools/lldb/docs lldb-cpp-doc %endif %install rm -rf $RPM_BUILD_ROOT -%{__make} -C obj -j1 install \ - PROJ_docsdir=/moredocs \ +%{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT -# Static analyzer not installed by default: +# only some .pyc files are created by make install +%py_comp $RPM_BUILD_ROOT%{py_sitedir} +%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} + +# Adjust static analyzer installation # http://clang-analyzer.llvm.org/installation#OtherPlatforms -install -d $RPM_BUILD_ROOT%{_libdir}/clang-analyzer -# create launchers -for f in scan-{build,view}; do - ln -s %{_libdir}/clang-analyzer/$f/$f $RPM_BUILD_ROOT%{_bindir}/$f - cp -pr tools/clang/tools/$f $RPM_BUILD_ROOT%{_libdir}/clang-analyzer -done -%{__mv} $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-build/scan-build.1 $RPM_BUILD_ROOT%{_mandir}/man1 -%py_comp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view -%py_ocomp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view -%py_postclean %{_libdir}/clang-analyzer/scan-view +install -d $RPM_BUILD_ROOT%{_libdir}/scan-build +%{__mv} $RPM_BUILD_ROOT%{_prefix}/libexec/c??-analyzer $RPM_BUILD_ROOT%{_libdir}/scan-build +%{__sed} -i -e 's,/\.\./libexec/,/../%{_lib}/scan-build/,' $RPM_BUILD_ROOT%{_bindir}/scan-build +%py_comp $RPM_BUILD_ROOT%{_datadir}/scan-view +%py_ocomp $RPM_BUILD_ROOT%{_datadir}/scan-view +%py_postclean %{_datadir}/scan-view + +# not installed by cmake buildsystem +install build/bin/pp-trace $RPM_BUILD_ROOT%{_bindir} %if %{with doc} -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -cp -p docs/_build/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p build/docs/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 # these tools are not installed %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{FileCheck,llvm-build}.1 # make links @@ -513,16 +595,15 @@ echo '.so llvm-ar.1' > $RPM_BUILD_ROOT%{_mandir}/man1/llvm-ranlib.1 %endif # Move documentation back to build directory -rm -rf moredocs -mv $RPM_BUILD_ROOT/moredocs . -%{__rm} -v moredocs/*.tar.gz -%{__rm} -v moredocs/ocamldoc/html/*.tar.gz +%if %{with ocaml} +rm -rf ocamldocs +%{__mv} $RPM_BUILD_ROOT%{_prefix}/docs/ocaml/html/html ocamldocs +%endif # and separate the apidoc %if %{with apidocs} -rm -rf apidoc clang-apidoc -mv moredocs/html/doxygen apidoc -cp -a tools/clang/docs/doxygen/html clang-apidoc +rm -rf clang-apidoc +cp -a build/tools/clang/docs/html clang-apidoc %endif # And prepare Clang documentation @@ -533,16 +614,15 @@ for f in LICENSE.TXT NOTES.txt README.txt; do 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 -rm -rf moredocs/examples -cp -a examples moredocs/examples -find moredocs/examples -name Makefile | xargs -0r rm -f +%{__rm} $RPM_BUILD_ROOT%{_libdir}/LLVMHello.so +# test? +%{__rm} $RPM_BUILD_ROOT%{_bindir}/{c-index-test,llvm-c-test} +# not this OS +%{__rm} $RPM_BUILD_ROOT%{_datadir}/clang/clang-format-bbedit.applescript +# use system six +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/six.py* +# it seems it is used internally by an extra clang tool +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libfindAllSymbols.a %clean rm -rf $RPM_BUILD_ROOT @@ -562,16 +642,19 @@ rm -rf $RPM_BUILD_ROOT %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 %attr(755,root,root) %{_bindir}/llvm-cov %attr(755,root,root) %{_bindir}/llvm-diff %attr(755,root,root) %{_bindir}/llvm-dis +%attr(755,root,root) %{_bindir}/llvm-dsymutil %attr(755,root,root) %{_bindir}/llvm-dwarfdump +%attr(755,root,root) %{_bindir}/llvm-dwp %attr(755,root,root) %{_bindir}/llvm-extract +%attr(755,root,root) %{_bindir}/llvm-lib %attr(755,root,root) %{_bindir}/llvm-link +%attr(755,root,root) %{_bindir}/llvm-lto %attr(755,root,root) %{_bindir}/llvm-mc %attr(755,root,root) %{_bindir}/llvm-mcmarkup %attr(755,root,root) %{_bindir}/llvm-nm @@ -581,11 +664,18 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/llvm-readobj %attr(755,root,root) %{_bindir}/llvm-rtdyld %attr(755,root,root) %{_bindir}/llvm-size +%attr(755,root,root) %{_bindir}/llvm-split %attr(755,root,root) %{_bindir}/llvm-stress %attr(755,root,root) %{_bindir}/llvm-symbolizer %attr(755,root,root) %{_bindir}/llvm-tblgen -%attr(755,root,root) %{_bindir}/macho-dump +%attr(755,root,root) %{_bindir}/llvm-cxxdump +%attr(755,root,root) %{_bindir}/llvm-pdbdump +%attr(755,root,root) %{_bindir}/obj2yaml %attr(755,root,root) %{_bindir}/opt +%attr(755,root,root) %{_bindir}/sancov +%attr(755,root,root) %{_bindir}/sanstats +%attr(755,root,root) %{_bindir}/verify-uselistorder +%attr(755,root,root) %{_bindir}/yaml2obj %if %{with doc} %{_mandir}/man1/bugpoint.1* %{_mandir}/man1/lit.1* @@ -599,6 +689,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/llvm-dis.1* %{_mandir}/man1/llvm-dwarfdump.1* %{_mandir}/man1/llvm-extract.1* +%{_mandir}/man1/llvm-lib.1* %{_mandir}/man1/llvm-link.1* %{_mandir}/man1/llvm-nm.1* %{_mandir}/man1/llvm-profdata.1* @@ -612,29 +703,26 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libLLVM-%{abi}.so +# non-soname symlink %attr(755,root,root) %{_libdir}/libLLVM-%{version}.so -%attr(755,root,root) %{_libdir}/libLLVM-3.5.so +%attr(755,root,root) %{_libdir}/libLTO.so %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/llvm-config -%{_libdir}/libLLVM*.a -%ifarch %{x8664} +%attr(755,root,root) %{_libdir}/libLLVM.so %attr(755,root,root) %{_libdir}/BugpointPasses.so -%attr(755,root,root) %{_libdir}/libLTO.so -%{_libdir}/libLTO.a -%endif +%{_libdir}/libLLVM*.a %{_includedir}/llvm %{_includedir}/llvm-c -%dir %{_datadir}/llvm -%{_datadir}/llvm/cmake +%{_libdir}/cmake/llvm %if %{with doc} %{_mandir}/man1/llvm-config.1* %endif -%files doc -%defattr(644,root,root,755) -%doc moredocs/examples moredocs/html +#%files doc +#%defattr(644,root,root,755) %if %{with apidocs} %files apidocs @@ -645,59 +733,98 @@ rm -rf $RPM_BUILD_ROOT %if %{with polly} %files polly %defattr(644,root,root,755) -%doc tools/polly/{CREDITS.txt,LICENSE.txt,README} +%doc tools/polly/{CREDITS.txt,LICENSE.txt,README} tools/polly/www/{bugs,changelog,contributors}.html %attr(755,root,root) %{_libdir}/LLVMPolly.so %files polly-devel %defattr(644,root,root,755) +%{_libdir}/libPolly.a +%{_libdir}/libPollyISL.a +%{_libdir}/libPollyPPCG.a %{_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} -%attr(755,root,root) %{_bindir}/c-index-test %attr(755,root,root) %{_bindir}/clang %attr(755,root,root) %{_bindir}/clang++ +%attr(755,root,root) %{_bindir}/clang-%{abi} %attr(755,root,root) %{_bindir}/clang-check +%attr(755,root,root) %{_bindir}/clang-cl %attr(755,root,root) %{_bindir}/clang-format -%attr(755,root,root) %{_bindir}/clang-tblgen -%attr(755,root,root) %{_libdir}/libclang.so +%attr(755,root,root) %{_bindir}/git-clang-format %dir %{_libdir}/clang %dir %{_libdir}/clang/%{version} %{_libdir}/clang/%{version}/include %if %{with rt} -%{_libdir}/clang/%{version}/lib +%ifarch %{ix86} %{x8664} x32 +%dir %{_libdir}/clang/%{version}/lib +%dir %{_libdir}/clang/%{version}/lib/linux +%endif +%ifarch %{ix86} +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i*86.a +%attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i*86.so +%endif +%ifarch %{x8664} +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a +%attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.so +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a.syms +%endif +%ifarch %{ix86} %{x8664} x32 %{arm} aarch64 mips mips64 ppc64 +%{_libdir}/clang/%{version}/asan_blacklist.txt +%endif +%ifarch %{ix86} %{x8664} x32 mips64 +%{_libdir}/clang/%{version}/cfi_blacklist.txt +%endif +%ifarch %{x8664} x32 aarch64 mips64 +%{_libdir}/clang/%{version}/dfsan_abilist.txt +%{_libdir}/clang/%{version}/msan_blacklist.txt +%endif +%endif +%dir %{_datadir}/clang +%{_datadir}/clang/clang-format-diff.py + +%files -n clang-libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libclang.so.%{abi} + +%if %{with rt} && %{with multilib} +%ifarch %{x8664} x32 +%files -n clang-multilib +%defattr(644,root,root,755) +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i386.a +%attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i386.so +%endif +%ifarch x32 +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a +%attr(755,root,root) %{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.so +%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a.syms +%endif %endif -%{_mandir}/man1/clang.1* %files -n clang-analyzer %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/scan-build %attr(755,root,root) %{_bindir}/scan-view +%{_datadir}/scan-build +%{_datadir}/scan-view %{_mandir}/man1/scan-build.1* -%dir %{_libdir}/clang-analyzer - -%dir %{_libdir}/clang-analyzer/scan-build -%{_libdir}/clang-analyzer/scan-build/*.css -%{_libdir}/clang-analyzer/scan-build/*.js -%attr(755,root,root) %{_libdir}/clang-analyzer/scan-build/scan-build -%attr(755,root,root) %{_libdir}/clang-analyzer/scan-build/*-analyzer - -%dir %{_libdir}/clang-analyzer/scan-view -%attr(755,root,root) %{_libdir}/clang-analyzer/scan-view/scan-view -%{_libdir}/clang-analyzer/scan-view/Resources -%{_libdir}/clang-analyzer/scan-view/*.py[co] +%dir %{_libdir}/scan-build +%attr(755,root,root) %{_libdir}/scan-build/c++-analyzer +%attr(755,root,root) %{_libdir}/scan-build/ccc-analyzer %files -n clang-devel %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libclang.so %{_libdir}/libclang*.a %{_includedir}/clang %{_includedir}/clang-c +%{_libdir}/cmake/clang %files -n clang-doc %defattr(644,root,root,755) -%doc tools/clang/docs/*.{css,html,png,txt} +%doc tools/clang/docs/*.{html,png,txt} %if %{with apidocs} %files -n clang-apidocs @@ -707,47 +834,56 @@ rm -rf $RPM_BUILD_ROOT %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}} +%doc tools/clang/tools/extra/{CODE_OWNERS.TXT,README.txt} %attr(755,root,root) %{_bindir}/clang-apply-replacements -%attr(755,root,root) %{_bindir}/clang-modernize +%attr(755,root,root) %{_bindir}/clang-include-fixer %attr(755,root,root) %{_bindir}/clang-query +%attr(755,root,root) %{_bindir}/clang-rename %attr(755,root,root) %{_bindir}/clang-tidy +%attr(755,root,root) %{_bindir}/find-all-symbols +%attr(755,root,root) %{_bindir}/modularize %attr(755,root,root) %{_bindir}/pp-trace -%{_libdir}/libmodernizeCore.a +%{_datadir}/clang/clang-include-fixer.py +%{_datadir}/clang/clang-tidy-diff.py +%{_datadir}/clang/run-clang-tidy.py +%{_datadir}/clang/run-find-all-symbols.py %files -n lld %defattr(644,root,root,755) %doc tools/lld/{LICENSE.TXT,README.md} +%attr(755,root,root) %{_bindir}/ld.lld %attr(755,root,root) %{_bindir}/lld +%attr(755,root,root) %{_bindir}/lld-link %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 +%{_libdir}/liblld[ACDEHMRXY]*.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-%{version} +%attr(755,root,root) %{_bindir}/lldb-argdumper %attr(755,root,root) %{_bindir}/lldb-mi -%attr(755,root,root) %{_bindir}/lldb-platform -%attr(755,root,root) %{_libdir}/liblldb.so +%attr(755,root,root) %{_bindir}/lldb-mi-%{version} +%attr(755,root,root) %{_bindir}/lldb-server +%attr(755,root,root) %{_bindir}/lldb-server-%{version} +%attr(755,root,root) %{_libdir}/liblldb.so.%{version} %dir %{py_sitedir}/lldb +%attr(755,root,root) %{py_sitedir}/lldb/lldb-argdumper +%{py_sitedir}/lldb/formatters +%{py_sitedir}/lldb/runtime +%{py_sitedir}/lldb/utils +%{py_sitedir}/lldb/__init__.py[co] +%{py_sitedir}/lldb/embedded_interpreter.py[co] %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) +%attr(755,root,root) %{_libdir}/liblldb.so %{_libdir}/liblldb*.a %{_includedir}/lldb %endif @@ -762,14 +898,11 @@ rm -rf $RPM_BUILD_ROOT %files ocaml-devel %defattr(644,root,root,755) -%{_libdir}/libllvm*.a -%{_libdir}/ocaml/libLLVM*.a %{_libdir}/ocaml/libllvm*.a %{_libdir}/ocaml/llvm*.a %{_libdir}/ocaml/llvm*.cmx* -%{_libdir}/ocaml/llvm*.mli %files ocaml-doc %defattr(644,root,root,755) -%doc moredocs/ocamldoc/html/* +%doc ocamldocs/* %endif diff --git a/x32-gcc-toolchain.patch b/x32-gcc-toolchain.patch new file mode 100644 index 0000000..fffe393 --- /dev/null +++ b/x32-gcc-toolchain.patch @@ -0,0 +1,37 @@ +--- llvm-3.6.2.src/tools/clang/lib/Driver/ToolChains.cpp~ 2015-07-26 12:48:18.000000000 +0200 ++++ llvm-3.6.2.src/tools/clang/lib/Driver/ToolChains.cpp 2015-07-26 17:44:56.883613971 +0200 +@@ -1312,6 +1312,9 @@ + "x86_64-slackware-linux", "x86_64-linux-android", + "x86_64-unknown-linux"}; + static const char *const X32LibDirs[] = {"/libx32"}; ++ static const char *const X32Triples[] = { ++ "x86_64-pld-linux-gnux32", "amd64-pld-linux-gnux32", ++ "x86_64-linux-gnux32", "x86_64-unknown-linux-gnux32", "x86_64-pc-linux-gnux32"}; + static const char *const X86LibDirs[] = {"/lib32", "/lib"}; + static const char *const X86Triples[] = { + "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux", +@@ -1407,15 +1407,19 @@ + } + break; + case llvm::Triple::x86_64: +- LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); +- TripleAliases.append(begin(X86_64Triples), end(X86_64Triples)); +- // x32 is always available when x86_64 is available, so adding it as +- // secondary arch with x86_64 triples + if (TargetTriple.getEnvironment() == llvm::Triple::GNUX32) { +- BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs)); ++ LibDirs.append(begin(X32LibDirs), end(X32LibDirs)); ++ TripleAliases.append(begin(X32Triples), end(X32Triples)); ++ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); ++ BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs)); + BiarchTripleAliases.append(begin(X86_64Triples), end(X86_64Triples)); ++ BiarchTripleAliases.append(begin(X86Triples), end(X86Triples)); + } else { ++ LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); ++ TripleAliases.append(begin(X86_64Triples), end(X86_64Triples)); ++ BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs)); + BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs)); ++ BiarchTripleAliases.append(begin(X32Triples), end(X32Triples)); + BiarchTripleAliases.append(begin(X86Triples), end(X86Triples)); + } + break; -- 2.44.0