import llvm-8.0.1-1.module+el8.1.0+3866+6be7f4d8
This commit is contained in:
commit
5ca104e76f
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/llvm-8.0.1.src.tar.xz
|
1
.llvm.metadata
Normal file
1
.llvm.metadata
Normal file
@ -0,0 +1 @@
|
||||
09964f9eabc364f221a3caefbdaea28557273b4a SOURCES/llvm-8.0.1.src.tar.xz
|
28
SOURCES/0001-Deactivate-markdown-doc.patch
Normal file
28
SOURCES/0001-Deactivate-markdown-doc.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From eeb9da2ece9a58448c213b900090b32e6d303bff Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 13 Jun 2019 07:58:59 +0000
|
||||
Subject: [PATCH 4/4] Deactivate markdown doc
|
||||
|
||||
---
|
||||
llvm/docs/conf.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py
|
||||
index 7fdcb3d2f52..501b48b540d 100644
|
||||
--- a/llvm/docs/conf.py
|
||||
+++ b/llvm/docs/conf.py
|
||||
@@ -32,9 +32,9 @@ extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo']
|
||||
templates_path = ['_templates']
|
||||
|
||||
# The suffix of source filenames.
|
||||
-source_suffix = ['.rst', '.md']
|
||||
+source_suffix = ['.rst']
|
||||
|
||||
-source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
|
||||
+source_parsers = {}
|
||||
|
||||
# The encoding of source files.
|
||||
#source_encoding = 'utf-8-sig'
|
||||
--
|
||||
2.20.1
|
||||
|
@ -0,0 +1,82 @@
|
||||
From e491bb836e530585e4d278b82725e4cefdd14abc Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 13 Jun 2019 07:55:37 +0000
|
||||
Subject: [PATCH 3/4] Filter-out-cxxflags-not-supported-by-clang
|
||||
|
||||
---
|
||||
llvm/cmake/modules/AddLLVM.cmake | 6 +++++-
|
||||
llvm/cmake/modules/CMakeLists.txt | 3 +++
|
||||
llvm/cmake/modules/LLVMConfig.cmake.in | 2 ++
|
||||
llvm/tools/llvm-config/CMakeLists.txt | 4 ++++
|
||||
4 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
|
||||
index 1a417447278..bb10f20cdd6 100644
|
||||
--- a/llvm/cmake/modules/AddLLVM.cmake
|
||||
+++ b/llvm/cmake/modules/AddLLVM.cmake
|
||||
@@ -664,7 +664,11 @@ macro(add_llvm_library name)
|
||||
|
||||
if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
|
||||
NOT LLVM_DISTRIBUTION_COMPONENTS)
|
||||
- set(export_to_llvmexports EXPORT LLVMExports)
|
||||
+ if (ARG_SHARED)
|
||||
+ set(export_to_llvmexports EXPORT LLVMExports)
|
||||
+ else()
|
||||
+ set(export_to_llvmexports EXPORT LLVMStaticExports)
|
||||
+ endif()
|
||||
set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True)
|
||||
endif()
|
||||
|
||||
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
|
||||
index f5cc0006fa0..6605dc729c2 100644
|
||||
--- a/llvm/cmake/modules/CMakeLists.txt
|
||||
+++ b/llvm/cmake/modules/CMakeLists.txt
|
||||
@@ -97,6 +97,7 @@ set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}")
|
||||
set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin")
|
||||
set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake")
|
||||
set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}")
|
||||
+set(LLVM_CONFIG_STATIC_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMStaticExports.cmake")
|
||||
configure_file(
|
||||
LLVMConfig.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLVMConfig.cmake
|
||||
@@ -113,6 +114,8 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
||||
if(llvm_has_exports)
|
||||
install(EXPORT LLVMExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
|
||||
COMPONENT cmake-exports)
|
||||
+ install(EXPORT LLVMStaticExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
|
||||
+ COMPONENT cmake-exports)
|
||||
endif()
|
||||
|
||||
install(FILES
|
||||
diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
|
||||
index 7ca06381d90..44d042c9b11 100644
|
||||
--- a/llvm/cmake/modules/LLVMConfig.cmake.in
|
||||
+++ b/llvm/cmake/modules/LLVMConfig.cmake.in
|
||||
@@ -84,6 +84,8 @@ if(NOT TARGET LLVMSupport)
|
||||
set(LLVM_EXPORTED_TARGETS "@LLVM_CONFIG_EXPORTS@")
|
||||
include("@LLVM_CONFIG_EXPORTS_FILE@")
|
||||
@llvm_config_include_buildtree_only_exports@
|
||||
+
|
||||
+ include("@LLVM_CONFIG_STATIC_EXPORTS_FILE@" OPTIONAL)
|
||||
endif()
|
||||
|
||||
# By creating intrinsics_gen here, subprojects that depend on LLVM's
|
||||
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
|
||||
index a7db17386fb..8a796d03b5a 100644
|
||||
--- a/llvm/tools/llvm-config/CMakeLists.txt
|
||||
+++ b/llvm/tools/llvm-config/CMakeLists.txt
|
||||
@@ -42,7 +42,11 @@ set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
|
||||
set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
|
||||
set(LLVM_CPPFLAGS "${LLVM_DEFINITIONS}")
|
||||
set(LLVM_CFLAGS "${LLVM_C_STD_FLAG} ${LLVM_DEFINITIONS}")
|
||||
+STRING(REGEX REPLACE "-mcet" "" LLVM_CFLAGS ${LLVM_CFLAGS})
|
||||
+STRING(REGEX REPLACE "-fcf-protection" "" LLVM_CFLAGS ${LLVM_CFLAGS})
|
||||
set(LLVM_CXXFLAGS "${LLVM_CXX_STD_FLAG} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
|
||||
+STRING(REGEX REPLACE "-mcet" "" LLVM_CXXFLAGS ${LLVM_CXXFLAGS})
|
||||
+STRING(REGEX REPLACE "-fcf-protection" "" LLVM_CXXFLAGS ${LLVM_CXXFLAGS})
|
||||
set(LLVM_BUILD_SYSTEM cmake)
|
||||
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
|
||||
set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}")
|
||||
--
|
||||
2.20.1
|
||||
|
381
SOURCES/0001-Selectively-disable-threading-from-gold.patch
Normal file
381
SOURCES/0001-Selectively-disable-threading-from-gold.patch
Normal file
@ -0,0 +1,381 @@
|
||||
From 5fd2c900e90445c6efb7b97f8c663e588bcab81b Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Tue, 2 Jul 2019 09:25:52 +0000
|
||||
Subject: [PATCH] Selectively disable threading from gold
|
||||
|
||||
Related: rhbz#1636479
|
||||
---
|
||||
llvm/include/llvm/LTO/LTO.h | 3 +
|
||||
llvm/include/llvm/LTO/LTOBackend.h | 3 +
|
||||
llvm/include/llvm/Support/ThreadPool.h | 7 ++
|
||||
llvm/lib/LTO/LTO.cpp | 134 ++++++++++++++++++++++++-
|
||||
llvm/lib/LTO/LTOBackend.cpp | 48 ++++++++-
|
||||
llvm/lib/Support/ThreadPool.cpp | 6 +-
|
||||
llvm/tools/gold/gold-plugin.cpp | 7 +-
|
||||
7 files changed, 197 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/llvm/include/llvm/LTO/LTO.h b/llvm/include/llvm/LTO/LTO.h
|
||||
index 534d9b6f3f2..9dfda126540 100644
|
||||
--- a/llvm/include/llvm/LTO/LTO.h
|
||||
+++ b/llvm/include/llvm/LTO/LTO.h
|
||||
@@ -212,6 +212,7 @@ typedef std::function<std::unique_ptr<ThinBackendProc>(
|
||||
|
||||
/// This ThinBackend runs the individual backend jobs in-process.
|
||||
ThinBackend createInProcessThinBackend(unsigned ParallelismLevel);
|
||||
+ThinBackend createInProcessThinBackendNoThread(unsigned ParallelismLevel);
|
||||
|
||||
/// This ThinBackend writes individual module indexes to files, instead of
|
||||
/// running the individual backend jobs. This backend is for distributed builds
|
||||
@@ -281,6 +282,7 @@ public:
|
||||
/// The client will receive at most one callback (via either AddStream or
|
||||
/// Cache) for each task identifier.
|
||||
Error run(AddStreamFn AddStream, NativeObjectCache Cache = nullptr);
|
||||
+ Error runNoThread(AddStreamFn AddStream, NativeObjectCache Cache = nullptr);
|
||||
|
||||
private:
|
||||
Config Conf;
|
||||
@@ -397,6 +399,7 @@ private:
|
||||
const SymbolResolution *&ResI, const SymbolResolution *ResE);
|
||||
|
||||
Error runRegularLTO(AddStreamFn AddStream);
|
||||
+ Error runRegularLTONoThread(AddStreamFn AddStream);
|
||||
Error runThinLTO(AddStreamFn AddStream, NativeObjectCache Cache);
|
||||
|
||||
mutable bool CalledGetMaxTasks = false;
|
||||
diff --git a/llvm/include/llvm/LTO/LTOBackend.h b/llvm/include/llvm/LTO/LTOBackend.h
|
||||
index d4743f6940f..2d6461fa82e 100644
|
||||
--- a/llvm/include/llvm/LTO/LTOBackend.h
|
||||
+++ b/llvm/include/llvm/LTO/LTOBackend.h
|
||||
@@ -39,6 +39,9 @@ namespace lto {
|
||||
Error backend(Config &C, AddStreamFn AddStream,
|
||||
unsigned ParallelCodeGenParallelismLevel,
|
||||
std::unique_ptr<Module> M, ModuleSummaryIndex &CombinedIndex);
|
||||
+Error backendNoThread(Config &C, AddStreamFn AddStream,
|
||||
+ unsigned ParallelCodeGenParallelismLevel,
|
||||
+ std::unique_ptr<Module> M, ModuleSummaryIndex &CombinedIndex);
|
||||
|
||||
/// Runs a ThinLTO backend.
|
||||
Error thinBackend(Config &C, unsigned Task, AddStreamFn AddStream, Module &M,
|
||||
diff --git a/llvm/include/llvm/Support/ThreadPool.h b/llvm/include/llvm/Support/ThreadPool.h
|
||||
index 4fdbd528b21..60ea5097114 100644
|
||||
--- a/llvm/include/llvm/Support/ThreadPool.h
|
||||
+++ b/llvm/include/llvm/Support/ThreadPool.h
|
||||
@@ -98,4 +98,11 @@ private:
|
||||
};
|
||||
}
|
||||
|
||||
+#ifndef ThreadPool
|
||||
+#undef LLVM_SUPPORT_THREAD_POOL_H
|
||||
+#define ThreadPool SequentialThreadPool
|
||||
+#include "llvm/Support/ThreadPool.h"
|
||||
+#undef ThreadPool
|
||||
+#endif
|
||||
+
|
||||
#endif // LLVM_SUPPORT_THREAD_POOL_H
|
||||
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
|
||||
index 3a955060dea..a7b4f45b18c 100644
|
||||
--- a/llvm/lib/LTO/LTO.cpp
|
||||
+++ b/llvm/lib/LTO/LTO.cpp
|
||||
@@ -861,6 +861,58 @@ Error LTO::run(AddStreamFn AddStream, NativeObjectCache Cache) {
|
||||
return Result;
|
||||
}
|
||||
|
||||
+Error LTO::runNoThread(AddStreamFn AddStream, NativeObjectCache Cache) {
|
||||
+ // Compute "dead" symbols, we don't want to import/export these!
|
||||
+ DenseSet<GlobalValue::GUID> GUIDPreservedSymbols;
|
||||
+ DenseMap<GlobalValue::GUID, PrevailingType> GUIDPrevailingResolutions;
|
||||
+ for (auto &Res : GlobalResolutions) {
|
||||
+ // Normally resolution have IR name of symbol. We can do nothing here
|
||||
+ // otherwise. See comments in GlobalResolution struct for more details.
|
||||
+ if (Res.second.IRName.empty())
|
||||
+ continue;
|
||||
+
|
||||
+ GlobalValue::GUID GUID = GlobalValue::getGUID(
|
||||
+ GlobalValue::dropLLVMManglingEscape(Res.second.IRName));
|
||||
+
|
||||
+ if (Res.second.VisibleOutsideSummary && Res.second.Prevailing)
|
||||
+ GUIDPreservedSymbols.insert(GlobalValue::getGUID(
|
||||
+ GlobalValue::dropLLVMManglingEscape(Res.second.IRName)));
|
||||
+
|
||||
+ GUIDPrevailingResolutions[GUID] =
|
||||
+ Res.second.Prevailing ? PrevailingType::Yes : PrevailingType::No;
|
||||
+ }
|
||||
+
|
||||
+ auto isPrevailing = [&](GlobalValue::GUID G) {
|
||||
+ auto It = GUIDPrevailingResolutions.find(G);
|
||||
+ if (It == GUIDPrevailingResolutions.end())
|
||||
+ return PrevailingType::Unknown;
|
||||
+ return It->second;
|
||||
+ };
|
||||
+ computeDeadSymbolsWithConstProp(ThinLTO.CombinedIndex, GUIDPreservedSymbols,
|
||||
+ isPrevailing, Conf.OptLevel > 0);
|
||||
+
|
||||
+ // Setup output file to emit statistics.
|
||||
+ std::unique_ptr<ToolOutputFile> StatsFile = nullptr;
|
||||
+ if (!Conf.StatsFile.empty()) {
|
||||
+ EnableStatistics(false);
|
||||
+ std::error_code EC;
|
||||
+ StatsFile =
|
||||
+ llvm::make_unique<ToolOutputFile>(Conf.StatsFile, EC, sys::fs::F_None);
|
||||
+ if (EC)
|
||||
+ return errorCodeToError(EC);
|
||||
+ StatsFile->keep();
|
||||
+ }
|
||||
+
|
||||
+ Error Result = runRegularLTONoThread(AddStream);
|
||||
+ if (!Result)
|
||||
+ Result = runThinLTO(AddStream, Cache);
|
||||
+
|
||||
+ if (StatsFile)
|
||||
+ PrintStatisticsJSON(StatsFile->os());
|
||||
+
|
||||
+ return Result;
|
||||
+}
|
||||
+
|
||||
Error LTO::runRegularLTO(AddStreamFn AddStream) {
|
||||
for (auto &M : RegularLTO.ModsWithSummaries)
|
||||
if (Error Err = linkRegularLTO(std::move(M),
|
||||
@@ -928,6 +980,73 @@ Error LTO::runRegularLTO(AddStreamFn AddStream) {
|
||||
std::move(RegularLTO.CombinedModule), ThinLTO.CombinedIndex);
|
||||
}
|
||||
|
||||
+Error LTO::runRegularLTONoThread(AddStreamFn AddStream) {
|
||||
+ for (auto &M : RegularLTO.ModsWithSummaries)
|
||||
+ if (Error Err = linkRegularLTO(std::move(M),
|
||||
+ /*LivenessFromIndex=*/true))
|
||||
+ return Err;
|
||||
+
|
||||
+ // Make sure commons have the right size/alignment: we kept the largest from
|
||||
+ // all the prevailing when adding the inputs, and we apply it here.
|
||||
+ const DataLayout &DL = RegularLTO.CombinedModule->getDataLayout();
|
||||
+ for (auto &I : RegularLTO.Commons) {
|
||||
+ if (!I.second.Prevailing)
|
||||
+ // Don't do anything if no instance of this common was prevailing.
|
||||
+ continue;
|
||||
+ GlobalVariable *OldGV = RegularLTO.CombinedModule->getNamedGlobal(I.first);
|
||||
+ if (OldGV && DL.getTypeAllocSize(OldGV->getValueType()) == I.second.Size) {
|
||||
+ // Don't create a new global if the type is already correct, just make
|
||||
+ // sure the alignment is correct.
|
||||
+ OldGV->setAlignment(I.second.Align);
|
||||
+ continue;
|
||||
+ }
|
||||
+ ArrayType *Ty =
|
||||
+ ArrayType::get(Type::getInt8Ty(RegularLTO.Ctx), I.second.Size);
|
||||
+ auto *GV = new GlobalVariable(*RegularLTO.CombinedModule, Ty, false,
|
||||
+ GlobalValue::CommonLinkage,
|
||||
+ ConstantAggregateZero::get(Ty), "");
|
||||
+ GV->setAlignment(I.second.Align);
|
||||
+ if (OldGV) {
|
||||
+ OldGV->replaceAllUsesWith(ConstantExpr::getBitCast(GV, OldGV->getType()));
|
||||
+ GV->takeName(OldGV);
|
||||
+ OldGV->eraseFromParent();
|
||||
+ } else {
|
||||
+ GV->setName(I.first);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (Conf.PreOptModuleHook &&
|
||||
+ !Conf.PreOptModuleHook(0, *RegularLTO.CombinedModule))
|
||||
+ return Error::success();
|
||||
+
|
||||
+ if (!Conf.CodeGenOnly) {
|
||||
+ for (const auto &R : GlobalResolutions) {
|
||||
+ if (!R.second.isPrevailingIRSymbol())
|
||||
+ continue;
|
||||
+ if (R.second.Partition != 0 &&
|
||||
+ R.second.Partition != GlobalResolution::External)
|
||||
+ continue;
|
||||
+
|
||||
+ GlobalValue *GV =
|
||||
+ RegularLTO.CombinedModule->getNamedValue(R.second.IRName);
|
||||
+ // Ignore symbols defined in other partitions.
|
||||
+ // Also skip declarations, which are not allowed to have internal linkage.
|
||||
+ if (!GV || GV->hasLocalLinkage() || GV->isDeclaration())
|
||||
+ continue;
|
||||
+ GV->setUnnamedAddr(R.second.UnnamedAddr ? GlobalValue::UnnamedAddr::Global
|
||||
+ : GlobalValue::UnnamedAddr::None);
|
||||
+ if (EnableLTOInternalization && R.second.Partition == 0)
|
||||
+ GV->setLinkage(GlobalValue::InternalLinkage);
|
||||
+ }
|
||||
+
|
||||
+ if (Conf.PostInternalizeModuleHook &&
|
||||
+ !Conf.PostInternalizeModuleHook(0, *RegularLTO.CombinedModule))
|
||||
+ return Error::success();
|
||||
+ }
|
||||
+ return backendNoThread(Conf, AddStream, RegularLTO.ParallelCodeGenParallelismLevel,
|
||||
+ std::move(RegularLTO.CombinedModule), ThinLTO.CombinedIndex);
|
||||
+}
|
||||
+
|
||||
/// This class defines the interface to the ThinLTO backend.
|
||||
class lto::ThinBackendProc {
|
||||
protected:
|
||||
@@ -952,8 +1071,9 @@ public:
|
||||
};
|
||||
|
||||
namespace {
|
||||
+template<class ThreadEngine>
|
||||
class InProcessThinBackend : public ThinBackendProc {
|
||||
- ThreadPool BackendThreadPool;
|
||||
+ ThreadEngine BackendThreadPool;
|
||||
AddStreamFn AddStream;
|
||||
NativeObjectCache Cache;
|
||||
std::set<GlobalValue::GUID> CfiFunctionDefs;
|
||||
@@ -1065,9 +1185,19 @@ ThinBackend lto::createInProcessThinBackend(unsigned ParallelismLevel) {
|
||||
return [=](Config &Conf, ModuleSummaryIndex &CombinedIndex,
|
||||
const StringMap<GVSummaryMapTy> &ModuleToDefinedGVSummaries,
|
||||
AddStreamFn AddStream, NativeObjectCache Cache) {
|
||||
- return llvm::make_unique<InProcessThinBackend>(
|
||||
+ return llvm::make_unique<InProcessThinBackend<ThreadPool>>(
|
||||
+ Conf, CombinedIndex, ParallelismLevel, ModuleToDefinedGVSummaries,
|
||||
+ AddStream, Cache);
|
||||
+ };
|
||||
+}
|
||||
+ThinBackend lto::createInProcessThinBackendNoThread(unsigned ParallelismLevel) {
|
||||
+ return [=](Config &Conf, ModuleSummaryIndex &CombinedIndex,
|
||||
+ const StringMap<GVSummaryMapTy> &ModuleToDefinedGVSummaries,
|
||||
+ AddStreamFn AddStream, NativeObjectCache Cache) {
|
||||
+ ThinBackendProc* Backend = new InProcessThinBackend<SequentialThreadPool>(
|
||||
Conf, CombinedIndex, ParallelismLevel, ModuleToDefinedGVSummaries,
|
||||
AddStream, Cache);
|
||||
+ return std::unique_ptr<ThinBackendProc>(Backend);
|
||||
};
|
||||
}
|
||||
|
||||
diff --git a/llvm/lib/LTO/LTOBackend.cpp b/llvm/lib/LTO/LTOBackend.cpp
|
||||
index 926c419e34a..2c263ed86a9 100644
|
||||
--- a/llvm/lib/LTO/LTOBackend.cpp
|
||||
+++ b/llvm/lib/LTO/LTOBackend.cpp
|
||||
@@ -333,10 +333,11 @@ void codegen(Config &Conf, TargetMachine *TM, AddStreamFn AddStream,
|
||||
DwoOut->keep();
|
||||
}
|
||||
|
||||
-void splitCodeGen(Config &C, TargetMachine *TM, AddStreamFn AddStream,
|
||||
+template<class ThreadPoolEngine>
|
||||
+static void splitCodeGen_(Config &C, TargetMachine *TM, AddStreamFn AddStream,
|
||||
unsigned ParallelCodeGenParallelismLevel,
|
||||
std::unique_ptr<Module> Mod) {
|
||||
- ThreadPool CodegenThreadPool(ParallelCodeGenParallelismLevel);
|
||||
+ ThreadPoolEngine CodegenThreadPool(ParallelCodeGenParallelismLevel);
|
||||
unsigned ThreadCount = 0;
|
||||
const Target *T = &TM->getTarget();
|
||||
|
||||
@@ -380,6 +381,17 @@ void splitCodeGen(Config &C, TargetMachine *TM, AddStreamFn AddStream,
|
||||
// can leave the function scope.
|
||||
CodegenThreadPool.wait();
|
||||
}
|
||||
+void splitCodeGen(Config &C, TargetMachine *TM, AddStreamFn AddStream,
|
||||
+ unsigned ParallelCodeGenParallelismLevel,
|
||||
+ std::unique_ptr<Module> Mod) {
|
||||
+ splitCodeGen_<ThreadPool>(C, TM, AddStream, ParallelCodeGenParallelismLevel, std::move(Mod));
|
||||
+}
|
||||
+
|
||||
+void splitCodeGenNoThread(Config &C, TargetMachine *TM, AddStreamFn AddStream,
|
||||
+ unsigned ParallelCodeGenParallelismLevel,
|
||||
+ std::unique_ptr<Module> Mod) {
|
||||
+ splitCodeGen_<SequentialThreadPool>(C, TM, AddStream, ParallelCodeGenParallelismLevel, std::move(Mod));
|
||||
+}
|
||||
|
||||
Expected<const Target *> initAndLookupTarget(Config &C, Module &Mod) {
|
||||
if (!C.OverrideTriple.empty())
|
||||
@@ -439,6 +451,38 @@ Error lto::backend(Config &C, AddStreamFn AddStream,
|
||||
return finalizeOptimizationRemarks(std::move(DiagnosticOutputFile));
|
||||
}
|
||||
|
||||
+Error lto::backendNoThread(Config &C, AddStreamFn AddStream,
|
||||
+ unsigned ParallelCodeGenParallelismLevel,
|
||||
+ std::unique_ptr<Module> Mod,
|
||||
+ ModuleSummaryIndex &CombinedIndex) {
|
||||
+ Expected<const Target *> TOrErr = initAndLookupTarget(C, *Mod);
|
||||
+ if (!TOrErr)
|
||||
+ return TOrErr.takeError();
|
||||
+
|
||||
+ std::unique_ptr<TargetMachine> TM = createTargetMachine(C, *TOrErr, *Mod);
|
||||
+
|
||||
+ // Setup optimization remarks.
|
||||
+ auto DiagFileOrErr = lto::setupOptimizationRemarks(
|
||||
+ Mod->getContext(), C.RemarksFilename, C.RemarksWithHotness);
|
||||
+ if (!DiagFileOrErr)
|
||||
+ return DiagFileOrErr.takeError();
|
||||
+ auto DiagnosticOutputFile = std::move(*DiagFileOrErr);
|
||||
+
|
||||
+ if (!C.CodeGenOnly) {
|
||||
+ if (!opt(C, TM.get(), 0, *Mod, /*IsThinLTO=*/false,
|
||||
+ /*ExportSummary=*/&CombinedIndex, /*ImportSummary=*/nullptr))
|
||||
+ return finalizeOptimizationRemarks(std::move(DiagnosticOutputFile));
|
||||
+ }
|
||||
+
|
||||
+ if (ParallelCodeGenParallelismLevel == 1) {
|
||||
+ codegen(C, TM.get(), AddStream, 0, *Mod);
|
||||
+ } else {
|
||||
+ splitCodeGenNoThread(C, TM.get(), AddStream, ParallelCodeGenParallelismLevel,
|
||||
+ std::move(Mod));
|
||||
+ }
|
||||
+ return finalizeOptimizationRemarks(std::move(DiagnosticOutputFile));
|
||||
+}
|
||||
+
|
||||
static void dropDeadSymbols(Module &Mod, const GVSummaryMapTy &DefinedGlobals,
|
||||
const ModuleSummaryIndex &Index) {
|
||||
std::vector<GlobalValue*> DeadGVs;
|
||||
diff --git a/llvm/lib/Support/ThreadPool.cpp b/llvm/lib/Support/ThreadPool.cpp
|
||||
index d0212ca1346..3d760edbcb7 100644
|
||||
--- a/llvm/lib/Support/ThreadPool.cpp
|
||||
+++ b/llvm/lib/Support/ThreadPool.cpp
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
using namespace llvm;
|
||||
|
||||
-#if LLVM_ENABLE_THREADS
|
||||
-
|
||||
// Default to hardware_concurrency
|
||||
ThreadPool::ThreadPool() : ThreadPool(hardware_concurrency()) {}
|
||||
|
||||
@@ -107,7 +105,7 @@ ThreadPool::~ThreadPool() {
|
||||
Worker.join();
|
||||
}
|
||||
|
||||
-#else // LLVM_ENABLE_THREADS Disabled
|
||||
+#define ThreadPool SequentialThreadPool
|
||||
|
||||
ThreadPool::ThreadPool() : ThreadPool(0) {}
|
||||
|
||||
@@ -142,5 +140,3 @@ std::shared_future<void> ThreadPool::asyncImpl(TaskTy Task) {
|
||||
ThreadPool::~ThreadPool() {
|
||||
wait();
|
||||
}
|
||||
-
|
||||
-#endif
|
||||
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
|
||||
index 738cafa6cac..8ef75d2589c 100644
|
||||
--- a/llvm/tools/gold/gold-plugin.cpp
|
||||
+++ b/llvm/tools/gold/gold-plugin.cpp
|
||||
@@ -848,7 +848,7 @@ static std::unique_ptr<LTO> createLTO(IndexWriteCallback OnIndexWrite,
|
||||
Conf.DisableVerify = options::DisableVerify;
|
||||
Conf.OptLevel = options::OptLevel;
|
||||
if (options::Parallelism)
|
||||
- Backend = createInProcessThinBackend(options::Parallelism);
|
||||
+ Backend = createInProcessThinBackendNoThread(options::Parallelism);
|
||||
if (options::thinlto_index_only) {
|
||||
std::string OldPrefix, NewPrefix;
|
||||
getThinLTOOldAndNewPrefix(OldPrefix, NewPrefix);
|
||||
@@ -856,6 +856,9 @@ static std::unique_ptr<LTO> createLTO(IndexWriteCallback OnIndexWrite,
|
||||
options::thinlto_emit_imports_files,
|
||||
LinkedObjectsFile, OnIndexWrite);
|
||||
}
|
||||
+ if(!Backend)
|
||||
+ Backend = createInProcessThinBackendNoThread(llvm::heavyweight_hardware_concurrency());
|
||||
+
|
||||
|
||||
Conf.OverrideTriple = options::triple;
|
||||
Conf.DefaultTriple = sys::getDefaultTargetTriple();
|
||||
@@ -1039,7 +1042,7 @@ static std::vector<std::pair<SmallString<128>, bool>> runLTO() {
|
||||
if (!options::cache_dir.empty())
|
||||
Cache = check(localCache(options::cache_dir, AddBuffer));
|
||||
|
||||
- check(Lto->run(AddStream, Cache));
|
||||
+ check(Lto->runNoThread(AddStream, Cache));
|
||||
|
||||
// Write empty output files that may be expected by the distributed build
|
||||
// system.
|
||||
--
|
||||
2.20.1
|
||||
|
17
SOURCES/lit.fedora.cfg.py
Normal file
17
SOURCES/lit.fedora.cfg.py
Normal file
@ -0,0 +1,17 @@
|
||||
|
||||
config.llvm_tools_dir = '/usr/bin'
|
||||
config.llvm_shlib_dir = '%(llvm_shlib_dir)s' % lit_config.params
|
||||
|
||||
if hasattr(config, 'host_triple'):
|
||||
# This means we are running lit regression tests
|
||||
|
||||
# Regression tests write output to this directory, so we need to be able to specify
|
||||
# a temp directory when invoking lit. e.g. lit -Dllvm_obj_root=/tmp/lit
|
||||
config.llvm_obj_root = "%(llvm_obj_root)s" % lit_config.params
|
||||
lit_config.load_config(config, '%(llvm_test_root)s/lit.cfg.py' % lit_config.params)
|
||||
else:
|
||||
# This means we are running lit unit tests
|
||||
|
||||
# For unit tests, llvm_obj_root is used to find the unit test binaries.
|
||||
config.llvm_obj_root = '%(llvm_unittest_bindir)s' % lit_config.params
|
||||
lit_config.load_config(config, '%(llvm_test_root)s/Unit/lit.cfg.py' % lit_config.params)
|
58
SOURCES/run-lit-tests
Executable file
58
SOURCES/run-lit-tests
Executable file
@ -0,0 +1,58 @@
|
||||
#!/bin/bash
|
||||
|
||||
usage() {
|
||||
echo "usage: `basename $0` [OPTIONS]"
|
||||
echo " --threads NUM The number of threads to use for running tests."
|
||||
echo " --multilib-arch ARCH Use this option to test 32-bit libs/binaries on"
|
||||
echo " 64-bit hosts."
|
||||
}
|
||||
|
||||
threads_arg=''
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
case $1 in
|
||||
--threads)
|
||||
shift
|
||||
threads_arg="--threads $1"
|
||||
;;
|
||||
--multilib-arch)
|
||||
shift
|
||||
ARCH=$1
|
||||
;;
|
||||
* )
|
||||
echo "unknown option: $1"
|
||||
echo ""
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
set -xe
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
ARCH=`rpm --eval '%_arch'`
|
||||
fi
|
||||
|
||||
case $ARCH in
|
||||
arm)
|
||||
;&
|
||||
i686)
|
||||
LIB_DIR="/usr/lib/"
|
||||
;;
|
||||
*)
|
||||
LIB_DIR="/usr/lib64/"
|
||||
;;
|
||||
esac
|
||||
|
||||
cd $(mktemp -d)
|
||||
ln -s /usr/include include
|
||||
tar -xzf /usr/share/llvm/src/test.tar.gz
|
||||
ln -s $ARCH.site.cfg.py test/lit.site.cfg.py
|
||||
ln -s $ARCH.site.cfg.py test/Unit/lit.site.cfg.py
|
||||
lit -v -s $threads_arg test \
|
||||
-Dllvm_obj_root=`pwd` \
|
||||
-Dllvm_test_root=`pwd`/test \
|
||||
-Dllvm_unittest_bindir=$LIB_DIR/llvm \
|
||||
-Dllvm_shlib_dir=$LIB_DIR
|
673
SPECS/llvm.spec
Normal file
673
SPECS/llvm.spec
Normal file
@ -0,0 +1,673 @@
|
||||
# Components enabled if supported by target architecture:
|
||||
%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64}
|
||||
%ifarch %{gold_arches}
|
||||
%bcond_without gold
|
||||
%else
|
||||
%bcond_with gold
|
||||
%endif
|
||||
|
||||
%global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
|
||||
%global build_llvm_bindir %{buildroot}%{_bindir}
|
||||
%global llvm_libdir %{_libdir}/%{name}
|
||||
%global build_llvm_libdir %{buildroot}%{llvm_libdir}
|
||||
%global maj_ver 8
|
||||
%global min_ver 0
|
||||
%global patch_ver 1
|
||||
#%%global rc_ver 2
|
||||
#%%global compat_version 7.0.1
|
||||
|
||||
|
||||
%global pkg_name llvm
|
||||
%global install_prefix /usr
|
||||
%global install_libdir %{_libdir}
|
||||
%global pkg_libdir %{install_libdir}
|
||||
|
||||
%global build_install_prefix %{buildroot}%{install_prefix}
|
||||
%global build_pkgdocdir %{buildroot}%{_pkgdocdir}
|
||||
|
||||
#%%ifnarch i686
|
||||
%global enable_test_pkg 1
|
||||
#%%endif
|
||||
|
||||
%if !0%{?rhel}
|
||||
# libedit-devel is a buildroot-only package in RHEL8, so we can't have a
|
||||
# any run-time depencies on it.
|
||||
%global use_libedit 1
|
||||
%endif
|
||||
|
||||
Name: %{pkg_name}
|
||||
Version: %{maj_ver}.%{min_ver}.%{patch_ver}
|
||||
Release: 1%{?rc_ver:.rc%{rc_ver}}%{?dist}
|
||||
Summary: The Low Level Virtual Machine
|
||||
|
||||
License: NCSA
|
||||
URL: http://llvm.org
|
||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-%{rc_ver}}/%{llvm_srcdir}.tar.xz
|
||||
Source1: run-lit-tests
|
||||
Source2: lit.fedora.cfg.py
|
||||
%if %{defined compat_version}
|
||||
Source100: http://llvm.org/releases/%{compat_version}/%{name}-%{compat_version}.src.tar.xz
|
||||
%endif
|
||||
|
||||
Patch2: 0001-Selectively-disable-threading-from-gold.patch
|
||||
Patch3: 0001-Filter-out-cxxflags-not-supported-by-clang.patch
|
||||
Patch4: 0001-Deactivate-markdown-doc.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libffi-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: python3-sphinx
|
||||
#BuildRequires: python3-recommonmark
|
||||
BuildRequires: multilib-rpm-config
|
||||
%if %{with gold}
|
||||
BuildRequires: binutils-devel
|
||||
%endif
|
||||
%ifarch %{valgrind_arches}
|
||||
# Enable extra functionality when run the LLVM JIT under valgrind.
|
||||
BuildRequires: valgrind-devel
|
||||
%endif
|
||||
%if 0%{?use_libedit}
|
||||
# LLVM's LineEditor library will use libedit if it is available.
|
||||
BuildRequires: libedit-devel
|
||||
%endif
|
||||
# We need python3-devel for pathfix.py.
|
||||
BuildRequires: python3-devel
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description
|
||||
LLVM is a compiler infrastructure designed for compile-time, link-time,
|
||||
runtime, and idle-time optimization of programs from arbitrary programming
|
||||
languages. The compiler infrastructure includes mirror sets of programming
|
||||
tools as well as libraries with equivalent functionality.
|
||||
|
||||
%package devel
|
||||
Summary: Libraries and header files for LLVM
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# The installed LLVM cmake files will add -ledit to the linker flags for any
|
||||
# app that requires the libLLVMLineEditor, so we need to make sure
|
||||
# libedit-devel is available.
|
||||
%if 0%{?use_libedit}
|
||||
Requires: libedit-devel
|
||||
%endif
|
||||
Requires(post): %{_sbindir}/alternatives
|
||||
Requires(postun): %{_sbindir}/alternatives
|
||||
|
||||
%description devel
|
||||
This package contains library and header files needed to develop new native
|
||||
programs that use the LLVM infrastructure.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for LLVM
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description doc
|
||||
Documentation for the LLVM compiler infrastructure.
|
||||
|
||||
%package libs
|
||||
Summary: LLVM shared libraries
|
||||
|
||||
%description libs
|
||||
Shared libraries for the LLVM compiler infrastructure.
|
||||
|
||||
%package static
|
||||
Summary: LLVM static libraries
|
||||
Conflicts: %{name}-devel < 8
|
||||
|
||||
%description static
|
||||
Static libraries for the LLVM compiler infrastructure.
|
||||
|
||||
%if 0%{?enable_test_pkg}
|
||||
|
||||
%package test
|
||||
Summary: LLVM regression tests
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python3-lit
|
||||
# The regression tests need gold.
|
||||
Requires: binutils
|
||||
# This is for llvm-config
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
# Bugpoint tests require gcc
|
||||
Requires: gcc
|
||||
Requires: findutils
|
||||
|
||||
%description test
|
||||
LLVM regression tests.
|
||||
|
||||
%endif
|
||||
|
||||
%package googletest
|
||||
Summary: LLVM's modified googletest sources
|
||||
|
||||
%description googletest
|
||||
LLVM's modified googletest sources.
|
||||
|
||||
%prep
|
||||
%if %{defined compat_version}
|
||||
%setup -T -q -b 100 -n llvm-%{compat_version}.src
|
||||
|
||||
%setup -q -n llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
%patch2 -p2
|
||||
%patch3 -p2
|
||||
%patch4 -p2
|
||||
|
||||
%else
|
||||
%autosetup -n llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src -p2
|
||||
%endif
|
||||
|
||||
pathfix.py -i %{__python3} -pn \
|
||||
test/BugPoint/compile-custom.ll.py \
|
||||
tools/opt-viewer/*.py
|
||||
|
||||
%build
|
||||
mkdir -p _build
|
||||
cd _build
|
||||
|
||||
%ifarch s390 %{arm} %ix86
|
||||
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
|
||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||
%endif
|
||||
|
||||
# force off shared libs as cmake macros turns it on.
|
||||
#
|
||||
# -DCMAKE_INSTALL_RPATH=";" is a workaround for llvm manually setting the
|
||||
# rpath of libraries and binaries. llvm will skip the manual setting
|
||||
# if CAMKE_INSTALL_RPATH is set to a value, but cmake interprets this value
|
||||
# as nothing, so it sets the rpath to "" when installing.
|
||||
%cmake .. -G Ninja \
|
||||
-DBUILD_SHARED_LIBS:BOOL=OFF \
|
||||
-DLLVM_PARALLEL_LINK_JOBS=1 \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_INSTALL_RPATH=";" \
|
||||
%ifarch s390 s390x %{arm} %ix86
|
||||
-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
|
||||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
|
||||
%endif
|
||||
%if 0%{?__isa_bits} == 64
|
||||
-DLLVM_LIBDIR_SUFFIX=64 \
|
||||
%else
|
||||
-DLLVM_LIBDIR_SUFFIX= \
|
||||
%endif
|
||||
\
|
||||
-DLLVM_TARGETS_TO_BUILD="X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF" \
|
||||
-DLLVM_ENABLE_LIBCXX:BOOL=OFF \
|
||||
-DLLVM_ENABLE_ZLIB:BOOL=ON \
|
||||
-DLLVM_ENABLE_FFI:BOOL=ON \
|
||||
-DLLVM_ENABLE_RTTI:BOOL=ON \
|
||||
%if %{with gold}
|
||||
-DLLVM_BINUTILS_INCDIR=%{_includedir} \
|
||||
%endif
|
||||
\
|
||||
-DLLVM_BUILD_RUNTIME:BOOL=ON \
|
||||
\
|
||||
-DLLVM_INCLUDE_TOOLS:BOOL=ON \
|
||||
-DLLVM_BUILD_TOOLS:BOOL=ON \
|
||||
\
|
||||
-DLLVM_INCLUDE_TESTS:BOOL=ON \
|
||||
-DLLVM_BUILD_TESTS:BOOL=ON \
|
||||
\
|
||||
-DLLVM_INCLUDE_EXAMPLES:BOOL=ON \
|
||||
-DLLVM_BUILD_EXAMPLES:BOOL=OFF \
|
||||
\
|
||||
-DLLVM_INCLUDE_UTILS:BOOL=ON \
|
||||
-DLLVM_INSTALL_UTILS:BOOL=ON \
|
||||
-DLLVM_UTILS_INSTALL_DIR:PATH=%{build_llvm_bindir} \
|
||||
-DLLVM_TOOLS_INSTALL_DIR:PATH=bin \
|
||||
\
|
||||
-DLLVM_INCLUDE_DOCS:BOOL=ON \
|
||||
-DLLVM_BUILD_DOCS:BOOL=ON \
|
||||
-DLLVM_ENABLE_SPHINX:BOOL=ON \
|
||||
-DLLVM_ENABLE_DOXYGEN:BOOL=OFF \
|
||||
\
|
||||
-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
|
||||
-DLLVM_DYLIB_EXPORT_ALL:BOOL=ON \
|
||||
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
|
||||
-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \
|
||||
-DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \
|
||||
\
|
||||
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
|
||||
-DCMAKE_INSTALL_PREFIX=%{build_install_prefix} \
|
||||
-DLLVM_INSTALL_SPHINX_HTML_DIR=%{build_pkgdocdir}/html \
|
||||
-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3
|
||||
|
||||
ninja -v -j2
|
||||
|
||||
%if %{defined compat_version}
|
||||
mkdir ../compat-build
|
||||
cd ../compat-build
|
||||
%cmake ../../%{name}-%{compat_version}.src \
|
||||
-G Ninja \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DLLVM_TARGETS_TO_BUILD="X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF" \
|
||||
-DLLVM_ENABLE_RTTI:BOOL=ON \
|
||||
-DLLVM_ENABLE_ZLIB:BOOL=ON \
|
||||
-DLLVM_ENABLE_FFI:BOOL=ON \
|
||||
-DLLVM_BUILD_LLVM_DYLIB=ON
|
||||
ninja -v LLVM
|
||||
|
||||
# Remove files we don't need to save disk space
|
||||
mv lib/libLLVM-`echo %{compat_version} | cut -f1 -d .`.so ..
|
||||
rm -Rf *
|
||||
%endif
|
||||
|
||||
%install
|
||||
ninja -C _build -v install
|
||||
|
||||
|
||||
mkdir -p %{buildroot}/%{_bindir}
|
||||
mv %{buildroot}/%{_bindir}/llvm-config %{buildroot}/%{_bindir}/llvm-config-%{__isa_bits}
|
||||
ln -s llvm-config-%{__isa_bits} %{buildroot}/%{_bindir}/llvm-config
|
||||
|
||||
# Fix some man pages
|
||||
ln -s llvm-config.1 %{buildroot}%{_mandir}/man1/llvm-config-%{__isa_bits}.1
|
||||
mv %{buildroot}%{_mandir}/man1/tblgen.1 %{buildroot}%{_mandir}/man1/llvm-tblgen.1
|
||||
|
||||
# Install binaries needed for lit tests
|
||||
%if 0%{?enable_test_pkg}
|
||||
%global test_binaries FileCheck count lli-child-target llvm-PerfectShuffle llvm-isel-fuzzer llvm-opt-fuzzer not yaml-bench
|
||||
|
||||
for f in %{test_binaries}
|
||||
do
|
||||
install -m 0755 ./_build/bin/$f %{build_llvm_bindir}
|
||||
done
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
%multilib_fix_c_header --file %{_includedir}/llvm/Config/llvm-config.h
|
||||
|
||||
# Install libraries needed for unittests
|
||||
%if 0%{?__isa_bits} == 64
|
||||
%global build_libdir _build/lib64
|
||||
%else
|
||||
%global build_libdir _build/lib
|
||||
%endif
|
||||
|
||||
install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{_libdir}
|
||||
|
||||
%global install_srcdir %{buildroot}%{_datadir}/llvm/src
|
||||
%global lit_cfg test/%{_arch}.site.cfg.py
|
||||
%global lit_unit_cfg test/Unit/%{_arch}.site.cfg.py
|
||||
%global lit_fedora_cfg %{_datadir}/llvm/lit.fedora.cfg.py
|
||||
|
||||
# Install gtest sources so clang can use them for gtest
|
||||
install -d %{install_srcdir}
|
||||
install -d %{install_srcdir}/utils/
|
||||
cp -R utils/unittest %{install_srcdir}/utils/
|
||||
|
||||
%if 0%{?enable_test_pkg}
|
||||
# Generate lit config files. Strip off the last line that initiates the
|
||||
# test run, so we can customize the configuration.
|
||||
head -n -1 _build/test/lit.site.cfg.py >> %{lit_cfg}
|
||||
head -n -1 _build/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg}
|
||||
|
||||
# Install custom fedora config file
|
||||
cp %{SOURCE2} %{buildroot}%{lit_fedora_cfg}
|
||||
|
||||
# Patch lit config files to load custom fedora config:
|
||||
for f in %{lit_cfg} %{lit_unit_cfg}; do
|
||||
echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> $f
|
||||
done
|
||||
|
||||
install -d %{buildroot}%{_libexecdir}/tests/llvm
|
||||
install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/llvm
|
||||
|
||||
# Install lit tests. We need to put these in a tarball otherwise rpm will complain
|
||||
# about some of the test inputs having the wrong object file format.
|
||||
install -d %{buildroot}%{_datadir}/llvm/
|
||||
tar -czf %{install_srcdir}/test.tar.gz test/
|
||||
|
||||
# Install the unit test binaries
|
||||
mkdir -p %{build_llvm_libdir}
|
||||
cp -R _build/unittests %{build_llvm_libdir}/
|
||||
rm -rf `find %{build_llvm_libdir} -iname 'cmake*'`
|
||||
|
||||
# Install libraries used for testing
|
||||
install -m 0755 %{build_libdir}/BugpointPasses.so %{buildroot}%{_libdir}
|
||||
install -m 0755 %{build_libdir}/LLVMHello.so %{buildroot}%{_libdir}
|
||||
|
||||
# Install test inputs for PDB tests
|
||||
echo "%{_datadir}/llvm/src/unittests/DebugInfo/PDB" > %{build_llvm_libdir}/unittests/DebugInfo/PDB/llvm.srcdir.txt
|
||||
mkdir -p %{buildroot}%{_datadir}/llvm/src/unittests/DebugInfo/PDB/
|
||||
cp -R unittests/DebugInfo/PDB/Inputs %{buildroot}%{_datadir}/llvm/src/unittests/DebugInfo/PDB/
|
||||
%endif
|
||||
|
||||
|
||||
%if %{defined compat_version}
|
||||
cd compat-build
|
||||
install ../libLLVM-`echo %{compat_version} | cut -f1 -d .`.so %{buildroot}%{_libdir}
|
||||
%endif
|
||||
|
||||
%check
|
||||
|
||||
# TODO: Fix arm
|
||||
ninja check-all -C _build || \
|
||||
%ifarch %{arm}
|
||||
:
|
||||
%else
|
||||
false
|
||||
%endif
|
||||
|
||||
|
||||
%ldconfig_scriptlets libs
|
||||
|
||||
%post devel
|
||||
%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config llvm-config %{_bindir}/llvm-config-%{__isa_bits} %{__isa_bits}
|
||||
|
||||
%postun devel
|
||||
if [ $1 -eq 0 ]; then
|
||||
%{_sbindir}/update-alternatives --remove llvm-config %{_bindir}/llvm-config-%{__isa_bits}
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
%exclude %{_bindir}/llvm-config*
|
||||
%exclude %{_bindir}/not
|
||||
%exclude %{_bindir}/count
|
||||
%exclude %{_bindir}/yaml-bench
|
||||
%exclude %{_bindir}/lli-child-target
|
||||
%exclude %{_bindir}/llvm-isel-fuzzer
|
||||
%exclude %{_bindir}/llvm-opt-fuzzer
|
||||
%{_bindir}/*
|
||||
|
||||
%exclude %{_mandir}/man1/llvm-config*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%{_datadir}/opt-viewer
|
||||
|
||||
%files libs
|
||||
%{pkg_libdir}/libLLVM-%{maj_ver}.so
|
||||
%if %{with gold}
|
||||
%{_libdir}/LLVMgold.so
|
||||
%endif
|
||||
%{_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
|
||||
%{_libdir}/libLTO.so*
|
||||
%{pkg_libdir}/libOptRemarks.so*
|
||||
%if %{defined compat_version}
|
||||
%{_libdir}/libLLVM-7.so
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%{_bindir}/llvm-config*
|
||||
%{_mandir}/man1/llvm-config*
|
||||
%{_includedir}/llvm
|
||||
%{_includedir}/llvm-c
|
||||
%{_libdir}/libLLVM.so
|
||||
%{_libdir}/cmake/llvm
|
||||
%exclude %{_libdir}/cmake/llvm/LLVMStaticExports.cmake
|
||||
|
||||
%files doc
|
||||
%doc %{_pkgdocdir}/html
|
||||
|
||||
%files static
|
||||
%{_libdir}/*.a
|
||||
%exclude %{_libdir}/libLLVMTestingSupport.a
|
||||
%{_libdir}/cmake/llvm/LLVMStaticExports.cmake
|
||||
|
||||
%if 0%{?enable_test_pkg}
|
||||
%files test
|
||||
%{_libexecdir}/tests/llvm/
|
||||
%{llvm_libdir}/unittests/
|
||||
%{_datadir}/llvm/src/unittests
|
||||
%{_datadir}/llvm/src/test.tar.gz
|
||||
%{_datadir}/llvm/lit.fedora.cfg.py
|
||||
%{_bindir}/not
|
||||
%{_bindir}/count
|
||||
%{_bindir}/yaml-bench
|
||||
%{_bindir}/lli-child-target
|
||||
%{_bindir}/llvm-isel-fuzzer
|
||||
%{_bindir}/llvm-opt-fuzzer
|
||||
%{_libdir}/BugpointPasses.so
|
||||
%{_libdir}/LLVMHello.so
|
||||
%endif
|
||||
|
||||
%files googletest
|
||||
%{_datadir}/llvm/src/utils
|
||||
%{_libdir}/libLLVMTestingSupport.a
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 1 2019 sguelton@redhat.com - 8.0.1-1
|
||||
- 8.0.1 release
|
||||
|
||||
* Tue Jul 2 2019 sguelton@redhat.com - 8.0.1-0.3.rc2
|
||||
- Deactivate multithreading for gold plugin only to fix rhbz#1636479
|
||||
|
||||
* Mon Jun 17 2019 sguelton@redhat.com - 8.0.1-0.2.rc2
|
||||
- Deactivate multithreading instead of patching to fix rhbz#1636479
|
||||
|
||||
* Thu Jun 13 2019 sguelton@redhat.com - 8.0.1-0.1.rc2
|
||||
- 8.0.1rc2 Release
|
||||
|
||||
* Tue May 14 2019 sguelton@redhat.com - 8.0.0-3
|
||||
- Disable threading in LTO
|
||||
|
||||
* Wed May 8 2019 sguelton@redhat.com - 8.0.0-2
|
||||
- Fix conflicts between llvm-static = 8 and llvm-dev < 8 around LLVMStaticExports.cmake
|
||||
|
||||
* Thu May 2 2019 sguelton@redhat.com - 8.0.0-1
|
||||
- 8.0.0 Release
|
||||
|
||||
* Fri Dec 14 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-1
|
||||
- 7.0.1 Release
|
||||
|
||||
* Thu Dec 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.5.rc3
|
||||
- Drop compat libs
|
||||
|
||||
* Wed Dec 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.4.rc3
|
||||
- Fix ambiguous python shebangs
|
||||
|
||||
* Tue Dec 11 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.3.rc3
|
||||
- Disable threading in thinLTO
|
||||
|
||||
* Tue Dec 11 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.2.rc3
|
||||
- Update cmake options for compat build
|
||||
|
||||
* Mon Dec 10 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.1.rc3
|
||||
- 7.0.1-rc3 Release
|
||||
|
||||
* Fri Dec 07 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-14
|
||||
- Don't build llvm-test on i686
|
||||
|
||||
* Thu Dec 06 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-13
|
||||
- Fix build when python2 is not present on system
|
||||
|
||||
* Tue Nov 06 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-12
|
||||
- Fix multi-lib installation of llvm-devel
|
||||
|
||||
* Tue Oct 23 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-11
|
||||
- Add sub-packages for testing
|
||||
|
||||
* Mon Oct 01 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-10
|
||||
- Drop scl macros
|
||||
|
||||
* Tue Aug 28 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-9
|
||||
- Drop libedit dependency
|
||||
|
||||
* Tue Aug 14 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-8
|
||||
- Only enabled valgrind functionality on arches that support it
|
||||
|
||||
* Mon Aug 13 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-7
|
||||
- BuildRequires: python3-devel
|
||||
|
||||
* Mon Aug 06 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-6
|
||||
- Backport fixes for rhbz#1610053, rhbz#1562196, rhbz#1595996
|
||||
|
||||
* Mon Aug 06 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-5
|
||||
- Fix ld.so.conf.d path in files list
|
||||
|
||||
* Sat Aug 04 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-4
|
||||
- Fix ld.so.conf.d path
|
||||
|
||||
* Fri Aug 03 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-3
|
||||
- Install ld.so.conf so llvm libs are in the library search path
|
||||
|
||||
* Wed Jul 25 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
|
||||
- Re-enable doc package now that BREW-2381 is fixed
|
||||
|
||||
* Tue Jul 10 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
|
||||
- 6.0.1 Release
|
||||
|
||||
* Mon Jun 04 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-13
|
||||
- Limit build jobs on ppc64 to avoid OOM errors
|
||||
|
||||
* Sat Jun 02 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-12
|
||||
- Switch to python3-sphinx
|
||||
|
||||
* Thu May 31 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-11
|
||||
- Remove conditionals to enable building only the llvm-libs package, we don't
|
||||
needs these for module builds.
|
||||
|
||||
* Wed May 23 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-10
|
||||
- Add BuildRequires: libstdc++-static
|
||||
- Resolves: #1580785
|
||||
|
||||
* Wed Apr 04 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-9
|
||||
- Add conditionals to enable building only the llvm-libs package
|
||||
|
||||
* Tue Apr 03 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-8
|
||||
- Drop BuildRequires: libstdc++-static this package does not exist in RHEL8
|
||||
|
||||
* Tue Mar 20 2018 Tilmann Scheller <tschelle@redhat.com> - 5.0.1-7
|
||||
- Backport fix for rhbz#1558226 from trunk
|
||||
|
||||
* Tue Mar 06 2018 Tilmann Scheller <tschelle@redhat.com> - 5.0.1-6
|
||||
- Backport fix for rhbz#1550469 from trunk
|
||||
|
||||
* Thu Feb 22 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-5
|
||||
- Backport some retpoline fixes
|
||||
|
||||
* Tue Feb 06 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-4
|
||||
- Backport retpoline support
|
||||
|
||||
* Mon Jan 29 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-3
|
||||
- Backport r315279 to fix an issue with rust
|
||||
|
||||
* Mon Jan 15 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-2
|
||||
- Drop ExculdeArch: ppc64
|
||||
|
||||
* Mon Jan 08 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-1
|
||||
- 5.0.1 Release
|
||||
|
||||
* Thu Jun 22 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-3
|
||||
- Fix Requires for devel package again.
|
||||
|
||||
* Thu Jun 22 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-2
|
||||
- Fix Requires for llvm-devel
|
||||
|
||||
* Tue Jun 20 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-1
|
||||
- 4.0.1 Release
|
||||
|
||||
* Mon Jun 05 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-5
|
||||
- Build for llvm-toolset-7 rename
|
||||
|
||||
* Mon May 01 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-4
|
||||
- Remove multi-lib workarounds
|
||||
|
||||
* Fri Apr 28 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-3
|
||||
- Fix build with llvm-toolset-4 scl
|
||||
|
||||
* Mon Apr 03 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-2
|
||||
- Simplify spec with rpm macros.
|
||||
|
||||
* Thu Mar 23 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-1
|
||||
- LLVM 4.0.0 Final Release
|
||||
|
||||
* Wed Mar 22 2017 tstellar@redhat.com - 3.9.1-6
|
||||
- Fix %%postun sep for -devel package.
|
||||
|
||||
* Mon Mar 13 2017 Tom Stellard <tstellar@redhat.com> - 3.9.1-5
|
||||
- Disable failing tests on ARM.
|
||||
|
||||
* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 3.9.1-4
|
||||
- Fix missing mask on relocation for aarch64 (rhbz 1429050)
|
||||
|
||||
* Wed Mar 01 2017 Dave Airlie <airlied@redhat.com> - 3.9.1-3
|
||||
- revert upstream radeonsi breaking change.
|
||||
|
||||
* Thu Feb 23 2017 Josh Stone <jistone@redhat.com> - 3.9.1-2
|
||||
- disable sphinx warnings-as-errors
|
||||
|
||||
* Fri Feb 10 2017 Orion Poplawski <orion@cora.nwra.com> - 3.9.1-1
|
||||
- llvm 3.9.1
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Nov 29 2016 Josh Stone <jistone@redhat.com> - 3.9.0-7
|
||||
- Apply backports from rust-lang/llvm#55, #57
|
||||
|
||||
* Tue Nov 01 2016 Dave Airlie <airlied@gmail.com - 3.9.0-6
|
||||
- rebuild for new arches
|
||||
|
||||
* Wed Oct 26 2016 Dave Airlie <airlied@redhat.com> - 3.9.0-5
|
||||
- apply the patch from -4
|
||||
|
||||
* Wed Oct 26 2016 Dave Airlie <airlied@redhat.com> - 3.9.0-4
|
||||
- add fix for lldb out-of-tree build
|
||||
|
||||
* Mon Oct 17 2016 Josh Stone <jistone@redhat.com> - 3.9.0-3
|
||||
- Apply backports from rust-lang/llvm#47, #48, #53, #54
|
||||
|
||||
* Sat Oct 15 2016 Josh Stone <jistone@redhat.com> - 3.9.0-2
|
||||
- Apply an InstCombine backport via rust-lang/llvm#51
|
||||
|
||||
* Wed Sep 07 2016 Dave Airlie <airlied@redhat.com> - 3.9.0-1
|
||||
- llvm 3.9.0
|
||||
- upstream moved where cmake files are packaged.
|
||||
- upstream dropped CppBackend
|
||||
|
||||
* Wed Jul 13 2016 Adam Jackson <ajax@redhat.com> - 3.8.1-1
|
||||
- llvm 3.8.1
|
||||
- Add mips target
|
||||
- Fix some shared library mispackaging
|
||||
|
||||
* Tue Jun 07 2016 Jan Vcelak <jvcelak@fedoraproject.org> - 3.8.0-2
|
||||
- fix color support detection on terminal
|
||||
|
||||
* Thu Mar 10 2016 Dave Airlie <airlied@redhat.com> 3.8.0-1
|
||||
- llvm 3.8.0 release
|
||||
|
||||
* Wed Mar 09 2016 Dan Horák <dan[at][danny.cz> 3.8.0-0.3
|
||||
- install back memory consumption workaround for s390
|
||||
|
||||
* Thu Mar 03 2016 Dave Airlie <airlied@redhat.com> 3.8.0-0.2
|
||||
- llvm 3.8.0 rc3 release
|
||||
|
||||
* Fri Feb 19 2016 Dave Airlie <airlied@redhat.com> 3.8.0-0.1
|
||||
- llvm 3.8.0 rc2 release
|
||||
|
||||
* Tue Feb 16 2016 Dan Horák <dan[at][danny.cz> 3.7.1-7
|
||||
- recognize s390 as SystemZ when configuring build
|
||||
|
||||
* Sat Feb 13 2016 Dave Airlie <airlied@redhat.com> 3.7.1-6
|
||||
- export C++ API for mesa.
|
||||
|
||||
* Sat Feb 13 2016 Dave Airlie <airlied@redhat.com> 3.7.1-5
|
||||
- reintroduce llvm-static, clang needs it currently.
|
||||
|
||||
* Fri Feb 12 2016 Dave Airlie <airlied@redhat.com> 3.7.1-4
|
||||
- jump back to single llvm library, the split libs aren't working very well.
|
||||
|
||||
* Fri Feb 05 2016 Dave Airlie <airlied@redhat.com> 3.7.1-3
|
||||
- add missing obsoletes (#1303497)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 07 2016 Jan Vcelak <jvcelak@fedoraproject.org> 3.7.1-1
|
||||
- new upstream release
|
||||
- enable gold linker
|
||||
|
||||
* Wed Nov 04 2015 Jan Vcelak <jvcelak@fedoraproject.org> 3.7.0-100
|
||||
- fix Requires for subpackages on the main package
|
||||
|
||||
* Tue Oct 06 2015 Jan Vcelak <jvcelak@fedoraproject.org> 3.7.0-100
|
||||
- initial version using cmake build system
|
Loading…
Reference in New Issue
Block a user