parent
4fcf8241b9
commit
f68186bfdd
@ -1,30 +0,0 @@
|
|||||||
From 2a0175c88ccd8c162901ac0ade56859d2b599f38 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nikita Popov <npopov@redhat.com>
|
|
||||||
Date: Mon, 17 Apr 2023 16:19:04 +0200
|
|
||||||
Subject: [PATCH] Change LLVM_COMMON_CMAKE_UTILS usage
|
|
||||||
|
|
||||||
Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are
|
|
||||||
available and stop assuming its directory structure.
|
|
||||||
---
|
|
||||||
clang/CMakeLists.txt | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
|
|
||||||
index 1fff005d6525..f4b3ef4bd15a 100644
|
|
||||||
--- a/clang/CMakeLists.txt
|
|
||||||
+++ b/clang/CMakeLists.txt
|
|
||||||
@@ -1,9 +1,9 @@
|
|
||||||
cmake_minimum_required(VERSION 3.13.4)
|
|
||||||
|
|
||||||
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
|
|
||||||
- set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
|
|
||||||
+ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules)
|
|
||||||
endif()
|
|
||||||
-include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
|
|
||||||
+include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake
|
|
||||||
NO_POLICY_SCOPE)
|
|
||||||
|
|
||||||
# If we are not building as a part of LLVM, build Clang as an
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
|||||||
From ccf3e4407e7a5c4c1f2e41c89aad9f86a9c7d81d Mon Sep 17 00:00:00 2001
|
From d68a5a7817dc0d43853d8b84c9185dc24338664f Mon Sep 17 00:00:00 2001
|
||||||
From: Tom Stellard <tstellar@redhat.com>
|
From: Tom Stellard <tstellar@redhat.com>
|
||||||
Date: Wed, 6 Oct 2021 05:32:44 +0000
|
Date: Wed, 6 Oct 2021 05:32:44 +0000
|
||||||
Subject: Driver: Add a gcc equivalent triple to the list of triples to search
|
Subject: [PATCH] Driver: Add a gcc equivalent triple to the list of triples to
|
||||||
|
search
|
||||||
|
|
||||||
There are some gcc triples, like x86_64-redhat-linux, that provide the
|
There are some gcc triples, like x86_64-redhat-linux, that provide the
|
||||||
same behavior as a clang triple with a similar name (e.g.
|
same behavior as a clang triple with a similar name (e.g.
|
||||||
@ -14,10 +15,10 @@ Differential Revision: https://reviews.llvm.org/D111207
|
|||||||
1 file changed, 22 insertions(+)
|
1 file changed, 22 insertions(+)
|
||||||
|
|
||||||
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
index f203cae1d329..12fa2da3187e 100644
|
index fe5bda5c6605..fd4a7f72be14 100644
|
||||||
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
@@ -1969,6 +1969,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args,
|
@@ -1884,6 +1884,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args,
|
||||||
return GCC_INSTALL_PREFIX;
|
return GCC_INSTALL_PREFIX;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,7 +37,7 @@ index f203cae1d329..12fa2da3187e 100644
|
|||||||
/// Initialize a GCCInstallationDetector from the driver.
|
/// Initialize a GCCInstallationDetector from the driver.
|
||||||
///
|
///
|
||||||
/// This performs all of the autodetection and sets up the various paths.
|
/// This performs all of the autodetection and sets up the various paths.
|
||||||
@@ -1989,6 +2001,16 @@ void Generic_GCC::GCCInstallationDetector::init(
|
@@ -1904,6 +1916,16 @@ void Generic_GCC::GCCInstallationDetector::init(
|
||||||
// The compatible GCC triples for this particular architecture.
|
// The compatible GCC triples for this particular architecture.
|
||||||
SmallVector<StringRef, 16> CandidateTripleAliases;
|
SmallVector<StringRef, 16> CandidateTripleAliases;
|
||||||
SmallVector<StringRef, 16> CandidateBiarchTripleAliases;
|
SmallVector<StringRef, 16> CandidateBiarchTripleAliases;
|
||||||
@ -54,5 +55,5 @@ index f203cae1d329..12fa2da3187e 100644
|
|||||||
CandidateTripleAliases, CandidateBiarchLibDirs,
|
CandidateTripleAliases, CandidateBiarchLibDirs,
|
||||||
CandidateBiarchTripleAliases);
|
CandidateBiarchTripleAliases);
|
||||||
--
|
--
|
||||||
2.37.1
|
2.26.2
|
||||||
|
|
@ -1,21 +1,20 @@
|
|||||||
From d95d3fbff661c0390072ed0bb4544d5e2aae5c9a Mon Sep 17 00:00:00 2001
|
From 49f827b09db549de62dcaf8b90b3fcb3e08c0ee5 Mon Sep 17 00:00:00 2001
|
||||||
From: serge-sans-paille <sguelton@redhat.com>
|
From: Serge Guelton <sguelton@redhat.com>
|
||||||
Date: Thu, 25 Feb 2021 14:09:29 +0100
|
Date: Mon, 6 Mar 2023 12:37:48 +0100
|
||||||
Subject: [PATCH] Make -funwind-tables the default on all archs
|
Subject: [PATCH] Make -funwind-tables the default on all archs
|
||||||
|
|
||||||
---
|
---
|
||||||
clang/lib/Driver/ToolChains/Gnu.cpp | 5 +++++
|
clang/lib/Driver/ToolChains/Gnu.cpp | 4 ++++
|
||||||
1 file changed, 5 insertions(+)
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
index c8006f3d8412..6ed03adb7702 100644
|
index 24fbdcffc07b..8fed46b49515 100644
|
||||||
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
|
||||||
@@ -2863,6 +2863,11 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
|
@@ -2904,6 +2904,10 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
|
||||||
case llvm::Triple::ppc64le:
|
case llvm::Triple::riscv64:
|
||||||
case llvm::Triple::x86:
|
case llvm::Triple::x86:
|
||||||
case llvm::Triple::x86_64:
|
case llvm::Triple::x86_64:
|
||||||
+
|
|
||||||
+ // Enable -funwind-tables on all architectures supported by Fedora:
|
+ // Enable -funwind-tables on all architectures supported by Fedora:
|
||||||
+ // rhbz#1655546
|
+ // rhbz#1655546
|
||||||
+ case llvm::Triple::systemz:
|
+ case llvm::Triple::systemz:
|
@ -1,36 +1,38 @@
|
|||||||
From 4ea62faaaac1aad0fe496cabe9674c809c91c49a Mon Sep 17 00:00:00 2001
|
From adbe188f3b1e3a0dd5ec80d9409601ba7f5b0423 Mon Sep 17 00:00:00 2001
|
||||||
From: Konrad Kleine <kkleine@redhat.com>
|
From: Konrad Kleine <kkleine@redhat.com>
|
||||||
Date: Mon, 13 Feb 2023 17:11:00 -0300
|
Date: Thu, 24 Mar 2022 09:44:21 +0100
|
||||||
Subject: [PATCH] Produce DWARF4 by default
|
Subject: [PATCH] Produce DWARF4 by default
|
||||||
|
|
||||||
Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream:
|
Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream:
|
||||||
|
|
||||||
https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8f5b4?diff=unified
|
https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8f5b4?diff=unified
|
||||||
---
|
---
|
||||||
clang/include/clang/Driver/ToolChain.h | 2 +-
|
clang/lib/Driver/ToolChain.cpp | 4 +---
|
||||||
clang/test/CodeGen/dwarf-version.c | 4 ++--
|
clang/test/CodeGen/dwarf-version.c | 4 ++--
|
||||||
clang/test/Driver/as-options.s | 4 ++--
|
clang/test/Driver/as-options.s | 4 ++--
|
||||||
clang/test/Driver/cl-options.c | 2 +-
|
clang/test/Driver/cl-options.c | 2 +-
|
||||||
clang/test/Driver/clang-g-opts.c | 2 +-
|
clang/test/Driver/clang-g-opts.c | 2 +-
|
||||||
clang/test/Driver/ve-toolchain.c | 2 +-
|
clang/test/Driver/ve-toolchain.c | 2 +-
|
||||||
clang/test/Driver/ve-toolchain.cpp | 2 +-
|
clang/test/Driver/ve-toolchain.cpp | 2 +-
|
||||||
7 files changed, 9 insertions(+), 9 deletions(-)
|
7 files changed, 9 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
|
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
|
||||||
index f75f35dc9e65..a70ae2b17833 100644
|
index 8dafc3d481c2..92bf26dc8ec6 100644
|
||||||
--- a/clang/include/clang/Driver/ToolChain.h
|
--- a/clang/lib/Driver/ToolChain.cpp
|
||||||
+++ b/clang/include/clang/Driver/ToolChain.h
|
+++ b/clang/lib/Driver/ToolChain.cpp
|
||||||
@@ -547,7 +547,7 @@ public:
|
@@ -428,9 +428,7 @@ ToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const {
|
||||||
|
}
|
||||||
|
|
||||||
// Return the DWARF version to emit, in the absence of arguments
|
unsigned ToolChain::GetDefaultDwarfVersion() const {
|
||||||
// to the contrary.
|
- // TODO: Remove the RISC-V special case when R_RISCV_SET_ULEB128 linker
|
||||||
- virtual unsigned GetDefaultDwarfVersion() const { return 5; }
|
- // support becomes more widely available.
|
||||||
+ virtual unsigned GetDefaultDwarfVersion() const { return 4; }
|
- return getTriple().isRISCV() ? 4 : 5;
|
||||||
|
+ return 4;
|
||||||
|
}
|
||||||
|
|
||||||
// Some toolchains may have different restrictions on the DWARF version and
|
Tool *ToolChain::getClang() const {
|
||||||
// may need to adjust it. E.g. NVPTX may need to enforce DWARF2 even when host
|
|
||||||
diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
|
diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
|
||||||
index 0a6fa4768026..96f01749d0d8 100644
|
index d307eb3f101f..e7e93bf6688c 100644
|
||||||
--- a/clang/test/CodeGen/dwarf-version.c
|
--- a/clang/test/CodeGen/dwarf-version.c
|
||||||
+++ b/clang/test/CodeGen/dwarf-version.c
|
+++ b/clang/test/CodeGen/dwarf-version.c
|
||||||
@@ -2,8 +2,8 @@
|
@@ -2,8 +2,8 @@
|
||||||
@ -67,10 +69,10 @@ index 73d002c7ef7e..71d55f7fd537 100644
|
|||||||
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 %s -### 2>&1 | \
|
// RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 %s -### 2>&1 | \
|
||||||
// RUN: FileCheck --check-prefix=GDWARF5 %s
|
// RUN: FileCheck --check-prefix=GDWARF5 %s
|
||||||
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
|
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
|
||||||
index 1d588bdfc1b0..1ad57aedc3a4 100644
|
index 6d929b19e7e2..373905c2e0fc 100644
|
||||||
--- a/clang/test/Driver/cl-options.c
|
--- a/clang/test/Driver/cl-options.c
|
||||||
+++ b/clang/test/Driver/cl-options.c
|
+++ b/clang/test/Driver/cl-options.c
|
||||||
@@ -575,7 +575,7 @@
|
@@ -569,7 +569,7 @@
|
||||||
// RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
|
// RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
|
||||||
// Z7_gdwarf: "-gcodeview"
|
// Z7_gdwarf: "-gcodeview"
|
||||||
// Z7_gdwarf: "-debug-info-kind=constructor"
|
// Z7_gdwarf: "-debug-info-kind=constructor"
|
||||||
@ -80,7 +82,7 @@ index 1d588bdfc1b0..1ad57aedc3a4 100644
|
|||||||
// RUN: %clang_cl /ZH:MD5 /c -### -- %s 2>&1 | FileCheck -check-prefix=ZH_MD5 %s
|
// RUN: %clang_cl /ZH:MD5 /c -### -- %s 2>&1 | FileCheck -check-prefix=ZH_MD5 %s
|
||||||
// ZH_MD5: "-gsrc-hash=md5"
|
// ZH_MD5: "-gsrc-hash=md5"
|
||||||
diff --git a/clang/test/Driver/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c
|
diff --git a/clang/test/Driver/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c
|
||||||
index d982b1070cae..bb129e75769c 100644
|
index 5ee0fe64fe48..985158746137 100644
|
||||||
--- a/clang/test/Driver/clang-g-opts.c
|
--- a/clang/test/Driver/clang-g-opts.c
|
||||||
+++ b/clang/test/Driver/clang-g-opts.c
|
+++ b/clang/test/Driver/clang-g-opts.c
|
||||||
@@ -32,7 +32,7 @@
|
@@ -32,7 +32,7 @@
|
||||||
@ -119,5 +121,5 @@ index 5a33d5eceb61..cedf895b36dc 100644
|
|||||||
///-----------------------------------------------------------------------------
|
///-----------------------------------------------------------------------------
|
||||||
/// Checking include-path
|
/// Checking include-path
|
||||||
--
|
--
|
||||||
2.39.1
|
2.41.0
|
||||||
|
|
30
0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
Normal file
30
0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From a2449cee8c995b56f1892502aab3dfad3d6f3ca1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
|
||||||
|
Date: Fri, 8 Sep 2023 11:45:34 -0300
|
||||||
|
Subject: [PATCH] Workaround a bug in ORC on ppc64le
|
||||||
|
|
||||||
|
The Jit code appears to be returning the wrong printf symbol on ppc64le
|
||||||
|
after the transition of the default long double to IEEE 128-bit floating
|
||||||
|
point.
|
||||||
|
---
|
||||||
|
clang/unittests/Interpreter/InterpreterTest.cpp | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/clang/unittests/Interpreter/InterpreterTest.cpp b/clang/unittests/Interpreter/InterpreterTest.cpp
|
||||||
|
index abb8e6377aab..7b6697ebc6ed 100644
|
||||||
|
--- a/clang/unittests/Interpreter/InterpreterTest.cpp
|
||||||
|
+++ b/clang/unittests/Interpreter/InterpreterTest.cpp
|
||||||
|
@@ -243,7 +243,9 @@ TEST(IncrementalProcessing, FindMangledNameSymbol) {
|
||||||
|
EXPECT_FALSE(!Addr);
|
||||||
|
|
||||||
|
// FIXME: Re-enable when we investigate the way we handle dllimports on Win.
|
||||||
|
-#ifndef _WIN32
|
||||||
|
+ // FIXME: The printf symbol returned from the Jit may not be correct on
|
||||||
|
+ // ppc64le when the default long double is IEEE 128-bit fp.
|
||||||
|
+#if !defined _WIN32 && !(defined __PPC64__ && defined __LITTLE_ENDIAN__)
|
||||||
|
EXPECT_EQ((uintptr_t)&printf, Addr->getValue());
|
||||||
|
#endif // _WIN32
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
From 581300e447602b9b7a505b0f07e8461d58d041ca Mon Sep 17 00:00:00 2001
|
From 22d62b32cd3be5fb0ae10723b35a781e0f862b71 Mon Sep 17 00:00:00 2001
|
||||||
From: Tom Stellard <tstellar@redhat.com>
|
From: Tom Stellard <tstellar@redhat.com>
|
||||||
Date: Fri, 1 Jul 2022 21:24:17 -0700
|
Date: Tue, 24 Jan 2023 22:46:25 +0000
|
||||||
Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional
|
Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional
|
||||||
|
|
||||||
This fixes clang + clang-tools-extra standalone build after
|
This fixes clang + clang-tools-extra standalone build after
|
||||||
@ -55,19 +55,19 @@ index c66a94f458cf..b4e7a5d691e5 100644
|
|||||||
// CHECK-LIST: Enabled checks:
|
// CHECK-LIST: Enabled checks:
|
||||||
// CHECK-LIST-NEXT: mytest1
|
// CHECK-LIST-NEXT: mytest1
|
||||||
diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py
|
diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py
|
||||||
index 9b99bfd93440..3fca9f25fb48 100644
|
index 9f64fd3d2ffa..1b258a00ddf9 100644
|
||||||
--- a/clang-tools-extra/test/lit.cfg.py
|
--- a/clang-tools-extra/test/lit.cfg.py
|
||||||
+++ b/clang-tools-extra/test/lit.cfg.py
|
+++ b/clang-tools-extra/test/lit.cfg.py
|
||||||
@@ -59,6 +59,9 @@ config.substitutions.append(
|
@@ -75,6 +75,9 @@ config.substitutions.append(("%clang_tidy_headers", clang_tidy_headers))
|
||||||
# Plugins (loadable modules)
|
|
||||||
if config.has_plugins and config.llvm_plugin_ext:
|
if config.has_plugins and config.llvm_plugin_ext:
|
||||||
config.available_features.add('plugins')
|
config.available_features.add("plugins")
|
||||||
+
|
|
||||||
+if config.has_llvm_hello:
|
+if config.has_llvm_hello:
|
||||||
+ config.available_features.add("llvm-hello")
|
+ config.available_features.add("llvm-hello")
|
||||||
|
+
|
||||||
# It is not realistically possible to account for all options that could
|
# It is not realistically possible to account for all options that could
|
||||||
# possibly be present in system and user configuration files, so disable
|
# possibly be present in system and user configuration files, so disable
|
||||||
|
# default configs for the test runs.
|
||||||
diff --git a/clang-tools-extra/test/lit.site.cfg.py.in b/clang-tools-extra/test/lit.site.cfg.py.in
|
diff --git a/clang-tools-extra/test/lit.site.cfg.py.in b/clang-tools-extra/test/lit.site.cfg.py.in
|
||||||
index 4eb830a1baf1..6e5559348454 100644
|
index 4eb830a1baf1..6e5559348454 100644
|
||||||
--- a/clang-tools-extra/test/lit.site.cfg.py.in
|
--- a/clang-tools-extra/test/lit.site.cfg.py.in
|
||||||
@ -81,5 +81,5 @@ index 4eb830a1baf1..6e5559348454 100644
|
|||||||
# used when we can't determine the tool dir at configuration time.
|
# used when we can't determine the tool dir at configuration time.
|
||||||
config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
|
config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
|
||||||
--
|
--
|
||||||
2.27.0
|
2.40.1
|
||||||
|
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
From 6e0c48576740a1da9abeecfb8070127b8e91ab73 Mon Sep 17 00:00:00 2001
|
From 88704fc2eabb9dd19a9c3eb81a9b3dc37d95651c Mon Sep 17 00:00:00 2001
|
||||||
From: Tom Stellard <tstellar@redhat.com>
|
From: Tom Stellard <tstellar@redhat.com>
|
||||||
Date: Fri, 31 Jan 2020 11:04:57 -0800
|
Date: Fri, 31 Jan 2020 11:04:57 -0800
|
||||||
Subject: Don't install static libraries
|
Subject: [PATCH][clang] Don't install static libraries
|
||||||
|
|
||||||
---
|
---
|
||||||
clang/cmake/modules/AddClang.cmake | 2 +-
|
clang/cmake/modules/AddClang.cmake | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
|
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
|
||||||
index 21ac332e4f5f..d0cf20cced21 100644
|
index 5752f4277444..0f52822d91f0 100644
|
||||||
--- a/clang/cmake/modules/AddClang.cmake
|
--- a/clang/cmake/modules/AddClang.cmake
|
||||||
+++ b/clang/cmake/modules/AddClang.cmake
|
+++ b/clang/cmake/modules/AddClang.cmake
|
||||||
@@ -114,7 +114,7 @@ macro(add_clang_library name)
|
@@ -113,7 +113,7 @@ macro(add_clang_library name)
|
||||||
if(TARGET ${lib})
|
if(TARGET ${lib})
|
||||||
target_link_libraries(${lib} INTERFACE ${LLVM_COMMON_LIBS})
|
target_link_libraries(${lib} INTERFACE ${LLVM_COMMON_LIBS})
|
||||||
|
|
||||||
@ -21,5 +21,5 @@ index 21ac332e4f5f..d0cf20cced21 100644
|
|||||||
install(TARGETS ${lib}
|
install(TARGETS ${lib}
|
||||||
COMPONENT ${lib}
|
COMPONENT ${lib}
|
||||||
--
|
--
|
||||||
2.37.1
|
2.30.2
|
||||||
|
|
@ -1,38 +1,26 @@
|
|||||||
From f4e2d711e5cfd8e357d770e2da7a114086ee8659 Mon Sep 17 00:00:00 2001
|
diff -Naur a/clang/docs/conf.py b/clang/docs/conf.py
|
||||||
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
|
--- a/clang/docs/conf.py 2020-09-15 09:12:24.318287611 +0000
|
||||||
Date: Thu, 22 Sep 2022 10:49:43 +0200
|
+++ b/clang/docs/conf.py 2020-09-15 15:01:00.025893199 +0000
|
||||||
Subject: disable recommonmark
|
@@ -37,21 +37,7 @@
|
||||||
|
".rst": "restructuredtext",
|
||||||
---
|
|
||||||
clang/docs/conf.py | 15 +--------------
|
|
||||||
1 file changed, 1 insertion(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/clang/docs/conf.py b/clang/docs/conf.py
|
|
||||||
index b8a42018191a..912449a7f792 100644
|
|
||||||
--- a/clang/docs/conf.py
|
|
||||||
+++ b/clang/docs/conf.py
|
|
||||||
@@ -37,20 +37,7 @@ source_suffix = {
|
|
||||||
'.rst': 'restructuredtext',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-try:
|
-try:
|
||||||
- import recommonmark
|
- import recommonmark
|
||||||
-except ImportError:
|
-except ImportError:
|
||||||
- # manpages do not use any .md sources
|
- # manpages do not use any .md sources
|
||||||
- if not tags.has('builder-man'):
|
- if not tags.has("builder-man"):
|
||||||
- raise
|
- raise
|
||||||
-else:
|
-else:
|
||||||
- import sphinx
|
- import sphinx
|
||||||
|
-
|
||||||
- if sphinx.version_info >= (3, 0):
|
- if sphinx.version_info >= (3, 0):
|
||||||
- # This requires 0.5 or later.
|
- # This requires 0.5 or later.
|
||||||
- extensions.append('recommonmark')
|
- extensions.append("recommonmark")
|
||||||
- else:
|
- else:
|
||||||
- source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
|
- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"}
|
||||||
- source_suffix['.md'] = 'markdown'
|
- source_suffix[".md"] = "markdown"
|
||||||
+import sphinx
|
+import sphinx
|
||||||
|
|
||||||
# The encoding of source files.
|
# The encoding of source files.
|
||||||
#source_encoding = 'utf-8-sig'
|
# source_encoding = 'utf-8-sig'
|
||||||
--
|
|
||||||
2.37.1
|
|
||||||
|
|
||||||
|
196
clang.spec
196
clang.spec
@ -1,3 +1,9 @@
|
|||||||
|
%bcond_with snapshot_build
|
||||||
|
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
%{llvm_sb}
|
||||||
|
%endif
|
||||||
|
|
||||||
# We are building with clang for faster/lower memory LTO builds.
|
# We are building with clang for faster/lower memory LTO builds.
|
||||||
# See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros
|
# See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros
|
||||||
%global toolchain clang
|
%global toolchain clang
|
||||||
@ -5,12 +11,21 @@
|
|||||||
%global gts_version 13
|
%global gts_version 13
|
||||||
|
|
||||||
%bcond_with compat_build
|
%bcond_with compat_build
|
||||||
%bcond_with bundle_compat_lib
|
%bcond_without bundle_compat_lib
|
||||||
%bcond_without check
|
%bcond_without check
|
||||||
|
|
||||||
%global maj_ver 16
|
%global maj_ver 17
|
||||||
%global min_ver 0
|
%global min_ver 0
|
||||||
%global patch_ver 6
|
%global patch_ver 1
|
||||||
|
#global rc_ver 4
|
||||||
|
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
%undefine rc_ver
|
||||||
|
%global maj_ver %{llvm_snapshot_version_major}
|
||||||
|
%global min_ver %{llvm_snapshot_version_minor}
|
||||||
|
%global patch_ver %{llvm_snapshot_version_patch}
|
||||||
|
%endif
|
||||||
|
|
||||||
%global clang_version %{maj_ver}.%{min_ver}.%{patch_ver}
|
%global clang_version %{maj_ver}.%{min_ver}.%{patch_ver}
|
||||||
|
|
||||||
%if %{with compat_build}
|
%if %{with compat_build}
|
||||||
@ -21,19 +36,19 @@
|
|||||||
%global install_bindir %{install_prefix}/bin
|
%global install_bindir %{install_prefix}/bin
|
||||||
%global install_includedir %{install_prefix}/include
|
%global install_includedir %{install_prefix}/include
|
||||||
%global install_libdir %{install_prefix}/lib
|
%global install_libdir %{install_prefix}/lib
|
||||||
|
%global install_datadir %{install_prefix}/share
|
||||||
|
|
||||||
%global pkg_bindir %{install_bindir}
|
|
||||||
%global pkg_includedir %{install_includedir}
|
%global pkg_includedir %{install_includedir}
|
||||||
%global pkg_libdir %{install_libdir}
|
|
||||||
%else
|
%else
|
||||||
%global pkg_name clang
|
%global pkg_name clang
|
||||||
%global install_prefix /usr
|
%global install_prefix /usr
|
||||||
%global pkg_libdir %{_libdir}
|
%global install_datadir %{_datadir}
|
||||||
|
%global install_libdir %{_libdir}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with bundle_compat_lib}
|
%if %{with bundle_compat_lib}
|
||||||
%global compat_maj_ver 15
|
%global compat_maj_ver 16
|
||||||
%global compat_ver %{compat_maj_ver}.0.7
|
%global compat_ver %{compat_maj_ver}.0.6
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -46,17 +61,23 @@
|
|||||||
%global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
%global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||||
|
|
||||||
Name: %pkg_name
|
Name: %pkg_name
|
||||||
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
|
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A C language family front-end for LLVM
|
Summary: A C language family front-end for LLVM
|
||||||
|
|
||||||
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
||||||
URL: http://llvm.org
|
URL: http://llvm.org
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
Source0: %{llvm_snapshot_source_prefix}clang-%{llvm_snapshot_yyyymmdd}.src.tar.xz
|
||||||
|
Source1: %{llvm_snapshot_source_prefix}clang-tools-extra-%{llvm_snapshot_yyyymmdd}.src.tar.xz
|
||||||
|
%{llvm_snapshot_extra_source_tags}
|
||||||
|
|
||||||
|
%else
|
||||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz
|
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz
|
||||||
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig
|
Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig
|
||||||
%if %{without compat_build}
|
%if %{without compat_build}
|
||||||
Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz
|
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz
|
||||||
Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig
|
Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig
|
||||||
%endif
|
%endif
|
||||||
Source4: release-keys.asc
|
Source4: release-keys.asc
|
||||||
%if %{with bundle_compat_lib}
|
%if %{with bundle_compat_lib}
|
||||||
@ -67,30 +88,25 @@ Source8: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat
|
|||||||
Source9: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz
|
Source9: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz
|
||||||
Source10: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz.sig
|
Source10: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz.sig
|
||||||
%endif
|
%endif
|
||||||
%if !0%{with compat_build}
|
%endif
|
||||||
Source11: macros.%{name}
|
%if %{without compat_build}
|
||||||
|
Source105: macros.%{name}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Patches for clang
|
# Patches for clang
|
||||||
|
Patch1: 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
|
||||||
|
Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch
|
||||||
|
Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
|
||||||
|
# Drop the following patch after debugedit adds support to DWARF-5:
|
||||||
|
# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
|
||||||
|
Patch4: 0001-Produce-DWARF4-by-default.patch
|
||||||
|
# Workaround a bug in ORC on ppc64le.
|
||||||
|
# More info is available here: https://reviews.llvm.org/D159115#4641826
|
||||||
|
Patch5: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
|
||||||
|
|
||||||
Patch1: 0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
|
# RHEL specific patches
|
||||||
Patch2: 0006-Don-t-install-static-libraries.patch
|
Patch101: 0009-disable-recommonmark.patch
|
||||||
Patch3: 0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
|
Patch102: 0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch
|
||||||
Patch4: 0010-PATCH-clang-Produce-DWARF4-by-default.patch
|
|
||||||
# Make clangBasic and clangDriver depend on LLVMTargetParser
|
|
||||||
# See https://reviews.llvm.org/D141581
|
|
||||||
Patch7: D141581.diff
|
|
||||||
# clang/cmake: Use installed gtest libraries for stand-alone builds
|
|
||||||
# See https://reviews.llvm.org/D138472
|
|
||||||
Patch8: D138472.diff
|
|
||||||
|
|
||||||
Patch10: fix-ieee128-cross.diff
|
|
||||||
|
|
||||||
Patch11: 0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
|
|
||||||
|
|
||||||
# RHEL specific patch
|
|
||||||
Patch12: 0009-disable-recommonmark.patch
|
|
||||||
Patch13: 0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch
|
|
||||||
|
|
||||||
%if %{without compat_build}
|
%if %{without compat_build}
|
||||||
# Patches for clang-tools-extra
|
# Patches for clang-tools-extra
|
||||||
@ -105,18 +121,21 @@ BuildRequires: gcc-toolset-%{gts_version}-gdb
|
|||||||
BuildRequires: clang
|
BuildRequires: clang
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
|
|
||||||
%if %{with compat_build}
|
%if %{with compat_build}
|
||||||
BuildRequires: llvm%{maj_ver}-devel = %{version}
|
%global llvm_pkg_name llvm%{maj_ver}
|
||||||
BuildRequires: llvm%{maj_ver}-static = %{version}
|
|
||||||
%else
|
%else
|
||||||
BuildRequires: llvm-devel = %{version}
|
%global llvm_pkg_name llvm
|
||||||
BuildRequires: llvm-test = %{version}
|
BuildRequires: llvm-test = %{version}
|
||||||
# llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
|
|
||||||
# is not included in libLLVM.so.
|
|
||||||
BuildRequires: llvm-static = %{version}
|
|
||||||
BuildRequires: llvm-googletest = %{version}
|
BuildRequires: llvm-googletest = %{version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
BuildRequires: %{llvm_pkg_name}-devel = %{version}
|
||||||
|
# llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
|
||||||
|
# is not included in libLLVM.so.
|
||||||
|
BuildRequires: %{llvm_pkg_name}-static = %{version}
|
||||||
|
BuildRequires: %{llvm_pkg_name}-cmake-utils = %{version}
|
||||||
|
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -190,7 +209,7 @@ libomp-devel to enable -fopenmp.
|
|||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
Summary: Runtime library for clang
|
Summary: Runtime library for clang
|
||||||
Requires: %{name}-resource-filesystem%{?_isa} = %{version}
|
Requires: %{name}-resource-filesystem = %{version}
|
||||||
Requires: gcc-toolset-%{gts_version}-gcc-c++
|
Requires: gcc-toolset-%{gts_version}-gcc-c++
|
||||||
Recommends: compiler-rt%{?_isa} = %{version}
|
Recommends: compiler-rt%{?_isa} = %{version}
|
||||||
# atomic support is not part of compiler-rt
|
# atomic support is not part of compiler-rt
|
||||||
@ -223,9 +242,10 @@ Development header files for clang.
|
|||||||
%package resource-filesystem
|
%package resource-filesystem
|
||||||
Summary: Filesystem package that owns the clang resource directory
|
Summary: Filesystem package that owns the clang resource directory
|
||||||
Provides: %{name}-resource-filesystem(major) = %{maj_ver}
|
Provides: %{name}-resource-filesystem(major) = %{maj_ver}
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
%description resource-filesystem
|
%description resource-filesystem
|
||||||
This package owns the clang resouce directory: $libdir/clang/$version/
|
This package owns the clang resouce directory: lib/clang/$version/
|
||||||
|
|
||||||
%if %{without compat_build}
|
%if %{without compat_build}
|
||||||
%package analyzer
|
%package analyzer
|
||||||
@ -248,6 +268,15 @@ Requires: emacs-filesystem
|
|||||||
%description tools-extra
|
%description tools-extra
|
||||||
A set of extra tools built using Clang's tooling API.
|
A set of extra tools built using Clang's tooling API.
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%package tools-extra-devel
|
||||||
|
Summary: Development header files for clang tools
|
||||||
|
Requires: %{name}-tools-extra = %{version}-%{release}
|
||||||
|
|
||||||
|
%description tools-extra-devel
|
||||||
|
Development header files for clang tools.
|
||||||
|
%endif
|
||||||
|
|
||||||
# Put git-clang-format in its own package, because it Requires git
|
# Put git-clang-format in its own package, because it Requires git
|
||||||
# and we don't want to force users to install all those dependenices if they
|
# and we don't want to force users to install all those dependenices if they
|
||||||
# just want clang.
|
# just want clang.
|
||||||
@ -273,7 +302,9 @@ Requires: python3
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
%if %{without snapshot_build}
|
||||||
|
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with bundle_compat_lib}
|
%if %{with bundle_compat_lib}
|
||||||
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
|
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
|
||||||
@ -289,10 +320,12 @@ Requires: python3
|
|||||||
%autosetup -n %{clang_srcdir} -p2
|
%autosetup -n %{clang_srcdir} -p2
|
||||||
%else
|
%else
|
||||||
|
|
||||||
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE2}'
|
%if %{without snapshot_build}
|
||||||
%setup -T -q -b 2 -n %{clang_tools_srcdir}
|
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
|
||||||
%autopatch -m200 -p2
|
%endif
|
||||||
|
|
||||||
|
%setup -T -q -b 1 -n %{clang_tools_srcdir}
|
||||||
|
%autopatch -m200 -p2
|
||||||
|
|
||||||
# failing test case
|
# failing test case
|
||||||
rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
|
rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
|
||||||
@ -302,7 +335,7 @@ rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
|
|||||||
clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
|
clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
|
||||||
|
|
||||||
%setup -q -n %{clang_srcdir}
|
%setup -q -n %{clang_srcdir}
|
||||||
%autopatch -M200 -p2
|
%autopatch -M%{?!rhel:100}%{?rhel:200} -p2
|
||||||
|
|
||||||
# failing test case
|
# failing test case
|
||||||
rm test/CodeGen/profile-filter.c
|
rm test/CodeGen/profile-filter.c
|
||||||
@ -320,6 +353,19 @@ rm test/CodeGen/profile-filter.c
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
# Use ThinLTO to limit build time.
|
||||||
|
%define _lto_cflags -flto=thin
|
||||||
|
# And disable LTO on AArch64 entirely.
|
||||||
|
%ifarch aarch64
|
||||||
|
%define _lto_cflags %{nil}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Disable LTO to speed up builds
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
%global _lto_cflags %nil
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?__isa_bits} == 64
|
%if 0%{?__isa_bits} == 64
|
||||||
sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
|
sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
|
||||||
%else
|
%else
|
||||||
@ -362,7 +408,8 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
|||||||
-DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \
|
-DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \
|
||||||
-DLLVM_INCLUDE_BENCHMARKS=OFF \
|
-DLLVM_INCLUDE_BENCHMARKS=OFF \
|
||||||
-DCMAKE_C_FLAGS_RELEASE="-fno-lto" \
|
-DCMAKE_C_FLAGS_RELEASE="-fno-lto" \
|
||||||
-DCMAKE_CXX_FLAGS_RELEASE="-fno-lto"
|
-DCMAKE_CXX_FLAGS_RELEASE="-fno-lto" \
|
||||||
|
-DLLVM_INCLUDE_TESTS:BOOL=OFF
|
||||||
|
|
||||||
%ninja_build -C ../clang-compat-libs libclang.so
|
%ninja_build -C ../clang-compat-libs libclang.so
|
||||||
%ninja_build -C ../clang-compat-libs libclang-cpp.so
|
%ninja_build -C ../clang-compat-libs libclang-cpp.so
|
||||||
@ -370,13 +417,15 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF to match the default used by Fedora's GCC.
|
# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF and PPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON to match the
|
||||||
|
# defaults used by Fedora's GCC.
|
||||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=2134146
|
# See https://bugzilla.redhat.com/show_bug.cgi?id=2134146
|
||||||
%cmake -G Ninja \
|
%cmake -G Ninja \
|
||||||
%ifarch %ix86
|
%ifarch %ix86
|
||||||
-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF \
|
-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF \
|
||||||
%endif
|
%endif
|
||||||
-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
|
-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
|
||||||
|
-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON \
|
||||||
-DLLVM_PARALLEL_LINK_JOBS=1 \
|
-DLLVM_PARALLEL_LINK_JOBS=1 \
|
||||||
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
|
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
@ -391,6 +440,8 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
|||||||
-DLLVM_CONFIG:FILEPATH=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \
|
-DLLVM_CONFIG:FILEPATH=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \
|
||||||
-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
|
-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
|
||||||
-DCLANG_INCLUDE_TESTS:BOOL=OFF \
|
-DCLANG_INCLUDE_TESTS:BOOL=OFF \
|
||||||
|
-DLLVM_INCLUDE_TESTS:BOOL=OFF \
|
||||||
|
-DLLVM_CMAKE_DIR=%{install_libdir}/cmake/llvm \
|
||||||
%else
|
%else
|
||||||
-DCLANG_INCLUDE_TESTS:BOOL=ON \
|
-DCLANG_INCLUDE_TESTS:BOOL=ON \
|
||||||
-DLLVM_BUILD_UTILS:BOOL=ON \
|
-DLLVM_BUILD_UTILS:BOOL=ON \
|
||||||
@ -403,6 +454,10 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
|||||||
%else
|
%else
|
||||||
-DLLVM_LIBDIR_SUFFIX= \
|
-DLLVM_LIBDIR_SUFFIX= \
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
\
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
|
||||||
%endif
|
%endif
|
||||||
\
|
\
|
||||||
%if %{with compat_build}
|
%if %{with compat_build}
|
||||||
@ -410,7 +465,7 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
|||||||
%else
|
%else
|
||||||
-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
|
-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
|
||||||
%endif
|
%endif
|
||||||
-DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm \
|
-DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
|
||||||
-DCLANG_ENABLE_ARCMT:BOOL=ON \
|
-DCLANG_ENABLE_ARCMT:BOOL=ON \
|
||||||
-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
|
-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
|
||||||
-DCLANG_INCLUDE_DOCS:BOOL=ON \
|
-DCLANG_INCLUDE_DOCS:BOOL=ON \
|
||||||
@ -425,7 +480,8 @@ mv ../cmake-%{compat_ver}.src ../cmake
|
|||||||
\
|
\
|
||||||
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
|
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
|
-DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \
|
||||||
|
-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
-DCLANG_DEFAULT_LINKER=lld \
|
-DCLANG_DEFAULT_LINKER=lld \
|
||||||
%endif
|
%endif
|
||||||
@ -455,14 +511,14 @@ rm -Rf %{buildroot}%{install_bindir}
|
|||||||
rm -Rf %{buildroot}%{install_prefix}/share
|
rm -Rf %{buildroot}%{install_prefix}/share
|
||||||
rm -Rf %{buildroot}%{install_prefix}/libexec
|
rm -Rf %{buildroot}%{install_prefix}/libexec
|
||||||
# Remove scanview-py helper libs
|
# Remove scanview-py helper libs
|
||||||
rm -Rf %{buildroot}%{install_prefix}/%{_lib}/{libear,libscanbuild}
|
rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}
|
||||||
|
|
||||||
%else
|
%else
|
||||||
|
|
||||||
# File in the macros file for other packages to use. We are not doing this
|
# File in the macros file for other packages to use. We are not doing this
|
||||||
# in the compat package, because the version macros would # conflict with
|
# in the compat package, because the version macros would # conflict with
|
||||||
# eachother if both clang and the clang compat package were installed together.
|
# eachother if both clang and the clang compat package were installed together.
|
||||||
install -p -m0644 -D %{SOURCE11} %{buildroot}%{_rpmmacrodir}/macros.%{name}
|
install -p -m0644 -D %{SOURCE105} %{buildroot}%{_rpmmacrodir}/macros.%{name}
|
||||||
sed -i -e "s|@@CLANG_MAJOR_VERSION@@|%{maj_ver}|" \
|
sed -i -e "s|@@CLANG_MAJOR_VERSION@@|%{maj_ver}|" \
|
||||||
-e "s|@@CLANG_MINOR_VERSION@@|%{min_ver}|" \
|
-e "s|@@CLANG_MINOR_VERSION@@|%{min_ver}|" \
|
||||||
-e "s|@@CLANG_PATCH_VERSION@@|%{patch_ver}|" \
|
-e "s|@@CLANG_PATCH_VERSION@@|%{patch_ver}|" \
|
||||||
@ -517,7 +573,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
|
|||||||
|
|
||||||
# Create sub-directories in the clang resource directory that will be
|
# Create sub-directories in the clang resource directory that will be
|
||||||
# populated by other packages
|
# populated by other packages
|
||||||
mkdir -p %{buildroot}%{pkg_libdir}/clang/%{maj_ver}/{include,lib,share}/
|
mkdir -p %{buildroot}%{install_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/
|
||||||
|
|
||||||
|
|
||||||
# Remove clang-tidy headers. We don't ship the libraries for these.
|
# Remove clang-tidy headers. We don't ship the libraries for these.
|
||||||
@ -579,13 +635,8 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
%if %{without compat_build}
|
%{install_prefix}/lib/clang/%{maj_ver}/include/*
|
||||||
%{_libdir}/clang/%{maj_ver}/include/*
|
%{install_libdir}/*.so.*
|
||||||
%{_libdir}/*.so.*
|
|
||||||
%else
|
|
||||||
%{pkg_libdir}/*.so.*
|
|
||||||
%{pkg_libdir}/clang/%{maj_ver}/include/*
|
|
||||||
%endif
|
|
||||||
%if %{with bundle_compat_lib}
|
%if %{with bundle_compat_lib}
|
||||||
%{_libdir}/libclang.so.%{compat_maj_ver}*
|
%{_libdir}/libclang.so.%{compat_maj_ver}*
|
||||||
%{_libdir}/libclang-cpp.so.%{compat_maj_ver}*
|
%{_libdir}/libclang-cpp.so.%{compat_maj_ver}*
|
||||||
@ -601,20 +652,23 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
|
|||||||
%dir %{_datadir}/clang/
|
%dir %{_datadir}/clang/
|
||||||
%{_rpmmacrodir}/macros.%{name}
|
%{_rpmmacrodir}/macros.%{name}
|
||||||
%else
|
%else
|
||||||
%{pkg_libdir}/*.so
|
%{install_libdir}/*.so
|
||||||
%{pkg_includedir}/clang/
|
%{pkg_includedir}/clang/
|
||||||
%{pkg_includedir}/clang-c/
|
%{pkg_includedir}/clang-c/
|
||||||
%{pkg_libdir}/cmake/
|
%{install_libdir}/cmake/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files resource-filesystem
|
%files resource-filesystem
|
||||||
%dir %{pkg_libdir}/clang/
|
%dir %{install_prefix}/lib/clang/
|
||||||
%dir %{pkg_libdir}/clang/%{maj_ver}/
|
%dir %{install_prefix}/lib/clang/%{maj_ver}/
|
||||||
%dir %{pkg_libdir}/clang/%{maj_ver}/include/
|
%dir %{install_prefix}/lib/clang/%{maj_ver}/bin/
|
||||||
%dir %{pkg_libdir}/clang/%{maj_ver}/lib/
|
%dir %{install_prefix}/lib/clang/%{maj_ver}/include/
|
||||||
%dir %{pkg_libdir}/clang/%{maj_ver}/share/
|
%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
|
||||||
|
%dir %{install_prefix}/lib/clang/%{maj_ver}/share/
|
||||||
%if %{without compat_build}
|
%if %{without compat_build}
|
||||||
|
%{_rpmmacrodir}/macros.%{name}
|
||||||
|
|
||||||
|
|
||||||
%files analyzer
|
%files analyzer
|
||||||
%{_bindir}/scan-view
|
%{_bindir}/scan-view
|
||||||
%{_bindir}/scan-build
|
%{_bindir}/scan-build
|
||||||
@ -677,6 +731,11 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
|
|||||||
%{_datadir}/clang/run-find-all-symbols.py*
|
%{_datadir}/clang/run-find-all-symbols.py*
|
||||||
%{_datadir}/clang/clang-rename.py*
|
%{_datadir}/clang/clang-rename.py*
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%files tools-extra-devel
|
||||||
|
%{_includedir}/clang-tidy/
|
||||||
|
%endif
|
||||||
|
|
||||||
%files -n git-clang-format
|
%files -n git-clang-format
|
||||||
%{_bindir}/git-clang-format
|
%{_bindir}/git-clang-format
|
||||||
|
|
||||||
@ -686,6 +745,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 28 2023 Timm Bäder <tbaeder@redhat.com> - 170.1-1
|
||||||
|
- Update to 17.0.1
|
||||||
|
|
||||||
* Wed Jul 05 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-1
|
* Wed Jul 05 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-1
|
||||||
- Update to LLVM 16.0.6
|
- Update to LLVM 16.0.6
|
||||||
|
|
||||||
|
12
sources
12
sources
@ -1,4 +1,10 @@
|
|||||||
SHA512 (clang-16.0.6.src.tar.xz) = 92c65b882e1504f4a9b8a3f6b8a24061505987aaacc8bb835115b4e4d74ac3a8c98343a308567b07c6b42bb99877c300bce3c4a5a25ada77abe65606aa25188d
|
SHA512 (clang-17.0.1.src.tar.xz.sig) = 40ebd4b4b2102f130734388c4368fa21d3c7dd3b88e6ef1bf167416d17dafc60a216ec80d87e13465b7b450349310d1cb44b56b9e6166d3bef41c96230a5cc32
|
||||||
|
SHA512 (clang-tools-extra-17.0.1.src.tar.xz.sig) = 9a08b574ced425ebe42790257afa42963483292c9866e2fcf114fe0aca1626e771ce97cf52196c070f0d26e695f17684c7da6937925175369e990aaf82aa8843
|
||||||
|
SHA512 (clang-tools-extra-17.0.1.src.tar.xz) = e4e1b3b39aba0d225312e6c504851cf98fba888cdcadd45a5f3ac6673b1d43e289e3febbd3e18cb0f44b522a6316651a400bb2c2e48e4c650ffa5dc8b4a46d74
|
||||||
|
SHA512 (clang-17.0.1.src.tar.xz) = fe2a74f67d6f45cb53d25864643e5b8e98a7066c8f8862acdd76a73e3b5478fc7220d5f136558ba9dd4043e661d09a3d293e0ad689eedcd491feba0a201e0c51
|
||||||
|
SHA512 (cmake-16.0.6.src.tar.xz.sig) = d20c5e51315aa476775e6ce886684b9f882ce283fc40aa6c1b8f03964c77a1e745e2e1fb00b3488dddfe1a04378e2bfd090350de28e58088525a5305ecb1bea6
|
||||||
|
SHA512 (cmake-16.0.6.src.tar.xz) = 52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b
|
||||||
|
SHA512 (llvm-16.0.6.src.tar.xz.sig) = 9adda28085f4a2e2a64dab1d8e4ff23c5629bbb0bb6b34afc081e44f6f85ac4f3c6cd0c3488af98c0fad939c33f9d2a8a0cbef67a577cd7fe3013bc2200452b1
|
||||||
|
SHA512 (llvm-16.0.6.src.tar.xz) = 8d4cdadc9a1ad249fbf9248c8e56f3bcafab73a473a0b0ca73499ed8825c62e27668aac4f1d03341631e5ad93701621e834e9e196ca32eac3ef805cf1c860083
|
||||||
SHA512 (clang-16.0.6.src.tar.xz.sig) = a3e68c07d61ce62dfe406464f1afce352f36480966ceaa3171889ac1f02441d9df48e938b3e81d6b73b5957dd6623171323a9915281dc052be0c5c7014e75f24
|
SHA512 (clang-16.0.6.src.tar.xz.sig) = a3e68c07d61ce62dfe406464f1afce352f36480966ceaa3171889ac1f02441d9df48e938b3e81d6b73b5957dd6623171323a9915281dc052be0c5c7014e75f24
|
||||||
SHA512 (clang-tools-extra-16.0.6.src.tar.xz) = ec1a0834f223e393d24c11586b744167a41cea6c39d1bb18c433d2fb736501950fdff42f1eb0caa13c75bcb8ef9ac309eb0687644307698ec0420ff8a769c710
|
SHA512 (clang-16.0.6.src.tar.xz) = 92c65b882e1504f4a9b8a3f6b8a24061505987aaacc8bb835115b4e4d74ac3a8c98343a308567b07c6b42bb99877c300bce3c4a5a25ada77abe65606aa25188d
|
||||||
SHA512 (clang-tools-extra-16.0.6.src.tar.xz.sig) = ff94fe024399bb72da10752ad1c41d57dcf5094b11ef5abdb82189026db0d7016c7ede0f47b7841aaa823de75bd927f8a1ffdbc112c5a0f61dec878790b5e7e3
|
|
||||||
|
Loading…
Reference in New Issue
Block a user