summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-11-30 21:21:55 +0000
committer Eric Hameleers <alien@slackware.com>2023-11-30 23:10:46 +0100
commit0e4c181655a6847ee8308178a62decf591db187e (patch)
tree9a9ee00264b0c34888bb5d5e33132a9b2dea04da /source/x
parent08605e45c377c78305d95a895e1080a864d5ec90 (diff)
downloadcurrent-0e4c181655a6847ee8308178a62decf591db187e.tar.gz
current-0e4c181655a6847ee8308178a62decf591db187e.tar.xz
Thu Nov 30 21:21:55 UTC 202320231130212155
d/perl-5.38.2-x86_64-1.txz: Upgraded. d/rust-1.70.0-x86_64-4.txz: Rebuilt. Fixed path to the rust libraries in rust-analyzer. Thanks to Heinz Wiesinger. kde/digikam-8.2.0-x86_64-1.txz: Upgraded. kde/wcslib-8.2.2-x86_64-1.txz: Upgraded. l/gdbm-1.23-x86_64-2.txz: Rebuilt. Build with --enable-libgdbm-compat since Python wants this. n/c-ares-1.23.0-x86_64-1.txz: Upgraded. x/mesa-23.3.0-x86_64-1.txz: Upgraded. xfce/xfce4-power-manager-4.18.3-x86_64-1.txz: Upgraded. xfce/xfce4-settings-4.18.4-x86_64-1.txz: Upgraded. testing/packages/rust-1.74.0-x86_64-2.txz: Rebuilt. Fixed path to the rust libraries in rust-analyzer. Thanks to Heinz Wiesinger.
Diffstat (limited to 'source/x')
-rw-r--r--source/x/mesa/patches/23827.patch42
-rw-r--r--source/x/mesa/patches/2d4fe5f229791fde52846b3f583c12508b5109d6.patch127
2 files changed, 0 insertions, 169 deletions
diff --git a/source/x/mesa/patches/23827.patch b/source/x/mesa/patches/23827.patch
deleted file mode 100644
index 32dfd887a..000000000
--- a/source/x/mesa/patches/23827.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 919d6d420f49b61096b5ebfc65cfb3866a427e73 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 23 Jun 2023 01:20:38 -0700
-Subject: [PATCH] gallium: Fix build with llvm 17
-
-These headers are not available for C files in llvm 17+
-and they seem to be not needed to compile after all with llvm 17
-so add conditions to exclude them for llvm >= 17
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index cd2108f3a088d..7131ec8667ecf 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -45,16 +45,18 @@
- #include <llvm-c/BitWriter.h>
- #if GALLIVM_USE_NEW_PASS == 1
- #include <llvm-c/Transforms/PassBuilder.h>
--#elif GALLIVM_HAVE_CORO == 1
-+#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17
- #include <llvm-c/Transforms/Scalar.h>
--#if LLVM_VERSION_MAJOR >= 7
-+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17
- #include <llvm-c/Transforms/Utils.h>
- #endif
- #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
- #include <llvm-c/Transforms/IPO.h>
- #endif
-+#if LLVM_VERSION_MAJOR < 17
- #include <llvm-c/Transforms/Coroutines.h>
- #endif
-+#endif
-
- unsigned gallivm_perf = 0;
-
---
-GitLab
-
diff --git a/source/x/mesa/patches/2d4fe5f229791fde52846b3f583c12508b5109d6.patch b/source/x/mesa/patches/2d4fe5f229791fde52846b3f583c12508b5109d6.patch
deleted file mode 100644
index 3fa3282f2..000000000
--- a/source/x/mesa/patches/2d4fe5f229791fde52846b3f583c12508b5109d6.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Fri, 25 Aug 2023 12:43:44 +1000
-Subject: clover/llvm: move to modern pass manager.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems like it should work, but I haven't tested it yet.
-
-Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879>
----
- src/gallium/frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++++++-----
- 1 file changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
-index 7a50fea3323..43d26fe1abb 100644
---- a/src/gallium/frontends/clover/llvm/invocation.cpp
-+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
-@@ -27,13 +27,17 @@
- #include <llvm/IR/DiagnosticPrinter.h>
- #include <llvm/IR/DiagnosticInfo.h>
- #include <llvm/IR/LLVMContext.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Support/raw_ostream.h>
--#include <llvm/Transforms/IPO/PassManagerBuilder.h>
-+#include <llvm/Transforms/IPO/Internalize.h>
- #include <llvm-c/Target.h>
- #ifdef HAVE_CLOVER_SPIRV
- #include <LLVMSPIRVLib/LLVMSPIRVLib.h>
- #endif
-
-+#include <llvm-c/TargetMachine.h>
-+#include <llvm-c/Transforms/PassBuilder.h>
-+#include <llvm/Support/CBindingWrapping.h>
- #include <clang/CodeGen/CodeGenAction.h>
- #include <clang/Lex/PreprocessorOptions.h>
- #include <clang/Frontend/TextDiagnosticBuffer.h>
-@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source,
-
- namespace {
- void
-- optimize(Module &mod, unsigned optimization_level,
-+ optimize(Module &mod,
-+ const std::string& ir_target,
-+ unsigned optimization_level,
- bool internalize_symbols) {
-- ::llvm::legacy::PassManager pm;
--
- // By default, the function internalizer pass will look for a function
- // called "main" and then mark all other functions as internal. Marking
- // functions as internal enables the optimizer to perform optimizations
-@@ -458,19 +462,53 @@ namespace {
- if (internalize_symbols) {
- std::vector<std::string> names =
- map(std::mem_fn(&Function::getName), get_kernels(mod));
-- pm.add(::llvm::createInternalizePass(
-+ internalizeModule(mod,
- [=](const ::llvm::GlobalValue &gv) {
- return std::find(names.begin(), names.end(),
- gv.getName()) != names.end();
-- }));
-+ });
- }
-
-- ::llvm::PassManagerBuilder pmb;
-- pmb.OptLevel = optimization_level;
-- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl(
-- ::llvm::Triple(mod.getTargetTriple()));
-- pmb.populateModulePassManager(pm);
-- pm.run(mod);
-+
-+ const char *opt_str = NULL;
-+ LLVMCodeGenOptLevel level;
-+ switch (optimization_level) {
-+ case 0:
-+ default:
-+ opt_str = "default<O0>";
-+ level = LLVMCodeGenLevelNone;
-+ break;
-+ case 1:
-+ opt_str = "default<O1>";
-+ level = LLVMCodeGenLevelLess;
-+ break;
-+ case 2:
-+ opt_str = "default<O2>";
-+ level = LLVMCodeGenLevelDefault;
-+ break;
-+ case 3:
-+ opt_str = "default<O3>";
-+ level = LLVMCodeGenLevelAggressive;
-+ break;
-+ }
-+
-+ const target &target = ir_target;
-+ LLVMTargetRef targ;
-+ char *err_message;
-+
-+ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message))
-+ return;
-+ LLVMTargetMachineRef tm =
-+ LLVMCreateTargetMachine(targ, target.triple.c_str(),
-+ target.cpu.c_str(), "", level,
-+ LLVMRelocDefault, LLVMCodeModelDefault);
-+
-+ if (!tm)
-+ return;
-+ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions();
-+ LLVMRunPasses(wrap(&mod), opt_str, tm, opts);
-+
-+ LLVMDisposeTargetMachine(tm);
- }
-
- std::unique_ptr<Module>
-@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries,
- auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log);
- auto mod = link(*ctx, *c, binaries, r_log);
-
-- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library);
-+ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library);
-
- static std::atomic_uint seq(0);
- const std::string id = "." + mod->getModuleIdentifier() + "-" +
---
-cgit v1.2.1
-