From 0504a422f35c84c24559c73b725781d0a897a9a3 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Aug 26 2021 11:01:52 +0000 Subject: Backport fixes for LLVM/Clang 13 --- diff --git a/0001-test-additional-updates-for-LLVM-Clang-13.patch b/0001-test-additional-updates-for-LLVM-Clang-13.patch new file mode 100644 index 0000000..b3cc0e8 --- /dev/null +++ b/0001-test-additional-updates-for-LLVM-Clang-13.patch @@ -0,0 +1,79 @@ +From 7a84ed2b19655c6c59713b469e3e17e0a1961e33 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Thu, 26 Aug 2021 11:54:03 +0200 +Subject: [PATCH] test: additional updates for LLVM/Clang 13 + +--- + test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt | 1 + + test/expect/cmd.cc-msvc-builtin-1800-E.stdout.txt | 3 ++- + test/expect/cmd.cc-msvc-builtin-1900-E.stdout.txt | 3 ++- + test/expect/cmd.cc-msvc-src-cxx-E.stdout.txt | 3 ++- + test/expect/cmd.cc-msvc-std-c++17-E.stdout.txt | 3 ++- + 5 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt b/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt +index 43df3e4..8b7307a 100644 +--- a/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt ++++ b/test/expect/cmd.cc-gnu-c-tgt-i386-opt-E.stdout.txt +@@ -1,4 +1,5 @@ + ^(#define _WIN32 1 ++)?(#define __GCC_HAVE_DWARF2_CFI_ASM 1 + )?#define __GNUC_MINOR__ 1 + #define __GNUC__ 1( + #define __MINGW32__ 1)? +diff --git a/test/expect/cmd.cc-msvc-builtin-1800-E.stdout.txt b/test/expect/cmd.cc-msvc-builtin-1800-E.stdout.txt +index 77c41a0..e932e8d 100644 +--- a/test/expect/cmd.cc-msvc-builtin-1800-E.stdout.txt ++++ b/test/expect/cmd.cc-msvc-builtin-1800-E.stdout.txt +@@ -1,6 +1,7 @@ + ^#define _MSC_VER 1800 + #define _WIN32 1 +-#define __castxml__ [^ ++(#define __GCC_HAVE_DWARF2_CFI_ASM 1 ++)?#define __castxml__ [^ + ]* + #define __castxml_check[^ + ]* +diff --git a/test/expect/cmd.cc-msvc-builtin-1900-E.stdout.txt b/test/expect/cmd.cc-msvc-builtin-1900-E.stdout.txt +index 5fa2378..ded05e3 100644 +--- a/test/expect/cmd.cc-msvc-builtin-1900-E.stdout.txt ++++ b/test/expect/cmd.cc-msvc-builtin-1900-E.stdout.txt +@@ -1,6 +1,7 @@ + ^#define _MSC_VER 1900 + #define _WIN32 1 +-#define __castxml__ [^ ++(#define __GCC_HAVE_DWARF2_CFI_ASM 1 ++)?#define __castxml__ [^ + ]* + #define __castxml_check[^ + ]* +diff --git a/test/expect/cmd.cc-msvc-src-cxx-E.stdout.txt b/test/expect/cmd.cc-msvc-src-cxx-E.stdout.txt +index faf1ab4..226faef 100644 +--- a/test/expect/cmd.cc-msvc-src-cxx-E.stdout.txt ++++ b/test/expect/cmd.cc-msvc-src-cxx-E.stdout.txt +@@ -1,6 +1,7 @@ + ^#define _MSC_VER 1600 + #define _WIN32 1 +-#define __castxml__ [^ ++(#define __GCC_HAVE_DWARF2_CFI_ASM 1 ++)?#define __castxml__ [^ + ]* + #define __castxml_check[^ + ]* +diff --git a/test/expect/cmd.cc-msvc-std-c++17-E.stdout.txt b/test/expect/cmd.cc-msvc-std-c++17-E.stdout.txt +index b273c29..f783d88 100644 +--- a/test/expect/cmd.cc-msvc-std-c++17-E.stdout.txt ++++ b/test/expect/cmd.cc-msvc-std-c++17-E.stdout.txt +@@ -1,7 +1,8 @@ + ^#define _MSC_VER 1900 + #define _MSVC_LANG 201703L + #define _WIN32 1 +-#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16ll ++(#define __GCC_HAVE_DWARF2_CFI_ASM 1 ++)?#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16ll + #define __castxml__ [^ + ]* + #define __castxml_check[^ +-- +2.31.1 + diff --git a/0001-test-update-for-LLVM-Clang-13.patch b/0001-test-update-for-LLVM-Clang-13.patch new file mode 100644 index 0000000..41a600f --- /dev/null +++ b/0001-test-update-for-LLVM-Clang-13.patch @@ -0,0 +1,65 @@ +From e38a64f24bd0acbc49b3b5148e03f5978e06b4a6 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 25 Aug 2021 12:02:54 -0400 +Subject: [PATCH] test: update for LLVM/Clang 13 + +Clang now defines more builtin macros that happen to be sorted among +macros we check in the tests. Update the test expectations to account +for them. + +Fixes: #204 +--- + test/expect/cmd.cc-gnu-c-src-c-E.stdout.txt | 1 + + test/expect/cmd.cc-gnu-src-cxx-E.stdout.txt | 1 + + test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt | 1 + + test/expect/cmd.predefined-macros.stdout.txt.in | 4 +++- + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/test/expect/cmd.cc-gnu-c-src-c-E.stdout.txt b/test/expect/cmd.cc-gnu-c-src-c-E.stdout.txt +index b248fb8..f880d02 100644 +--- a/test/expect/cmd.cc-gnu-c-src-c-E.stdout.txt ++++ b/test/expect/cmd.cc-gnu-c-src-c-E.stdout.txt +@@ -1,4 +1,5 @@ + ^(#define _WIN32 1 ++)?(#define __GCC_HAVE_DWARF2_CFI_ASM 1 + )?#define __GNUC_MINOR__ 1 + #define __GNUC__ 1( + #define __MINGW32__ 1)? +diff --git a/test/expect/cmd.cc-gnu-src-cxx-E.stdout.txt b/test/expect/cmd.cc-gnu-src-cxx-E.stdout.txt +index 1c7bf1f..24a3dad 100644 +--- a/test/expect/cmd.cc-gnu-src-cxx-E.stdout.txt ++++ b/test/expect/cmd.cc-gnu-src-cxx-E.stdout.txt +@@ -1,4 +1,5 @@ + ^(#define _WIN32 1 ++)?(#define __GCC_HAVE_DWARF2_CFI_ASM 1 + )?#define __GNUC_MINOR__ 1 + #define __GNUC__ 1( + #define __MINGW32__ 1)? +diff --git a/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt b/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt +index 4e6d6d0..e13d358 100644 +--- a/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt ++++ b/test/expect/cmd.cc-gnu-tgt-i386-opt-E.stdout.txt +@@ -1,4 +1,5 @@ + ^(#define _WIN32 1 ++)?(#define __GCC_HAVE_DWARF2_CFI_ASM 1 + )?#define __GNUC_MINOR__ 1 + #define __GNUC__ 1( + #define __MINGW32__ 1)? +diff --git a/test/expect/cmd.predefined-macros.stdout.txt.in b/test/expect/cmd.predefined-macros.stdout.txt.in +index b56fbdc..d7a5b2b 100644 +--- a/test/expect/cmd.predefined-macros.stdout.txt.in ++++ b/test/expect/cmd.predefined-macros.stdout.txt.in +@@ -6,7 +6,9 @@ + #define __castxml_major__ @CastXML_VERSION_MAJOR@ + #define __castxml_minor__ @CastXML_VERSION_MINOR@ + #define __castxml_patch__ @CastXML_VERSION_PATCH@ +-#define __clang__ 1 ++#define __clang__ 1( ++#define __clang_literal_encoding__ [^ ++]*)? + #define __clang_major__ [0-9]+ + #define __clang_minor__ [0-9]+ + #define __clang_patchlevel__ [0-9]+ +-- +2.31.1 + diff --git a/castxml.spec b/castxml.spec index 7209085..5a41189 100644 --- a/castxml.spec +++ b/castxml.spec @@ -2,12 +2,15 @@ Name: castxml Version: 0.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C-family abstract syntax tree XML output tool License: ASL 2.0 URL: https://github.com/CastXML/CastXML Source0: https://github.com/CastXML/CastXML/archive/v%{version}/%{name}-%{version}.tar.gz +# Backport fixes for LLVM/Clang 13 +Patch0: 0001-test-update-for-LLVM-Clang-13.patch +Patch1: 0001-test-additional-updates-for-LLVM-Clang-13.patch BuildRequires: cmake BuildRequires: make @@ -30,6 +33,8 @@ may support alternative output formats. %prep %setup -q -n CastXML-%{version} +%patch0 -p1 +%patch1 -p1 %build %cmake -DCastXML_INSTALL_DOC_DIR:STRING=share/doc/%{name} \ @@ -61,6 +66,9 @@ rm %{buildroot}%{_pkgdocdir}/NOTICE %license LICENSE NOTICE %changelog +* Thu Aug 26 2021 Mattias Ellert - 0.4.3-6 +- Backport fixes for LLVM/Clang 13 + * Wed Jul 21 2021 Fedora Release Engineering - 0.4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild