Skip to content

Commit

Permalink
[llvm] Update llvm and clang to version 10.0.1. Contributes to JB#50504
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlehtima
mlehtima committed Nov 11, 2020
1 parent 74f771e commit 05c41a9
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 51 deletions.
2 changes: 1 addition & 1 deletion llvm
Submodule llvm updated 27914 files
8 changes: 4 additions & 4 deletions rpm/0001-Make-funwind-tables-the-default-for-all-archs.patch
View file
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] Make -funwind-tables the default for all archs
2 files changed, 2 insertions(+), 2 deletions(-)

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

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

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

bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
Expand Down
6 changes: 3 additions & 3 deletions rpm/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch
View file
Expand Up @@ -12,10 +12,10 @@ provides this implementation.
2 files changed, 3 insertions(+), 2 deletions(-)

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

case ToolChain::CST_Libstdcxx:
diff --git a/clang/test/Driver/netbsd.cpp b/clang/test/Driver/netbsd.cpp
index 4af7d83..ff18c62 100644
index 4af7d8373d6..ff18c627f56 100644
--- a/clang/test/Driver/netbsd.cpp
+++ b/clang/test/Driver/netbsd.cpp
@@ -131,7 +131,7 @@
Expand Down
22 changes: 11 additions & 11 deletions rpm/clang-sailfishos-toolchain.patch
View file
@@ -1,16 +1,16 @@
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index 67dc764fb7d..2ae6c555515 100644
index d382cf77a8b..8c06919f1d3 100644
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -41,6 +41,7 @@ public:
@@ -42,6 +42,7 @@ public:
Fedora,
Gentoo,
OpenSUSE,
+ Sailfish,
UbuntuHardy,
UbuntuIntrepid,
UbuntuJaunty,
@@ -117,6 +118,10 @@ public:
@@ -119,6 +120,10 @@ public:
return DistroVal >= DebianLenny && DistroVal <= DebianBullseye;
}

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

Expand All @@ -36,10 +36,10 @@ index f2a3074d1e7..b9971b63a81 100644
}

diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index 33cdd3585c2..e1890849100 100644
index e8ef881e89a..1bad4f13226 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -1927,7 +1927,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
@@ -1999,7 +1999,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
static const char *const AArch64Triples[] = {
"aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
Expand All @@ -48,15 +48,15 @@ index 33cdd3585c2..e1890849100 100644
static const char *const AArch64beLibDirs[] = {"/lib"};
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
"aarch64_be-linux-gnu"};
@@ -1937,6 +1937,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
@@ -2009,6 +2009,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
"arm-linux-androideabi"};
static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
"armv7hl-redhat-linux-gnueabi",
+ "armv7hl-meego-linux-gnueabi",
"armv6hl-suse-linux-gnueabi",
"armv7hl-suse-linux-gnueabi"};
static const char *const ARMebLibDirs[] = {"/lib"};
@@ -1964,7 +1965,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
@@ -2036,7 +2037,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
"i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
"i686-linux-android", "i386-gnu", "i486-gnu",
Expand All @@ -66,7 +66,7 @@ index 33cdd3585c2..e1890849100 100644
static const char *const MIPSLibDirs[] = {"/lib"};
static const char *const MIPSTriples[] = {
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 7f59bc77f52..9cf648e2c08 100644
index 6532c899492..3fa0bea23bd 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -248,7 +248,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
Expand Down
33 changes: 18 additions & 15 deletions rpm/clang.spec
View file
@@ -1,34 +1,37 @@
%global maj_ver 9
%global maj_ver 10
%global min_ver 0
%global patch_ver 1

%global clang_tools_binaries \
%{_bindir}/clangd \
%{_bindir}/clang-apply-replacements \
%{_bindir}/clang-change-namespace \
%{_bindir}/clang-check \
%{_bindir}/clang-doc \
%{_bindir}/clang-extdef-mapping \
%{_bindir}/clang-format \
%{_bindir}/clang-import-test \
%{_bindir}/clang-include-fixer \
%{_bindir}/clang-move \
%{_bindir}/clang-offload-bundler \
%{_bindir}/clang-offload-wrapper \
%{_bindir}/clang-query \
%{_bindir}/clang-refactor \
%{_bindir}/clang-reorder-fields \
%{_bindir}/clang-rename \
%{_bindir}/clang-tidy
%{_bindir}/clang-scan-deps \
%{_bindir}/clang-tidy \
%{_bindir}/clangd \
%{_bindir}/diagtool \
%{_bindir}/hmaptool \
%{_bindir}/pp-trace

%global clang_binaries \
%{_bindir}/clang \
%{_bindir}/clang++ \
%{_bindir}/clang-%{maj_ver} \
%{_bindir}/clang++-%{maj_ver} \
%{_bindir}/clang-check \
%{_bindir}/clang-cl \
%{_bindir}/clang-cpp \
%{_bindir}/clang-extdef-mapping \
%{_bindir}/clang-format \
%{_bindir}/clang-import-test \
%{_bindir}/clang-offload-bundler \
%{_bindir}/clang-scan-deps \
%{_bindir}/diagtool \
%{_bindir}/hmaptool
%{_bindir}/clang-cpp

Name: clang
Version: %{maj_ver}.%{min_ver}.%{patch_ver}
Expand Down Expand Up @@ -195,9 +198,6 @@ popd
%files
%license clang/LICENSE.TXT
%{clang_binaries}
%{_bindir}/c-index-test
%{_datadir}/clang/clang-format.py*
%{_datadir}/clang/clang-format-diff.py*
%{_libdir}/clang/
%{_libdir}/*.so.*

Expand All @@ -218,8 +218,11 @@ popd

%files tools-extra
%{clang_tools_binaries}
%{_bindir}/c-index-test
%{_bindir}/find-all-symbols
%{_bindir}/modularize
%{_datadir}/clang/clang-format.py*
%{_datadir}/clang/clang-format-diff.py*
%{_datadir}/clang/clang-include-fixer.py*
%{_datadir}/clang/clang-tidy-diff.py*
%{_datadir}/clang/run-clang-tidy.py*
Expand Down
32 changes: 16 additions & 16 deletions rpm/llvm-sailfishos-toolchain.patch
View file
@@ -1,8 +1,8 @@
diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
index edeb31efab8..fd9e38db0ac 100644
index 76a754d671f..6ee7f680dee 100644
--- a/llvm/include/llvm/ADT/Triple.h
+++ b/llvm/include/llvm/ADT/Triple.h
@@ -149,7 +149,8 @@ public:
@@ -152,7 +152,8 @@ public:
Mesa,
SUSE,
OpenEmbedded,
Expand All @@ -13,26 +13,26 @@ index edeb31efab8..fd9e38db0ac 100644
enum OSType {
UnknownOS,
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index d419463e6a5..916ebc28856 100644
index 2c480c1094a..e7d399bfa4f 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -166,6 +166,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
case AMD: return "amd";
case Mesa: return "mesa";
case SUSE: return "suse";
@@ -162,6 +162,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
case Freescale: return "fsl";
case IBM: return "ibm";
case ImaginationTechnologies: return "img";
+ case MeeGo: return "meego";
case OpenEmbedded: return "oe";
}

@@ -476,6 +477,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
case Mesa: return "mesa";
case MipsTechnologies: return "mti";
case Myriad: return "myriad";
@@ -479,6 +480,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
.Case("mesa", Triple::Mesa)
.Case("suse", Triple::SUSE)
.Case("oe", Triple::OpenEmbedded)
+ .Case("meego", Triple::MeeGo)
.Default(Triple::UnknownVendor);
}

@@ -738,6 +740,9 @@ Triple::Triple(const Twine &Str)
@@ -743,6 +745,9 @@ Triple::Triple(const Twine &Str)
OS = parseOS(Components[2]);
if (Components.size() > 3) {
Environment = parseEnvironment(Components[3]);
Expand All @@ -42,7 +42,7 @@ index d419463e6a5..916ebc28856 100644
ObjectFormat = parseFormat(Components[3]);
}
}
@@ -789,6 +794,10 @@ Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
@@ -794,6 +799,10 @@ Triple::Triple(const Twine &ArchStr, const Twine &VendorStr, const Twine &OSStr,
ObjectFormat(parseFormat(EnvironmentStr.str())) {
if (ObjectFormat == Triple::UnknownObjectFormat)
ObjectFormat = getDefaultFormat(*this);
Expand All @@ -53,7 +53,7 @@ index d419463e6a5..916ebc28856 100644
}

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

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

Expand Down
2 changes: 1 addition & 1 deletion rpm/llvm.spec
View file
Expand Up @@ -10,7 +10,7 @@
%endif

Name: llvm
Version: 9.0.1
Version: 10.0.1
Release: 0
Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
License: University of Illinois/NCSA Open Source License
Expand Down

0 comments on commit 05c41a9

Please sign in to comment.