From nobody Tue Jan 10 14:01:40 2023 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 4NrstX4slBz2qnt5; Tue, 10 Jan 2023 14:01:40 +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 4NrstX4QFvz3mJf; Tue, 10 Jan 2023 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673359300; 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=ghn/hfPN9v/RefP2rYu70/D4AWtsBAaXXJnQxTiKMlE=; b=IXrqIQTFNbrE2wB3vqb/dMAgpjvPXwatY7FUVpedeKXDvm4eraHnJGuFQCZOVXf1fP4UEr NokKRQE6KphtVyKvBfAQwHzU5sT/scZN37sNpeWaSh+31mKEEDs6lM4zi2834yrCzta7ss PFcInd2GkEjAztKXnQvJSQCUxnpyMY5ROKMX1OIhUNw0REZV88Cwt0izrDcXroe2cZUx2p C0muOVds/KFVl1qFmvsKS+3/PX25+arib6UQry2KJby5t2HC4wxVz+hf8m/e1wRou75I4y K05nYLRBa12IM1Dmxu97gK8ii7MJ5M6EySgjQX68kwXZL0A9BFPpDqJisXOHqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673359300; 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=ghn/hfPN9v/RefP2rYu70/D4AWtsBAaXXJnQxTiKMlE=; b=lpRKHvpHctt+MifzOmAWYTM+TLxhVJ+6T8xoh1pg2ZRpaiQHFEQjIlNfrZgl+2shscwN3H l5MVa3oQaGf6xBPS/OAQzVh3rJoWCzz0ITrXjKGLccVECJkeyB47uEd1VusFjkwVvOnsiE jRvkzgXZB454GxNrqGEH5vmADpiMNDzuwkP+k/MaPZcWXizJKytBc/GjzIg4sywDc4HqHh J2y4XjpZqSAA7vxySOnydSL9WsSBlGogMYIclHhUtEGsK/RlRFF6SQX6nOujujMHRg4uhN IxdX080sh7M5BxSHsYOw051nVS1QOoZpuOruTwzmlmZwnQt6IosYNeF4voRE6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673359300; a=rsa-sha256; cv=none; b=l2iiTcTPYSp6LuuxBtBYDJyAGS9xOLwtxhJ4WsJwCDnWDEYCg5yZ3xnezl7y3OUhixjLtF xkyKtqyn2x6jLP8+lpbSPhVRepMipxUhMGD5yqyWn7L3UAC1U5wMDFTI9T+VDGGtWeAObG ffXwgVqpa6I/5x1SgIWNOuR/0WlApg5buUtW9Ijd2u1PVOqdvlAoJw7v8yipYJrutqYpEB GZqlBr2W10HKqepWMZtM1O27HENuIrjdLeIOHsjJhWPFXNbqn9nsg8YuAhFEgnL8b2vQaP s5UwMcIDA07uAyweRVOQpSLQYYwTg1YDDDObvhiYILpaYEWn+vpz7CHHqxHMAw== 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 4NrstX3Tv8z19XG; Tue, 10 Jan 2023 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30AE1eMZ007976; Tue, 10 Jan 2023 14:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AE1e18007975; Tue, 10 Jan 2023 14:01:40 GMT (envelope-from git) Date: Tue, 10 Jan 2023 14:01:40 GMT Message-Id: <202301101401.30AE1e18007975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: 016e46fd869e - main - libc: Fix build with WITHOUT_MACHDEP_OPTIMIZATIONS=YES set. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 016e46fd869ebf9891ca4b2cf1d22b337717a8c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=016e46fd869ebf9891ca4b2cf1d22b337717a8c8 commit 016e46fd869ebf9891ca4b2cf1d22b337717a8c8 Author: Gleb Popov AuthorDate: 2023-01-10 10:17:01 +0000 Commit: Gleb Popov CommitDate: 2023-01-10 14:00:41 +0000 libc: Fix build with WITHOUT_MACHDEP_OPTIMIZATIONS=YES set. Test Plan: `make buildword WITHOUT_MACHDEP_OPTIMIZATIONS=YES` on 14-CURRENT and 13-STABLE Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38017 PR: 266900 --- lib/libc/string/Makefile.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc index afc113eeb867..3ecc3bc5b334 100644 --- a/lib/libc/string/Makefile.inc +++ b/lib/libc/string/Makefile.inc @@ -1,7 +1,10 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string ${LIBC_SRCTOP}/string +.if ${MK_MACHDEP_OPTIMIZATIONS} != "no" +.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string +.endif +.PATH: ${LIBC_SRCTOP}/string .PATH: ${SRCTOP}/sys/libkern CFLAGS+= -I${LIBC_SRCTOP}/locale @@ -39,8 +42,10 @@ CFLAGS.memchr.c+= -fno-sanitize=address .endif +.if ${MK_MACHDEP_OPTIMIZATIONS} != "no" # machine-dependent string sources .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/string/Makefile.inc" +.endif MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 strcasecmp.3 strcat.3 \