From nobody Wed Dec 21 15:43:01 2022 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 4Ncd4k0j95z1G1sN; Wed, 21 Dec 2022 15:43:02 +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 4Ncd4k09jWz3K4W; Wed, 21 Dec 2022 15:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671637382; 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=H+EyHABMju4KCMvZLM7w+nkeLmbK9iAoKWl3k9Hjik0=; b=S0iQLWOnpXnoDapc3A4gmOn8W/ff2mQu8RtGhXz7Bd6IR563Wq0SBSsOBHOyfeEI3u4GBs 2JhOxCFFJ3++s5bKA8fynv58jYL0beXobvW4MUr+P0cY8F594d6yn9i0JXLkMLenXGho2N pSXYuP7m70Wno0IUS0s810vIRxm+vKOgCTZ9pUXQ/zWLWbV8MIdyKg1saxR8ao+Z8JyDZ3 QM8+8sMfp+U6pC3T9Wd83lq/5aj+c65dkaeXMT4Utxs+/9G9bnAI4T5FP486J3/77vXWMF kc+zghkou4KLBV9/KmE5Bahdklt7Vluow1+IKslx+b3IgjCi0fvmsMvjIR6zMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671637382; 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=H+EyHABMju4KCMvZLM7w+nkeLmbK9iAoKWl3k9Hjik0=; b=XvWuZvPPcu8P45t9USjOoVy80wilqzAF74AgXy4V18l4iyDum9MfLfkmNm/Psah6QgXF0V ZYNC2SKhRft3Aure0CXKJGlhIagMIkKP6DGu2pERBr4ff77WH1zDTcaNcNNollLNzBYQJp LvpztPQUywVKxUwgb3gqN+BoRCWfsXweIwo/nv9FdtDu4AacDY4bFftbdGFstsjXZDybiD EjxUieWJJqkPg1cCt7/W8G1j0gWbZlOeUlalv3eBPat5LljOzpo73Wg3uNmhagVXID8ybB ID4TLAapKn3ezhiIj16aEpuXYhRSAhe7E1+DTLl7GnVkAdkPod3rKuNhZFuCpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671637382; a=rsa-sha256; cv=none; b=cC3f24Pr1smebVSPjJbrQdBq7uQ6ETP6y9CnGXJLaNnP3eVUns+DP/30mV0UK1pknW/YF8 7bpS+g3n6n0b4Mi3WLu3ECSYBVJMEYmtLGIQ1PfjEOFR5oU9MS7PVriE6RbSY5YsYugKcm M9kgDGDc+zWPraL52mnZxJrFR2YgLnwGBKmkkMllvq+yxp3L3ZAsWRczqEELi6LM8/ePun RbHJYGwVcNNT5ikR0xGb2wmGKfyviZFkQq/MEJX41ZOjfBGfyyByv7d9A4tsEuS6v3Aclt 76l0Ey0Xedn+nLQXRyiOytxjZ18yZqoCWCyWJPwV+bYS5KMYJieKjqfPFomLqQ== 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 4Ncd4j6LdqzLBy; Wed, 21 Dec 2022 15:43:01 +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 2BLFh1wg025685; Wed, 21 Dec 2022 15:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BLFh1p8025684; Wed, 21 Dec 2022 15:43:01 GMT (envelope-from git) Date: Wed, 21 Dec 2022 15:43:01 GMT Message-Id: <202212211543.2BLFh1p8025684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fc15d5bf1109 - stable/13 - sys/conf: Remove an unneeded flag variable 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/stable/13 X-Git-Reftype: branch X-Git-Commit: fc15d5bf11099bf04d62cf8fdd5b8ab413a61cea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc15d5bf11099bf04d62cf8fdd5b8ab413a61cea commit fc15d5bf11099bf04d62cf8fdd5b8ab413a61cea Author: Mark Johnston AuthorDate: 2022-12-14 14:32:17 +0000 Commit: Mark Johnston CommitDate: 2022-12-21 15:42:46 +0000 sys/conf: Remove an unneeded flag variable After commit fac6dee9eb58 ("Remove tests for obsolete compilers in the build system"), we always set -fdebug-prefix-map, so there's no point in defining and testing _MAP_DEBUG_PREFIX. No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit ab8b2d108c7c4e63ed850148fdc237633077fcd3) --- sys/conf/kern.post.mk | 4 ---- sys/conf/kmod.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 79a6d3b516ca..fd5abb039b1a 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -349,8 +349,6 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}} .depend: .PRECIOUS ${SRCS} -_MAP_DEBUG_PREFIX= yes - _ILINKS= machine .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" _ILINKS+= ${MACHINE_CPUARCH} @@ -365,13 +363,11 @@ _ILINKS+= x86 .if !exists(${.OBJDIR}/${_link}) ${SRCS} ${DEPENDOBJS}: ${_link} .endif -.if defined(_MAP_DEBUG_PREFIX) .if ${_link} == "machine" CFLAGS+= -fdebug-prefix-map=./machine=${SYSDIR}/${MACHINE}/include .else CFLAGS+= -fdebug-prefix-map=./${_link}=${SYSDIR}/${_link}/include .endif -.endif .endfor ${_ILINKS}: diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 9faccaf76de1..a4dafc22b2e4 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -283,8 +283,6 @@ ${FULLPROG}: ${OBJS} ${OBJCOPY} --strip-debug ${.TARGET} .endif -_MAP_DEBUG_PREFIX= yes - _ILINKS=machine .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+=x86 @@ -303,13 +301,11 @@ beforebuild: ${_ILINKS} .if !exists(${.OBJDIR}/${_link}) OBJS_DEPEND_GUESS+= ${_link} .endif -.if defined(_MAP_DEBUG_PREFIX) .if ${_link} == "machine" CFLAGS+= -fdebug-prefix-map=./machine=${SYSDIR}/${MACHINE}/include .else CFLAGS+= -fdebug-prefix-map=./${_link}=${SYSDIR}/${_link}/include .endif -.endif .endfor .NOPATH: ${_ILINKS}