fix: add patch to fix linux arm build (electron#22523)

zcbenz · web-flow · commit 479354e72157 · 2020-03-03T22:41:31.000-08:00
diff --git a/patches/config.json b/patches/config.json
@@ -5,5 +5,7 @@
 
   "src/electron/patches/v8":  "src/v8",
 
-  "src/electron/patches/node": "src/third_party/electron_node"
+  "src/electron/patches/node": "src/third_party/electron_node",
+
+  "src/electron/patches/swiftshader": "src/third_party/swiftshader"
 }
diff --git a/patches/swiftshader/.patches b/patches/swiftshader/.patches
@@ -0,0 +1 @@
+marl_arm.patch
diff --git a/patches/swiftshader/marl_arm.patch b/patches/swiftshader/marl_arm.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Wed, 4 Mar 2020 14:23:28 -0700
+Subject: fix: linux arm build
+
+Fix Linux ARM build error caused by compiler update.
+
+This means to be a quick fix, we should choose other solution once we
+get an answer at:
+https://bugs.chromium.org/p/chromium/issues/detail?id=1058107
+
+diff --git a/third_party/marl/src/osfiber_asm_arm.S b/third_party/marl/src/osfiber_asm_arm.S
+index d276ac806..b2be5face 100644
+--- a/third_party/marl/src/osfiber_asm_arm.S
++++ b/third_party/marl/src/osfiber_asm_arm.S
+@@ -22,6 +22,7 @@
+ // x1: to
+ .text
+ .global marl_fiber_swap
++.type marl_fiber_swap, %function
+ .align 4
+ marl_fiber_swap:
+ 

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@`
`5`	`5`
`6`	`6`	`"src/electron/patches/v8": "src/v8",`
`7`	`7`
`8`		`- "src/electron/patches/node": "src/third_party/electron_node"`
	`8`	`+ "src/electron/patches/node": "src/third_party/electron_node",`
	`9`	`+`
	`10`	`+ "src/electron/patches/swiftshader": "src/third_party/swiftshader"`
`9`	`11`	`}`