From nobody Wed Dec 14 14:51:56 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 4NXJH05h4Qz4kmwJ; Wed, 14 Dec 2022 14:51:56 +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 4NXJH057Xnz4bCv; Wed, 14 Dec 2022 14:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671029516; 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=GkM5rcgmS4iKnXYnmwTgyD1QRQgY/6lI39PMGsUBW3Q=; b=JpEyDOczu3n9TvPcMpzq9Jp+xhZ7OHquAdt9FOmGmmXBcVYz7yRO/ObzGqwVeulA+wNf1B T2tsJ5NV8sUQ/HMhKt5hLjnv3XU/HIInvtgS65wSRgmrEG2XaQ9s4oG+hRZ8GPTxHOXw5P QQBUJnc2x7C3aySphhhX2nsPPJZaWnISR7tgGg8971T7uBSspiydh5jDM2P0qIKsUoyeg2 mGKpwTmfiJKEXyOnSO4fYX/7IVqQx+dwfiF4AcZRk0CtWU7U5yBCEKb+z62Q2GdqFESr1S pV4rIWk2pck8rUiKMvCwcqm7R4TPZ6WTaa7mL8Z3zP7Mew31cwyWceE1K2x2MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671029516; 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=GkM5rcgmS4iKnXYnmwTgyD1QRQgY/6lI39PMGsUBW3Q=; b=cmQRo1ZEzNubreoF32YPLFjDEmUgNVQFDPEiYZirklJmmgsRXybiPoJBmtTvfklKq9LSWr Go3EgcWufyus3qRKSBqRc5HSmT9uYuBk5Ow4MeSAqPWzgZmeFYXgwEO1VdObXFWNX1l6+b gWnMOjf9/M2vKIqCiXYT9cNakNxQ/z44aX2lbChJmDfZCidGVek+zGjM191Gb42iV2KPIP VZ3fAa5/f7bY4b4EX2d8Qjdo7zBYnqwrlRrEHZ5rFcoxFxMm/W0fPYhrAduMu/w6YMUG6u zxUBF2sZqA/hsDHBpyQ1xjUWt+3Sqml88rZKB+ADc/H07di9yRNF+wI/D9b0Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671029516; a=rsa-sha256; cv=none; b=uNkLdmiTqFq/QvIbtkZaN2UETOtoAbzJIcOJTn+BgzNH2h4DM+oIyWokksthWnhO0K0Ees aZ1ismBv5QmALrOxZR6ljWh0AozRk9NFUQkkwJH/YjhS8fGxUJJ8ncG9UpASeS/y6MNEy4 FFoyzRXcPicyRY0xSNQ1bfTk2cNZPIR7AdlYcikDZjcRki44sIvxxYkNTonBZYnqfys28w zkT2UOP5/+jWr8Px0KG6wzUgJ23N3cQdgV5FuQ1wDKw00Tkflobu2S/ZqsGzpWI2EJGEIf O5UmM8X295/hW247X50X2zSAYFHFoDrUvkvoAxmxHQ1I5EGEWWfR5jR1+R2kbg== 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 4NXJH03lR7zxv0; Wed, 14 Dec 2022 14:51:56 +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 2BEEpuAB018902; Wed, 14 Dec 2022 14:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BEEpua9018901; Wed, 14 Dec 2022 14:51:56 GMT (envelope-from git) Date: Wed, 14 Dec 2022 14:51:56 GMT Message-Id: <202212141451.2BEEpua9018901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ab8b2d108c7c - main - 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/main X-Git-Reftype: branch X-Git-Commit: ab8b2d108c7c4e63ed850148fdc237633077fcd3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ab8b2d108c7c4e63ed850148fdc237633077fcd3 commit ab8b2d108c7c4e63ed850148fdc237633077fcd3 Author: Mark Johnston AuthorDate: 2022-12-14 14:32:17 +0000 Commit: Mark Johnston CommitDate: 2022-12-14 14:32:17 +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 --- 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 d08dfe30d7de..7aac581fdb0f 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -351,8 +351,6 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}} .depend: .PRECIOUS ${SRCS} -_MAP_DEBUG_PREFIX= yes - _ILINKS= machine .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" _ILINKS+= ${MACHINE_CPUARCH} @@ -370,13 +368,11 @@ _ILINKS+= i386 .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 ace2f4cc3d4c..89da3d4fc82e 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -281,8 +281,6 @@ ${FULLPROG}: ${OBJS} ${BLOB_OBJS} ${OBJCOPY} --strip-debug ${.TARGET} .endif -_MAP_DEBUG_PREFIX= yes - _ILINKS=machine .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+=x86 @@ -304,13 +302,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}