From patchwork Mon Nov 28 17:42:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C8B3C4332F for ; Mon, 28 Nov 2022 17:42:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.124727.1669657336916044117 for ; Mon, 28 Nov 2022 09:42:17 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0EEDBD6E; Mon, 28 Nov 2022 09:42:23 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0826F3F73B; Mon, 28 Nov 2022 09:42:15 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH] CI: revert a meta-clang change which breaks pixman (thus, xserver) Date: Mon, 28 Nov 2022 17:42:13 +0000 Message-Id: <20221128174213.194165-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 28 Nov 2022 17:42:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4169 Signed-off-by: Ross Burton --- ...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 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 +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: |