diff mbox series

[06/10] Revert "CI: revert a meta-clang change which breaks pixman (thus, xserver)"

Message ID 20230112110257.2070363-6-ross.burton@arm.com
State New
Headers show
Series [01/10] meta-*: mark layers as compatible with mickledore only | expand

Commit Message

Ross Burton Jan. 12, 2023, 11:02 a.m. UTC 
meta-clang now builds pixman with GCC until this is resolved.

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 deletions(-)
 delete mode 100644 ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch
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
deleted file mode 100644
index 4ad66078..00000000
--- a/ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-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 59265f41..a2063f19 100644
--- a/ci/clang.yml
+++ b/ci/clang.yml
@@ -4,10 +4,6 @@  header:
 repos:
   meta-clang:
     url: https://github.com/kraj/meta-clang
-    patches:
-      pixman:
-        repo: meta-arm
-        path: ci/0001-Revert-pixman-Do-not-use-clang-assembler-for-now.patch
 
 local_conf_header:
   clang: |