From nobody Sun Sep 28 16:35:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1758289081; cv=none; d=zohomail.com; s=zohoarc; b=KqT/2VRt+oerYAGN3xqNEjoQwmLvf5M3U6famxbRCtvYv/CKnFkVKDLBJoaYnO3tjXijM60Hxt92mxjQg9OYk70NnAyZO+OERw6xZpWwsmhvtBAAsRazCHs0EqfYHmmSH6SeQ6XtA0JmG4druWnL+nOSqt3aTlScx1iagLnFDDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758289081; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3SGfB0u17RJddOmDPzZYgVSMOQw6qUmaA2O8s0exs4Q=; b=AR/jUt1vJfnIc+uTVqQsh8Z+wJgC3l/fiXI3hUznZYr9B9XTYZ2e2XRO75NAsKAKOauVqpUGn8iF7yo99+T0VmorE49dqeBngMRWnPyMEKNUqH/S/TpLhAXLYXWoxe4LkprbncDtBPtxD8lmCmNVm/71odT4eZwsQ6oLzUyU0FE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758289081943886.7551377083212; Fri, 19 Sep 2025 06:38:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uzbI3-00089e-4a; Fri, 19 Sep 2025 09:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uzbGn-0006Vd-Gd for qemu-devel@nongnu.org; Fri, 19 Sep 2025 09:35:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uzbGe-0003nt-DS for qemu-devel@nongnu.org; Fri, 19 Sep 2025 09:35:24 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-J29o6PQ1N9-6qDwwEPkc0A-1; Fri, 19 Sep 2025 09:35:07 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59171180057A; Fri, 19 Sep 2025 13:35:05 +0000 (UTC) Received: from localhost (unknown [10.45.242.27]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD99730002C5; Fri, 19 Sep 2025 13:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758288911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3SGfB0u17RJddOmDPzZYgVSMOQw6qUmaA2O8s0exs4Q=; b=SseXEc1gLb0xuzj5NEFJ1p1i8p/6mtGKRGhj/hJd1SpGejZXaAbLN8kWRZBtwNualOZ1kn CYISFRgf+yjcDIt/DzktMV4FLZh1ffcfmCFy3kxNhVDjLBfPBKg+tI5o1NuSwThxrl5meB ozWmrC3bD2Vyae0UxLjAshCzhGL56Ig= X-MC-Unique: J29o6PQ1N9-6qDwwEPkc0A-1 X-Mimecast-MFC-AGG-ID: J29o6PQ1N9-6qDwwEPkc0A_1758288905 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Ed Maste , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Li-Wen Hsu , Yonggang Luo , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kohei Tokunaga , Kyle Evans Subject: [PATCH 16/24] build-sys: cfi_debug and safe_stack are not compatible Date: Fri, 19 Sep 2025 17:33:10 +0400 Message-ID: <20250919133320.240145-17-marcandre.lureau@redhat.com> In-Reply-To: <20250919133320.240145-1-marcandre.lureau@redhat.com> References: <20250919133320.240145-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.105, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1758289082963116600 From: Marc-Andr=C3=A9 Lureau It fails to link on fedora >=3D 41: /usr/bin/ld: /usr/bin/../lib/clang/20/lib/x86_64-redhat-linux-gnu/libclang_= rt.safestack.a(safestack.cpp.o): in function `__sanitizer_internal_memcpy': (.text.__sanitizer_internal_memcpy+0x0): multiple definition of `__sanitize= r_internal_memcpy'; /usr/bin/../lib/clang/20/lib/x86_64-redhat-linux-gnu/li= bclang_rt.ubsan_standalone.a(sanitizer_libc.cpp.o):(.text.__sanitizer_inter= nal_memcpy+0x0): first defined here /usr/bin/ld: /usr/bin/../lib/clang/20/lib/x86_64-redhat-linux-gnu/libclang_= rt.safestack.a(safestack.cpp.o): in function `__sanitizer_internal_memmove': (.text.__sanitizer_internal_memmove+0x0): multiple definition of `__sanitiz= er_internal_memmove'; /usr/bin/../lib/clang/20/lib/x86_64-redhat-linux-gnu/= libclang_rt.ubsan_standalone.a(sanitizer_libc.cpp.o):(.text.__sanitizer_int= ernal_memmove+0x0): first defined here /usr/bin/ld: /usr/bin/../lib/clang/20/lib/x86_64-redhat-linux-gnu/libclang_= rt.safestack.a(safestack.cpp.o): in function `__sanitizer_internal_memset': (.text.__sanitizer_internal_memset+0x0): multiple definition of `__sanitize= r_internal_memset'; /usr/bin/../lib/clang/20/lib/x86_64-redhat-linux-gnu/li= bclang_rt.ubsan_standalone.a(sanitizer_libc.cpp.o):(.text.__sanitizer_inter= nal_memset+0x0): first defined here cfi_debug seems to pull ubsan which has conflicting symbols with safe_stack. Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 16 ++++++++++------ .gitlab-ci.d/buildtest.yml | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 6ade30f36a..856c8f1a85 100644 --- a/meson.build +++ b/meson.build @@ -681,13 +681,17 @@ if get_option('cfi') error('-fsanitize-cfi-icall-generalize-pointers is not supported by th= e compiler') endif if get_option('cfi_debug') - if cc.compiles('int main () { return 0; }', - name: '-fno-sanitize-trap=3Dcfi-icall', - args: ['-flto', '-fsanitize=3Dcfi-icall', - '-fno-sanitize-trap=3Dcfi-icall'] ) - cfi_flags +=3D '-fno-sanitize-trap=3Dcfi-icall' + if get_option('safe_stack') + error('cfi_debug is not compatible with safe_stack') else - error('-fno-sanitize-trap=3Dcfi-icall is not supported by the compil= er') + if cc.compiles('int main () { return 0; }', + name: '-fno-sanitize-trap=3Dcfi-icall', + args: ['-flto', '-fsanitize=3Dcfi-icall', + '-fno-sanitize-trap=3Dcfi-icall'] ) + cfi_flags +=3D '-fno-sanitize-trap=3Dcfi-icall' + else + error('-fno-sanitize-trap=3Dcfi-icall is not supported by the comp= iler') + endif endif endif add_global_arguments(cfi_flags, native: false, language: all_languages) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 8378b663b6..94d646c5a7 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -479,7 +479,7 @@ build-cfi-aarch64: LD_JOBS: 1 AR: llvm-ar IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-safe-stack --disable-slirp TARGETS: aarch64-softmmu MAKE_CHECK_ARGS: check-build @@ -517,7 +517,7 @@ build-cfi-ppc64-s390x: LD_JOBS: 1 AR: llvm-ar IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-safe-stack --disable-slirp TARGETS: ppc64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-build @@ -555,7 +555,7 @@ build-cfi-x86_64: LD_JOBS: 1 AR: llvm-ar IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-safe-stack --disable-slirp TARGETS: x86_64-softmmu MAKE_CHECK_ARGS: check-build --=20 2.51.0