From nobody Thu Jul 31 03:35:09 2025 X-Original-To: dev-commits-src-main@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 4bsvq202Zcz63Nb8; Thu, 31 Jul 2025 03:35:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bsvq16LJjz3Cn9; Thu, 31 Jul 2025 03:35:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753932909; 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=7w9bSXTyeph2TQbb1rxbB1oyoY1ge1iF4c5SIXHk67g=; b=SwOPZnskG1B9zMykVtOGjaXxEImdN9j5ECamGZkmMnNep4UZBM8lT92cOkiILs5WBN3uUW vEkKRXZ+R5idSJs7PT6cSqBW0fpqYFXs74l1CaGy+clarFzdGzEi6dr0R6B+jn9e1edpPf NNFaQPE/BwlxCOP7a5gW2PYu1VcWGP+uUOHLXOcr74YXWEBf7eurwXPQq+VjybZ4eoedU5 pIUEQuPMn8SPv3MMrpTRCYI3eRWrFsz9myVrrmW/jkODE3vwcvsYHM/YlUaWlLEHBuL/hZ 4JL/Z4C882R37aLZ8ti1gNAPNJI7eLpcccg5DVHSXUUI17DOJRlUjr2AW+sZcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753932909; 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=7w9bSXTyeph2TQbb1rxbB1oyoY1ge1iF4c5SIXHk67g=; b=E4pQeZGJYn7Y8DLe5XpnONkv2X8cP7ZgTrAPgCjVIVGDz57gX4n4iw77NPpl7+T6JZ1O0L 5WtqeFiRS6v/t0DBMz7tkFC4wVYTCmX9KK84xiOF1T0lDiFZ9U0k4QOj5IJY3VY/4vkC5X ZDwKHjVKc5Rdepql8PVBw8notq09dv+f8OHrYGTtVKdw2Pj00UmmZ7p44UwRxYKUP5INeF Sj0cKp6VOjwUtXy70gUudXw7MCLKjBTuakg3VM3zLVLNxFsa6JR3acIZjRJN+o2FvSelmI KjWuBd1lVs6f5FJqMRiDwj/47v3o/mPdf4Vj7rxh20eIeTRY0giv1RKr/1Q3Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753932909; a=rsa-sha256; cv=none; b=c2CUl2dejlAZ4GOZoST0AFjrt+icj2pJ/OTvnl4rEAIy0dSkciNODzxZ38FRQlcTy3uwMX kEfFFwBZEHHBHZQ3iYZ6caU0AA0gNHdt4D86Ck1IiBJAYpo3rzeULGWYpPIPv47WEh9W0j /95zFyOPPgAB2GLJkJo4lvenso9L1WsZ4eFBTiMGQk623Zgkq8dOQIGslkCI2Bww2APXOB Qjb9X9UkklneMjfqRWG8ic8HCffgVqa2cSkCxH3NWwkVv/1zEkuQRcPP2JCJKQuwyMKX/F 1KxgIGYfgY+H3CgY/R/KQsg+qd/NeCdmsrQpI4fXwe9zVz6wEohVKaxbpgDVzw== 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 4bsvq15xNRzm5J; Thu, 31 Jul 2025 03:35:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56V3Z9I6022487; Thu, 31 Jul 2025 03:35:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56V3Z9OY022484; Thu, 31 Jul 2025 03:35:09 GMT (envelope-from git) Date: Thu, 31 Jul 2025 03:35:09 GMT Message-Id: <202507310335.56V3Z9OY022484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 147b90973b97 - main - Revert "src.opts.mk: Default LLVM_ASSERTIONS off" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 147b90973b97df902c01018a18e7f219f18c0b83 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=147b90973b97df902c01018a18e7f219f18c0b83 commit 147b90973b97df902c01018a18e7f219f18c0b83 Author: Kevin Bowling AuthorDate: 2025-07-31 03:25:39 +0000 Commit: Kevin Bowling CommitDate: 2025-07-31 03:33:52 +0000 Revert "src.opts.mk: Default LLVM_ASSERTIONS off" Enabling and disabling LLVM assertions changes the ABI. There have been multiple reports on the freebsd-current@ mailing list of broken 'cc'. Out of caution, you may wish to do a clean build while crossing this commit after building the reverted commit if you do not set LLVM_ASSERTIONS in your src.conf. Discussed with: kevans, jrtc27 This reverts commit 9b3055d0d4bcbe665d3c622c761adcc7d0a5b1c9. --- UPDATING | 5 ----- share/man/man5/src.conf.5 | 7 +++---- share/mk/src.opts.mk | 2 +- tools/build/options/WITH_LLVM_ASSERTIONS | 1 - 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/UPDATING b/UPDATING index 541bdf7ee7c7..28ff08e65ef5 100644 --- a/UPDATING +++ b/UPDATING @@ -42,11 +42,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: package, FreeBSD-bmake. If you use pkgbase and you need make, you should install this package. -20250727: - LLVM's debugging assertions are now disabled in main by default. - The WITH_LLVM_ASSERTIONS src.conf(5) knob should be used to - enable it when working on LLVM or requesting help with it. - 20250726: amd64 kernel configurations must contain "options SMP". diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index f93d3f9fc69f..a3db00aed42f 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd July 27, 2025 +.Dd July 14, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -940,9 +940,8 @@ amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le Do not build the LLD linker during the bootstrap phase of the build. To be able to build the system an alternate linker must be provided via XLD. -.It Va WITH_LLVM_ASSERTIONS -Enable debugging assertions in LLVM. -Use when working on or requesting help with LLVM components. +.It Va WITHOUT_LLVM_ASSERTIONS +Disable debugging assertions in LLVM. .It Va WITHOUT_LLVM_BINUTILS Install ELF Tool Chain's binary utilities instead of LLVM's. This includes diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 77923ae7b6d1..ef43d3c939b2 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -123,6 +123,7 @@ __DEFAULT_YES_OPTIONS = \ LEGACY_CONSOLE \ LLD \ LLD_BOOTSTRAP \ + LLVM_ASSERTIONS \ LLVM_BINUTILS \ LLVM_COV \ LLVM_CXXFILT \ @@ -209,7 +210,6 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ - LLVM_ASSERTIONS \ LLVM_FULL_DEBUGINFO \ MALLOC_PRODUCTION \ OFED_EXTRA \ diff --git a/tools/build/options/WITH_LLVM_ASSERTIONS b/tools/build/options/WITH_LLVM_ASSERTIONS index 6af75221a206..0e7fbfbda0a3 100644 --- a/tools/build/options/WITH_LLVM_ASSERTIONS +++ b/tools/build/options/WITH_LLVM_ASSERTIONS @@ -1,2 +1 @@ Enable debugging assertions in LLVM. -Use when working on or requesting help with LLVM components.