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

rebase of the patches + remove + fix-doc-rst.diff

Browse Source
This commit is contained in:
Sylvestre Ledru 2016-02-14 17:16:22 +00:00
parent ef02fcab14
commit 720303b34c
9 changed files with 85 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +0,0 @@
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/libclang/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/libclang/Makefile
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/libclang/Makefile
@@ -14,6 +14,7 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/l
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
+SONAME_MAJOR=1
include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter core \
@@ -36,7 +37,7 @@ include $(CLANG_LEVEL)/Makefile
# Add soname to the library.
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))
- LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT).$(SONAME_MAJOR)
endif
ifeq ($(ENABLE_CLANG_ARCMT),1)

36
debian/patches/clang-format-version.diff vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.py
Index: llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.py
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.py
@@ -25,7 +25,7 @@ import vim
--- llvm-toolchain-snapshot_3.9~svn260089.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.py
@@ -34,7 +34,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
@ -11,23 +11,23 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format-diff.py
Index: llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format-diff.py
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format-diff.py
@@ -32,7 +32,7 @@ import sys
--- llvm-toolchain-snapshot_3.9~svn260089.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format-diff.py
@@ -55,7 +55,7 @@ def main():
parser.add_argument('-style',
help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)')
- parser.add_argument('-binary', default='clang-format',
+ parser.add_argument('-binary', default='clang-format-3.9',
help='location of binary to use for clang-format')
args = parser.parse_args()
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-3.9'
def main():
Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.el
Index: llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.el
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.el
--- llvm-toolchain-snapshot_3.9~svn260089.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.el
@@ -36,7 +36,7 @@
:group 'tools)

3
debian/patches/fix-cmake-config-prefix.diff vendored
View File

@ -1,6 +1,3 @@
## Description: add some description
## Origin/Author: add some origin or author
## Bug: bug URL
--- a/cmake/modules/Makefile
+++ b/cmake/modules/Makefile
@@ -62,17 +62,9 @@

52
debian/patches/fix-doc-rst.diff vendored Normal file
View File

@ -0,0 +1,52 @@
Index: llvm-toolchain-snapshot_3.9~svn260815/clang-tools-extra/docs/clang-tidy/checks/readability-simplify-boolean-expr.rst
===================================================================
--- llvm-toolchain-snapshot_3.9~svn260815.orig/clang-tools-extra/docs/clang-tidy/checks/readability-simplify-boolean-expr.rst
+++ llvm-toolchain-snapshot_3.9~svn260815/clang-tools-extra/docs/clang-tidy/checks/readability-simplify-boolean-expr.rst
@@ -32,15 +32,21 @@ Initial expression
The resulting expression ``e`` is modified as follows:
1. Unnecessary parentheses around the expression are removed.
+
2. Negated applications of ``!`` are eliminated.
+
3. Negated applications of comparison operators are changed to use the
opposite condition.
+
4. Implicit conversions of pointers, including pointers to members, to
``bool`` are replaced with explicit comparisons to ``nullptr`` in C++11
or ``NULL`` in C++98/03.
+
5. Implicit casts to ``bool`` are replaced with explicit casts to ``bool``.
+
6. Object expressions with ``explicit operator bool`` conversion operators
are replaced with explicit casts to ``bool``.
+
7. Implicit conversions of integral types to ``bool`` are replaced with
explicit comparisons to ``0``.
Index: llvm-toolchain-snapshot_3.9~svn260815/clang/tools/extra/docs/clang-tidy/checks/readability-simplify-boolean-expr.rst
===================================================================
--- llvm-toolchain-snapshot_3.9~svn260815.orig/clang/tools/extra/docs/clang-tidy/checks/readability-simplify-boolean-expr.rst
+++ llvm-toolchain-snapshot_3.9~svn260815/clang/tools/extra/docs/clang-tidy/checks/readability-simplify-boolean-expr.rst
@@ -32,15 +32,21 @@ Initial expression
The resulting expression ``e`` is modified as follows:
1. Unnecessary parentheses around the expression are removed.
+
2. Negated applications of ``!`` are eliminated.
+
3. Negated applications of comparison operators are changed to use the
opposite condition.
+
4. Implicit conversions of pointers, including pointers to members, to
``bool`` are replaced with explicit comparisons to ``nullptr`` in C++11
or ``NULL`` in C++98/03.
+
5. Implicit casts to ``bool`` are replaced with explicit casts to ``bool``.
+
6. Object expressions with ``explicit operator bool`` conversion operators
are replaced with explicit casts to ``bool``.
+
7. Implicit conversions of integral types to ``bool`` are replaced with
explicit comparisons to ``0``.

14
debian/patches/fix-llvm-config-obj-src-root.patch vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp
Index: llvm-toolchain-snapshot_3.9~svn260089/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp
@@ -498,9 +498,9 @@ int main(int argc, char **argv) {
--- llvm-toolchain-snapshot_3.9~svn260089.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-snapshot_3.9~svn260089/tools/llvm-config/llvm-config.cpp
@@ -533,9 +533,9 @@ int main(int argc, char **argv) {
} else if (Arg == "--shared-mode") {
PrintSharedMode = true;
} else if (Arg == "--obj-root") {
@ -11,6 +11,6 @@ Index: llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp
} else if (Arg == "--src-root") {
- OS << LLVM_SRC_ROOT << '\n';
+ OS << ActivePrefix << "/build/" << '\n';
} else {
usage();
}
} else if (Arg == "--link-shared") {
LinkMode = LinkModeShared;
} else if (Arg == "--link-static") {

8
debian/patches/hurd-EIEIO-undef.diff vendored
View File

@ -1,9 +1,9 @@
Index: llvm-toolchain-snapshot_3.6~svn217023/utils/TableGen/CodeEmitterGen.cpp
Index: llvm-toolchain-snapshot_3.9~svn260089/utils/TableGen/CodeEmitterGen.cpp
===================================================================
--- llvm-toolchain-snapshot_3.6~svn217023.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_3.6~svn217023/utils/TableGen/CodeEmitterGen.cpp
--- llvm-toolchain-snapshot_3.9~svn260089.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_3.9~svn260089/utils/TableGen/CodeEmitterGen.cpp
@@ -230,6 +230,9 @@ void CodeEmitterGen::run(raw_ostream &o)
const std::vector<const CodeGenInstruction*> &NumberedInstructions =
ArrayRef<const CodeGenInstruction*> NumberedInstructions =
Target.getInstructionsByEnumValue();
+ o << "// Undef for HURD\n";

19
debian/patches/lldb-soname.diff vendored
View File

@ -1,22 +1,3 @@
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -16,6 +16,7 @@
NO_BUILD_ARCHIVE = 1
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
+SONAME_EXTENSION = 1
ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
PYTHON_CONFIG?= python-config
@@ -191,7 +192,7 @@
LLVMLibsOptions += -Wl,--no-undefined
# Link in python
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION)
ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
# Link GCC atomic helper library
LLVMLibsOptions += -latomic
--- a/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt
@@ -6,7 +6,12 @@

14
debian/patches/series vendored
View File

@ -1,18 +1,11 @@
18-soname.patch
19-clang_debian_version.patch
23-strlcpy_strlcat_warning_removed.diff
27-fix_clang_stdint.diff
26-set-correct-float-abi.diff
0003-Debian-version-info-and-bugreport.patch
0021-shared-lib-debian.patch
0023-link-libopagent.patch
0044-soname.diff
scan-build-clang-path.diff
declare_clear_cache.diff
31-powerpcspe.diff
34-powerpc-no-altivec.diff
clang-format-version.diff
disable-execinfo-usage.diff
unwind-chain-inclusion.diff
hurd-pathmax.diff
use-deb-json.diff
@ -25,17 +18,12 @@ fix-clang-path-and-build.diff
do-not-fail-on-unexpected-pass.diff
silent-more-tests.diff
disable-display-PASS-UNSUPPORTED-XFAIL.diff
lldb-link-atomic.diff
fix-llvm-config-obj-src-root.patch
compiler-rt-path.diff
lldb-soname.diff
force-link-pass.o.diff
follow-parallel-var.diff
hurd-EIEIO-undef.diff
silent-MCJIIT-tests.diff
lldb-libname.diff
compiler-rt-i586.diff
clang-analyzer-force-version.diff
fix-cmake-config-prefix.diff
llvm25468-lldb-swig-format-security.diff
llvm26003-sanitizer-check-env.diff
fix-doc-rst.diff

30
debian/patches/use-deb-json.diff vendored
View File

@ -1,31 +1,7 @@
Index: llvm-toolchain-3.8_3.8~+rc1/polly/lib/Makefile
Index: llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt
===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/polly/lib/Makefile
+++ llvm-toolchain-3.8_3.8~+rc1/polly/lib/Makefile
@@ -26,9 +26,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
CodeGen/IslNodeBuilder.cpp \
CodeGen/CodeGeneration.cpp
-POLLY_JSON_FILES= JSON/json_reader.cpp \
- JSON/json_value.cpp \
- JSON/json_writer.cpp
+#POLLY_JSON_FILES= JSON/json_reader.cpp \
+# JSON/json_value.cpp \
+# JSON/json_writer.cpp
ISL_FILES= External/isl/basis_reduction_tab.c \
External/isl/isl_aff.c \
@@ -146,4 +146,5 @@ SOURCES= Polly.cpp \
#
include $(LEVEL)/Makefile.common
-LIBS += $(POLLY_LD) $(POLLY_LIB)
+LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
+
Index: llvm-toolchain-3.8_3.8~+rc1/polly/lib/CMakeLists.txt
===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/polly/lib/CMakeLists.txt
+++ llvm-toolchain-3.8_3.8~+rc1/polly/lib/CMakeLists.txt
--- llvm-toolchain-snapshot_3.9~svn260089.orig/polly/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_3.9~svn260089/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@
set(LLVM_NO_RTTI 1)