proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 08:08:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Draft of a snapshot release (3.3)

Browse Source
This commit is contained in:
Sylvestre Ledru 2013-02-26 16:34:08 +00:00
parent f311a354c5
commit 8b9db2b79f
79 changed files with 337 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/README.source vendored
View File

@ -1,6 +1,5 @@
The tarball are basically the one from upstream, renamed and recompressed using Repack of the snapshot release are done with orig-tar.sh which will checkout the sources.
tar.bz2
-- Sylvestre Ledru <sylvestre@debian.org>, Sat, 9 Feb 2013 11:36:37 +0100 -- Sylvestre Ledru <sylvestre@debian.org>, Tue, 26 Feb 2013 14:57:56 +0100

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain (1:3.3~svn176083-1~exp1) experimental; urgency=low
* Draft of a snapshot release (3.3)
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 26 Feb 2013 13:49:57 +0100
llvm-toolchain-3.2 (1:3.2repack-1~exp3) UNRELEASED; urgency=low llvm-toolchain-3.2 (1:3.2repack-1~exp3) UNRELEASED; urgency=low
* Fix some issues relative to the epoch change * Fix some issues relative to the epoch change

0
debian/clang-3.2-doc.docs → debian/clang-3.3-doc.docs vendored
View File

8
debian/clang-3.2.install → debian/clang-3.3.install vendored
View File

@ -1,7 +1,7 @@
usr/lib/llvm-3.2/bin/clang /usr/bin/ usr/lib/llvm-3.3/bin/clang /usr/bin/
usr/lib/llvm-3.2/bin/clang++ /usr/bin/ usr/lib/llvm-3.3/bin/clang++ /usr/bin/
usr/lib/llvm-3.2/bin/clang-check /usr/bin/ usr/lib/llvm-3.3/bin/clang-check /usr/bin/
usr/lib/llvm-3.2/bin/clang-tblgen /usr/bin/ usr/lib/llvm-3.3/bin/clang-tblgen /usr/bin/
tools/clang/tools/scan-build /usr/share/clang/ tools/clang/tools/scan-build /usr/share/clang/
tools/clang/tools/scan-view /usr/share/clang/ tools/clang/tools/scan-view /usr/share/clang/
#usr/share/man/man1/clang.1 usr/share/man/man1/ #usr/share/man/man1/clang.1 usr/share/man/man1/

0
debian/clang-3.2.links → debian/clang-3.3.links vendored
View File

0
debian/clang-3.2.manpages → debian/clang-3.3.manpages vendored
View File

0
debian/clang-3.2.postinst → debian/clang-3.3.postinst vendored
View File

0
debian/clang-3.2.prerm → debian/clang-3.3.prerm vendored
View File

58
debian/control vendored
View File

@ -1,4 +1,4 @@
Source: llvm-toolchain-3.2 Source: llvm-toolchain
Section: devel Section: devel
Priority: optional Priority: optional
Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org> Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
@ -12,12 +12,12 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect,
Build-Conflicts: oprofile, ocaml Build-Conflicts: oprofile, ocaml
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Homepage: http://www.llvm.org/ Homepage: http://www.llvm.org/
Vcs-Svn: svn://svn.debian.org/svn/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/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/
Package: clang Package: clang
Architecture: all 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) Description: C, C++ and Objective-C compiler (LLVM based)
Clang project is a C, C++, Objective C and Objective C++ front-end Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Some of its goals include the following: 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++ * A single unified parser for C, Objective C, C++, and Objective C++
* Conformance with C/C++/ObjC and their variants * Conformance with C/C++/ObjC and their variants
Package: clang-3.2 Package: clang-3.3
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6-4.7-dev, libgcc-4.7-dev, Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6-4.7-dev, libgcc-4.7-dev,
libobjc-4.7-dev, libclang-common-dev (= ${binary:Version}) libobjc-4.7-dev, libclang-common-dev (= ${binary:Version})
Provides: c-compiler, objc-compiler, c++-compiler 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 Replaces: clang (<< 1:3.1), clang-3.1, compiler-rt
Breaks: 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) 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++ * A single unified parser for C, Objective C, C++, and Objective C++
* Conformance with C/C++/ObjC and their variants * Conformance with C/C++/ObjC and their variants
Package: clang-3.2-doc Package: clang-3.3-doc
Architecture: all Architecture: all
Section: doc Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
@ -205,8 +205,8 @@ Package: libclang-common-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: ${misc:Depends} Depends: ${misc:Depends}
Replaces: llvm-3.2-dev (<< 1:3.2repack), libclang-dev Replaces: llvm-3.3-dev (<< 1:3.2repack), libclang-dev
Breaks: llvm-3.2-dev (<< 1:3.2repack) Breaks: llvm-3.3-dev (<< 1:3.2repack)
Description: clang library - Common development package Description: clang library - Common development package
Clang project is a C, C++, Objective C and Objective C++ front-end Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Some of its goals include the following: for the LLVM compiler. Some of its goals include the following:
@ -257,7 +257,7 @@ Description: clang library - Common development package
# libgcc implementations. # libgcc implementations.
# . # .
Package: libllvm3.2 Package: libllvm3.3
Architecture: any Architecture: any
Section: libs Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
@ -270,11 +270,11 @@ Description: Low-Level Virtual Machine (LLVM), runtime library
. .
This package contains the LLVM runtime library. This package contains the LLVM runtime library.
Package: libllvm3.2-dbg Package: libllvm3.3-dbg
Architecture: any Architecture: any
Section: debug Section: debug
Priority: extra Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.2 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.3
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same Multi-Arch: same
Description: Low-Level Virtual Machine (LLVM), debugging symbols library 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. This package contains the LLVM runtime library debug symbols.
Package: llvm-3.2 Package: llvm-3.3
Architecture: any Architecture: any
Suggests: llvm-3.2-doc Suggests: llvm-3.3-doc
Depends: llvm-3.2-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: llvm-3.3-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-3.2-dev Recommends: llvm-3.3-dev
Conflicts: llvm (<< 2.7-1) Conflicts: llvm (<< 2.7-1)
Replaces: llvm (<< 2.7-1) Replaces: llvm (<< 2.7-1)
Description: Low-Level Virtual Machine (LLVM) 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 LLVM is the key component of the clang compiler and the gcc plugin called
dragonegg. dragonegg.
Package: llvm-3.2-runtime Package: llvm-3.3-runtime
Architecture: any Architecture: any
Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
Conflicts: llvm (<< 2.7-1) 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 This package provides the minimal required to execute programs in LLVM
format. format.
Package: llvm-3.2-dev Package: llvm-3.3-dev
Architecture: any 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) Replaces: llvm (<< 2.2-3)
Description: Low-Level Virtual Machine (LLVM), libraries and headers Description: Low-Level Virtual Machine (LLVM), libraries and headers
The Low-Level Virtual Machine (LLVM) is a collection of libraries and 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 This package provides the libraries and headers to develop applications
using llvm. using llvm.
Package: libllvm-3.2-ocaml-dev Package: libllvm-3.3-ocaml-dev
Section: ocaml Section: ocaml
Architecture: any Architecture: any
Suggests: llvm-3.2-doc Suggests: llvm-3.3-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.2-dev (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.3-dev (= ${binary:Version})
Replaces: libllvm-ocaml-3.2-dev Replaces: libllvm-ocaml-3.3-dev
Conflicts: libllvm-ocaml-3.2-dev Conflicts: libllvm-ocaml-3.3-dev
Provides: ${ocaml:Provides} Provides: ${ocaml:Provides}
Description: Low-Level Virtual Machine (LLVM), bindings for OCaml Description: Low-Level Virtual Machine (LLVM), bindings for OCaml
The Low-Level Virtual Machine (LLVM) is a collection of libraries and 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. This package provides the OCaml bindings to develop applications using llvm.
Package: llvm-3.2-doc Package: llvm-3.3-doc
Section: doc Section: doc
Architecture: all Architecture: all
Depends: ${misc:Depends} Depends: ${misc:Depends}
@ -395,10 +395,10 @@ Description: Low-Level Virtual Machine (LLVM), documentation
. .
This package contains all documentation (extensive). This package contains all documentation (extensive).
Package: llvm-3.2-examples Package: llvm-3.3-examples
Section: doc Section: doc
Architecture: all 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 Description: Low-Level Virtual Machine (LLVM), examples
The Low-Level Virtual Machine (LLVM) is a collection of libraries and The Low-Level Virtual Machine (LLVM) is a collection of libraries and
tools that make it easy to build compilers, optimizers, Just-In-Time 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 This package contains examples for using LLVM, both in developing
extensions to LLVM and in using it to compile code. extensions to LLVM and in using it to compile code.
# Package: llvm-3.2-source # Package: llvm-3.3-source
# Architecture: all # Architecture: all
# Depends: ${shlibs:Depends}, ${misc:Depends} # Depends: ${shlibs:Depends}, ${misc:Depends}
# Description: Low-Level Virtual Machine (LLVM), source code # 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 Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python Depends: ${shlibs:Depends}, ${misc:Depends}, python
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}

8
debian/libllvm-3.2-ocaml-dev.doc-base vendored
View File

@ -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/*

2
debian/libllvm-3.2-ocaml-dev.install.in vendored
View File

@ -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/

2
debian/libllvm-3.2-ocaml-dev.lintian-overrides vendored
View File

@ -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

28
debian/libllvm-3.2-ocaml-dev.META → debian/libllvm-3.3-ocaml-dev.META vendored
View File

@ -1,7 +1,7 @@
description = "Low Level Virtual Machine bindings" 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(byte) = "llvm.cma"
archive(native) = "llvm.cmxa" archive(native) = "llvm.cmxa"
@ -9,8 +9,8 @@ linkopts = "-cclib -lstdc++ -cclib -lllvm"
package "executionengine" package "executionengine"
( (
requires = "llvm-3_2" requires = "llvm-3_3"
version = "3.2" version = "3.3"
archive(native) = "llvm_executionengine.cmxa" archive(native) = "llvm_executionengine.cmxa"
archive(byte) = "llvm_executionengine.cma" archive(byte) = "llvm_executionengine.cma"
linkopts = "-cclib -lllvm_executionengine" linkopts = "-cclib -lllvm_executionengine"
@ -18,8 +18,8 @@ package "executionengine"
package "target" package "target"
( (
requires = "llvm-3_2" requires = "llvm-3_3"
version = "3.2" version = "3.3"
archive(native) = "llvm_target.cmxa" archive(native) = "llvm_target.cmxa"
archive(byte) = "llvm_target.cma" archive(byte) = "llvm_target.cma"
linkopts = "-cclib -lllvm_target" linkopts = "-cclib -lllvm_target"
@ -27,8 +27,8 @@ package "target"
package "scalar_opts" package "scalar_opts"
( (
requires = "llvm-3_2 llvm-3_2.target" requires = "llvm-3_3 llvm-3_3.target"
version = "3.2" version = "3.3"
archive(native) = "llvm_scalar_opts.cmxa" archive(native) = "llvm_scalar_opts.cmxa"
archive(byte) = "llvm_scalar_opts.cma" archive(byte) = "llvm_scalar_opts.cma"
linkopts = "-cclib -lllvm_scalar_opts" linkopts = "-cclib -lllvm_scalar_opts"
@ -36,8 +36,8 @@ package "scalar_opts"
package "analysis" package "analysis"
( (
requires = "llvm-3_2" requires = "llvm-3_3"
version = "3.2" version = "3.3"
archive(native) = "llvm_analysis.cmxa" archive(native) = "llvm_analysis.cmxa"
archive(byte) = "llvm_analysis.cma" archive(byte) = "llvm_analysis.cma"
linkopts = "-cclib -lllvm_analysis" linkopts = "-cclib -lllvm_analysis"
@ -45,8 +45,8 @@ package "analysis"
package "bitwriter" package "bitwriter"
( (
requires = "llvm-3_2" requires = "llvm-3_3"
version = "3.2" version = "3.3"
archive(native) = "llvm_bitwriter.cmxa" archive(native) = "llvm_bitwriter.cmxa"
archive(byte) = "llvm_bitwriter.cma" archive(byte) = "llvm_bitwriter.cma"
linkopts = "-cclib -lllvm_bitwriter" linkopts = "-cclib -lllvm_bitwriter"
@ -54,8 +54,8 @@ package "bitwriter"
package "bitreader" package "bitreader"
( (
requires = "llvm-3_2 llvm-3_2.bitwriter" requires = "llvm-3_3 llvm-3_3.bitwriter"
version = "3.2" version = "3.3"
archive(native) = "llvm_bitreader.cmxa" archive(native) = "llvm_bitreader.cmxa"
archive(byte) = "llvm_bitreader.cma" archive(byte) = "llvm_bitreader.cma"
linkopts = "-cclib -lllvm_bitreader" linkopts = "-cclib -lllvm_bitreader"

0
debian/libllvm-3.2-ocaml-dev.dirs.in → debian/libllvm-3.3-ocaml-dev.dirs.in vendored
View File

8
debian/libllvm-3.3-ocaml-dev.doc-base vendored Normal file
View File

@ -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/*

2
debian/libllvm-3.3-ocaml-dev.install.in vendored Normal file
View File

@ -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/

2
debian/libllvm-3.3-ocaml-dev.lintian-overrides vendored Normal file
View File

@ -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

1
debian/libllvm3.2.install vendored
View File

@ -1 +0,0 @@
usr/lib/llvm-3.2/lib/libLLVM-3.2.so.1 /usr/lib/x86_64-linux-gnu/

1
debian/libllvm3.2.install.in vendored
View File

@ -1 +0,0 @@
usr/lib/llvm-3.2/lib/libLLVM-3.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/

1
debian/libllvm3.3.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/llvm-3.3/lib/libLLVM-3.3.so.1 /usr/lib/x86_64-linux-gnu/

1
debian/libllvm3.3.install.in vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/llvm-3.3/lib/libLLVM-3.3.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/

5
debian/lldb-3.2.install.in vendored
View File

@ -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/

5
debian/lldb-3.3.install.in vendored Normal file
View File

@ -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/

0
debian/lldb-3.2.links.in → debian/lldb-3.3.links.in vendored
View File

5
debian/llvm-3.2-dev.dirs vendored
View File

@ -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

21
debian/llvm-3.2-dev.install vendored
View File

@ -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/

3
debian/llvm-3.2-dev.links.in vendored
View File

@ -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

1
debian/llvm-3.2-doc.dirs vendored
View File

@ -1 +0,0 @@
usr/share/doc/llvm-3.2-doc

1
debian/llvm-3.2-doc.install vendored
View File

@ -1 +0,0 @@
docs/_build/html usr/share/doc/llvm-3.2-doc/

1
debian/llvm-3.2-examples.dirs vendored
View File

@ -1 +0,0 @@
usr/share/doc/llvm-3.2-examples

3
debian/llvm-3.2-examples.links vendored
View File

@ -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

3
debian/llvm-3.2-runtime.install vendored
View File

@ -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/

1
debian/llvm-3.2-runtime.manpages vendored
View File

@ -1 +0,0 @@
debian/tmp//usr/lib/llvm-3.2/share/man/man1/lli*

3
debian/llvm-3.2.dirs vendored
View File

@ -1,3 +0,0 @@
/usr/lib/llvm-3.2/bin
usr/share/man/man1
usr/share/doc/llvm-3.2

13
debian/llvm-3.2.install vendored
View File

@ -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*

5
debian/llvm-3.3-dev.dirs vendored Normal file
View File

@ -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

21
debian/llvm-3.3-dev.install vendored Normal file
View File

@ -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/

3
debian/llvm-3.3-dev.links.in vendored Normal file
View File

@ -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

1
debian/llvm-3.3-doc.dirs vendored Normal file
View File

@ -0,0 +1 @@
usr/share/doc/llvm-3.3-doc

1
debian/llvm-3.3-doc.install vendored Normal file
View File

@ -0,0 +1 @@
docs/_build/html usr/share/doc/llvm-3.3-doc/

1
debian/llvm-3.3-examples.dirs vendored Normal file
View File

@ -0,0 +1 @@
usr/share/doc/llvm-3.3-examples

0
debian/llvm-3.2-examples.examples → debian/llvm-3.3-examples.examples vendored
View File

3
debian/llvm-3.3-examples.links vendored Normal file
View File

@ -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

0
debian/llvm-3.2-runtime.binfmt.in → debian/llvm-3.3-runtime.binfmt.in vendored
View File

3
debian/llvm-3.3-runtime.install vendored Normal file
View File

@ -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/

0
debian/llvm-3.2-runtime.links → debian/llvm-3.3-runtime.links vendored
View File

1
debian/llvm-3.3-runtime.manpages vendored Normal file
View File

@ -0,0 +1 @@
debian/tmp//usr/lib/llvm-3.3/share/man/man1/lli*

2
debian/llvm-3.2-runtime.postinst → debian/llvm-3.3-runtime.postinst vendored
View File

@ -2,7 +2,7 @@
if test "$1" = "configure"; then if test "$1" = "configure"; then
if test -x /usr/sbin/update-binfmts; 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
fi fi

0
debian/llvm-3.2-runtime.prerm.in → debian/llvm-3.3-runtime.prerm.in vendored
View File

3
debian/llvm-3.3.dirs vendored Normal file
View File

@ -0,0 +1,3 @@
/usr/lib/llvm-3.3/bin
usr/share/man/man1
usr/share/doc/llvm-3.3

13
debian/llvm-3.3.install vendored Normal file
View File

@ -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*

0
debian/llvm-3.2.links → debian/llvm-3.3.links vendored
View File

0
debian/llvm-3.2.manpages → debian/llvm-3.3.manpages vendored
View File

55
debian/orig-tar.sh vendored
View File

@ -1,23 +1,46 @@
#!/bin/sh #!/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' <version> <file> SVN_URL=http://llvm.org/svn/llvm-project/
DIR=clang-*.src REVISION=$(LANG=C svn info $SVN_URL|grep "^Revision:"|awk '{print $2}')
DIRIN=clang-$2 SVN_CMD="svn export -r $REVISION $SVN_URL"
TAR=../clang_$2.orig.tar.bz2 MAJOR_VERSION=3.3
# clean up the upstream tarball # LLVM
tar zxvf $3 LLVM_TARGET=llvm-toolchain_3.3~svn$REVISION
mkdir -p $DIRIN/tools/clang $SVN_CMD/llvm/trunk $LLVM_TARGET
mv $DIR/* $DIRIN/tools/clang/ tar jcvf llvm-toolchain_3.3~svn$REVISION.orig.tar.bz2 $LLVM_TARGET
tar -c -j -f $TAR $DIRIN rm -rf $LLVM_TARGET
rm -rf $DIRIN $DIR
# 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 exit 0

8
debian/patches/0003-Debian-version-info-and-bugreport.patch vendored
View File

@ -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-toolchain_3.3~svn176083.orig/lib/Support/CommandLine.cpp 2012-12-03 17:50:05.000000000 +0100
+++ llvm-3.1-3.1/lib/Support/CommandLine.cpp 2012-09-18 11:13:05.154409249 +0200 +++ llvm-toolchain_3.3~svn176083/lib/Support/CommandLine.cpp 2013-02-26 14:12:03.000000000 +0100
@@ -1351,6 +1352,10 @@ @@ -1347,6 +1347,10 @@
OS << LLVM_VERSION_INFO; OS << LLVM_VERSION_INFO;
#endif #endif
OS << "\n "; OS << "\n ";

6
debian/patches/0021-shared-lib-debian.patch vendored
View File

@ -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-toolchain_3.3~svn176083.orig/tools/llvm-shlib/Makefile 2012-08-06 22:52:18.000000000 +0200
+++ llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile 2012-05-20 16:17:53.926257341 +0200 +++ llvm-toolchain_3.3~svn176083/tools/llvm-shlib/Makefile 2013-02-26 14:12:05.000000000 +0100
@@ -39,6 +39,12 @@ @@ -39,6 +39,12 @@
LLVMLibsPaths := $(IncludeInLibLlvm) LLVMLibsPaths := $(IncludeInLibLlvm)

12
debian/patches/0023-link-libopagent.patch vendored
View File

@ -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-toolchain_3.3~svn176083.orig/configure 2013-02-13 22:19:39.000000000 +0100
+++ llvm-3.2-3.2~rc1/configure 2012-11-15 11:03:52.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/configure 2013-02-26 14:12:05.000000000 +0100
@@ -13183,7 +13183,7 @@ @@ -13574,7 +13574,7 @@
case $llvm_cv_os_type in case $llvm_cv_os_type in
Linux) Linux)
if test -n "$llvm_cv_oppath" ; then 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 "$as_me:$LINENO: checking for library containing bfd_init" >&5
echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; } echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
if test "${ac_cv_search_bfd_init+set}" = set; then 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; } echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
ac_res=$ac_cv_search_bfd_init ac_res=$ac_cv_search_bfd_init
if test "$ac_res" != no; then if test "$ac_res" != no; then
@ -20,7 +20,7 @@ Index: llvm-3.2-3.2~rc1/configure
fi fi
@@ -13315,8 +13315,8 @@ @@ -13706,8 +13706,8 @@
if test -z "$ac_lib"; then if test -z "$ac_lib"; then
ac_res="none required" ac_res="none required"
else else

26
debian/patches/0041-undef-PPC-macro.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-12-20 06:13:09.000000000 +0100
+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2012-11-15 11:04:00.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2013-02-26 14:12:06.000000000 +0100
@@ -44,6 +44,10 @@ @@ -47,6 +47,10 @@
uint8_t OSABI); uint8_t OSABI);
} // End llvm namespace } // 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 // Defines symbolic names for PowerPC registers. This defines a mapping from
// register name to register number. // 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-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-12-20 06:13:09.000000000 +0100
+++ llvm-3.2-3.2~rc1/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2012-11-15 11:04:00.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2013-02-26 14:12:06.000000000 +0100
@@ -14,6 +14,10 @@ @@ -17,6 +17,10 @@
#ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H // GCC #defines PPC on Linux but we use it as our namespace name
#define LLVM_TARGET_POWERPC_PPCPREDICATES_H #undef PPC
+// Generated files will use "namespace PPC". To avoid symbol clash, +// Generated files will use "namespace PPC". To avoid symbol clash,
+// undefine PPC here. PPC may be predefined on some hosts. +// 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 llvm {
namespace PPC { namespace PPC {
/// Predicate - These are "(BI << 5) | BO" for various predicates. /// 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-toolchain_3.3~svn176083.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2012-12-12 20:29:35.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/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2013-02-26 14:12:06.000000000 +0100
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
#include "llvm/MC/MCFixup.h" #include "llvm/MC/MCFixup.h"

6
debian/patches/0044-soname.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/tools/llvm-shlib/Makefile 2013-02-26 14:12:05.000000000 +0100
+++ llvm-3.1-3.1~+rc3/tools/llvm-shlib/Makefile 2012-05-20 16:17:56.278257311 +0200 +++ llvm-toolchain_3.3~svn176083/tools/llvm-shlib/Makefile 2013-02-26 14:12:08.000000000 +0100
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))

32
debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch vendored
View File

@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
test/DebugInfo/X86/ending-run.ll | 6 ++---- test/DebugInfo/X86/ending-run.ll | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-) 2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Index: llvm-toolchain_3.3~svn176083/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 3e79a6d..24aedfb 100644 ===================================================================
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp --- llvm-toolchain_3.3~svn176083.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-02-23 00:50:08.000000000 +0100
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ llvm-toolchain_3.3~svn176083/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-02-26 14:12:18.000000000 +0100
@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { @@ -1299,15 +1299,12 @@
if (!MI->isDebugValue()) { if (!MI->isDebugValue()) {
DebugLoc DL = MI->getDebugLoc(); DebugLoc DL = MI->getDebugLoc();
if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
@ -33,22 +33,13 @@ index 3e79a6d..24aedfb 100644
if (!DL.isUnknown()) { if (!DL.isUnknown()) {
const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { Index: llvm-toolchain_3.3~svn176083/test/DebugInfo/X86/ending-run.ll
MF->getFunction()->getContext()); ===================================================================
recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), --- llvm-toolchain_3.3~svn176083.orig/test/DebugInfo/X86/ending-run.ll 2013-02-02 06:56:24.000000000 +0100
FnStartDL.getScope(MF->getFunction()->getContext()), +++ llvm-toolchain_3.3~svn176083/test/DebugInfo/X86/ending-run.ll 2013-02-26 14:12:18.000000000 +0100
- 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
@@ -1,11 +1,9 @@ @@ -1,11 +1,9 @@
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj ; 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 -; Check that the line table starts at 7, not 4, but that the first
-; statement isn't until line 8. -; statement isn't until line 8.
@ -60,6 +51,3 @@ index 6935c47..0cd3de1 100644
; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end
define i32 @callee(i32 %x) nounwind uwtable ssp { define i32 @callee(i32 %x) nounwind uwtable ssp {
--
1.7.10

28
debian/patches/0047-version-name.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/autoconf/configure.ac 2013-02-13 22:19:39.000000000 +0100
+++ llvm-3.2-3.2~rc1/autoconf/configure.ac 2012-11-15 14:36:20.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/autoconf/configure.ac 2013-02-26 14:13:47.000000000 +0100
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
dnl===-----------------------------------------------------------------------=== dnl===-----------------------------------------------------------------------===
dnl Initialize autoconf and define the package name, version number and dnl Initialize autoconf and define the package name, version number and
dnl address for reporting bugs. dnl address for reporting bugs.
-AC_INIT([LLVM],[3.2svn],[http://llvm.org/bugs/]) -AC_INIT([LLVM],[3.3svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.2],[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_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-toolchain_3.3~svn176083.orig/configure 2013-02-26 14:12:05.000000000 +0100
+++ llvm-3.2-3.2~rc1/configure 2012-11-15 14:36:15.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/configure 2013-02-26 14:13:57.000000000 +0100
@@ -561,7 +561,7 @@ @@ -561,8 +561,8 @@
# Identity of this package. # Identity of this package.
PACKAGE_NAME='LLVM' PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm' PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.2svn' -PACKAGE_VERSION='3.3svn'
+PACKAGE_VERSION='3.2' -PACKAGE_STRING='LLVM 3.3svn'
PACKAGE_STRING='LLVM 3.2svn' +PACKAGE_VERSION='3.3'
+PACKAGE_STRING='LLVM 3.3'
PACKAGE_BUGREPORT='http://llvm.org/bugs/' PACKAGE_BUGREPORT='http://llvm.org/bugs/'
ac_unique_file="lib/IR/Module.cpp"

6
debian/patches/0050-powerpcspe-fp.diff vendored
View File

@ -1,8 +1,10 @@
PPCJITInfo.cpp | 12 ++++++++++++ PPCJITInfo.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
--- a/lib/Target/PowerPC/PPCJITInfo.cpp Index: llvm-toolchain_3.3~svn176083/lib/Target/PowerPC/PPCJITInfo.cpp
+++ b/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 @@ @@ -99,6 +99,7 @@
"stw r8, 196(r1)\n" "stw r7, 192(r1)\n" "stw r8, 196(r1)\n" "stw r7, 192(r1)\n"
"stw r6, 188(r1)\n" "stw r5, 184(r1)\n" "stw r6, 188(r1)\n" "stw r5, 184(r1)\n"

10
debian/patches/18-soname.patch vendored
View File

@ -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 --- llvm-toolchain_3.3~svn176083.orig/clang/tools/libclang/Makefile 2013-02-13 20:44:17.000000000 +0100
+++ clang-3.2~rc1/clang/tools/libclang/Makefile 2012-11-17 15:42:01.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/clang/tools/libclang/Makefile 2013-02-26 14:09:14.000000000 +0100
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
LINK_LIBS_IN_SHARED = 1 LINK_LIBS_IN_SHARED = 1
@ -9,8 +9,8 @@ Index: clang-3.2~rc1/clang/tools/libclang/Makefile
+SONAME_MAJOR=1 +SONAME_MAJOR=1
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc
@@ -27,7 +28,7 @@ @@ -30,7 +31,7 @@
# Add soname to the library. # Add soname to the library.
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))

10
debian/patches/19-clang_debian_version.patch vendored
View File

@ -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 --- llvm-toolchain_3.3~svn176083.orig/clang/lib/Basic/Version.cpp 2012-12-04 10:13:33.000000000 +0100
+++ clang-3.2~rc1/clang/lib/Basic/Version.cpp 2012-11-17 15:43:03.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Basic/Version.cpp 2013-02-26 14:09:55.000000000 +0100
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#include "clang/Basic/LLVM.h" #include "clang/Basic/LLVM.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Config/config.h" #include "llvm/Config/config.h"
#include "llvm/Support/raw_ostream.h"
+#include "clang/Debian/debian_path.h" +#include "clang/Debian/debian_path.h"
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <cstring>
@@ -117,7 +118,8 @@ @@ -117,7 +118,8 @@
#ifdef CLANG_VENDOR #ifdef CLANG_VENDOR

8
debian/patches/21-searchPathHeaders.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.cpp 2013-02-21 23:35:01.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:33:39.427064577 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:10:01.000000000 +0100
@@ -2237,6 +2237,11 @@ @@ -2487,6 +2487,11 @@
addSystemInclude(DriverArgs, CC1Args, P.str()); addSystemInclude(DriverArgs, CC1Args, P.str());
} }

44
debian/patches/23-strlcpy_strlcat_warning_removed.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/include/clang/Basic/Builtins.def 2013-01-18 00:46:04.000000000 +0100
+++ llvm-3.2.src/clang/include/clang/Basic/Builtins.def 2013-01-12 15:33:43.299064490 +0100 +++ llvm-toolchain_3.3~svn176083/clang/include/clang/Basic/Builtins.def 2013-02-26 14:10:34.000000000 +0100
@@ -462,8 +462,8 @@ @@ -464,8 +464,8 @@
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcat_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___strcpy_chk, "c*c*cC*z", "nF")
-BUILTIN(__builtin___strlcat_chk, "c*c*cC*zz", "nF") -BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF")
-BUILTIN(__builtin___strlcpy_chk, "c*c*cC*zz", "nF") -BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
+//BUILTIN(__builtin___strlcat_chk, "c*c*cC*zz", "nF") +//BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF")
+//BUILTIN(__builtin___strlcpy_chk, "c*c*cC*zz", "nF") +//BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___stpncpy_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(_longjmp, "vJi", "fr", "setjmp.h", ALL_LANGUAGES)
LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_LANGUAGES)
// non-standard but very common // 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) +//LIBBUILTIN(strlcat, "zc*cC*z", "f", "string.h", ALL_LANGUAGES)
// id objc_msgSend(id, SEL, ...) // id objc_msgSend(id, SEL, ...)
LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG) LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG)
// long double objc_msgSend_fpret(id self, SEL op, ...)
Index: llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp 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-toolchain_3.3~svn176083.orig/clang/lib/Sema/SemaChecking.cpp 2013-02-20 23:23:23.000000000 +0100
+++ llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp 2013-01-12 15:33:43.303064490 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Sema/SemaChecking.cpp 2013-02-26 14:10:11.000000000 +0100
@@ -576,9 +576,10 @@ @@ -575,9 +575,10 @@
return false; return false;
// Handle memory setting and copying functions. // Handle memory setting and copying functions.
@ -42,11 +42,11 @@ Index: llvm-3.2.src/clang/lib/Sema/SemaChecking.cpp
CheckStrncatArguments(TheCall, FnInfo); CheckStrncatArguments(TheCall, FnInfo);
else else
CheckMemaccessArguments(TheCall, CMId, FnInfo); 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-toolchain_3.3~svn176083.orig/clang/lib/AST/Decl.cpp 2013-02-23 14:53:57.000000000 +0100
+++ llvm-3.2.src/clang/lib/AST/Decl.cpp 2013-01-12 15:33:43.303064490 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/AST/Decl.cpp 2013-02-26 14:10:11.000000000 +0100
@@ -2394,10 +2394,10 @@ @@ -2717,10 +2717,10 @@
case Builtin::BImemmove: case Builtin::BImemmove:
return 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::BI__builtin_memcmp:
case Builtin::BImemcmp: 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-toolchain_3.3~svn176083.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-20 23:23:23.000000000 +0100
+++ llvm-3.2.src/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-01-12 15:33:43.303064490 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-26 14:10:11.000000000 +0100
@@ -237,9 +237,9 @@ @@ -238,9 +238,9 @@
case Builtin::BIstrncpy: case Builtin::BIstrncpy:
case Builtin::BIstrncat: case Builtin::BIstrncat:
return TaintPropagationRule(1, 2, 0, true); return TaintPropagationRule(1, 2, 0, true);

8
debian/patches/26-disable_SplitsOnSpaces.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-01-12 20:30:44.000000000 +0100
+++ llvm-3.2.src/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-01-12 15:33:49.771064346 +0100 +++ llvm-toolchain_3.3~svn176083/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-02-26 14:10:45.000000000 +0100
@@ -262,19 +262,6 @@ @@ -302,19 +302,6 @@
return FoundCommand.CommandLine; return FoundCommand.CommandLine;
} }

8
debian/patches/26-set-correct-float-abi.diff vendored
View File

@ -18,11 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch> Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD> Last-Update: <YYYY-MM-DD>
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-toolchain_3.3~svn176083.orig/clang/lib/Driver/Tools.cpp 2013-02-23 00:50:16.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/Tools.cpp 2013-01-12 15:33:51.947064297 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/Tools.cpp 2013-02-26 14:10:49.000000000 +0100
@@ -671,7 +671,7 @@ @@ -663,7 +663,7 @@
FloatABI = "hard"; FloatABI = "hard";
break; break;
case llvm::Triple::GNUEABI: case llvm::Triple::GNUEABI:

6
debian/patches/27-fix_clang_stdint.diff vendored
View File

@ -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-toolchain_3.3~svn176083.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/clang/lib/Headers/stdint.h 2013-02-26 14:10:48.000000000 +0100
@@ -22,8 +22,6 @@ @@ -22,8 +22,6 @@
* *
\*===----------------------------------------------------------------------===*/ \*===----------------------------------------------------------------------===*/

20
debian/patches/28-gcc-4.7-paths.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:10:01.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-18 15:57:49.752900485 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:11:45.000000000 +0100
@@ -36,6 +36,9 @@ @@ -33,6 +33,9 @@
#include <cstdlib> // ::getenv // 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/Config/config.h" // for GCC_INSTALL_PREFIX
+#include "clang/Debian/debian_path.h" +#include "clang/Debian/debian_path.h"
+ +
+#include <iostream> +#include <iostream>
using namespace clang::driver; #include <cstdlib> // ::getenv
using namespace clang::driver::toolchains;
@@ -2379,6 +2382,10 @@ @@ -2634,6 +2637,10 @@
const std::string IncludePathCandidates[] = { const std::string IncludePathCandidates[] = {
LibDir.str() + "/../include/c++/" + Version.str(), 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 // Gentoo is weird and places its headers inside the GCC install, so if the
// first attempt to find the headers fails, try this pattern. // first attempt to find the headers fails, try this pattern.
InstallDir.str() + "/include/g++-v4", InstallDir.str() + "/include/g++-v4",
@@ -2390,10 +2397,10 @@ @@ -2645,10 +2652,10 @@
}; };
for (unsigned i = 0; i < llvm::array_lengthof(IncludePathCandidates); ++i) { for (unsigned i = 0; i < llvm::array_lengthof(IncludePathCandidates); ++i) {

20
debian/patches/29-hurd.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/lib/Lex/HeaderSearch.cpp 2013-02-08 01:10:48.000000000 +0100
+++ llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp 2013-01-12 15:34:28.831063474 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Lex/HeaderSearch.cpp 2013-02-26 14:11:46.000000000 +0100
@@ -25,6 +25,11 @@ @@ -28,6 +28,11 @@
#include <cstdio> #endif
using namespace clang; using namespace clang;
+// For GNU Hurd +// For GNU Hurd
@ -14,12 +14,12 @@ Index: llvm-3.2.src/clang/lib/Lex/HeaderSearch.cpp
const IdentifierInfo * const IdentifierInfo *
HeaderFileInfo::getControllingMacro(ExternalIdentifierLookup *External) { HeaderFileInfo::getControllingMacro(ExternalIdentifierLookup *External) {
if (ControllingMacro) 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-toolchain_3.3~svn176083.orig/clang/lib/Lex/ModuleMap.cpp 2013-02-19 20:58:45.000000000 +0100
+++ llvm-3.2.src/clang/lib/Lex/ModuleMap.cpp 2013-01-12 15:34:28.831063474 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Lex/ModuleMap.cpp 2013-02-26 14:11:46.000000000 +0100
@@ -30,6 +30,11 @@ @@ -34,6 +34,11 @@
#include <stdlib.h> #endif
using namespace clang; using namespace clang;
+// For GNU Hurd +// For GNU Hurd

18
debian/patches/30-kfreebsd.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.h 2013-01-31 13:13:10.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.h 2013-01-12 15:34:29.815063452 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.h 2013-02-26 14:11:47.000000000 +0100
@@ -131,6 +131,8 @@ @@ -129,6 +129,8 @@
virtual bool IsUnwindTablesDefault() const; virtual bool IsUnwindTablesDefault() const;
virtual bool isPICDefault() const; virtual bool isPICDefault() const;
virtual bool isPICDefaultForced() const; virtual bool isPICDefaultForced() const;
@ -11,11 +11,11 @@ Index: llvm-3.2.src/clang/lib/Driver/ToolChains.h
protected: protected:
/// \name ToolChain Implementation Helper Functions /// \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-toolchain_3.3~svn176083.orig/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:11:45.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/ToolChains.cpp 2013-01-12 15:34:29.815063452 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/ToolChains.cpp 2013-02-26 14:11:47.000000000 +0100
@@ -943,6 +943,13 @@ @@ -963,6 +963,13 @@
return GoodVersion; 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. /// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering.
bool Generic_GCC::GCCVersion::operator<(const GCCVersion &RHS) const { 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)

8
debian/patches/declare_clear_cache.diff vendored
View File

@ -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 --- llvm-toolchain_3.3~svn176083.orig/lib/Support/Unix/Memory.inc 2013-02-20 20:25:09.000000000 +0100
+++ b/lib/Support/Unix/Memory.inc +++ llvm-toolchain_3.3~svn176083/lib/Support/Unix/Memory.inc 2013-02-26 14:15:33.000000000 +0100
@@ -318,7 +318,7 @@ @@ -329,7 +329,7 @@
// FIXME: Can we safely always call this for __GNUC__ everywhere? // FIXME: Can we safely always call this for __GNUC__ everywhere?
const char *Start = static_cast<const char *>(Addr); const char *Start = static_cast<const char *>(Addr);
const char *End = Start + Len; const char *End = Start + Len;

10
debian/patches/polly-c++0x.diff vendored
View File

@ -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.3~svn176083.orig/polly/lib/CodeGen/LoopGenerators.cpp 2013-02-05 19:01:29.000000000 +0100
+++ llvm-toolchain-3.2-3.2/polly/lib/CodeGen/LoopGenerators.cpp 2013-01-24 12:35:56.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/polly/lib/CodeGen/LoopGenerators.cpp 2013-02-26 15:11:09.000000000 +0100
@@ -226,7 +226,7 @@ @@ -203,7 +203,7 @@
for (unsigned i = 0; i < OldValues.size(); i++) { for (unsigned i = 0; i < OldValues.size(); i++) {
Value *Address = Builder.CreateStructGEP(Struct, i); Value *Address = Builder.CreateStructGEP(Struct, i);
Value *NewValue = Builder.CreateLoad(Address); Value *NewValue = Builder.CreateLoad(Address);
- Map.insert(std::make_pair<Value*, Value*>(OldValues[i], NewValue)); - Map.insert(std::make_pair<Value *, Value *>(OldValues[i], NewValue));
+ Map.insert(std::pair<Value*, Value*>(OldValues[i], NewValue)); + Map.insert(std::pair<Value*, Value*>(OldValues[i], NewValue));
} }
} }

20
debian/patches/profile_rt.diff vendored
View File

@ -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-toolchain_3.3~svn176083.orig/clang/lib/Driver/Tools.cpp 2013-02-26 14:10:49.000000000 +0100
+++ llvm-3.2.src/clang/lib/Driver/Tools.cpp 2013-01-12 15:34:26.679063522 +0100 +++ llvm-toolchain_3.3~svn176083/clang/lib/Driver/Tools.cpp 2013-02-26 14:11:32.000000000 +0100
@@ -32,10 +32,13 @@ @@ -33,6 +33,7 @@
#include "llvm/Support/Host.h"
#include "llvm/Support/Process.h" #include "llvm/Support/Process.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h"
+#include "llvm/Config/config.h" +#include "llvm/Config/config.h"
+
#include "InputInfo.h"
#include "SanitizerArgs.h"
#include "ToolChains.h"
+
using namespace clang::driver; using namespace clang::driver;
using namespace clang::driver::tools; using namespace clang::driver::tools;
using namespace clang; @@ -216,7 +217,7 @@
@@ -218,7 +221,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 =

8
debian/patches/scan-build-clang-path.diff vendored
View File

@ -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.3~svn176083.orig/clang/tools/scan-build/scan-build 2013-02-26 14:15:04.000000000 +0100
+++ llvm-toolchain-3.2-3.2/clang/tools/scan-build/scan-build 2013-01-17 16:04:10.000000000 +0100 +++ llvm-toolchain_3.3~svn176083/clang/tools/scan-build/scan-build 2013-02-26 14:15:06.000000000 +0100
@@ -1459,7 +1459,7 @@ @@ -1512,7 +1512,7 @@
# Find 'clang' # Find 'clang'
if (!defined $AnalyzerDiscoveryMethod) { if (!defined $AnalyzerDiscoveryMethod) {

16
debian/patches/series vendored
View File

@ -10,12 +10,12 @@ profile_rt.diff
28-gcc-4.7-paths.diff 28-gcc-4.7-paths.diff
29-hurd.diff 29-hurd.diff
30-kfreebsd.diff 30-kfreebsd.diff
50-lldb-segfaultgcc.diff #50-lldb-segfaultgcc.diff
51-lldb-hasBCPLComments.diff #51-lldb-hasBCPLComments.diff
52-lldb-declaration.diff #52-lldb-declaration.diff
54-lldb-cpp-declaration.diff #54-lldb-cpp-declaration.diff
55-lldb-cpp-declaration.diff #55-lldb-cpp-declaration.diff
56-lldb-python-path.diff #56-lldb-python-path.diff
0003-Debian-version-info-and-bugreport.patch 0003-Debian-version-info-and-bugreport.patch
0021-shared-lib-debian.patch 0021-shared-lib-debian.patch
0023-link-libopagent.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 0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch
0047-version-name.diff 0047-version-name.diff
scan-build-clang-path.diff scan-build-clang-path.diff
57-lldb-soname.diff
0050-powerpcspe-fp.diff 0050-powerpcspe-fp.diff
polly-c++0x.diff
declare_clear_cache.diff declare_clear_cache.diff
#r600-snapshot.diff #r600-snapshot.diff
polly-c++0x.diff

10
debian/prepare-new-release.sh vendored
View File

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
ORIG_VERSION=3.1 ORIG_VERSION=3.2
TARGET_VERSION=3.2 TARGET_VERSION=3.3
ORIG_VERSION_2=3_1 ORIG_VERSION_2=3_2
TARGET_VERSION_2=3_2 TARGET_VERSION_2=3_3
LIST=`ls debian/*$ORIG_VERSION*` LIST=`ls debian/*$ORIG_VERSION*`
for F in $LIST; do for F in $LIST; do
TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"` TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"`
mv $F $TARGET svn mv $F $TARGET
done done
LIST=`ls debian/*$TARGET_VERSION* debian/control` LIST=`ls debian/*$TARGET_VERSION* debian/control`
for F in $LIST; do for F in $LIST; do

2
debian/rules vendored
View File

@ -2,7 +2,7 @@
TARGET_BUILD := build-llvm TARGET_BUILD := build-llvm
GCC_VERSION := 4.7 GCC_VERSION := 4.7
LLVM_VERSION := 3.2 LLVM_VERSION := 3.3
SONAME_EXT := 1 SONAME_EXT := 1
DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p') DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p')
ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))