From nobody Wed Jul 13 16:47:41 2022 X-Original-To: dev-commits-src-branches@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 7F98D17FC7CE; Wed, 13 Jul 2022 16:47:42 +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 4Ljk7f0ZDRz3Wfd; Wed, 13 Jul 2022 16:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730862; 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=kQoBfTtmlevjPYZlZyKOvJiWzypCOnbQWEjXJORAk6I=; b=bk9jGcMZ46Bf4P2TOoddtZa7G6vN8OrPMLIUU6r7cuH5VD49deCdyF+EafMPa2Qaq3iAiO vLdnwO+6Tw72rX206gYrFA04PSt8jkizGP46svChkN6D31aKPTAWbI8/YLQdYdSLNJ00qo 1zvOopeoXOg8Hh90s/0CgLVV+cX7aHepAXX8MfLlqdRY1eyjMtXen5QVV4TaKXn3bkNYpr qmuWGYy+mEbuG8YEqaeGKGhrLOElbcwvKDFFaL3ATZRv+1LsY1s+7p9Y9ZKbVxO6zg9oGi KbjCvcyJfKfWs+EIylZ9OpanFSyu/kM6gAwi+ItlAOzonXECKlAioFyJS11zXA== 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 4Ljk7d6mSCzWC0; Wed, 13 Jul 2022 16:47:41 +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 26DGlffh052281; Wed, 13 Jul 2022 16:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DGlf6B052280; Wed, 13 Jul 2022 16:47:41 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:47:41 GMT Message-Id: <202207131647.26DGlf6B052280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b45594b2713a - stable/13 - firmware: Map '@' in filenames to '_' in symbols. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b45594b2713a38490fde1029f16b2f338a2ef77b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730862; 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=kQoBfTtmlevjPYZlZyKOvJiWzypCOnbQWEjXJORAk6I=; b=HArR10fG55B/+sOfacqB4ge+qwLkfFv5SLf9btD6OfT3zs40/+JoJAwzLpUOuOz3RjEBS/ IeJCSbfu41qVjtZH1Hf+kb8XrmS9nNNQxRV5/brm4Oith1y8nsBfs7hFq3y8y0EiR4gQQs 3s/dm0teE6qBBcEER3p5iWmn9g8FFYwYr6l61EF2iKx8ugmXvyQ6kVGWZifmH7/2yMKBQV VnyJqAcSVxazEkYo61x54S005N5RqQDrQ2dGzJ/nxbPvN9mmzYUZu/1lTTmqImzbDAoC+r BYMYEZMh/3Mqtwwl4C2yIQWdwBgwdefHZ6dPAZa5WdDmuUnbxkE6027VqZnxkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657730862; a=rsa-sha256; cv=none; b=jjO2zQEOd8+oZjJ3PSrbyhqDMz0PYhAFgVOqu3UksTnj5mTj1uCxBGGjLe4al8J2hRt/37 HPB9nLtIGchzh8fQxKEO8nd1H++FRvYPoa8aEQzJBbPXDDKZRUR9/GL07laZ3pgZLXGE3b kFBHAij6d1h1HUfesipiMYM0SuN5fmiIwnRqoj4NM4NbDC4SnFRfRbryEJeR/V6Zndc43R dN5Wp783/BkhvALNT1FCQ/OkZMvqqkrjSM9v1iCDbjzCCUZ39q1D3e9MAQgqYWQKO7W0js 2krJRc4sYwYOoiyQA30WSFUglFoHEYm164dGIED+5r0BwCICQ/aOxHiwf1cRcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b45594b2713a38490fde1029f16b2f338a2ef77b commit b45594b2713a38490fde1029f16b2f338a2ef77b Author: John Baldwin AuthorDate: 2022-06-14 17:50:51 +0000 Commit: John Baldwin CommitDate: 2022-07-13 16:19:51 +0000 firmware: Map '@' in filenames to '_' in symbols. '@' is not a valid character in symbol names and can sometimes appear in path names. Reviewed by: imp, markj Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D35480 (cherry picked from commit 628a4156a761d3daac8a4adc0e675c6e6064fd5a) --- sys/conf/kmod.mk | 2 +- sys/tools/fw_stub.awk | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index cc5d394bb186..5a7199091096 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -201,7 +201,7 @@ ${_firmw:C/\:.*$/.fwo/:T}: ${_firmw:C/\:.*$//} ${SYSDIR}/kern/firmw.S ${CC:N${CCACHE_BIN}} -c -x assembler-with-cpp -DLOCORE \ ${CFLAGS} ${WERROR} \ -DFIRMW_FILE="${.ALLSRC:M*${_firmw:C/\:.*$//}}" \ - -DFIRMW_SYMBOL="${_firmw:C/\:.*$//:C/[-.\/]/_/g}" \ + -DFIRMW_SYMBOL="${_firmw:C/\:.*$//:C/[-.\/@]/_/g}" \ ${SYSDIR}/kern/firmw.S -o ${.TARGET} OBJS+= ${_firmw:C/\:.*$/.fwo/:T} diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk index 94975687f4e2..1d01cf1f2c29 100644 --- a/sys/tools/fw_stub.awk +++ b/sys/tools/fw_stub.awk @@ -143,8 +143,8 @@ if (opt_l) { for (file_i = 0; file_i < num_files; file_i++) { symb = filenames[file_i]; - # '-', '.' and '/' are converted to '_' - gsub(/-|\.|\//, "_", symb); + # '-', '.', '/', and '@' are converted to '_' + gsub(/-|\.|\/|@/, "_", symb); printc("extern char _binary_" symb "_start[], _binary_" symb "_end[];"); } @@ -172,8 +172,8 @@ for (file_i = 0; file_i < num_files; file_i++) { short = shortnames[file_i]; symb = filenames[file_i]; version = versions[file_i]; - # '-', '.' and '/' are converted to '_' - gsub(/-|\.|\//, "_", symb); + # '-', '.', '/', and '@' are converted to '_' + gsub(/-|\.|\/|@/, "_", symb); reg = "\t\tfp = "; reg = reg "firmware_register(\"" short "\", _binary_" symb "_start , ";