nodejs/nodejs-electron
SHA256
8
0
Fork 2
forked from pool/nodejs-electron
Code Pull Requests 2 Activity

Accepting request 1077213 from home:Guillaume_G:branches:devel:languages:nodejs

Browse Source 
- Add upstream patches to fix build on aarch64:
  * d0aa9ad.patch
  * 647d3d2.patch

OBS-URL: https://build.opensuse.org/request/show/1077213
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=70
This commit is contained in:
dziobian
2023-04-04 14:21:45 +00:00
committed by Git OBS Bridge
parent 30c1f7518c
commit 4005129651
4 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodejs-electron.changes
+7
View File
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 3 15:36:21 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add upstream patches to fix build on aarch64:
* d0aa9ad.patch
* 647d3d2.patch
-------------------------------------------------------------------
Thu Mar 30 12:51:54 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
- New upstream release 22.3.5
nodejs-electron.spec
+4
View File
@@ -383,6 +383,10 @@ Patch3118: gpu_feature_info-missing-uint32_t.patch
Patch3119: blink-gcc13-missing-headers.patch
Patch3120: effect_paint_property_node-Wchanges-meaning.patch
Patch3121: services-network-optional-explicit-constructor.patch
# PATCH-FIX-UPSTREAM - https://swiftshader-review.googlesource.com/c/SwiftShader/+/70528
Patch3200: d0aa9ad.patch
# PATCH-FIX-UPSTREAM - https://swiftshader-review.googlesource.com/c/SwiftShader/+/70328
Patch3201: 647d3d2.patch
%if %{with clang}
BuildRequires: clang
647d3d2.patch
+31
View File
@@ -0,0 +1,31 @@
From 647d3d24c935c2adb4e7bc5f1ecfe14ab12725d2 Mon Sep 17 00:00:00 2001
From: Alexis Hetu <sugoi@google.com>
Date: Mon, 12 Dec 2022 18:15:10 -0500
Subject: [PATCH] Fix LLVM update from google3
This CL imports a google3 fix for LLVM:
https://critique.corp.google.com/cl/494101670/depot/google3/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
Bug: b/191050320
Change-Id: I1250459354dd8e783352f9acfaf59821be2a84f0
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/70328
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Alexis Hétu <sugoi@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
---
diff --git src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
index d3dbdb9..fad747a 100644
--- src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
+++ src/third_party/swiftshader/src/Reactor/LLVMJIT.cpp
@@ -922,7 +922,7 @@
if(optimizationLevel > 0)
{
- fpm.addPass(llvm::SROAPass());
+ fpm.addPass(llvm::SROAPass(llvm::SROAOptions::PreserveCFG));
fpm.addPass(llvm::InstCombinePass());
}
d0aa9ad.patch
+30
View File
@@ -0,0 +1,30 @@
From d0aa9ad9447025a42f17df1b93bd71183e9b2d1f Mon Sep 17 00:00:00 2001
From: Nicolas Capens <nicolas.capens@gmail.com>
Date: Thu, 22 Dec 2022 01:46:20 -0500
Subject: [PATCH] Support LLVM 16+ API change
Bug: b/165000222
Change-Id: I4a77e7740d0af3b72627db1bec7d3094c2e69d21
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/70528
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Alexis Hétu <sugoi@google.com>
---
diff --git src/third_party/swiftshader/src/Reactor/LLVMReactor.cpp src/third_party/swiftshader/src/Reactor/LLVMReactor.cpp
index 9a2cb0b..6f7e503 100644
--- src/third_party/swiftshader/src/Reactor/LLVMReactor.cpp
+++ src/third_party/swiftshader/src/Reactor/LLVMReactor.cpp
@@ -621,7 +621,11 @@
declaration = new llvm::AllocaInst(T(type), 0, (llvm::Value *)nullptr, align);
}
+#if LLVM_VERSION_MAJOR >= 16
+ declaration->insertInto(&entryBlock, entryBlock.begin());
+#else
entryBlock.getInstList().push_front(declaration);
+#endif
if(getPragmaState(InitializeLocalVariables))
{