* New upstream release. Note that only LLVM & Clang had a new release.

I just copied the 3.4 tarballs for clang-extra-tools, polly, lldb and
  compiler-rt.
  - lldb-platform-3.4        - lldb-3.4
This commit is contained in:
Sylvestre Ledru 2014-05-10 16:10:05 +00:00
parent 31731b162f
commit 15fb7c9a27
9 changed files with 39 additions and 43 deletions

8
debian/changelog vendored
View File

@ -1,5 +1,8 @@
llvm-toolchain-3.4 (1:3.4+204650-1~exp1) UNRELEASED; urgency=medium llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium
* New upstream release. Note that only LLVM & Clang had a new release.
I just copied the 3.4 tarballs for clang-extra-tools, polly, lldb and
compiler-rt.
* Symlink for current build mode missing (Closes upstream #18836) * Symlink for current build mode missing (Closes upstream #18836)
* Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts * Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts
* Backport of a r201586 from upstream. scan-build was failing on some project * Backport of a r201586 from upstream. scan-build was failing on some project
@ -21,11 +24,12 @@ llvm-toolchain-3.4 (1:3.4+204650-1~exp1) UNRELEASED; urgency=medium
- ocamldoc.tar.gz - llvm-3.4-doc - ocamldoc.tar.gz - llvm-3.4-doc
- BugpointPasses.so - llvm-3.4-dev - BugpointPasses.so - llvm-3.4-dev
- liblldb* - lldb-3.4-dev - liblldb* - lldb-3.4-dev
- lldb-platform-3.4 - lldb-3.4
- clang-apply-replacements - clang-3.4 - clang-apply-replacements - clang-3.4
- clang-tidy - clang-3.4 - clang-tidy - clang-3.4
- pp-trace - clang-3.4 - pp-trace - clang-3.4
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 28 Mar 2014 13:41:23 +0000 -- Sylvestre Ledru <sylvestre@debian.org> Fri, 09 May 2014 19:57:33 +0200
llvm-toolchain-3.4 (1:3.4-2) unstable; urgency=medium llvm-toolchain-3.4 (1:3.4-2) unstable; urgency=medium

View File

@ -1,7 +1,7 @@
usr/lib/llvm-3.4/lib/clang/3.4/include usr/lib/llvm-3.4/lib/clang/3.4.1/include
usr/lib/llvm-3.4/include/polly/ usr/lib/llvm-3.4/include/polly/
usr/lib/llvm-3.4/lib/clang/3.4/lib usr/lib/llvm-3.4/lib/clang/3.4.1/lib
#usr/lib/clang/3.4/lib /usr/lib/clang/3.4/ #usr/lib/clang/3.4/lib /usr/lib/clang/3.4/

View File

@ -1,3 +1,6 @@
usr/lib/llvm-3.4/lib/clang/3.4/include usr/include/clang/3.4/include usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/include/clang/3.4/include
usr/lib/llvm-3.4/lib/clang/3.4/include usr/lib/clang/3.4/include usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/clang/3.4/include
usr/lib/llvm-3.4/lib/clang/3.4/lib usr/lib/clang/3.4/lib usr/lib/llvm-3.4/lib/clang/3.4.1/lib usr/lib/clang/3.4/lib
usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/include/clang/3.4.1/include
usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/clang/3.4.1/include
usr/lib/llvm-3.4/lib/clang/3.4.1/lib usr/lib/clang/3.4.1/lib

View File

@ -1,4 +1,5 @@
usr/bin/lldb-3.4 usr/bin/lldb-3.4
usr/bin/lldb-platform-3.4
usr/lib/llvm-3.4/bin/lldb usr/lib/llvm-3.4/bin/lldb
usr/lib/llvm-3.4/bin/lldb-platform usr/lib/llvm-3.4/bin/lldb-platform
usr/lib/llvm-3.4/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-3.4/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/

View File

@ -1,6 +1,7 @@
usr/lib/llvm-3.4/lib/libLLVM*.a usr/lib/llvm-3.4/lib/libLLVM*.a
usr/lib/llvm-3.4/lib/libllvm*.a usr/lib/llvm-3.4/lib/libllvm*.a
usr/lib/llvm-3.4/lib/LLVM*.so usr/lib/llvm-3.4/lib/LLVM*.so
usr/lib/llvm-3.4/lib/libLLVM*so
usr/lib/llvm-3.4/lib/libLTO.* usr/lib/llvm-3.4/lib/libLTO.*
usr/lib/llvm-3.4/lib/BugpointPasses.so usr/lib/llvm-3.4/lib/BugpointPasses.so
usr/lib/llvm-3.4/include/llvm/ usr/include/llvm-3.4/ usr/lib/llvm-3.4/include/llvm/ usr/include/llvm-3.4/

View File

@ -1,39 +1,23 @@
Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h Index: llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.h 2013-11-17 23:36:07.000000000 +0100 --- llvm-toolchain-3.4-3.4.1.orig/clang/lib/Driver/ToolChains.cpp 2014-04-26 01:38:13.000000000 +0200
+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h 2013-12-05 09:07:45.000000000 +0100 +++ llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp 2014-05-10 12:34:16.374471699 +0200
@@ -164,6 +164,8 @@ @@ -2588,6 +2588,10 @@
virtual bool isPICDefault() const; if (DriverArgs.hasArg(options::OPT_nostdinc))
virtual bool isPIEDefault() const; return;
virtual bool isPICDefaultForced() const;
+ virtual void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args) const;
protected:
virtual Tool *getTool(Action::ActionClass AC) const;
Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.cpp 2013-12-02 11:00:07.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp 2013-12-05 09:08:49.000000000 +0100
@@ -973,6 +973,13 @@
return GoodVersion;
}
+void Generic_GCC::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args) const {
+ // Under Debian, clang headers are installed into + // Under Debian, clang headers are installed into
+ // '/usr/include/clang/VERSION/include/' + // '/usr/include/clang/VERSION/include/'
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); + addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+}
+ +
/// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering. if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
bool Generic_GCC::GCCVersion::isOlderThan(int RHSMajor, int RHSMinor, addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
int RHSPatch,
Index: llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp Index: llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp
=================================================================== ===================================================================
--- llvm-toolchain-3.4-3.4~+rc2.orig/lldb/source/Host/common/Host.cpp 2013-12-05 09:08:49.000000000 +0100 --- llvm-toolchain-3.4-3.4.1.orig/lldb/source/Host/common/Host.cpp 2013-12-16 10:49:51.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp 2013-12-05 09:09:17.294953434 +0100 +++ llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp 2014-05-10 12:33:20.000000000 +0200
@@ -1546,7 +1546,7 @@ @@ -1586,7 +1586,7 @@
return error; return error;
} }

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp Index: llvm-toolchain-3.4_3.4~+final/clang/lib/Driver/Tools.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/Tools.cpp 2013-10-10 13:38:05.214083057 +0200 --- llvm-toolchain-3.4_3.4~+final.orig/clang/lib/Driver/Tools.cpp 2014-05-09 20:00:11.406805529 +0200
+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp 2013-10-10 13:38:05.206083056 +0200 +++ llvm-toolchain-3.4_3.4~+final/clang/lib/Driver/Tools.cpp 2014-05-09 20:00:11.402805450 +0200
@@ -36,6 +36,7 @@ @@ -37,6 +37,7 @@
#include "llvm/Support/Program.h" #include "llvm/Support/Program.h"
#include "llvm/Support/Process.h" #include "llvm/Support/Process.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp
#include <sys/stat.h> #include <sys/stat.h>
using namespace clang::driver; using namespace clang::driver;
@@ -221,7 +222,7 @@ @@ -222,7 +223,7 @@
// libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
// not supported by old linkers. // not supported by old linkers.
std::string ProfileRT = std::string ProfileRT =

5
debian/rules vendored
View File

@ -258,7 +258,10 @@ override_dh_auto_install:
if test ! -f libclang-$(LLVM_VERSION).so.$(SONAME_EXT); then \ if test ! -f libclang-$(LLVM_VERSION).so.$(SONAME_EXT); then \
mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \
ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \
fi fi; \
rm -f libLLVM-$(LLVM_VERSION).so; \
ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so; \
rm -f libclang.so
# cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty) # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty)