From 8b9db2b79f9975c4c11091a648cbf9090684177e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 26 Feb 2013 16:34:08 +0000 Subject: [PATCH] * Draft of a snapshot release (3.3) --- debian/README.source | 5 +- debian/changelog | 6 ++ ...{clang-3.2-doc.docs => clang-3.3-doc.docs} | 0 .../{clang-3.2.install => clang-3.3.install} | 8 +-- debian/{clang-3.2.links => clang-3.3.links} | 0 ...{clang-3.2.manpages => clang-3.3.manpages} | 0 ...{clang-3.2.postinst => clang-3.3.postinst} | 0 debian/{clang-3.2.prerm => clang-3.3.prerm} | 0 debian/control | 58 +++++++++---------- debian/libllvm-3.2-ocaml-dev.doc-base | 8 --- debian/libllvm-3.2-ocaml-dev.install.in | 2 - .../libllvm-3.2-ocaml-dev.lintian-overrides | 2 - ...ml-dev.META => libllvm-3.3-ocaml-dev.META} | 28 ++++----- ....dirs.in => libllvm-3.3-ocaml-dev.dirs.in} | 0 debian/libllvm-3.3-ocaml-dev.doc-base | 8 +++ debian/libllvm-3.3-ocaml-dev.install.in | 2 + .../libllvm-3.3-ocaml-dev.lintian-overrides | 2 + debian/libllvm3.2.install | 1 - debian/libllvm3.2.install.in | 1 - debian/libllvm3.3.install | 1 + debian/libllvm3.3.install.in | 1 + debian/lldb-3.2.install.in | 5 -- debian/lldb-3.3.install.in | 5 ++ .../{lldb-3.2.links.in => lldb-3.3.links.in} | 0 debian/llvm-3.2-dev.dirs | 5 -- debian/llvm-3.2-dev.install | 21 ------- debian/llvm-3.2-dev.links.in | 3 - debian/llvm-3.2-doc.dirs | 1 - debian/llvm-3.2-doc.install | 1 - debian/llvm-3.2-examples.dirs | 1 - debian/llvm-3.2-examples.links | 3 - debian/llvm-3.2-runtime.install | 3 - debian/llvm-3.2-runtime.manpages | 1 - debian/llvm-3.2.dirs | 3 - debian/llvm-3.2.install | 13 ----- debian/llvm-3.3-dev.dirs | 5 ++ debian/llvm-3.3-dev.install | 21 +++++++ debian/llvm-3.3-dev.links.in | 3 + debian/llvm-3.3-doc.dirs | 1 + debian/llvm-3.3-doc.install | 1 + debian/llvm-3.3-examples.dirs | 1 + ...es.examples => llvm-3.3-examples.examples} | 0 debian/llvm-3.3-examples.links | 3 + ...e.binfmt.in => llvm-3.3-runtime.binfmt.in} | 0 debian/llvm-3.3-runtime.install | 3 + ...2-runtime.links => llvm-3.3-runtime.links} | 0 debian/llvm-3.3-runtime.manpages | 1 + ...ime.postinst => llvm-3.3-runtime.postinst} | 2 +- ...ime.prerm.in => llvm-3.3-runtime.prerm.in} | 0 debian/llvm-3.3.dirs | 3 + debian/llvm-3.3.install | 13 +++++ debian/{llvm-3.2.links => llvm-3.3.links} | 0 .../{llvm-3.2.manpages => llvm-3.3.manpages} | 0 debian/orig-tar.sh | 55 +++++++++++++----- ...03-Debian-version-info-and-bugreport.patch | 8 +-- debian/patches/0021-shared-lib-debian.patch | 6 +- debian/patches/0023-link-libopagent.patch | 12 ++-- debian/patches/0041-undef-PPC-macro.diff | 26 ++++----- debian/patches/0044-soname.diff | 6 +- ...set-is_stmt-a-little-better-for-prol.patch | 32 ++++------ debian/patches/0047-version-name.diff | 28 ++++----- debian/patches/0050-powerpcspe-fp.diff | 6 +- debian/patches/18-soname.patch | 10 ++-- debian/patches/19-clang_debian_version.patch | 10 ++-- debian/patches/21-searchPathHeaders.diff | 8 +-- .../23-strlcpy_strlcat_warning_removed.diff | 44 +++++++------- debian/patches/26-disable_SplitsOnSpaces.diff | 8 +-- debian/patches/26-set-correct-float-abi.diff | 8 +-- debian/patches/27-fix_clang_stdint.diff | 6 +- debian/patches/28-gcc-4.7-paths.diff | 20 +++---- debian/patches/29-hurd.diff | 20 +++---- debian/patches/30-kfreebsd.diff | 18 +++--- debian/patches/declare_clear_cache.diff | 8 +-- debian/patches/polly-c++0x.diff | 10 ++-- debian/patches/profile_rt.diff | 20 +++---- debian/patches/scan-build-clang-path.diff | 8 +-- debian/patches/series | 16 ++--- debian/prepare-new-release.sh | 10 ++-- debian/rules | 2 +- 79 files changed, 337 insertions(+), 323 deletions(-) rename debian/{clang-3.2-doc.docs => clang-3.3-doc.docs} (100%) rename debian/{clang-3.2.install => clang-3.3.install} (50%) rename debian/{clang-3.2.links => clang-3.3.links} (100%) rename debian/{clang-3.2.manpages => clang-3.3.manpages} (100%) rename debian/{clang-3.2.postinst => clang-3.3.postinst} (100%) rename debian/{clang-3.2.prerm => clang-3.3.prerm} (100%) delete mode 100644 debian/libllvm-3.2-ocaml-dev.doc-base delete mode 100644 debian/libllvm-3.2-ocaml-dev.install.in delete mode 100644 debian/libllvm-3.2-ocaml-dev.lintian-overrides rename debian/{libllvm-3.2-ocaml-dev.META => libllvm-3.3-ocaml-dev.META} (76%) rename debian/{libllvm-3.2-ocaml-dev.dirs.in => libllvm-3.3-ocaml-dev.dirs.in} (100%) create mode 100644 debian/libllvm-3.3-ocaml-dev.doc-base create mode 100644 debian/libllvm-3.3-ocaml-dev.install.in create mode 100644 debian/libllvm-3.3-ocaml-dev.lintian-overrides delete mode 100644 debian/libllvm3.2.install delete mode 100644 debian/libllvm3.2.install.in create mode 100644 debian/libllvm3.3.install create mode 100644 debian/libllvm3.3.install.in delete mode 100644 debian/lldb-3.2.install.in create mode 100644 debian/lldb-3.3.install.in rename debian/{lldb-3.2.links.in => lldb-3.3.links.in} (100%) delete mode 100644 debian/llvm-3.2-dev.dirs delete mode 100644 debian/llvm-3.2-dev.install delete mode 100644 debian/llvm-3.2-dev.links.in delete mode 100644 debian/llvm-3.2-doc.dirs delete mode 100644 debian/llvm-3.2-doc.install delete mode 100644 debian/llvm-3.2-examples.dirs delete mode 100644 debian/llvm-3.2-examples.links delete mode 100644 debian/llvm-3.2-runtime.install delete mode 100644 debian/llvm-3.2-runtime.manpages delete mode 100644 debian/llvm-3.2.dirs delete mode 100644 debian/llvm-3.2.install create mode 100644 debian/llvm-3.3-dev.dirs create mode 100644 debian/llvm-3.3-dev.install create mode 100644 debian/llvm-3.3-dev.links.in create mode 100644 debian/llvm-3.3-doc.dirs create mode 100644 debian/llvm-3.3-doc.install create mode 100644 debian/llvm-3.3-examples.dirs rename debian/{llvm-3.2-examples.examples => llvm-3.3-examples.examples} (100%) create mode 100644 debian/llvm-3.3-examples.links rename debian/{llvm-3.2-runtime.binfmt.in => llvm-3.3-runtime.binfmt.in} (100%) create mode 100644 debian/llvm-3.3-runtime.install rename debian/{llvm-3.2-runtime.links => llvm-3.3-runtime.links} (100%) create mode 100644 debian/llvm-3.3-runtime.manpages rename debian/{llvm-3.2-runtime.postinst => llvm-3.3-runtime.postinst} (64%) rename debian/{llvm-3.2-runtime.prerm.in => llvm-3.3-runtime.prerm.in} (100%) create mode 100644 debian/llvm-3.3.dirs create mode 100644 debian/llvm-3.3.install rename debian/{llvm-3.2.links => llvm-3.3.links} (100%) rename debian/{llvm-3.2.manpages => llvm-3.3.manpages} (100%) diff --git a/debian/README.source b/debian/README.source index d2b776e4..deeb3f28 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,6 +1,5 @@ -The tarball are basically the one from upstream, renamed and recompressed using -tar.bz2 +Repack of the snapshot release are done with orig-tar.sh which will checkout the sources. - -- Sylvestre Ledru , Sat, 9 Feb 2013 11:36:37 +0100 + -- Sylvestre Ledru , Tue, 26 Feb 2013 14:57:56 +0100 diff --git a/debian/changelog b/debian/changelog index ad628c68..c25c8792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain (1:3.3~svn176083-1~exp1) experimental; urgency=low + + * Draft of a snapshot release (3.3) + + -- Sylvestre Ledru Tue, 26 Feb 2013 13:49:57 +0100 + llvm-toolchain-3.2 (1:3.2repack-1~exp3) UNRELEASED; urgency=low * Fix some issues relative to the epoch change diff --git a/debian/clang-3.2-doc.docs b/debian/clang-3.3-doc.docs similarity index 100% rename from debian/clang-3.2-doc.docs rename to debian/clang-3.3-doc.docs diff --git a/debian/clang-3.2.install b/debian/clang-3.3.install similarity index 50% rename from debian/clang-3.2.install rename to debian/clang-3.3.install index 3346b64c..ec13d591 100644 --- a/debian/clang-3.2.install +++ b/debian/clang-3.3.install @@ -1,7 +1,7 @@ -usr/lib/llvm-3.2/bin/clang /usr/bin/ -usr/lib/llvm-3.2/bin/clang++ /usr/bin/ -usr/lib/llvm-3.2/bin/clang-check /usr/bin/ -usr/lib/llvm-3.2/bin/clang-tblgen /usr/bin/ +usr/lib/llvm-3.3/bin/clang /usr/bin/ +usr/lib/llvm-3.3/bin/clang++ /usr/bin/ +usr/lib/llvm-3.3/bin/clang-check /usr/bin/ +usr/lib/llvm-3.3/bin/clang-tblgen /usr/bin/ tools/clang/tools/scan-build /usr/share/clang/ tools/clang/tools/scan-view /usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ diff --git a/debian/clang-3.2.links b/debian/clang-3.3.links similarity index 100% rename from debian/clang-3.2.links rename to debian/clang-3.3.links diff --git a/debian/clang-3.2.manpages b/debian/clang-3.3.manpages similarity index 100% rename from debian/clang-3.2.manpages rename to debian/clang-3.3.manpages diff --git a/debian/clang-3.2.postinst b/debian/clang-3.3.postinst similarity index 100% rename from debian/clang-3.2.postinst rename to debian/clang-3.3.postinst diff --git a/debian/clang-3.2.prerm b/debian/clang-3.3.prerm similarity index 100% rename from debian/clang-3.2.prerm rename to debian/clang-3.3.prerm diff --git a/debian/control b/debian/control index b65a89c3..2a1a03cf 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-3.2 +Source: llvm-toolchain Section: devel Priority: optional Maintainer: LLVM Packaging Team @@ -12,12 +12,12 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect, Build-Conflicts: oprofile, ocaml Standards-Version: 3.9.3 Homepage: http://www.llvm.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/trunk/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/ Package: clang Architecture: all -Depends: clang-3.2 (>= ${source:Version}), ${misc:Depends} +Depends: clang-3.3 (>= ${source:Version}), ${misc:Depends} Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Some of its goals include the following: @@ -43,12 +43,12 @@ Description: C, C++ and Objective-C compiler (LLVM based) * A single unified parser for C, Objective C, C++, and Objective C++ * Conformance with C/C++/ObjC and their variants -Package: clang-3.2 +Package: clang-3.3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6-4.7-dev, libgcc-4.7-dev, libobjc-4.7-dev, libclang-common-dev (= ${binary:Version}) Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-3.2-dev, python +Recommends: llvm-3.3-dev, python Replaces: clang (<< 1:3.1), clang-3.1, compiler-rt Breaks: clang (<< 1:3.1), clang-3.1, compiler-rt Description: C, C++ and Objective-C compiler (LLVM based) @@ -76,7 +76,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) * A single unified parser for C, Objective C, C++, and Objective C++ * Conformance with C/C++/ObjC and their variants -Package: clang-3.2-doc +Package: clang-3.3-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -205,8 +205,8 @@ Package: libclang-common-dev Architecture: any Section: libdevel Depends: ${misc:Depends} -Replaces: llvm-3.2-dev (<< 1:3.2repack), libclang-dev -Breaks: llvm-3.2-dev (<< 1:3.2repack) +Replaces: llvm-3.3-dev (<< 1:3.2repack), libclang-dev +Breaks: llvm-3.3-dev (<< 1:3.2repack) Description: clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Some of its goals include the following: @@ -257,7 +257,7 @@ Description: clang library - Common development package # libgcc implementations. # . -Package: libllvm3.2 +Package: libllvm3.3 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -270,11 +270,11 @@ Description: Low-Level Virtual Machine (LLVM), runtime library . This package contains the LLVM runtime library. -Package: libllvm3.2-dbg +Package: libllvm3.3-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.2 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.3 Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Low-Level Virtual Machine (LLVM), debugging symbols library @@ -284,11 +284,11 @@ Description: Low-Level Virtual Machine (LLVM), debugging symbols library . This package contains the LLVM runtime library debug symbols. -Package: llvm-3.2 +Package: llvm-3.3 Architecture: any -Suggests: llvm-3.2-doc -Depends: llvm-3.2-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-3.2-dev +Suggests: llvm-3.3-doc +Depends: llvm-3.3-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-3.3-dev Conflicts: llvm (<< 2.7-1) Replaces: llvm (<< 2.7-1) Description: Low-Level Virtual Machine (LLVM) @@ -316,7 +316,7 @@ Description: Low-Level Virtual Machine (LLVM) LLVM is the key component of the clang compiler and the gcc plugin called dragonegg. -Package: llvm-3.2-runtime +Package: llvm-3.3-runtime Architecture: any Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Conflicts: llvm (<< 2.7-1) @@ -336,9 +336,9 @@ Description: Low-Level Virtual Machine (LLVM), bytecode interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-3.2-dev +Package: llvm-3.3-dev Architecture: any -Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, llvm-3.2 (= ${binary:Version}) +Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, llvm-3.3 (= ${binary:Version}) Replaces: llvm (<< 2.2-3) Description: Low-Level Virtual Machine (LLVM), libraries and headers The Low-Level Virtual Machine (LLVM) is a collection of libraries and @@ -355,13 +355,13 @@ Description: Low-Level Virtual Machine (LLVM), libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: libllvm-3.2-ocaml-dev +Package: libllvm-3.3-ocaml-dev Section: ocaml Architecture: any -Suggests: llvm-3.2-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.2-dev (= ${binary:Version}) -Replaces: libllvm-ocaml-3.2-dev -Conflicts: libllvm-ocaml-3.2-dev +Suggests: llvm-3.3-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.3-dev (= ${binary:Version}) +Replaces: libllvm-ocaml-3.3-dev +Conflicts: libllvm-ocaml-3.3-dev Provides: ${ocaml:Provides} Description: Low-Level Virtual Machine (LLVM), bindings for OCaml The Low-Level Virtual Machine (LLVM) is a collection of libraries and @@ -377,7 +377,7 @@ Description: Low-Level Virtual Machine (LLVM), bindings for OCaml . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-3.2-doc +Package: llvm-3.3-doc Section: doc Architecture: all Depends: ${misc:Depends} @@ -395,10 +395,10 @@ Description: Low-Level Virtual Machine (LLVM), documentation . This package contains all documentation (extensive). -Package: llvm-3.2-examples +Package: llvm-3.3-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-3.2-dev (>= ${source:Version}), llvm-3.2-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-3.3-dev (>= ${source:Version}), llvm-3.3-dev (<< ${source:Version}+c~) Description: Low-Level Virtual Machine (LLVM), examples The Low-Level Virtual Machine (LLVM) is a collection of libraries and tools that make it easy to build compilers, optimizers, Just-In-Time @@ -414,7 +414,7 @@ Description: Low-Level Virtual Machine (LLVM), examples This package contains examples for using LLVM, both in developing extensions to LLVM and in using it to compile code. -# Package: llvm-3.2-source +# Package: llvm-3.3-source # Architecture: all # Depends: ${shlibs:Depends}, ${misc:Depends} # Description: Low-Level Virtual Machine (LLVM), source code @@ -433,7 +433,7 @@ Description: Low-Level Virtual Machine (LLVM), examples -Package: lldb-3.2 +Package: lldb-3.3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/libllvm-3.2-ocaml-dev.doc-base b/debian/libllvm-3.2-ocaml-dev.doc-base deleted file mode 100644 index 7aeadd11..00000000 --- a/debian/libllvm-3.2-ocaml-dev.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: libllvm-3.2-ocaml-dev-ocamldoc-api-reference -Title: Llvm OCamldoc API Reference -Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) -Section: Programming/OCaml - -Format: HTML -Index: /usr/share/doc/libllvm-3.2-ocaml-dev/html/index.html -Files: /usr/share/doc/libllvm-3.2-ocaml-dev/html/* diff --git a/debian/libllvm-3.2-ocaml-dev.install.in b/debian/libllvm-3.2-ocaml-dev.install.in deleted file mode 100644 index d03634fe..00000000 --- a/debian/libllvm-3.2-ocaml-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/@OCAML_STDLIB_DIR@/llvm-3.2 @OCAML_STDLIB_DIR@/ -debian/tmp//usr/lib/llvm-3.2/docs/llvm/ocamldoc/html usr/share/doc/libllvm-3.2-ocaml-dev/ diff --git a/debian/libllvm-3.2-ocaml-dev.lintian-overrides b/debian/libllvm-3.2-ocaml-dev.lintian-overrides deleted file mode 100644 index 3fecd490..00000000 --- a/debian/libllvm-3.2-ocaml-dev.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# It is in the section ocaml which is fine. -libllvm-3.2-ocaml-dev: wrong-section-according-to-package-name libllvm-3.2-ocaml-dev => libdevel diff --git a/debian/libllvm-3.2-ocaml-dev.META b/debian/libllvm-3.3-ocaml-dev.META similarity index 76% rename from debian/libllvm-3.2-ocaml-dev.META rename to debian/libllvm-3.3-ocaml-dev.META index 699b69bd..92efdc09 100644 --- a/debian/libllvm-3.2-ocaml-dev.META +++ b/debian/libllvm-3.3-ocaml-dev.META @@ -1,7 +1,7 @@ description = "Low Level Virtual Machine bindings" -version = "3.2" +version = "3.3" -directory = "+llvm-3.2" +directory = "+llvm-3.3" archive(byte) = "llvm.cma" archive(native) = "llvm.cmxa" @@ -9,8 +9,8 @@ linkopts = "-cclib -lstdc++ -cclib -lllvm" package "executionengine" ( - requires = "llvm-3_2" - version = "3.2" + requires = "llvm-3_3" + version = "3.3" archive(native) = "llvm_executionengine.cmxa" archive(byte) = "llvm_executionengine.cma" linkopts = "-cclib -lllvm_executionengine" @@ -18,8 +18,8 @@ package "executionengine" package "target" ( - requires = "llvm-3_2" - version = "3.2" + requires = "llvm-3_3" + version = "3.3" archive(native) = "llvm_target.cmxa" archive(byte) = "llvm_target.cma" linkopts = "-cclib -lllvm_target" @@ -27,8 +27,8 @@ package "target" package "scalar_opts" ( - requires = "llvm-3_2 llvm-3_2.target" - version = "3.2" + requires = "llvm-3_3 llvm-3_3.target" + version = "3.3" archive(native) = "llvm_scalar_opts.cmxa" archive(byte) = "llvm_scalar_opts.cma" linkopts = "-cclib -lllvm_scalar_opts" @@ -36,8 +36,8 @@ package "scalar_opts" package "analysis" ( - requires = "llvm-3_2" - version = "3.2" + requires = "llvm-3_3" + version = "3.3" archive(native) = "llvm_analysis.cmxa" archive(byte) = "llvm_analysis.cma" linkopts = "-cclib -lllvm_analysis" @@ -45,8 +45,8 @@ package "analysis" package "bitwriter" ( - requires = "llvm-3_2" - version = "3.2" + requires = "llvm-3_3" + version = "3.3" archive(native) = "llvm_bitwriter.cmxa" archive(byte) = "llvm_bitwriter.cma" linkopts = "-cclib -lllvm_bitwriter" @@ -54,8 +54,8 @@ package "bitwriter" package "bitreader" ( - requires = "llvm-3_2 llvm-3_2.bitwriter" - version = "3.2" + requires = "llvm-3_3 llvm-3_3.bitwriter" + version = "3.3" archive(native) = "llvm_bitreader.cmxa" archive(byte) = "llvm_bitreader.cma" linkopts = "-cclib -lllvm_bitreader" diff --git a/debian/libllvm-3.2-ocaml-dev.dirs.in b/debian/libllvm-3.3-ocaml-dev.dirs.in similarity index 100% rename from debian/libllvm-3.2-ocaml-dev.dirs.in rename to debian/libllvm-3.3-ocaml-dev.dirs.in diff --git a/debian/libllvm-3.3-ocaml-dev.doc-base b/debian/libllvm-3.3-ocaml-dev.doc-base new file mode 100644 index 00000000..139596ff --- /dev/null +++ b/debian/libllvm-3.3-ocaml-dev.doc-base @@ -0,0 +1,8 @@ +Document: libllvm-3.3-ocaml-dev-ocamldoc-api-reference +Title: Llvm OCamldoc API Reference +Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libllvm-3.3-ocaml-dev/html/index.html +Files: /usr/share/doc/libllvm-3.3-ocaml-dev/html/* diff --git a/debian/libllvm-3.3-ocaml-dev.install.in b/debian/libllvm-3.3-ocaml-dev.install.in new file mode 100644 index 00000000..9300143e --- /dev/null +++ b/debian/libllvm-3.3-ocaml-dev.install.in @@ -0,0 +1,2 @@ +debian/tmp/@OCAML_STDLIB_DIR@/llvm-3.3 @OCAML_STDLIB_DIR@/ +debian/tmp//usr/lib/llvm-3.3/docs/llvm/ocamldoc/html usr/share/doc/libllvm-3.3-ocaml-dev/ diff --git a/debian/libllvm-3.3-ocaml-dev.lintian-overrides b/debian/libllvm-3.3-ocaml-dev.lintian-overrides new file mode 100644 index 00000000..29dfc606 --- /dev/null +++ b/debian/libllvm-3.3-ocaml-dev.lintian-overrides @@ -0,0 +1,2 @@ +# It is in the section ocaml which is fine. +libllvm-3.3-ocaml-dev: wrong-section-according-to-package-name libllvm-3.3-ocaml-dev => libdevel diff --git a/debian/libllvm3.2.install b/debian/libllvm3.2.install deleted file mode 100644 index 89d19f87..00000000 --- a/debian/libllvm3.2.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-3.2/lib/libLLVM-3.2.so.1 /usr/lib/x86_64-linux-gnu/ diff --git a/debian/libllvm3.2.install.in b/debian/libllvm3.2.install.in deleted file mode 100644 index 860cba92..00000000 --- a/debian/libllvm3.2.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-3.2/lib/libLLVM-3.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvm3.3.install b/debian/libllvm3.3.install new file mode 100644 index 00000000..416052f0 --- /dev/null +++ b/debian/libllvm3.3.install @@ -0,0 +1 @@ +usr/lib/llvm-3.3/lib/libLLVM-3.3.so.1 /usr/lib/x86_64-linux-gnu/ diff --git a/debian/libllvm3.3.install.in b/debian/libllvm3.3.install.in new file mode 100644 index 00000000..9bbfacb3 --- /dev/null +++ b/debian/libllvm3.3.install.in @@ -0,0 +1 @@ +usr/lib/llvm-3.3/lib/libLLVM-3.3.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/lldb-3.2.install.in b/debian/lldb-3.2.install.in deleted file mode 100644 index 5ccaafc0..00000000 --- a/debian/lldb-3.2.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/lldb-3.2 -usr/lib/llvm-3.2/bin/lldb -usr/lib/llvm-3.2/bin/lldb-platform -usr/lib/llvm-3.2/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ diff --git a/debian/lldb-3.3.install.in b/debian/lldb-3.3.install.in new file mode 100644 index 00000000..f63324b7 --- /dev/null +++ b/debian/lldb-3.3.install.in @@ -0,0 +1,5 @@ +usr/bin/lldb-3.3 +usr/lib/llvm-3.3/bin/lldb +usr/lib/llvm-3.3/bin/lldb-platform +usr/lib/llvm-3.3/lib/liblldb.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +build-llvm/Release/lib/python2.7/site-packages/lldb/ /usr/lib/python2.7/dist-packages/ diff --git a/debian/lldb-3.2.links.in b/debian/lldb-3.3.links.in similarity index 100% rename from debian/lldb-3.2.links.in rename to debian/lldb-3.3.links.in diff --git a/debian/llvm-3.2-dev.dirs b/debian/llvm-3.2-dev.dirs deleted file mode 100644 index bfcb102f..00000000 --- a/debian/llvm-3.2-dev.dirs +++ /dev/null @@ -1,5 +0,0 @@ -/usr/lib/llvm-3.2/lib -/usr/lib/llvm-3.2/build -/usr/lib/llvm-3.2/include -usr/share/doc/llvm-3.2-dev -usr/share/emacs/site-lisp/llvm-3.2 diff --git a/debian/llvm-3.2-dev.install b/debian/llvm-3.2-dev.install deleted file mode 100644 index d342dd4c..00000000 --- a/debian/llvm-3.2-dev.install +++ /dev/null @@ -1,21 +0,0 @@ -usr/lib/llvm-3.2/lib/libLLVM*.a -usr/lib/llvm-3.2/lib/libllvm*.a -usr/lib/llvm-3.2/lib/LLVM*.so -usr/lib/llvm-3.2/lib/libLTO.* -usr/lib/llvm-3.2/include/llvm/ usr/include/llvm-3.2/ -usr/lib/llvm-3.2/include/llvm-c/ usr/include/llvm-c-3.2/ - -build-llvm/Makefile.common /usr/lib/llvm-3.2/build/ -build-llvm/Makefile.config /usr/lib/llvm-3.2/build/ -build-llvm/config.status /usr/lib/llvm-3.2/build/ -Makefile.rules /usr/lib/llvm-3.2/build/ -configure /usr/lib/llvm-3.2/build/ -autoconf/ /usr/lib/llvm-3.2/build/ - -utils/vim/llvm.vim usr/share/vim/addons/syntax/llvm-3.2.vim -utils/vim/tablegen.vim usr/share/vim/addons/syntax/tablegen-3.2.vim - -utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.2/ -utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.2/ -utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.2/ - diff --git a/debian/llvm-3.2-dev.links.in b/debian/llvm-3.2-dev.links.in deleted file mode 100644 index 22392821..00000000 --- a/debian/llvm-3.2-dev.links.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.2.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.2.so -usr/include/llvm-c-3.2/llvm-c usr/lib/llvm-3.2/include/llvm-c -usr/include/llvm-3.2/llvm usr/lib/llvm-3.2/include/llvm diff --git a/debian/llvm-3.2-doc.dirs b/debian/llvm-3.2-doc.dirs deleted file mode 100644 index e9ec3487..00000000 --- a/debian/llvm-3.2-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/llvm-3.2-doc diff --git a/debian/llvm-3.2-doc.install b/debian/llvm-3.2-doc.install deleted file mode 100644 index a3b1c54b..00000000 --- a/debian/llvm-3.2-doc.install +++ /dev/null @@ -1 +0,0 @@ -docs/_build/html usr/share/doc/llvm-3.2-doc/ diff --git a/debian/llvm-3.2-examples.dirs b/debian/llvm-3.2-examples.dirs deleted file mode 100644 index 49835d88..00000000 --- a/debian/llvm-3.2-examples.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/llvm-3.2-examples diff --git a/debian/llvm-3.2-examples.links b/debian/llvm-3.2-examples.links deleted file mode 100644 index 78b9c5c5..00000000 --- a/debian/llvm-3.2-examples.links +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-3.2/build/Makefile.common usr/share/doc/llvm-3.2-examples/Makefile.common -/usr/lib/llvm-3.2/build/Makefile.config usr/share/doc/llvm-3.2-examples/Makefile.config -/usr/lib/llvm-3.2/build/Makefile.rules usr/share/doc/llvm-3.2-examples/Makefile.rules diff --git a/debian/llvm-3.2-runtime.install b/debian/llvm-3.2-runtime.install deleted file mode 100644 index 6a7d2d65..00000000 --- a/debian/llvm-3.2-runtime.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/llvm-3.2/bin/lli /usr/lib/llvm-3.2/bin/ -debian/tmp/usr/bin/lli-3.2 /usr/bin/ -debian/llvm-3.2-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-3.2-runtime.manpages b/debian/llvm-3.2-runtime.manpages deleted file mode 100644 index 98af2255..00000000 --- a/debian/llvm-3.2-runtime.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp//usr/lib/llvm-3.2/share/man/man1/lli* diff --git a/debian/llvm-3.2.dirs b/debian/llvm-3.2.dirs deleted file mode 100644 index 9b8d4db7..00000000 --- a/debian/llvm-3.2.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-3.2/bin -usr/share/man/man1 -usr/share/doc/llvm-3.2 diff --git a/debian/llvm-3.2.install b/debian/llvm-3.2.install deleted file mode 100644 index dd13feb8..00000000 --- a/debian/llvm-3.2.install +++ /dev/null @@ -1,13 +0,0 @@ -usr/lib/llvm-3.2/bin/llvm-* -usr/lib/llvm-3.2/bin/opt* -usr/lib/llvm-3.2/bin/macho-dump* -usr/lib/llvm-3.2/bin/bugpoint* -usr/lib/llvm-3.2/bin/llc* -usr/lib/llvm-3.2/bin/c-index-test* -usr/bin/llvm-* -usr/bin/opt* -usr/bin/macho-dump* -usr/bin/bugpoint* -usr/bin/llc* -usr/bin/c-index-test* - diff --git a/debian/llvm-3.3-dev.dirs b/debian/llvm-3.3-dev.dirs new file mode 100644 index 00000000..a43aa185 --- /dev/null +++ b/debian/llvm-3.3-dev.dirs @@ -0,0 +1,5 @@ +/usr/lib/llvm-3.3/lib +/usr/lib/llvm-3.3/build +/usr/lib/llvm-3.3/include +usr/share/doc/llvm-3.3-dev +usr/share/emacs/site-lisp/llvm-3.3 diff --git a/debian/llvm-3.3-dev.install b/debian/llvm-3.3-dev.install new file mode 100644 index 00000000..4c896fde --- /dev/null +++ b/debian/llvm-3.3-dev.install @@ -0,0 +1,21 @@ +usr/lib/llvm-3.3/lib/libLLVM*.a +usr/lib/llvm-3.3/lib/libllvm*.a +usr/lib/llvm-3.3/lib/LLVM*.so +usr/lib/llvm-3.3/lib/libLTO.* +usr/lib/llvm-3.3/include/llvm/ usr/include/llvm-3.3/ +usr/lib/llvm-3.3/include/llvm-c/ usr/include/llvm-c-3.3/ + +build-llvm/Makefile.common /usr/lib/llvm-3.3/build/ +build-llvm/Makefile.config /usr/lib/llvm-3.3/build/ +build-llvm/config.status /usr/lib/llvm-3.3/build/ +Makefile.rules /usr/lib/llvm-3.3/build/ +configure /usr/lib/llvm-3.3/build/ +autoconf/ /usr/lib/llvm-3.3/build/ + +utils/vim/llvm.vim usr/share/vim/addons/syntax/llvm-3.3.vim +utils/vim/tablegen.vim usr/share/vim/addons/syntax/tablegen-3.3.vim + +utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.3/ +utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.3/ +utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.3/ + diff --git a/debian/llvm-3.3-dev.links.in b/debian/llvm-3.3-dev.links.in new file mode 100644 index 00000000..7cd72f65 --- /dev/null +++ b/debian/llvm-3.3-dev.links.in @@ -0,0 +1,3 @@ +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.3.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.3.so +usr/include/llvm-c-3.3/llvm-c usr/lib/llvm-3.3/include/llvm-c +usr/include/llvm-3.3/llvm usr/lib/llvm-3.3/include/llvm diff --git a/debian/llvm-3.3-doc.dirs b/debian/llvm-3.3-doc.dirs new file mode 100644 index 00000000..1e5dbbf5 --- /dev/null +++ b/debian/llvm-3.3-doc.dirs @@ -0,0 +1 @@ +usr/share/doc/llvm-3.3-doc diff --git a/debian/llvm-3.3-doc.install b/debian/llvm-3.3-doc.install new file mode 100644 index 00000000..909a73b7 --- /dev/null +++ b/debian/llvm-3.3-doc.install @@ -0,0 +1 @@ +docs/_build/html usr/share/doc/llvm-3.3-doc/ diff --git a/debian/llvm-3.3-examples.dirs b/debian/llvm-3.3-examples.dirs new file mode 100644 index 00000000..fffb7b83 --- /dev/null +++ b/debian/llvm-3.3-examples.dirs @@ -0,0 +1 @@ +usr/share/doc/llvm-3.3-examples diff --git a/debian/llvm-3.2-examples.examples b/debian/llvm-3.3-examples.examples similarity index 100% rename from debian/llvm-3.2-examples.examples rename to debian/llvm-3.3-examples.examples diff --git a/debian/llvm-3.3-examples.links b/debian/llvm-3.3-examples.links new file mode 100644 index 00000000..814eaae7 --- /dev/null +++ b/debian/llvm-3.3-examples.links @@ -0,0 +1,3 @@ +/usr/lib/llvm-3.3/build/Makefile.common usr/share/doc/llvm-3.3-examples/Makefile.common +/usr/lib/llvm-3.3/build/Makefile.config usr/share/doc/llvm-3.3-examples/Makefile.config +/usr/lib/llvm-3.3/build/Makefile.rules usr/share/doc/llvm-3.3-examples/Makefile.rules diff --git a/debian/llvm-3.2-runtime.binfmt.in b/debian/llvm-3.3-runtime.binfmt.in similarity index 100% rename from debian/llvm-3.2-runtime.binfmt.in rename to debian/llvm-3.3-runtime.binfmt.in diff --git a/debian/llvm-3.3-runtime.install b/debian/llvm-3.3-runtime.install new file mode 100644 index 00000000..ab380ff0 --- /dev/null +++ b/debian/llvm-3.3-runtime.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/llvm-3.3/bin/lli /usr/lib/llvm-3.3/bin/ +debian/tmp/usr/bin/lli-3.3 /usr/bin/ +debian/llvm-3.3-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-3.2-runtime.links b/debian/llvm-3.3-runtime.links similarity index 100% rename from debian/llvm-3.2-runtime.links rename to debian/llvm-3.3-runtime.links diff --git a/debian/llvm-3.3-runtime.manpages b/debian/llvm-3.3-runtime.manpages new file mode 100644 index 00000000..53289c8c --- /dev/null +++ b/debian/llvm-3.3-runtime.manpages @@ -0,0 +1 @@ +debian/tmp//usr/lib/llvm-3.3/share/man/man1/lli* diff --git a/debian/llvm-3.2-runtime.postinst b/debian/llvm-3.3-runtime.postinst similarity index 64% rename from debian/llvm-3.2-runtime.postinst rename to debian/llvm-3.3-runtime.postinst index d3156493..4ce8e3d6 100644 --- a/debian/llvm-3.2-runtime.postinst +++ b/debian/llvm-3.3-runtime.postinst @@ -2,7 +2,7 @@ if test "$1" = "configure"; then if test -x /usr/sbin/update-binfmts; then - update-binfmts --import llvm-3.2-runtime.binfmt || true + update-binfmts --import llvm-3.3-runtime.binfmt || true fi fi diff --git a/debian/llvm-3.2-runtime.prerm.in b/debian/llvm-3.3-runtime.prerm.in similarity index 100% rename from debian/llvm-3.2-runtime.prerm.in rename to debian/llvm-3.3-runtime.prerm.in diff --git a/debian/llvm-3.3.dirs b/debian/llvm-3.3.dirs new file mode 100644 index 00000000..ff3b30f1 --- /dev/null +++ b/debian/llvm-3.3.dirs @@ -0,0 +1,3 @@ +/usr/lib/llvm-3.3/bin +usr/share/man/man1 +usr/share/doc/llvm-3.3 diff --git a/debian/llvm-3.3.install b/debian/llvm-3.3.install new file mode 100644 index 00000000..8a49746a --- /dev/null +++ b/debian/llvm-3.3.install @@ -0,0 +1,13 @@ +usr/lib/llvm-3.3/bin/llvm-* +usr/lib/llvm-3.3/bin/opt* +usr/lib/llvm-3.3/bin/macho-dump* +usr/lib/llvm-3.3/bin/bugpoint* +usr/lib/llvm-3.3/bin/llc* +usr/lib/llvm-3.3/bin/c-index-test* +usr/bin/llvm-* +usr/bin/opt* +usr/bin/macho-dump* +usr/bin/bugpoint* +usr/bin/llc* +usr/bin/c-index-test* + diff --git a/debian/llvm-3.2.links b/debian/llvm-3.3.links similarity index 100% rename from debian/llvm-3.2.links rename to debian/llvm-3.3.links diff --git a/debian/llvm-3.2.manpages b/debian/llvm-3.3.manpages similarity index 100% rename from debian/llvm-3.2.manpages rename to debian/llvm-3.3.manpages diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index a36ae0da..926d8b40 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,23 +1,46 @@ #!/bin/sh +# This script will create the following tarballs: +# llvm-toolchain-3.2_3.2repack.orig-clang.tar.bz2 +# llvm-toolchain-3.2_3.2repack.orig-compiler-rt.tar.bz2 +# llvm-toolchain-3.2_3.2repack.orig-lldb.tar.bz2 +# llvm-toolchain-3.2_3.2repack.orig-polly.tar.bz2 +# llvm-toolchain-3.2_3.2repack.orig.tar.bz2 -# called by uscan with '--upstream-version' -DIR=clang-*.src -DIRIN=clang-$2 -TAR=../clang_$2.orig.tar.bz2 +SVN_URL=http://llvm.org/svn/llvm-project/ +REVISION=$(LANG=C svn info $SVN_URL|grep "^Revision:"|awk '{print $2}') +SVN_CMD="svn export -r $REVISION $SVN_URL" +MAJOR_VERSION=3.3 -# clean up the upstream tarball -tar zxvf $3 -mkdir -p $DIRIN/tools/clang -mv $DIR/* $DIRIN/tools/clang/ -tar -c -j -f $TAR $DIRIN -rm -rf $DIRIN $DIR +# LLVM +LLVM_TARGET=llvm-toolchain_3.3~svn$REVISION +$SVN_CMD/llvm/trunk $LLVM_TARGET +tar jcvf llvm-toolchain_3.3~svn$REVISION.orig.tar.bz2 $LLVM_TARGET +rm -rf $LLVM_TARGET + +# Clang +CLANG_TARGET=clang_3.3~svn$REVISION +$SVN_CMD/cfe/trunk $CLANG_TARGET +tar jcvf llvm-toolchain_3.3~svn$REVISION.orig-clang.tar.bz2 $CLANG_TARGET +rm -rf $CLANG_TARGET + +# Compiler-rt +COMPILER_RT_TARGET=compiler-rt_3.3~svn$REVISION +$SVN_CMD/compiler-rt/trunk $COMPILER_RT_TARGET +tar jcvf llvm-toolchain_3.3~svn$REVISION.orig-compiler-rt.tar.bz2 $COMPILER_RT_TARGET +rm -rf $COMPILER_RT_TARGET + +# Polly +POLLY_TARGET=polly_3.3~svn$REVISION +$SVN_CMD/polly/trunk $POLLY_TARGET +tar jcvf llvm-toolchain_3.3~svn$REVISION.orig-polly.tar.bz2 $POLLY_TARGET +rm -rf $POLLY_TARGET + +# LLDB +LLDB_TARGET=lldb_3.3~svn$REVISION +$SVN_CMD/lldb/trunk $LLDB_TARGET +tar jcvf llvm-toolchain_3.3~svn$REVISION.orig-lldb.tar.bz2 $LLDB_TARGET +rm -rf $LLDB_TARGET -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" -fi exit 0 diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch index ca0af9c7..5fee966b 100644 --- a/debian/patches/0003-Debian-version-info-and-bugreport.patch +++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch @@ -1,8 +1,8 @@ -Index: llvm-3.1-3.1/lib/Support/CommandLine.cpp +Index: llvm-toolchain_3.3~svn176083/lib/Support/CommandLine.cpp =================================================================== ---- llvm-3.1-3.1.orig/lib/Support/CommandLine.cpp 2012-03-12 11:51:06.000000000 +0100 -+++ llvm-3.1-3.1/lib/Support/CommandLine.cpp 2012-09-18 11:13:05.154409249 +0200 -@@ -1351,6 +1352,10 @@ +--- llvm-toolchain_3.3~svn176083.orig/lib/Support/CommandLine.cpp 2012-12-03 17:50:05.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/Support/CommandLine.cpp 2013-02-26 14:12:03.000000000 +0100 +@@ -1347,6 +1347,10 @@ OS << LLVM_VERSION_INFO; #endif OS << "\n "; diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch index 8c7aefd4..182c145b 100644 --- a/debian/patches/0021-shared-lib-debian.patch +++ b/debian/patches/0021-shared-lib-debian.patch @@ -1,7 +1,7 @@ -Index: llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile +Index: llvm-toolchain_3.3~svn176083/tools/llvm-shlib/Makefile =================================================================== ---- llvm-3.1-3.1~+rc3.orig/tools/llvm-shlib/Makefile 2012-05-20 16:17:40.498257510 +0200 -+++ llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile 2012-05-20 16:17:53.926257341 +0200 +--- llvm-toolchain_3.3~svn176083.orig/tools/llvm-shlib/Makefile 2012-08-06 22:52:18.000000000 +0200 ++++ llvm-toolchain_3.3~svn176083/tools/llvm-shlib/Makefile 2013-02-26 14:12:05.000000000 +0100 @@ -39,6 +39,12 @@ LLVMLibsPaths := $(IncludeInLibLlvm) diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index 5fa19663..b4e1ea0a 100644 --- a/debian/patches/0023-link-libopagent.patch +++ b/debian/patches/0023-link-libopagent.patch @@ -1,8 +1,8 @@ -Index: llvm-3.2-3.2~rc1/configure +Index: llvm-toolchain_3.3~svn176083/configure =================================================================== ---- llvm-3.2-3.2~rc1.orig/configure 2012-11-13 21:14:33.000000000 +0100 -+++ llvm-3.2-3.2~rc1/configure 2012-11-15 11:03:52.000000000 +0100 -@@ -13183,7 +13183,7 @@ +--- llvm-toolchain_3.3~svn176083.orig/configure 2013-02-13 22:19:39.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/configure 2013-02-26 14:12:05.000000000 +0100 +@@ -13574,7 +13574,7 @@ case $llvm_cv_os_type in Linux) if test -n "$llvm_cv_oppath" ; then @@ -11,7 +11,7 @@ Index: llvm-3.2-3.2~rc1/configure { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5 echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; } if test "${ac_cv_search_bfd_init+set}" = set; then -@@ -13279,7 +13279,7 @@ +@@ -13670,7 +13670,7 @@ echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; } ac_res=$ac_cv_search_bfd_init if test "$ac_res" != no; then @@ -20,7 +20,7 @@ Index: llvm-3.2-3.2~rc1/configure fi -@@ -13315,8 +13315,8 @@ +@@ -13706,8 +13706,8 @@ if test -z "$ac_lib"; then ac_res="none required" else diff --git a/debian/patches/0041-undef-PPC-macro.diff b/debian/patches/0041-undef-PPC-macro.diff index d2009c16..6040f1ec 100644 --- a/debian/patches/0041-undef-PPC-macro.diff +++ b/debian/patches/0041-undef-PPC-macro.diff @@ -1,8 +1,8 @@ -Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h +Index: llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h =================================================================== ---- llvm-3.2-3.2~rc1.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-11-13 21:14:34.000000000 +0100 -+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-11-15 11:04:00.000000000 +0100 -@@ -44,6 +44,10 @@ +--- llvm-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-12-20 06:13:09.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2013-02-26 14:12:06.000000000 +0100 +@@ -47,6 +47,10 @@ uint8_t OSABI); } // End llvm namespace @@ -13,13 +13,13 @@ Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h // Defines symbolic names for PowerPC registers. This defines a mapping from // register name to register number. // -Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h +Index: llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h =================================================================== ---- llvm-3.2-3.2~rc1.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-11-13 21:14:34.000000000 +0100 -+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-11-15 11:04:00.000000000 +0100 -@@ -14,6 +14,10 @@ - #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H - #define LLVM_TARGET_POWERPC_PPCPREDICATES_H +--- llvm-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-12-20 06:13:09.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2013-02-26 14:12:06.000000000 +0100 +@@ -17,6 +17,10 @@ + // GCC #defines PPC on Linux but we use it as our namespace name + #undef PPC +// Generated files will use "namespace PPC". To avoid symbol clash, +// undefine PPC here. PPC may be predefined on some hosts. @@ -28,10 +28,10 @@ Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h namespace llvm { namespace PPC { /// Predicate - These are "(BI << 5) | BO" for various predicates. -Index: llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h +Index: llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h =================================================================== ---- llvm-3.2-3.2~rc1.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2012-11-13 21:14:34.000000000 +0100 -+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2012-11-15 11:04:00.000000000 +0100 +--- llvm-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2012-12-12 20:29:35.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2013-02-26 14:12:06.000000000 +0100 @@ -12,6 +12,8 @@ #include "llvm/MC/MCFixup.h" diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index f9da0b1c..003bac20 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -1,7 +1,7 @@ -Index: llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile +Index: llvm-toolchain_3.3~svn176083/tools/llvm-shlib/Makefile =================================================================== ---- llvm-3.1-3.1~+rc3.orig/tools/llvm-shlib/Makefile 2012-05-20 16:17:53.926257341 +0200 -+++ llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile 2012-05-20 16:17:56.278257311 +0200 +--- llvm-toolchain_3.3~svn176083.orig/tools/llvm-shlib/Makefile 2013-02-26 14:12:05.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/tools/llvm-shlib/Makefile 2013-02-26 14:12:08.000000000 +0100 @@ -77,7 +77,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) diff --git a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch index de2d46b6..91a20cfc 100644 --- a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch +++ b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch @@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. test/DebugInfo/X86/ending-run.ll | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { +Index: llvm-toolchain_3.3~svn176083/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +=================================================================== +--- llvm-toolchain_3.3~svn176083.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-02-23 00:50:08.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-02-26 14:12:18.000000000 +0100 +@@ -1299,15 +1299,12 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,22 +33,13 @@ index 3e79a6d..24aedfb 100644 if (!DL.isUnknown()) { const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { - MF->getFunction()->getContext()); - recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), - FnStartDL.getScope(MF->getFunction()->getContext()), -- 0); -+ DWARF2_FLAG_IS_STMT); - } - } - -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll +Index: llvm-toolchain_3.3~svn176083/test/DebugInfo/X86/ending-run.ll +=================================================================== +--- llvm-toolchain_3.3~svn176083.orig/test/DebugInfo/X86/ending-run.ll 2013-02-02 06:56:24.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/test/DebugInfo/X86/ending-run.ll 2013-02-26 14:12:18.000000000 +0100 @@ -1,11 +1,9 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s + ; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s -; Check that the line table starts at 7, not 4, but that the first -; statement isn't until line 8. @@ -60,6 +51,3 @@ index 6935c47..0cd3de1 100644 ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end define i32 @callee(i32 %x) nounwind uwtable ssp { --- -1.7.10 - diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff index cd01383f..d7b26fce 100644 --- a/debian/patches/0047-version-name.diff +++ b/debian/patches/0047-version-name.diff @@ -1,26 +1,28 @@ -Index: llvm-3.2-3.2~rc1/autoconf/configure.ac +Index: llvm-toolchain_3.3~svn176083/autoconf/configure.ac =================================================================== ---- llvm-3.2-3.2~rc1.orig/autoconf/configure.ac 2012-11-13 21:14:34.000000000 +0100 -+++ llvm-3.2-3.2~rc1/autoconf/configure.ac 2012-11-15 14:36:20.000000000 +0100 +--- llvm-toolchain_3.3~svn176083.orig/autoconf/configure.ac 2013-02-13 22:19:39.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/autoconf/configure.ac 2013-02-26 14:13:47.000000000 +0100 @@ -31,7 +31,7 @@ dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl address for reporting bugs. --AC_INIT([LLVM],[3.2svn],[http://llvm.org/bugs/]) -+AC_INIT([LLVM],[3.2],[http://llvm.org/bugs/]) +-AC_INIT([LLVM],[3.3svn],[http://llvm.org/bugs/]) ++AC_INIT([LLVM],[3.3],[http://llvm.org/bugs/]) AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API]) - AC_DEFINE([LLVM_VERSION_MINOR], [2], [Minor version of the LLVM API]) + AC_DEFINE([LLVM_VERSION_MINOR], [3], [Minor version of the LLVM API]) -Index: llvm-3.2-3.2~rc1/configure +Index: llvm-toolchain_3.3~svn176083/configure =================================================================== ---- llvm-3.2-3.2~rc1.orig/configure 2012-11-15 12:28:46.000000000 +0100 -+++ llvm-3.2-3.2~rc1/configure 2012-11-15 14:36:15.000000000 +0100 -@@ -561,7 +561,7 @@ +--- llvm-toolchain_3.3~svn176083.orig/configure 2013-02-26 14:12:05.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/configure 2013-02-26 14:13:57.000000000 +0100 +@@ -561,8 +561,8 @@ # Identity of this package. PACKAGE_NAME='LLVM' PACKAGE_TARNAME='llvm' --PACKAGE_VERSION='3.2svn' -+PACKAGE_VERSION='3.2' - PACKAGE_STRING='LLVM 3.2svn' +-PACKAGE_VERSION='3.3svn' +-PACKAGE_STRING='LLVM 3.3svn' ++PACKAGE_VERSION='3.3' ++PACKAGE_STRING='LLVM 3.3' PACKAGE_BUGREPORT='http://llvm.org/bugs/' + ac_unique_file="lib/IR/Module.cpp" diff --git a/debian/patches/0050-powerpcspe-fp.diff b/debian/patches/0050-powerpcspe-fp.diff index e31c73a5..26e63267 100644 --- a/debian/patches/0050-powerpcspe-fp.diff +++ b/debian/patches/0050-powerpcspe-fp.diff @@ -1,8 +1,10 @@ PPCJITInfo.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---- a/lib/Target/PowerPC/PPCJITInfo.cpp -+++ b/lib/Target/PowerPC/PPCJITInfo.cpp +Index: llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/PPCJITInfo.cpp +=================================================================== +--- llvm-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-02-17 15:30:32.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/PPCJITInfo.cpp 2013-02-26 14:15:09.000000000 +0100 @@ -99,6 +99,7 @@ "stw r8, 196(r1)\n" "stw r7, 192(r1)\n" "stw r6, 188(r1)\n" "stw r5, 184(r1)\n" diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch index fd184fcb..64a7c93b 100644 --- a/debian/patches/18-soname.patch +++ b/debian/patches/18-soname.patch @@ -1,7 +1,7 @@ -Index: clang-3.2~rc1/clang/tools/libclang/Makefile +Index: llvm-toolchain_3.3~svn176083/clang/tools/libclang/Makefile =================================================================== ---- clang-3.2~rc1.orig/clang/tools/libclang/Makefile 2012-11-13 21:13:57.000000000 +0100 -+++ clang-3.2~rc1/clang/tools/libclang/Makefile 2012-11-17 15:42:01.000000000 +0100 +--- llvm-toolchain_3.3~svn176083.orig/clang/tools/libclang/Makefile 2013-02-13 20:44:17.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/tools/libclang/Makefile 2013-02-26 14:09:14.000000000 +0100 @@ -14,6 +14,7 @@ LINK_LIBS_IN_SHARED = 1 @@ -9,8 +9,8 @@ Index: clang-3.2~rc1/clang/tools/libclang/Makefile +SONAME_MAJOR=1 include $(CLANG_LEVEL)/../../Makefile.config - LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc -@@ -27,7 +28,7 @@ + LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc +@@ -30,7 +31,7 @@ # Add soname to the library. ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch index 22fc795a..fc4d0740 100644 --- a/debian/patches/19-clang_debian_version.patch +++ b/debian/patches/19-clang_debian_version.patch @@ -1,14 +1,14 @@ -Index: clang-3.2~rc1/clang/lib/Basic/Version.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Basic/Version.cpp =================================================================== ---- clang-3.2~rc1.orig/clang/lib/Basic/Version.cpp 2012-11-13 21:13:57.000000000 +0100 -+++ clang-3.2~rc1/clang/lib/Basic/Version.cpp 2012-11-17 15:43:03.000000000 +0100 +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Basic/Version.cpp 2012-12-04 10:13:33.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Basic/Version.cpp 2013-02-26 14:09:55.000000000 +0100 @@ -15,6 +15,7 @@ #include "clang/Basic/LLVM.h" - #include "llvm/Support/raw_ostream.h" #include "llvm/Config/config.h" + #include "llvm/Support/raw_ostream.h" +#include "clang/Debian/debian_path.h" - #include #include + #include @@ -117,7 +118,8 @@ #ifdef CLANG_VENDOR diff --git a/debian/patches/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff index f868adca..c849f3c6 100644 --- a/debian/patches/21-searchPathHeaders.diff +++ b/debian/patches/21-searchPathHeaders.diff @@ -1,8 +1,8 @@ -Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.cpp 2012-12-16 16:59:27.000000000 +0100 -+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:33:39.427064577 +0100 -@@ -2237,6 +2237,11 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.cpp 2013-02-21 23:35:01.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:10:01.000000000 +0100 +@@ -2487,6 +2487,11 @@ addSystemInclude(DriverArgs, CC1Args, P.str()); } diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 48a4fce1..53f74b05 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -1,19 +1,19 @@ -Index: llvm-3.2.src/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain_3.3~svn176083/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-3.2.src.orig/clang/include/clang/Basic/Builtins.def 2012-11-28 23:01:30.000000000 +0100 -+++ llvm-3.2.src/clang/include/clang/Basic/Builtins.def 2013-01-12 15:33:43.299064490 +0100 -@@ -462,8 +462,8 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/include/clang/Basic/Builtins.def 2013-01-18 00:46:04.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/include/clang/Basic/Builtins.def 2013-02-26 14:10:34.000000000 +0100 +@@ -464,8 +464,8 @@ BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") --BUILTIN(__builtin___strlcat_chk, "c*c*cC*zz", "nF") --BUILTIN(__builtin___strlcpy_chk, "c*c*cC*zz", "nF") -+//BUILTIN(__builtin___strlcat_chk, "c*c*cC*zz", "nF") -+//BUILTIN(__builtin___strlcpy_chk, "c*c*cC*zz", "nF") +-BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF") +-BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF") ++//BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF") ++//BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF") BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -756,8 +756,8 @@ +@@ -758,8 +758,8 @@ LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_LANGUAGES) // non-standard but very common @@ -23,12 +23,12 @@ Index: llvm-3.2.src/clang/include/clang/Basic/Builtins.def +//LIBBUILTIN(strlcat, "zc*cC*z", "f", "string.h", ALL_LANGUAGES) // id objc_msgSend(id, SEL, ...) LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG) - -Index: llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp + // long double objc_msgSend_fpret(id self, SEL op, ...) +Index: llvm-toolchain_3.3~svn176083/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Sema/SemaChecking.cpp 2012-11-08 01:41:20.000000000 +0100 -+++ llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp 2013-01-12 15:33:43.303064490 +0100 -@@ -576,9 +576,10 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Sema/SemaChecking.cpp 2013-02-20 23:23:23.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Sema/SemaChecking.cpp 2013-02-26 14:10:11.000000000 +0100 +@@ -575,9 +575,10 @@ return false; // Handle memory setting and copying functions. @@ -42,11 +42,11 @@ Index: llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-3.2.src/clang/lib/AST/Decl.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/AST/Decl.cpp 2012-11-12 05:10:23.000000000 +0100 -+++ llvm-3.2.src/clang/lib/AST/Decl.cpp 2013-01-12 15:33:43.303064490 +0100 -@@ -2394,10 +2394,10 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/AST/Decl.cpp 2013-02-23 14:53:57.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/AST/Decl.cpp 2013-02-26 14:10:11.000000000 +0100 +@@ -2717,10 +2717,10 @@ case Builtin::BImemmove: return Builtin::BImemmove; @@ -61,11 +61,11 @@ Index: llvm-3.2.src/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-3.2.src/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2012-11-02 02:54:06.000000000 +0100 -+++ llvm-3.2.src/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-01-12 15:33:43.303064490 +0100 -@@ -237,9 +237,9 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-20 23:23:23.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-26 14:10:11.000000000 +0100 +@@ -238,9 +238,9 @@ case Builtin::BIstrncpy: case Builtin::BIstrncat: return TaintPropagationRule(1, 2, 0, true); diff --git a/debian/patches/26-disable_SplitsOnSpaces.diff b/debian/patches/26-disable_SplitsOnSpaces.diff index 1abde9c1..14ca1dcb 100644 --- a/debian/patches/26-disable_SplitsOnSpaces.diff +++ b/debian/patches/26-disable_SplitsOnSpaces.diff @@ -1,8 +1,8 @@ -Index: llvm-3.2.src/clang/unittests/Tooling/CompilationDatabaseTest.cpp +Index: llvm-toolchain_3.3~svn176083/clang/unittests/Tooling/CompilationDatabaseTest.cpp =================================================================== ---- llvm-3.2.src.orig/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2012-10-08 22:32:51.000000000 +0200 -+++ llvm-3.2.src/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-01-12 15:33:49.771064346 +0100 -@@ -262,19 +262,6 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-01-12 20:30:44.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-02-26 14:10:45.000000000 +0100 +@@ -302,19 +302,6 @@ return FoundCommand.CommandLine; } diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 1b613999..d16de82f 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-3.2.src/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Driver/Tools.cpp 2012-11-21 08:56:23.000000000 +0100 -+++ llvm-3.2.src/clang/lib/Driver/Tools.cpp 2013-01-12 15:33:51.947064297 +0100 -@@ -671,7 +671,7 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Driver/Tools.cpp 2013-02-23 00:50:16.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/Tools.cpp 2013-02-26 14:10:49.000000000 +0100 +@@ -663,7 +663,7 @@ FloatABI = "hard"; break; case llvm::Triple::GNUEABI: diff --git a/debian/patches/27-fix_clang_stdint.diff b/debian/patches/27-fix_clang_stdint.diff index 8d3e847d..0e2d9e6c 100644 --- a/debian/patches/27-fix_clang_stdint.diff +++ b/debian/patches/27-fix_clang_stdint.diff @@ -1,7 +1,7 @@ -Index: llvm-3.2.src/clang/lib/Headers/stdint.h +Index: llvm-toolchain_3.3~svn176083/clang/lib/Headers/stdint.h =================================================================== ---- llvm-3.2.src.orig/clang/lib/Headers/stdint.h 2011-04-30 21:02:59.000000000 +0200 -+++ llvm-3.2.src/clang/lib/Headers/stdint.h 2013-01-12 15:33:50.891064321 +0100 +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Headers/stdint.h 2011-04-30 21:02:59.000000000 +0200 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Headers/stdint.h 2013-02-26 14:10:48.000000000 +0100 @@ -22,8 +22,6 @@ * \*===----------------------------------------------------------------------===*/ diff --git a/debian/patches/28-gcc-4.7-paths.diff b/debian/patches/28-gcc-4.7-paths.diff index c3b79cb8..df734c53 100644 --- a/debian/patches/28-gcc-4.7-paths.diff +++ b/debian/patches/28-gcc-4.7-paths.diff @@ -1,18 +1,18 @@ -Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.cpp 2013-01-18 15:57:25.240901367 +0100 -+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-18 15:57:49.752900485 +0100 -@@ -36,6 +36,9 @@ - #include // ::getenv - +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:10:01.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:11:45.000000000 +0100 +@@ -33,6 +33,9 @@ + // FIXME: This needs to be listed last until we fix the broken include guards + // in these files and the LLVM config.h files. #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX +#include "clang/Debian/debian_path.h" + +#include - using namespace clang::driver; - using namespace clang::driver::toolchains; -@@ -2379,6 +2382,10 @@ + #include // ::getenv + +@@ -2634,6 +2637,10 @@ const std::string IncludePathCandidates[] = { LibDir.str() + "/../include/c++/" + Version.str(), @@ -23,7 +23,7 @@ Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp // Gentoo is weird and places its headers inside the GCC install, so if the // first attempt to find the headers fails, try this pattern. InstallDir.str() + "/include/g++-v4", -@@ -2390,10 +2397,10 @@ +@@ -2645,10 +2652,10 @@ }; for (unsigned i = 0; i < llvm::array_lengthof(IncludePathCandidates); ++i) { diff --git a/debian/patches/29-hurd.diff b/debian/patches/29-hurd.diff index 32b86868..f6e1f68c 100644 --- a/debian/patches/29-hurd.diff +++ b/debian/patches/29-hurd.diff @@ -1,9 +1,9 @@ -Index: llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Lex/HeaderSearch.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Lex/HeaderSearch.cpp 2012-11-06 20:39:40.000000000 +0100 -+++ llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp 2013-01-12 15:34:28.831063474 +0100 -@@ -25,6 +25,11 @@ - #include +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Lex/HeaderSearch.cpp 2013-02-08 01:10:48.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Lex/HeaderSearch.cpp 2013-02-26 14:11:46.000000000 +0100 +@@ -28,6 +28,11 @@ + #endif using namespace clang; +// For GNU Hurd @@ -14,12 +14,12 @@ Index: llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp const IdentifierInfo * HeaderFileInfo::getControllingMacro(ExternalIdentifierLookup *External) { if (ControllingMacro) -Index: llvm-3.2.src/clang/lib/Lex/ModuleMap.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Lex/ModuleMap.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Lex/ModuleMap.cpp 2012-11-06 20:41:11.000000000 +0100 -+++ llvm-3.2.src/clang/lib/Lex/ModuleMap.cpp 2013-01-12 15:34:28.831063474 +0100 -@@ -30,6 +30,11 @@ - #include +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Lex/ModuleMap.cpp 2013-02-19 20:58:45.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Lex/ModuleMap.cpp 2013-02-26 14:11:46.000000000 +0100 +@@ -34,6 +34,11 @@ + #endif using namespace clang; +// For GNU Hurd diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index fefedafd..950ef36f 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,8 +1,8 @@ -Index: llvm-3.2.src/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.h =================================================================== ---- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.h 2012-11-21 09:33:40.000000000 +0100 -+++ llvm-3.2.src/clang/lib/Driver/ToolChains.h 2013-01-12 15:34:29.815063452 +0100 -@@ -131,6 +131,8 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.h 2013-01-31 13:13:10.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.h 2013-02-26 14:11:47.000000000 +0100 +@@ -129,6 +129,8 @@ virtual bool IsUnwindTablesDefault() const; virtual bool isPICDefault() const; virtual bool isPICDefaultForced() const; @@ -11,11 +11,11 @@ Index: llvm-3.2.src/clang/lib/Driver/ToolChains.h protected: /// \name ToolChain Implementation Helper Functions -Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:34:27.855063496 +0100 -+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:34:29.815063452 +0100 -@@ -943,6 +943,13 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:11:45.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:11:47.000000000 +0100 +@@ -963,6 +963,13 @@ return GoodVersion; } @@ -28,4 +28,4 @@ Index: llvm-3.2.src/clang/lib/Driver/ToolChains.cpp + /// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering. bool Generic_GCC::GCCVersion::operator<(const GCCVersion &RHS) const { - if (Major < RHS.Major) return true; if (Major > RHS.Major) return false; + if (Major != RHS.Major) diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index fa65db30..4e9a2631 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -1,8 +1,8 @@ -Index: b/lib/Support/Unix/Memory.inc +Index: llvm-toolchain_3.3~svn176083/lib/Support/Unix/Memory.inc =================================================================== ---- a/lib/Support/Unix/Memory.inc -+++ b/lib/Support/Unix/Memory.inc -@@ -318,7 +318,7 @@ +--- llvm-toolchain_3.3~svn176083.orig/lib/Support/Unix/Memory.inc 2013-02-20 20:25:09.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/lib/Support/Unix/Memory.inc 2013-02-26 14:15:33.000000000 +0100 +@@ -329,7 +329,7 @@ // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); const char *End = Start + Len; diff --git a/debian/patches/polly-c++0x.diff b/debian/patches/polly-c++0x.diff index badc9900..4a2f5ffb 100644 --- a/debian/patches/polly-c++0x.diff +++ b/debian/patches/polly-c++0x.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-3.2-3.2/polly/lib/CodeGen/LoopGenerators.cpp +Index: llvm-toolchain_3.3~svn176083/polly/lib/CodeGen/LoopGenerators.cpp =================================================================== ---- llvm-toolchain-3.2-3.2.orig/polly/lib/CodeGen/LoopGenerators.cpp 2013-01-24 12:31:02.000000000 +0100 -+++ llvm-toolchain-3.2-3.2/polly/lib/CodeGen/LoopGenerators.cpp 2013-01-24 12:35:56.000000000 +0100 -@@ -226,7 +226,7 @@ +--- llvm-toolchain_3.3~svn176083.orig/polly/lib/CodeGen/LoopGenerators.cpp 2013-02-05 19:01:29.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/polly/lib/CodeGen/LoopGenerators.cpp 2013-02-26 15:11:09.000000000 +0100 +@@ -203,7 +203,7 @@ for (unsigned i = 0; i < OldValues.size(); i++) { Value *Address = Builder.CreateStructGEP(Struct, i); Value *NewValue = Builder.CreateLoad(Address); -- Map.insert(std::make_pair(OldValues[i], NewValue)); +- Map.insert(std::make_pair(OldValues[i], NewValue)); + Map.insert(std::pair(OldValues[i], NewValue)); } } diff --git a/debian/patches/profile_rt.diff b/debian/patches/profile_rt.diff index ac8b0c7b..90adc579 100644 --- a/debian/patches/profile_rt.diff +++ b/debian/patches/profile_rt.diff @@ -1,22 +1,16 @@ -Index: llvm-3.2.src/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain_3.3~svn176083/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-3.2.src.orig/clang/lib/Driver/Tools.cpp 2013-01-12 15:33:51.947064297 +0100 -+++ llvm-3.2.src/clang/lib/Driver/Tools.cpp 2013-01-12 15:34:26.679063522 +0100 -@@ -32,10 +32,13 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/lib/Driver/Tools.cpp 2013-02-26 14:10:49.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/Tools.cpp 2013-02-26 14:11:32.000000000 +0100 +@@ -33,6 +33,7 @@ + #include "llvm/Support/Host.h" #include "llvm/Support/Process.h" - #include "llvm/Support/ErrorHandling.h" - + #include "llvm/Support/raw_ostream.h" +#include "llvm/Config/config.h" -+ - #include "InputInfo.h" - #include "SanitizerArgs.h" - #include "ToolChains.h" -+ using namespace clang::driver; using namespace clang::driver::tools; - using namespace clang; -@@ -218,7 +221,7 @@ +@@ -216,7 +217,7 @@ // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is // not supported by old linkers. std::string ProfileRT = diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 323e5e70..70c9f13c 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-3.2-3.2/clang/tools/scan-build/scan-build +Index: llvm-toolchain_3.3~svn176083/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-3.2-3.2.orig/clang/tools/scan-build/scan-build 2012-09-15 07:51:10.000000000 +0200 -+++ llvm-toolchain-3.2-3.2/clang/tools/scan-build/scan-build 2013-01-17 16:04:10.000000000 +0100 -@@ -1459,7 +1459,7 @@ +--- llvm-toolchain_3.3~svn176083.orig/clang/tools/scan-build/scan-build 2013-02-26 14:15:04.000000000 +0100 ++++ llvm-toolchain_3.3~svn176083/clang/tools/scan-build/scan-build 2013-02-26 14:15:06.000000000 +0100 +@@ -1512,7 +1512,7 @@ # Find 'clang' if (!defined $AnalyzerDiscoveryMethod) { diff --git a/debian/patches/series b/debian/patches/series index 73b9853d..773dbe7a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,12 +10,12 @@ profile_rt.diff 28-gcc-4.7-paths.diff 29-hurd.diff 30-kfreebsd.diff -50-lldb-segfaultgcc.diff -51-lldb-hasBCPLComments.diff -52-lldb-declaration.diff -54-lldb-cpp-declaration.diff -55-lldb-cpp-declaration.diff -56-lldb-python-path.diff +#50-lldb-segfaultgcc.diff +#51-lldb-hasBCPLComments.diff +#52-lldb-declaration.diff +#54-lldb-cpp-declaration.diff +#55-lldb-cpp-declaration.diff +#56-lldb-python-path.diff 0003-Debian-version-info-and-bugreport.patch 0021-shared-lib-debian.patch 0023-link-libopagent.patch @@ -24,8 +24,8 @@ profile_rt.diff 0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch 0047-version-name.diff scan-build-clang-path.diff -57-lldb-soname.diff 0050-powerpcspe-fp.diff -polly-c++0x.diff declare_clear_cache.diff #r600-snapshot.diff +polly-c++0x.diff + diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index ab6e9842..521f7593 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,13 +1,13 @@ #!/bin/sh -ORIG_VERSION=3.1 -TARGET_VERSION=3.2 -ORIG_VERSION_2=3_1 -TARGET_VERSION_2=3_2 +ORIG_VERSION=3.2 +TARGET_VERSION=3.3 +ORIG_VERSION_2=3_2 +TARGET_VERSION_2=3_3 LIST=`ls debian/*$ORIG_VERSION*` for F in $LIST; do TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"` - mv $F $TARGET + svn mv $F $TARGET done LIST=`ls debian/*$TARGET_VERSION* debian/control` for F in $LIST; do diff --git a/debian/rules b/debian/rules index 770e55d2..93b02377 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ TARGET_BUILD := build-llvm GCC_VERSION := 4.7 -LLVM_VERSION := 3.2 +LLVM_VERSION := 3.3 SONAME_EXT := 1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p') ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))