mirror of
https://abf.rosa.ru/djam/llvm.git
synced 2025-02-23 08:12:50 +00:00
upd: 11.0.1 > 12.0.1
This commit is contained in:
slava86
parent
f45825d9a8
commit
771958d88e
3 changed files with 55 additions and 35 deletions
5
.abf.yml
5
.abf.yml
|
|
@ -1,6 +1,11 @@
|
|||
sources:
|
||||
clang-11.0.1.src.tar.xz: 10516c6d177dc3d893e640c75d891ee3d6c1edcf
|
||||
clang-12.0.1.src.tar.xz: e3cdd3fb39c78a5bcb0a1d5706678cf8643a48f6
|
||||
clang-tools-extra-11.0.1.src.tar.xz: f5698eb81569a5dea2496c4934401be653eeb031
|
||||
clang-tools-extra-12.0.1.src.tar.xz: 42f179bb59432c4d2785239952853ad6308d0863
|
||||
compiler-rt-11.0.1.src.tar.xz: c492a0142887efbe667f6b3994b43a48f53d4832
|
||||
compiler-rt-12.0.1.src.tar.xz: d33af648dc9b901c6c9f6c5872af2f59203f1a25
|
||||
llvm-11.0.1.src.tar.xz: 1a911295260d4e41116b72788eb602702b4bb252
|
||||
llvm-12.0.1.src.tar.xz: 619fe668e0972d11d0fa2db670a57a42d02fb8ca
|
||||
polly-11.0.1.src.tar.xz: 1489870c457e7a6396bf4793b62dd264faf844b7
|
||||
polly-12.0.1.src.tar.xz: d3cf504adc32448f62aa396f221cf20df0c9fe34
|
||||
|
|
|
|||
|
|
@ -1,7 +1,14 @@
|
|||
diff -Naur clang-9.0.1.src-orig/include/clang/Driver/Distro.h clang-9.0.1.src/include/clang/Driver/Distro.h
|
||||
--- clang-9.0.1.src-orig/include/clang/Driver/Distro.h 2019-12-11 22:15:30.000000000 +0300
|
||||
+++ clang-9.0.1.src/include/clang/Driver/Distro.h 2020-02-14 19:46:31.781378040 +0300
|
||||
@@ -38,8 +38,10 @@
|
||||
.../include/clang/Driver/Distro.h | 9 +++++++++
|
||||
.../lib/Driver/Distro.cpp | 9 +++++++++
|
||||
.../lib/Driver/ToolChains/Gnu.cpp | 13 ++++++++++---
|
||||
.../lib/Driver/ToolChains/Linux.cpp | 5 +++--
|
||||
4 files changed, 31 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git clang-12.0.1.src/include/clang/Driver/Distro.h clang-12.0.1.src-diff/include/clang/Driver/Distro.h
|
||||
index 0e98d00..07d2097 100644
|
||||
--- clang-12.0.1.src/include/clang/Driver/Distro.h
|
||||
+++ clang-12.0.1.src-diff/include/clang/Driver/Distro.h
|
||||
@@ -41,8 +41,10 @@ public:
|
||||
RHEL5,
|
||||
RHEL6,
|
||||
RHEL7,
|
||||
|
|
@ -12,7 +19,7 @@ diff -Naur clang-9.0.1.src-orig/include/clang/Driver/Distro.h clang-9.0.1.src/in
|
|||
OpenSUSE,
|
||||
UbuntuHardy,
|
||||
UbuntuIntrepid,
|
||||
@@ -109,6 +111,10 @@
|
||||
@@ -115,6 +117,10 @@ public:
|
||||
return DistroVal == Fedora || (DistroVal >= RHEL5 && DistroVal <= RHEL7);
|
||||
}
|
||||
|
||||
|
|
@ -20,12 +27,12 @@ diff -Naur clang-9.0.1.src-orig/include/clang/Driver/Distro.h clang-9.0.1.src/in
|
|||
+ return DistroVal == ROSA;
|
||||
+ }
|
||||
+
|
||||
bool IsOpenSUSE() const {
|
||||
return DistroVal == OpenSUSE;
|
||||
}
|
||||
@@ -129,6 +135,9 @@
|
||||
return DistroVal == Gentoo;
|
||||
}
|
||||
bool IsOpenSUSE() const { return DistroVal == OpenSUSE; }
|
||||
|
||||
bool IsDebian() const {
|
||||
@@ -129,6 +135,9 @@ public:
|
||||
|
||||
bool IsGentoo() const { return DistroVal == Gentoo; }
|
||||
|
||||
+ bool IsMandriva() const {
|
||||
+ return DistroVal == OpenMandriva;
|
||||
|
|
@ -33,24 +40,31 @@ diff -Naur clang-9.0.1.src-orig/include/clang/Driver/Distro.h clang-9.0.1.src/in
|
|||
/// @}
|
||||
};
|
||||
|
||||
diff -Naur clang-9.0.1.src-orig/lib/Driver/Distro.cpp clang-9.0.1.src/lib/Driver/Distro.cpp
|
||||
--- clang-9.0.1.src-orig/lib/Driver/Distro.cpp 2019-12-11 22:15:30.000000000 +0300
|
||||
+++ clang-9.0.1.src/lib/Driver/Distro.cpp 2020-02-14 19:50:25.775772017 +0300
|
||||
@@ -57,6 +57,10 @@
|
||||
return Version;
|
||||
diff --git clang-12.0.1.src/lib/Driver/Distro.cpp clang-12.0.1.src-diff/lib/Driver/Distro.cpp
|
||||
index ee4fe84..1385c31 100644
|
||||
--- clang-12.0.1.src/lib/Driver/Distro.cpp
|
||||
+++ clang-12.0.1.src-diff/lib/Driver/Distro.cpp
|
||||
@@ -126,6 +126,15 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
|
||||
return Distro::UnknownDistro;
|
||||
}
|
||||
|
||||
+ File = VFS.getBufferForFile("/etc/rosa-release");
|
||||
+ if (File)
|
||||
+File = VFS.getBufferForFile("/etc/rosa-release");
|
||||
+if (File) {
|
||||
+ StringRef Data = File.get()->getBuffer();
|
||||
+ return Distro::ROSA;
|
||||
+
|
||||
File = VFS.getBufferForFile("/etc/redhat-release");
|
||||
+ return Distro::UnknownDistro;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
// ...for Debian
|
||||
File = VFS.getBufferForFile("/etc/debian_version");
|
||||
if (File) {
|
||||
StringRef Data = File.get()->getBuffer();
|
||||
diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Gnu.cpp clang-9.0.1.src/lib/Driver/ToolChains/Gnu.cpp
|
||||
--- clang-9.0.1.src-orig/lib/Driver/ToolChains/Gnu.cpp 2019-12-11 22:15:30.000000000 +0300
|
||||
+++ clang-9.0.1.src/lib/Driver/ToolChains/Gnu.cpp 2020-02-14 19:19:59.341584610 +0300
|
||||
@@ -1927,7 +1927,9 @@
|
||||
diff --git clang-12.0.1.src/lib/Driver/ToolChains/Gnu.cpp clang-12.0.1.src-diff/lib/Driver/ToolChains/Gnu.cpp
|
||||
index 1d8a3cd..1abd2aa 100644
|
||||
--- clang-12.0.1.src/lib/Driver/ToolChains/Gnu.cpp
|
||||
+++ clang-12.0.1.src-diff/lib/Driver/ToolChains/Gnu.cpp
|
||||
@@ -2075,7 +2075,9 @@ 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",
|
||||
|
|
@ -61,7 +75,7 @@ diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Gnu.cpp clang-9.0.1.src/li
|
|||
static const char *const AArch64beLibDirs[] = {"/lib"};
|
||||
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
|
||||
"aarch64_be-linux-gnu"};
|
||||
@@ -1937,6 +1939,8 @@
|
||||
@@ -2085,6 +2087,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
|
||||
"arm-linux-androideabi"};
|
||||
static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
|
||||
"armv7hl-redhat-linux-gnueabi",
|
||||
|
|
@ -70,7 +84,7 @@ diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Gnu.cpp clang-9.0.1.src/li
|
|||
"armv6hl-suse-linux-gnueabi",
|
||||
"armv7hl-suse-linux-gnueabi"};
|
||||
static const char *const ARMebLibDirs[] = {"/lib"};
|
||||
@@ -1955,7 +1959,8 @@
|
||||
@@ -2103,7 +2107,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
|
||||
"x86_64-redhat-linux", "x86_64-suse-linux",
|
||||
"x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
|
||||
"x86_64-slackware-linux", "x86_64-unknown-linux",
|
||||
|
|
@ -80,7 +94,7 @@ diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Gnu.cpp clang-9.0.1.src/li
|
|||
static const char *const X32LibDirs[] = {"/libx32"};
|
||||
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
|
||||
static const char *const X86Triples[] = {
|
||||
@@ -1964,7 +1969,9 @@
|
||||
@@ -2112,7 +2117,9 @@ 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",
|
||||
|
|
@ -91,10 +105,11 @@ diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Gnu.cpp clang-9.0.1.src/li
|
|||
|
||||
static const char *const MIPSLibDirs[] = {"/lib"};
|
||||
static const char *const MIPSTriples[] = {
|
||||
diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Linux.cpp clang-9.0.1.src/lib/Driver/ToolChains/Linux.cpp
|
||||
--- clang-9.0.1.src-orig/lib/Driver/ToolChains/Linux.cpp 2019-12-11 22:15:30.000000000 +0300
|
||||
+++ clang-9.0.1.src/lib/Driver/ToolChains/Linux.cpp 2020-02-14 19:35:44.855908872 +0300
|
||||
@@ -248,7 +248,7 @@
|
||||
diff --git clang-12.0.1.src/lib/Driver/ToolChains/Linux.cpp clang-12.0.1.src-diff/lib/Driver/ToolChains/Linux.cpp
|
||||
index 9663a73..e2ca948 100644
|
||||
--- clang-12.0.1.src/lib/Driver/ToolChains/Linux.cpp
|
||||
+++ clang-12.0.1.src-diff/lib/Driver/ToolChains/Linux.cpp
|
||||
@@ -231,7 +231,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
}
|
||||
|
||||
if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
|
||||
|
|
@ -103,7 +118,7 @@ diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Linux.cpp clang-9.0.1.src/
|
|||
ExtraOpts.push_back("-z");
|
||||
ExtraOpts.push_back("relro");
|
||||
}
|
||||
@@ -289,6 +289,7 @@
|
||||
@@ -271,6 +271,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
// Hexagon linker/loader does not support .gnu.hash
|
||||
if (!IsMips && !IsHexagon) {
|
||||
if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
|
||||
|
|
@ -111,7 +126,7 @@ diff -Naur clang-9.0.1.src-orig/lib/Driver/ToolChains/Linux.cpp clang-9.0.1.src/
|
|||
(Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) ||
|
||||
(IsAndroid && !Triple.isAndroidVersionLT(23)))
|
||||
ExtraOpts.push_back("--hash-style=gnu");
|
||||
@@ -304,7 +305,7 @@
|
||||
@@ -286,7 +287,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
ExtraOpts.push_back("--build-id");
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
%bcond_without clang
|
||||
|
||||
%define maj_ver 11
|
||||
%define maj_ver 12
|
||||
%define major_ver %{maj_ver}.0
|
||||
%define minor_ver 1
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
Summary: Low Level Virtual Machine (LLVM)
|
||||
Name: llvm
|
||||
Version: %{major_ver}.%{minor_ver}
|
||||
Release: 3
|
||||
Release: 1
|
||||
License: NCSA
|
||||
Group: Development/Other
|
||||
Url: http://llvm.org
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue