Apply patch D97846 to fix rhbz#1934065
This commit is contained in:
sergesanspaille
parent
283f2301df
commit
c1e69a30ae
|
|
@ -1,7 +1,7 @@
|
|||
From 7475a5bacb2c9dee974199652740d1555eb36e56 Mon Sep 17 00:00:00 2001
|
||||
From c6b921c8d833546946b70a8c2640032fd7c62461 Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 25 Feb 2021 14:04:52 +0100
|
||||
Subject: [PATCH 1/6] [PATCH][clang] Reorganize gtest integration
|
||||
Subject: [PATCH 1/7] [PATCH][clang] Reorganize gtest integration
|
||||
|
||||
---
|
||||
clang/CMakeLists.txt | 12 +++++-------
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 1622f30ac9ece9171dccb25db8d596ac45b11eee Mon Sep 17 00:00:00 2001
|
||||
From 8a4eb9e3fa9456de3da47115bdbd47dc552b5263 Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 25 Feb 2021 14:09:29 +0100
|
||||
Subject: [PATCH 3/6] [PATCH][clang] Make -funwind-tables the default on all
|
||||
Subject: [PATCH 3/7] [PATCH][clang] Make -funwind-tables the default on all
|
||||
archs
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 4dbe9c671f4f15f5fb6bf80428505690e15b7c83 Mon Sep 17 00:00:00 2001
|
||||
From 9e32a3c1481e5bccd951789bb3676cd8c85c0244 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Fri, 31 Jan 2020 11:04:57 -0800
|
||||
Subject: [PATCH 4/6] [PATCH][clang] Don't install static libraries
|
||||
Subject: [PATCH 4/7] [PATCH][clang] Don't install static libraries
|
||||
|
||||
---
|
||||
clang/cmake/modules/AddClang.cmake | 2 +-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 00bae317b3ae890a4baab8338696c3c9b0cdc114 Mon Sep 17 00:00:00 2001
|
||||
From ca5dec7a5ec6ca29ee6c4f2a35aaec03ad2e8238 Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Wed, 23 Sep 2020 12:47:30 +0000
|
||||
Subject: [PATCH 5/6] [PATCH][clang] Prefer gcc toolchains with libgcc_s.so
|
||||
Subject: [PATCH 5/7] [PATCH][clang] Prefer gcc toolchains with libgcc_s.so
|
||||
when not static linking libgcc
|
||||
|
||||
Fedora ships cross-compilers on all platforms, so a user could end up
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 4e7dc19c77a609671b2dea81797d79dad1b688c3 Mon Sep 17 00:00:00 2001
|
||||
From 88134d9897dce14e34c51406320764356bfde6a4 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Tue, 9 Feb 2021 13:35:43 -0800
|
||||
Subject: [PATCH 6/6] [PATCH][clang] Partially Revert "scan-view: Remove
|
||||
Subject: [PATCH 6/7] [PATCH][clang] Partially Revert "scan-view: Remove
|
||||
Reporter.py and associated AppleScript files"
|
||||
|
||||
This reverts some of commit dbb01536f6f49fa428f170e34466072ef439b3e9.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
From 7e0b36755d9bcccaddd1c4c1c69b1f12b729cf4e Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Mon, 15 Mar 2021 09:28:48 +0100
|
||||
Subject: [PATCH 7/7] [PATCH][clang] Allow __ieee128 as an alias to __float128
|
||||
on ppc
|
||||
|
||||
This matches gcc behavior.
|
||||
|
||||
Backported from https://reviews.llvm.org/D97846
|
||||
---
|
||||
clang/include/clang/Basic/LangOptions.def | 1 +
|
||||
clang/lib/Basic/IdentifierTable.cpp | 3 +++
|
||||
clang/lib/Basic/Targets/PPC.cpp | 1 +
|
||||
clang/test/Sema/128bitfloat.cpp | 7 +++++++
|
||||
4 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def
|
||||
index c01f0cc..3c22393e 100644
|
||||
--- a/clang/include/clang/Basic/LangOptions.def
|
||||
+++ b/clang/include/clang/Basic/LangOptions.def
|
||||
@@ -107,6 +107,7 @@ LANGOPT(Bool , 1, 0, "bool, true, and false keywords")
|
||||
LANGOPT(Half , 1, 0, "half keyword")
|
||||
LANGOPT(WChar , 1, CPlusPlus, "wchar_t keyword")
|
||||
LANGOPT(Char8 , 1, 0, "char8_t keyword")
|
||||
+LANGOPT(IEEE128 , 1, 0, "__ieee128 keyword")
|
||||
LANGOPT(DeclSpecKeyword , 1, 0, "__declspec keyword")
|
||||
BENIGN_LANGOPT(DollarIdents , 1, 1, "'$' in identifiers")
|
||||
BENIGN_LANGOPT(AsmPreprocessor, 1, 0, "preprocessor in asm mode")
|
||||
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
|
||||
index 51c6e02..cedc94a 100644
|
||||
--- a/clang/lib/Basic/IdentifierTable.cpp
|
||||
+++ b/clang/lib/Basic/IdentifierTable.cpp
|
||||
@@ -227,6 +227,9 @@ void IdentifierTable::AddKeywords(const LangOptions &LangOpts) {
|
||||
if (LangOpts.DeclSpecKeyword)
|
||||
AddKeyword("__declspec", tok::kw___declspec, KEYALL, LangOpts, *this);
|
||||
|
||||
+ if (LangOpts.IEEE128)
|
||||
+ AddKeyword("__ieee128", tok::kw___float128, KEYALL, LangOpts, *this);
|
||||
+
|
||||
// Add the 'import' contextual keyword.
|
||||
get("import").setModulesImport(true);
|
||||
}
|
||||
diff --git a/clang/lib/Basic/Targets/PPC.cpp b/clang/lib/Basic/Targets/PPC.cpp
|
||||
index ff09c0f..38f286c 100644
|
||||
--- a/clang/lib/Basic/Targets/PPC.cpp
|
||||
+++ b/clang/lib/Basic/Targets/PPC.cpp
|
||||
@@ -551,6 +551,7 @@ void PPCTargetInfo::adjust(LangOptions &Opts) {
|
||||
LongDoubleFormat = Opts.PPCIEEELongDouble
|
||||
? &llvm::APFloat::IEEEquad()
|
||||
: &llvm::APFloat::PPCDoubleDouble();
|
||||
+ Opts.IEEE128 = 1;
|
||||
}
|
||||
|
||||
ArrayRef<Builtin::Info> PPCTargetInfo::getTargetBuiltins() const {
|
||||
diff --git a/clang/test/Sema/128bitfloat.cpp b/clang/test/Sema/128bitfloat.cpp
|
||||
index 4a826b4..6a9ae74 100644
|
||||
--- a/clang/test/Sema/128bitfloat.cpp
|
||||
+++ b/clang/test/Sema/128bitfloat.cpp
|
||||
@@ -6,6 +6,13 @@
|
||||
// RUN: %clang_cc1 -triple x86_64-windows-msvc -verify -std=c++11 %s
|
||||
|
||||
#if defined(__FLOAT128__) || defined(__SIZEOF_FLOAT128__)
|
||||
+
|
||||
+#if defined(__ppc__)
|
||||
+template <typename> struct __is_float128 { static constexpr bool value = false; };
|
||||
+template <> struct __is_float128<__float128> { static constexpr bool value = true; };
|
||||
+static_assert(__is_float128<__ieee128>::value, "__ieee128 aliases to __float128");
|
||||
+#endif
|
||||
+
|
||||
__float128 f;
|
||||
template<typename> struct __is_floating_point_helper {};
|
||||
template<> struct __is_floating_point_helper<__float128> {};
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
%global min_ver 0
|
||||
%global patch_ver 0
|
||||
%global rc_ver 3
|
||||
%global baserelease 6
|
||||
%global baserelease 7
|
||||
|
||||
%global clang_tools_binaries \
|
||||
%{_bindir}/clang-apply-replacements \
|
||||
|
|
@ -94,6 +94,7 @@ Patch13: 0003-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
|
|||
Patch15: 0004-PATCH-clang-Don-t-install-static-libraries.patch
|
||||
Patch17: 0005-PATCH-clang-Prefer-gcc-toolchains-with-libgcc_s.so-w.patch
|
||||
Patch19: 0006-PATCH-clang-Partially-Revert-scan-view-Remove-Report.patch
|
||||
Patch20: 0007-PATCH-clang-Allow-__ieee128-as-an-alias-to-__float12.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -279,6 +280,7 @@ pathfix.py -i %{__python3} -pn \
|
|||
%patch15 -p2 -b .no-install-static
|
||||
%patch17 -p2 -b .check-gcc_s
|
||||
%patch19 -p2 -b .scan-view-remove-files-fix
|
||||
%patch20 -p2 -b .ieee128
|
||||
|
||||
|
||||
# failing test case
|
||||
|
|
@ -537,6 +539,9 @@ false
|
|||
|
||||
%endif
|
||||
%changelog
|
||||
* Mon Mar 15 2021 sguelton@redhat.com - 12.0.0-0.7.rc3
|
||||
- Apply patch D97846 to fix rhbz#1934065
|
||||
|
||||
* Mon Mar 15 2021 Timm Bäder <tbaeder@redhat.com> 12.0.0-0.6.rc3
|
||||
- Set CLANG_DEFAULT_UNWIND_LIB instead of using custom patch
|
||||
- Add toolchains test to the tests.yml
|
||||
|
|
|
|||
Loading…
Reference in New Issue