From nobody Tue Aug 22 20:01:45 2023 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 4RVgGf0dF3z4qMhq; Tue, 22 Aug 2023 20:01:46 +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 4RVgGd6yMVz3fdC; Tue, 22 Aug 2023 20:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734506; 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=b6g43SaIInK5nAI/4tiQzHt8WJhKP8W3kpOQJpj2oz4=; b=LBuFY6vXs73WGEHwDL8Nfjx4V++Bs79BArfY1GM3bKLc+qO0j702SRy7OoP+vFKSf0QS/e 7IK12IMHK1BmxDPxqfTsRLhfTPZ0zd93Qii2d1WPiOyjp8jP5qyuIxJ6TX/DXdj0ZoRkXy 2qwG85rkzvSDYBCkaSfYYg7GiX/rnIjvi1ghJo9dRtKpYol+18hzzB+sfDmiwY4zoMVrpe Q9Om62tIFfm5mhgNv/aqlsgDFbEGWbF1W6ut0qHS5b/5a6EN6c9iQNSgytDeTGfyMO/2Ff unneKLNYNLZQN+BdpmBVsSELaVkFzEsW2OgGCLAMqk2seRZPEC6JwRvil0IG9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692734506; 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=b6g43SaIInK5nAI/4tiQzHt8WJhKP8W3kpOQJpj2oz4=; b=L53vISLiJ12k4Tth/rljx6NMnwp4gyWiUTk45ls/N61cPST/jLyX5B3y4iP4gg8ktUAAUc Ya+9z7Gmx5tz/v69G81IyNgSr2SQ4Oukt246pQSoseGeF7woRNa7lh7F19K68qZj5JQGvC f7BbCARvf846I/BDTuBeq67fBdOdmT1Haf52BCYubdLUHymg8NeSTo3dGWUziPhPCrIL2s +iAjiSYDrhw2dNjtO3Xwab+BgAPtc+/gnQ9HIC2ofOC7IcrqF/7mSSZWKuKlf1u7WuKa6k tx2AxHMVOehGrytufyuOSQZEcJ6hBFxciYXq+u4RP90kzGrhi39KbiSsANdiMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692734506; a=rsa-sha256; cv=none; b=OwSRheLe8miWPEsyHDFFrWHPomBuDKdy8NArTwLLn9dMFthpnnQIUFPv61xSYWtOlBiW0P E6S0GeTgL7jfyXMQBUXa7iSOY8yxrHmSEvd0Mf8wD0uzlVv+Xiooq1f6t/0aVfrwgguL7s ZmOhEfE8fiwD3Svfr4laIGfwe63JnjNqrcjXAGb6UVWW0MJPuwxwNRO7oyj6hMks2lF/OL 7nyRL/N1gvcMLR+3CKAgYr+MQBE37WLeuenCxrIlBWDKaO/6C0dm/Eqd4EJSBSENB+0gqH P4mcQfLzNkYw4ejIWqE+oXZ5mAZ8HGD1amHk4NYBZm8CQUaUPxHDSYUiAvuBUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RVgGd5YQFz23C; Tue, 22 Aug 2023 20:01:45 +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 37MK1j4X083006; Tue, 22 Aug 2023 20:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37MK1jT9083003; Tue, 22 Aug 2023 20:01:45 GMT (envelope-from git) Date: Tue, 22 Aug 2023 20:01:45 GMT Message-Id: <202308222001.37MK1jT9083003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 4101bcfa18c0 - main - libzstd: Explicitly define ZSTD_DISABLE_ASM 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4101bcfa18c0f12a3294971f2f68f354d3e1d864 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4101bcfa18c0f12a3294971f2f68f354d3e1d864 commit 4101bcfa18c0f12a3294971f2f68f354d3e1d864 Author: Jessica Clarke AuthorDate: 2023-08-22 20:01:03 +0000 Commit: Jessica Clarke CommitDate: 2023-08-22 20:01:03 +0000 libzstd: Explicitly define ZSTD_DISABLE_ASM On FreeBSD, ZSTD_ASM_SUPPORTED is defined as 0, but on macOS and Linux it is defined as 1, yet we don't build any of the assembly sources. Rather than add them just for bootstrapping on non-FreeBSD, explicitly define ZSTD_DISABLE_ASM so they're not needed and everything is consistent. This fixes building a bootstrap LLVM toolchain on non-FreeBSD amd64 (the only architecture with assembly available). Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D41543 --- lib/libzstd/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 7b8211d0a584..080b6247fee8 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -38,6 +38,11 @@ CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \ -DZSTD_MULTITHREAD=1 -fvisibility=hidden LIBADD= pthread +# ZSTD_ASM_SUPPORTED is 0 on FreeBSD but 1 on macOS and Linux. Since we build +# this as a bootstrap library and don't include any assembly sources in SRCS, +# explicitly disable assembly. +CFLAGS+= -DZSTD_DISABLE_ASM + PRIVATELIB= yes PACKAGE= runtime