Skip to content

Commit 0096e7e

Browse files
mlehtimamlehtima
committed
Merge branch 'jb50504' into 'master'
[llvm] Update llvm and clang to version 10.0.1. Contributes to JB#50504 See merge request mer-core/llvm!12
2 parents 74f771e + 05c41a9 commit 0096e7e

7 files changed

+54
-51
lines changed

‎llvm

Submodule llvm updated 27914 files

‎rpm/0001-Make-funwind-tables-the-default-for-all-archs.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] Make -funwind-tables the default for all archs
99
2 files changed, 2 insertions(+), 2 deletions(-)
1010

1111
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
12-
index b1fddb0af55..43af40ed0e8 100644
12+
index 18400d9def5..2643e9decc3 100644
1313
--- a/clang/lib/Driver/ToolChain.cpp
1414
+++ b/clang/lib/Driver/ToolChain.cpp
15-
@@ -244,7 +244,7 @@ std::string ToolChain::getInputFilename(const InputInfo &Input) const {
15+
@@ -247,7 +247,7 @@ std::string ToolChain::getInputFilename(const InputInfo &Input) const {
1616
}
1717

1818
bool ToolChain::IsUnwindTablesDefault(const ArgList &Args) const {
@@ -22,10 +22,10 @@ index b1fddb0af55..43af40ed0e8 100644
2222

2323
Tool *ToolChain::getClang() const {
2424
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
25-
index 33cdd3585c2..15e82be8f3a 100644
25+
index e8ef881e89a..088a21455ac 100644
2626
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
2727
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
28-
@@ -2535,7 +2535,7 @@ void Generic_GCC::printVerboseInfo(raw_ostream &OS) const {
28+
@@ -2610,7 +2610,7 @@ void Generic_GCC::printVerboseInfo(raw_ostream &OS) const {
2929
}
3030

3131
bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {

‎rpm/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ provides this implementation.
1212
2 files changed, 3 insertions(+), 2 deletions(-)
1313

1414
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
15-
index 88a627e..cb99844 100644
15+
index 18400d9def5..3b455c26554 100644
1616
--- a/clang/lib/Driver/ToolChain.cpp
1717
+++ b/clang/lib/Driver/ToolChain.cpp
18-
@@ -767,6 +767,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
18+
@@ -895,6 +895,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
1919
switch (Type) {
2020
case ToolChain::CST_Libcxx:
2121
CmdArgs.push_back("-lc++");
@@ -24,7 +24,7 @@ index 88a627e..cb99844 100644
2424

2525
case ToolChain::CST_Libstdcxx:
2626
diff --git a/clang/test/Driver/netbsd.cpp b/clang/test/Driver/netbsd.cpp
27-
index 4af7d83..ff18c62 100644
27+
index 4af7d8373d6..ff18c627f56 100644
2828
--- a/clang/test/Driver/netbsd.cpp
2929
+++ b/clang/test/Driver/netbsd.cpp
3030
@@ -131,7 +131,7 @@

‎rpm/clang-sailfishos-toolchain.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
2-
index 67dc764fb7d..2ae6c555515 100644
2+
index d382cf77a8b..8c06919f1d3 100644
33
--- a/clang/include/clang/Driver/Distro.h
44
+++ b/clang/include/clang/Driver/Distro.h
5-
@@ -41,6 +41,7 @@ public:
5+
@@ -42,6 +42,7 @@ public:
66
Fedora,
77
Gentoo,
88
OpenSUSE,
99
+ Sailfish,
1010
UbuntuHardy,
1111
UbuntuIntrepid,
1212
UbuntuJaunty,
13-
@@ -117,6 +118,10 @@ public:
13+
@@ -119,6 +120,10 @@ public:
1414
return DistroVal >= DebianLenny && DistroVal <= DebianBullseye;
1515
}
1616

@@ -19,13 +19,13 @@ index 67dc764fb7d..2ae6c555515 100644
1919
+ }
2020
+
2121
bool IsUbuntu() const {
22-
return DistroVal >= UbuntuHardy && DistroVal <= UbuntuEoan;
22+
return DistroVal >= UbuntuHardy && DistroVal <= UbuntuFocal;
2323
}
2424
diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
25-
index f2a3074d1e7..b9971b63a81 100644
25+
index 06707fefc9d..cf14a4073fd 100644
2626
--- a/clang/lib/Driver/Distro.cpp
2727
+++ b/clang/lib/Driver/Distro.cpp
28-
@@ -145,6 +145,9 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
28+
@@ -163,6 +163,9 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS,
2929
if (VFS.exists("/etc/gentoo-release"))
3030
return Distro::Gentoo;
3131

@@ -36,10 +36,10 @@ index f2a3074d1e7..b9971b63a81 100644
3636
}
3737

3838
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
39-
index 33cdd3585c2..e1890849100 100644
39+
index e8ef881e89a..1bad4f13226 100644
4040
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
4141
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
42-
@@ -1927,7 +1927,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
42+
@@ -1999,7 +1999,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
4343
static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
4444
static const char *const AArch64Triples[] = {
4545
"aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
@@ -48,15 +48,15 @@ index 33cdd3585c2..e1890849100 100644
4848
static const char *const AArch64beLibDirs[] = {"/lib"};
4949
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
5050
"aarch64_be-linux-gnu"};
51-
@@ -1937,6 +1937,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
51+
@@ -2009,6 +2009,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
5252
"arm-linux-androideabi"};
5353
static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
5454
"armv7hl-redhat-linux-gnueabi",
5555
+ "armv7hl-meego-linux-gnueabi",
5656
"armv6hl-suse-linux-gnueabi",
5757
"armv7hl-suse-linux-gnueabi"};
5858
static const char *const ARMebLibDirs[] = {"/lib"};
59-
@@ -1964,7 +1965,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
59+
@@ -2036,7 +2037,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
6060
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
6161
"i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
6262
"i686-linux-android", "i386-gnu", "i486-gnu",
@@ -66,7 +66,7 @@ index 33cdd3585c2..e1890849100 100644
6666
static const char *const MIPSLibDirs[] = {"/lib"};
6767
static const char *const MIPSTriples[] = {
6868
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
69-
index 7f59bc77f52..9cf648e2c08 100644
69+
index 6532c899492..3fa0bea23bd 100644
7070
--- a/clang/lib/Driver/ToolChains/Linux.cpp
7171
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
7272
@@ -248,7 +248,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)

‎rpm/clang.spec

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
1-
%global maj_ver 9
1+
%global maj_ver 10
22
%global min_ver 0
33
%global patch_ver 1
44

55
%global clang_tools_binaries \
6-
%{_bindir}/clangd \
76
%{_bindir}/clang-apply-replacements \
87
%{_bindir}/clang-change-namespace \
8+
%{_bindir}/clang-check \
99
%{_bindir}/clang-doc \
10+
%{_bindir}/clang-extdef-mapping \
11+
%{_bindir}/clang-format \
12+
%{_bindir}/clang-import-test \
1013
%{_bindir}/clang-include-fixer \
14+
%{_bindir}/clang-move \
15+
%{_bindir}/clang-offload-bundler \
16+
%{_bindir}/clang-offload-wrapper \
1117
%{_bindir}/clang-query \
1218
%{_bindir}/clang-refactor \
1319
%{_bindir}/clang-reorder-fields \
1420
%{_bindir}/clang-rename \
15-
%{_bindir}/clang-tidy
21+
%{_bindir}/clang-scan-deps \
22+
%{_bindir}/clang-tidy \
23+
%{_bindir}/clangd \
24+
%{_bindir}/diagtool \
25+
%{_bindir}/hmaptool \
26+
%{_bindir}/pp-trace
1627

1728
%global clang_binaries \
1829
%{_bindir}/clang \
1930
%{_bindir}/clang++ \
2031
%{_bindir}/clang-%{maj_ver} \
2132
%{_bindir}/clang++-%{maj_ver} \
22-
%{_bindir}/clang-check \
2333
%{_bindir}/clang-cl \
24-
%{_bindir}/clang-cpp \
25-
%{_bindir}/clang-extdef-mapping \
26-
%{_bindir}/clang-format \
27-
%{_bindir}/clang-import-test \
28-
%{_bindir}/clang-offload-bundler \
29-
%{_bindir}/clang-scan-deps \
30-
%{_bindir}/diagtool \
31-
%{_bindir}/hmaptool
34+
%{_bindir}/clang-cpp
3235

3336
Name: clang
3437
Version: %{maj_ver}.%{min_ver}.%{patch_ver}
@@ -195,9 +198,6 @@ popd
195198
%files
196199
%license clang/LICENSE.TXT
197200
%{clang_binaries}
198-
%{_bindir}/c-index-test
199-
%{_datadir}/clang/clang-format.py*
200-
%{_datadir}/clang/clang-format-diff.py*
201201
%{_libdir}/clang/
202202
%{_libdir}/*.so.*
203203

@@ -218,8 +218,11 @@ popd
218218

219219
%files tools-extra
220220
%{clang_tools_binaries}
221+
%{_bindir}/c-index-test
221222
%{_bindir}/find-all-symbols
222223
%{_bindir}/modularize
224+
%{_datadir}/clang/clang-format.py*
225+
%{_datadir}/clang/clang-format-diff.py*
223226
%{_datadir}/clang/clang-include-fixer.py*
224227
%{_datadir}/clang/clang-tidy-diff.py*
225228
%{_datadir}/clang/run-clang-tidy.py*

‎rpm/llvm-sailfishos-toolchain.patch

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
2-
index edeb31efab8..fd9e38db0ac 100644
2+
index 76a754d671f..6ee7f680dee 100644
33
--- a/llvm/include/llvm/ADT/Triple.h
44
+++ b/llvm/include/llvm/ADT/Triple.h
5-
@@ -149,7 +149,8 @@ public:
5+
@@ -152,7 +152,8 @@ public:
66
Mesa,
77
SUSE,
88
OpenEmbedded,
@@ -13,26 +13,26 @@ index edeb31efab8..fd9e38db0ac 100644
1313
enum OSType {
1414
UnknownOS,
1515
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
16-
index d419463e6a5..916ebc28856 100644
16+
index 2c480c1094a..e7d399bfa4f 100644
1717
--- a/llvm/lib/Support/Triple.cpp
1818
+++ b/llvm/lib/Support/Triple.cpp
19-
@@ -166,6 +166,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
20-
case AMD: return "amd";
21-
case Mesa: return "mesa";
22-
case SUSE: return "suse";
19+
@@ -162,6 +162,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
20+
case Freescale: return "fsl";
21+
case IBM: return "ibm";
22+
case ImaginationTechnologies: return "img";
2323
+ case MeeGo: return "meego";
24-
case OpenEmbedded: return "oe";
25-
}
26-
27-
@@ -476,6 +477,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
24+
case Mesa: return "mesa";
25+
case MipsTechnologies: return "mti";
26+
case Myriad: return "myriad";
27+
@@ -479,6 +480,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
2828
.Case("mesa", Triple::Mesa)
2929
.Case("suse", Triple::SUSE)
3030
.Case("oe", Triple::OpenEmbedded)
3131
+ .Case("meego", Triple::MeeGo)
3232
.Default(Triple::UnknownVendor);
3333
}
3434

35-
@@ -738,6 +740,9 @@ Triple::Triple(const Twine &Str)
35+
@@ -743,6 +745,9 @@ Triple::Triple(const Twine &Str)
3636
OS = parseOS(Components[2]);
3737
if (Components.size() > 3) {
3838
Environment = parseEnvironment(Components[3]);
@@ -42,7 +42,7 @@ index d419463e6a5..916ebc28856 100644
4242
ObjectFormat = parseFormat(Components[3]);
4343
}
4444
}
45-
@@ -789,6 +794,10 @@ Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
45+
@@ -794,6 +799,10 @@ Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
4646
ObjectFormat(parseFormat(EnvironmentStr.str())) {
4747
if (ObjectFormat == Triple::UnknownObjectFormat)
4848
ObjectFormat = getDefaultFormat(*this);
@@ -53,7 +53,7 @@ index d419463e6a5..916ebc28856 100644
5353
}
5454

5555
std::string Triple::normalize(StringRef Str) {
56-
@@ -1051,6 +1065,9 @@ void Triple::getEnvironmentVersion(unsigned &Major, unsigned &Minor,
56+
@@ -1056,6 +1065,9 @@ void Triple::getEnvironmentVersion(unsigned &Major, unsigned &Minor,
5757
unsigned &Micro) const {
5858
StringRef EnvironmentName = getEnvironmentName();
5959
StringRef EnvironmentTypeName = getEnvironmentTypeName(getEnvironment());
@@ -64,10 +64,10 @@ index d419463e6a5..916ebc28856 100644
6464
EnvironmentName = EnvironmentName.substr(EnvironmentTypeName.size());
6565

6666
diff --git a/llvm/unittests/ADT/TripleTest.cpp b/llvm/unittests/ADT/TripleTest.cpp
67-
index 37ebe5dbcb2..2a69a2af8f5 100644
67+
index ef7f82d268e..5f9c04832ec 100644
6868
--- a/llvm/unittests/ADT/TripleTest.cpp
6969
+++ b/llvm/unittests/ADT/TripleTest.cpp
70-
@@ -336,6 +336,12 @@ TEST(TripleTest, ParsedIDs) {
70+
@@ -355,6 +355,12 @@ TEST(TripleTest, ParsedIDs) {
7171
EXPECT_EQ(Triple::Linux, T.getOS());
7272
EXPECT_EQ(Triple::GNUEABI, T.getEnvironment());
7373

‎rpm/llvm.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
%endif
1111

1212
Name: llvm
13-
Version: 9.0.1
13+
Version: 10.0.1
1414
Release: 0
1515
Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
1616
License: University of Illinois/NCSA Open Source License

0 commit comments

Comments
 (0)