From 09852f798c8fb17d8b701929eccce6a6395a93a1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 17 Feb 2021 09:12:48 +0100 Subject: [PATCH] New upstream release Should be mostly minor fixes Was driven by https://bugs.llvm.org/show_bug.cgi?id=46526 but as we are not impacted, I reverted the change in debian/patches/revert-abi-change-clang.diff --- debian/changelog | 10 ++ debian/patches/revert-abi-change-clang.diff | 187 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 198 insertions(+) create mode 100644 debian/patches/revert-abi-change-clang.diff diff --git a/debian/changelog b/debian/changelog index 4ff0710b..381e7999 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-11 (1:11.1.0-1) unstable; urgency=medium + + * New upstream release + Should be mostly minor fixes + Was driven by https://bugs.llvm.org/show_bug.cgi?id=46526 + but as we are not impacted, I reverted the change in + debian/patches/revert-abi-change-clang.diff + + -- Sylvestre Ledru Wed, 17 Feb 2021 08:59:36 +0100 + llvm-toolchain-11 (1:11.0.1-2) unstable; urgency=medium * Fix the changelog diff --git a/debian/patches/revert-abi-change-clang.diff b/debian/patches/revert-abi-change-clang.diff new file mode 100644 index 00000000..0992460a --- /dev/null +++ b/debian/patches/revert-abi-change-clang.diff @@ -0,0 +1,187 @@ +commit 9bbcb554cdbf1a7b85e9a72169e4037cf4736a10 +Author: Marco Antognini +Date: Thu Oct 29 10:30:11 2020 +0000 + + Address ABI issues introduced with CXCursor_CXXAddrspaceCastExpr + + Revert values in CXCursorKind as they were before + CXCursor_CXXAddrspaceCastExpr was introduced in a6a237f2046a ([OpenCL] + Added addrspace_cast operator in C++ mode., 2020-05-18). + + Insert CXCursor_CXXAddrspaceCastExpr after the last expression in + CXCursorKind using the next available value. + + Reviewed By: akyrtzi, svenvh + + Differential Revision: https://reviews.llvm.org/D90385 + + (cherry picked from commit bbdbd020d2c2f315ed1545b23c23ec6ff1abc022) + +Index: llvm-toolchain-11_11.1.0/clang/include/clang-c/Index.h +=================================================================== +--- llvm-toolchain-11_11.1.0.orig/clang/include/clang-c/Index.h ++++ llvm-toolchain-11_11.1.0/clang/include/clang-c/Index.h +@@ -33,7 +33,7 @@ + * compatible, thus CINDEX_VERSION_MAJOR is expected to remain stable. + */ + #define CINDEX_VERSION_MAJOR 0 +-#define CINDEX_VERSION_MINOR 61 ++#define CINDEX_VERSION_MINOR 60 + + #define CINDEX_VERSION_ENCODE(major, minor) (((major)*10000) + ((minor)*1)) + +@@ -2052,58 +2052,62 @@ enum CXCursorKind { + */ + CXCursor_CXXFunctionalCastExpr = 128, + ++ /** OpenCL's addrspace_cast<> expression. ++ */ ++ CXCursor_CXXAddrspaceCastExpr = 129, ++ + /** A C++ typeid expression (C++ [expr.typeid]). + */ +- CXCursor_CXXTypeidExpr = 129, ++ CXCursor_CXXTypeidExpr = 130, + + /** [C++ 2.13.5] C++ Boolean Literal. + */ +- CXCursor_CXXBoolLiteralExpr = 130, ++ CXCursor_CXXBoolLiteralExpr = 131, + + /** [C++0x 2.14.7] C++ Pointer Literal. + */ +- CXCursor_CXXNullPtrLiteralExpr = 131, ++ CXCursor_CXXNullPtrLiteralExpr = 132, + + /** Represents the "this" expression in C++ + */ +- CXCursor_CXXThisExpr = 132, ++ CXCursor_CXXThisExpr = 133, + + /** [C++ 15] C++ Throw Expression. + * + * This handles 'throw' and 'throw' assignment-expression. When + * assignment-expression isn't present, Op will be null. + */ +- CXCursor_CXXThrowExpr = 133, ++ CXCursor_CXXThrowExpr = 134, + + /** A new expression for memory allocation and constructor calls, e.g: + * "new CXXNewExpr(foo)". + */ +- CXCursor_CXXNewExpr = 134, ++ CXCursor_CXXNewExpr = 135, + + /** A delete expression for memory deallocation and destructor calls, + * e.g. "delete[] pArray". + */ +- CXCursor_CXXDeleteExpr = 135, ++ CXCursor_CXXDeleteExpr = 136, + + /** A unary expression. (noexcept, sizeof, or other traits) + */ +- CXCursor_UnaryExpr = 136, ++ CXCursor_UnaryExpr = 137, + + /** An Objective-C string literal i.e. @"foo". + */ +- CXCursor_ObjCStringLiteral = 137, ++ CXCursor_ObjCStringLiteral = 138, + + /** An Objective-C \@encode expression. + */ +- CXCursor_ObjCEncodeExpr = 138, ++ CXCursor_ObjCEncodeExpr = 139, + + /** An Objective-C \@selector expression. + */ +- CXCursor_ObjCSelectorExpr = 139, ++ CXCursor_ObjCSelectorExpr = 140, + + /** An Objective-C \@protocol expression. + */ +- CXCursor_ObjCProtocolExpr = 140, ++ CXCursor_ObjCProtocolExpr = 141, + + /** An Objective-C "bridged" cast expression, which casts between + * Objective-C pointers and C pointers, transferring ownership in the process. +@@ -2112,7 +2116,7 @@ enum CXCursorKind { + * NSString *str = (__bridge_transfer NSString *)CFCreateString(); + * \endcode + */ +- CXCursor_ObjCBridgedCastExpr = 141, ++ CXCursor_ObjCBridgedCastExpr = 142, + + /** Represents a C++0x pack expansion that produces a sequence of + * expressions. +@@ -2127,7 +2131,7 @@ enum CXCursorKind { + * } + * \endcode + */ +- CXCursor_PackExpansionExpr = 142, ++ CXCursor_PackExpansionExpr = 143, + + /** Represents an expression that computes the length of a parameter + * pack. +@@ -2139,7 +2143,7 @@ enum CXCursorKind { + * }; + * \endcode + */ +- CXCursor_SizeOfPackExpr = 143, ++ CXCursor_SizeOfPackExpr = 144, + + /* Represents a C++ lambda expression that produces a local function + * object. +@@ -2153,43 +2157,39 @@ enum CXCursorKind { + * } + * \endcode + */ +- CXCursor_LambdaExpr = 144, ++ CXCursor_LambdaExpr = 145, + + /** Objective-c Boolean Literal. + */ +- CXCursor_ObjCBoolLiteralExpr = 145, ++ CXCursor_ObjCBoolLiteralExpr = 146, + + /** Represents the "self" expression in an Objective-C method. + */ +- CXCursor_ObjCSelfExpr = 146, ++ CXCursor_ObjCSelfExpr = 147, + + /** OpenMP 5.0 [2.1.5, Array Section]. + */ +- CXCursor_OMPArraySectionExpr = 147, ++ CXCursor_OMPArraySectionExpr = 148, + + /** Represents an @available(...) check. + */ +- CXCursor_ObjCAvailabilityCheckExpr = 148, ++ CXCursor_ObjCAvailabilityCheckExpr = 149, + + /** + * Fixed point literal + */ +- CXCursor_FixedPointLiteral = 149, ++ CXCursor_FixedPointLiteral = 150, + + /** OpenMP 5.0 [2.1.4, Array Shaping]. + */ +- CXCursor_OMPArrayShapingExpr = 150, ++ CXCursor_OMPArrayShapingExpr = 151, + + /** + * OpenMP 5.0 [2.1.6 Iterators] + */ +- CXCursor_OMPIteratorExpr = 151, +- +- /** OpenCL's addrspace_cast<> expression. +- */ +- CXCursor_CXXAddrspaceCastExpr = 152, ++ CXCursor_OMPIteratorExpr = 152, + +- CXCursor_LastExpr = CXCursor_CXXAddrspaceCastExpr, ++ CXCursor_LastExpr = CXCursor_OMPIteratorExpr, + + /* Statements */ + CXCursor_FirstStmt = 200, diff --git a/debian/patches/series b/debian/patches/series index f23a386d..58d25730 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -141,3 +141,4 @@ print-lldb-path.patch libcxx-armhf-ftbfs.diff silent-integration-test-suite-i386.diff 0001-Add-minor-version-to-libclang.so-and-libclang-cpp.so.patch +revert-abi-change-clang.diff