From nobody Thu Jan 12 19:50:21 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 4NtFWx2Dd3z2qlmP; Thu, 12 Jan 2023 19:50:21 +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 4NtFWx1jb0z4PGK; Thu, 12 Jan 2023 19:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673553021; 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=fM8VMOLIkW2ChqQDF4kUjkiHucvQVBnQKAdyy7twNCI=; b=VmH4mPwDYZf/ksY/66uID/XyHgEpv9/py5PuZqXWr/RFEymCRtlKclOUH1i2L5DPkd7jO8 wui/lauIwVChjUizHj11y8A6N5uE5r3LpOrAhzwQhwP/pBwyG7C1jFZ8RdscM+prT59Qfb bQ2pL02MYzKfpi3ACesJl1dqxijV53yvfIZuadpspVzp4/wbRPovP6+O89ADsDNJzV+xmM N2P5g7fMBjrN3EueWPds7MYH2T80t/RsjTf3Lof5W2H/qOx46N8am9ngKKn011YZ4mw3N5 ywvuWvoe5vrqSSbqsLI4aXLW6tMeg22H5JSPtrHqmbIh7dPo/6rNHmupQjS5ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673553021; 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=fM8VMOLIkW2ChqQDF4kUjkiHucvQVBnQKAdyy7twNCI=; b=KlUzAxt9MjrgjHu+RWhwOLgFiPVWfRTefSOK/EWQ4lA3oO/H8nMPiOk/wYWfASx9BLcdsc zR2iGxeJwcX185i0lkpY83vOdL2h5ePH4zRqI5ZVVwiyMq5n5za3IxmYtGOn+Qkw6lmHsx hOYTxnpaFSGARel0/XiROsrO8L9N5ta/OO4Rsj2SJpig0DdoSenxRe05NAUUM5DA43z5+3 60gm2yXlRr0Ecddo9GB9iOb+0svRpQRFbmIhZVnGQLxuM8e1N3AlDplIsB35JQSltqrSPr 7gM98aoVWG3OHmBQJVP/eMFRxH068h7BQpieqCyXpmwEuBLm0k3Y6MFhNhqCzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673553021; a=rsa-sha256; cv=none; b=sq4POagR9swxlt4u7LCnNwdxKdlJ7LY2bWml2AZXyTZgz6lmYSL+dQxYSUxevM0DsCGJf5 tUrcZ85NyxM1V1+1lWZqJiHBRLeBO3CpE0vRY2s3c7nUivmfK5SOATn6XwanCF9DrnXi6y T51UqWn5SvlQAHC/EWvurwMKUksMyzgr62CtPEat7PzhMouhlZFmnfhXVc3CXTcKF58Kn6 7JTpUdbXmHK0gGtlg2IunLmGyz681LK+SY8dZ35aTgqhhnUn6fMJ4XB16eMcXuvTvRvQJY VKy/yL5uA9IWYkDAfWCtGi4lyD0oUpEemkSRDhRuVZf/xOekDu96NwI06l2hBA== 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 4NtFWx0j8gzfYm; Thu, 12 Jan 2023 19:50:21 +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 30CJoLnA045695; Thu, 12 Jan 2023 19:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30CJoLDl045694; Thu, 12 Jan 2023 19:50:21 GMT (envelope-from git) Date: Thu, 12 Jan 2023 19:50:21 GMT Message-Id: <202301121950.30CJoLDl045694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Popov Subject: git: b83b87f53e73 - stable/13 - libc: Fix build with WITHOUT_MACHDEP_OPTIMIZATIONS=YES set. 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: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b83b87f53e73f4d29e094eb89141b251c3272ddd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by arrowd (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=b83b87f53e73f4d29e094eb89141b251c3272ddd commit b83b87f53e73f4d29e094eb89141b251c3272ddd Author: Gleb Popov AuthorDate: 2023-01-10 10:17:01 +0000 Commit: Gleb Popov CommitDate: 2023-01-12 19:49:59 +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 (cherry picked from commit 016e46fd869ebf9891ca4b2cf1d22b337717a8c8) --- 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 b06731386c41..a675f7dbecca 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 @@ -30,8 +33,10 @@ MISRCS+=bcmp.c bcopy.c bzero.c explicit_bzero.c \ SYM_MAPS+= ${LIBC_SRCTOP}/string/Symbol.map +.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 \