From nobody Fri Mar 22 04:20:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V18Jb2M4kz5Fdbq; Fri, 22 Mar 2024 04:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V18Jb1Ntgz440Z; Fri, 22 Mar 2024 04:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711081247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y73oZniRjNt8yGt4q3bmZshwNyqg3FOqkEYB/8DGZu8=; b=EjwCassqFSpYyJafU+1ycrqYVNS1vQnswstz95bsqJDFXlUNzl/n59DmnlJzLgSxOqF+V8 iCe6xnhcCO7zu3ZqGYMKLhHx1BNOhl6RonOOe1l92rYWsyhOiNI4jZMVtiqBuYNKqK/P7h bRYSbZ1NwwwxDJ6I6IPUZxoMFGp/XI8QR3NrWyYFxd8qvIRXUubM5w++ES+41rO9rb2XWm eNqPfyJEM/1SZiChG40THm+tc2ij0Ncurkt7iyvFeWICofdb3al1RBnuVj4qbwV9z5bHmx LXTud27ELQX9baU82M0T28BE5FVe2IE0fRfHd04+6VwQOOvDfaNNMvhGGNTVtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711081247; a=rsa-sha256; cv=none; b=rm6nf4ZEO1ubI0o+jd6Ynz4j5vfuo8GAlTt7snJY2sgFuYA9CM4Os22Fvl/XAjT3Uh5PdA Tu89KavX9j6TFpynaiMpiuXZ71hlB46s9H1YSbY7Tjt6UGkeHDZH0Sy6OeIWPrilUHSO2b 8R7eaEbc/DHmHXa9Gb+MHP64Wv5250p1HW6ixxs86wEedjoDrGAIFVUfUreNlCVVf3onzG NL/KeNr9S5Ofx/D/ZwEENqFO3t+8Ya27HJWxmUZZBLpDUAscGRpGpCmSvKKIFVTgzfNASX SlG3755IIE/BcFtyQPnYcqJ/AURsBxIq2iV+4YToEMDpuDlUdDQ6d/hE8z6/wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711081247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y73oZniRjNt8yGt4q3bmZshwNyqg3FOqkEYB/8DGZu8=; b=JzAumAUAM+2rfynp485DzXpRLBPoTE/troJeqf3Xw1LRTvdLz3cdzjKk08r2nm1uI80/6a Hon1mH+9PhMwHPBDwwS9hnfeTeO9hy0T7Khk4DttO49lQBthMTY1BzkiFKqGxLWgrckm8w 5g1rgNxSM+3x56taKLcLAxep4ZfRH5ycjVlwIrYiX2aDK/pyyXVogtHIX6b7p8sqsr3SKC ZkoFgQ91fspS/leTqCOP6cU2+NbqG/b5U+IB9pdk5oNRFfXOKaAjnSFm9azttH6Z8SZDxO cL6V6WolXBuQH3nltcLwjg8dsVjL9JU3zM49LP/JrhT2mw3Mh0myXI4skTVl7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V18Jb113kz14JZ; Fri, 22 Mar 2024 04:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M4KlS4066898; Fri, 22 Mar 2024 04:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M4KlbF066895; Fri, 22 Mar 2024 04:20:47 GMT (envelope-from git) Date: Fri, 22 Mar 2024 04:20:47 GMT Message-Id: <202403220420.42M4KlbF066895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 26173a919ced - main - arm64/vmm: Exclude more sanitizer compiler flags from certain files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26173a919ced6179aa758db44fffc3bcac532be6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26173a919ced6179aa758db44fffc3bcac532be6 commit 26173a919ced6179aa758db44fffc3bcac532be6 Author: Mark Johnston AuthorDate: 2024-03-22 04:19:11 +0000 Commit: Mark Johnston CommitDate: 2024-03-22 04:20:34 +0000 arm64/vmm: Exclude more sanitizer compiler flags from certain files Reported by: rscheff Fixes: 47e073941f4e ("Import the kernel parts of bhyve/arm64") --- sys/conf/files.arm64 | 4 ++-- sys/modules/vmm/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index ef00857b61c0..679d442f672b 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -124,10 +124,10 @@ arm64/vmm/vmm_arm64.c optional vmm arm64/vmm/vmm_reset.c optional vmm arm64/vmm/vmm_call.S optional vmm arm64/vmm/vmm_hyp_exception.S optional vmm \ - compile-with "${NORMAL_C:N-fsanitize*:N-mbranch-protection*} -fpie" \ + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} -fpie" \ no-obj arm64/vmm/vmm_hyp.c optional vmm \ - compile-with "${NORMAL_C:N-fsanitize*:N-mbranch-protection*} -fpie" \ + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \ dependency "vmm_hyp.o vmm_hyp_exception.o" \ diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 075e594c4da1..1ef9e264ee97 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -41,11 +41,11 @@ CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin vmm_hyp_exception.o: vmm_hyp_exception.S ${CC} -c -x assembler-with-cpp -DLOCORE \ - ${CFLAGS:N-fsanitize*:N-mbranch-protection*} \ + ${CFLAGS:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} \ ${.IMPSRC} -o ${.TARGET} -fpie vmm_hyp.o: vmm_hyp.c - ${CC} -c ${CFLAGS:N-fsanitize*:N-mbranch-protection*} \ + ${CC} -c ${CFLAGS:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} \ ${.IMPSRC} -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_hyp_exception.o vmm_hyp.o