diff mbox series

CI: revert a meta-clang change which breaks pixman (thus, xserver)

Message ID 20221128174213.194165-1-ross.burton@arm.com
State New
Headers show
Series CI: revert a meta-clang change which breaks pixman (thus, xserver) | expand

Commit Message

Ross Burton Nov. 28, 2022, 5:42 p.m. UTC 
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...n-Do-not-use-clang-assembler-for-now.patch | 26 +++++++++++++++++++
 ci/clang.yml                                  |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch

Comments

Jon Mason Nov. 29, 2022, 1:14 a.m. UTC | #1 
On Mon, 28 Nov 2022 17:42:13 +0000, Ross Burton wrote:
> 


Applied, thanks!

[1/1] CI: revert a meta-clang change which breaks pixman (thus, xserver)
      commit: 4f1e45b6bd9cf4ff8d38f33f587d257ec1b30d6e

Best regards,
Jon Mason Dec. 1, 2022, 4:02 p.m. UTC | #2 
On Mon, 28 Nov 2022 17:42:13 +0000, Ross Burton wrote:
> 


Applied, thanks!

[1/1] CI: revert a meta-clang change which breaks pixman (thus, xserver)
      commit: 4f1e45b6bd9cf4ff8d38f33f587d257ec1b30d6e

Best regards,
diff mbox series

Patch

diff --git a/ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch b/ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch
new file mode 100644
index 00000000..4ad66078
--- /dev/null
+++ b/ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch
@@ -0,0 +1,26 @@ 
+This causes illegal instruction faults in pixman, so xserver crashes.
+https://github.com/kraj/meta-clang/issues/696
+
+From 8659c5c5bec39dd43a1988b19d4cf30507a44679 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 28 Nov 2022 16:52:50 +0000
+Subject: [PATCH] Revert "pixman: Do not use clang assembler for now"
+
+This reverts commit 84dbafa42d8141b00da75d6664aef07c252a52ee.
+---
+ conf/nonclangable.conf | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
+index 04112f4..b5db848 100644
+--- a/conf/nonclangable.conf
++++ b/conf/nonclangable.conf
+@@ -347,5 +347,4 @@ DEPENDS:append:pn-pixman:mips:toolchain-clang = " openmp"
+ #| .endfunc
+ #| ^
+ CFLAGS:append:pn-pixman:arm:toolchain-clang = " -no-integrated-as"
+-CFLAGS:append:pn-pixman:aarch64:toolchain-clang = " -no-integrated-as"
+ 
+-- 
+2.34.1
+
diff --git a/ci/clang.yml b/ci/clang.yml
index e5e7dd5f..bc6a18a3 100644
--- a/ci/clang.yml
+++ b/ci/clang.yml
@@ -5,6 +5,10 @@  repos:
   meta-clang:
     url: https://github.com/kraj/meta-clang
     refspec: master
+    patches:
+      pixman:
+        repo: meta-arm
+        path: ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch
 
 local_conf_header:
   clang: |