From nobody Tue Jun 14 17:52:22 2022 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 00DBC844B27; Tue, 14 Jun 2022 17:52:23 +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 4LMwxf6XjGz3k5s; Tue, 14 Jun 2022 17:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655229142; 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=ZiSDlXdCyH53XrwPl5ZGNX/USzEJ1TZz2/AsbChZH20=; b=oM6vwlt/rp8HJNuMDIwBnVW5FH2KLt8PD+DmDyIqkJC/vDyJt0juZwgvR6gd5w3RcU8oTa whPApit22Frgbwt/TGeZ/Yk4t9GgEg3QyUOha4QFvA+4Oqp6W6H/9O2Mz9Oj3ohMRq5xnh mQ8x4GE8/6tiPQjdYHbenthncrKs0oRP7XMhWXeXGLC6NT0VvU5gU4sJT5HGAvXq1KjcGC KkMVpag98g8qlrqJ5FxADaMAxINCB7vpXCezylI//ZzjghZkwPhI+OxX/IYt+Ouyca5wRU ZFBadtaJIYluw2AGYd9WhAHRfff/Z6Q3KiXwxoY/iTUvwxCNFiHkz3nbUbJ4iQ== 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 C06466DA8; Tue, 14 Jun 2022 17:52:22 +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 25EHqMO2032869; Tue, 14 Jun 2022 17:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25EHqMhj032868; Tue, 14 Jun 2022 17:52:22 GMT (envelope-from git) Date: Tue, 14 Jun 2022 17:52:22 GMT Message-Id: <202206141752.25EHqMhj032868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 628a4156a761 - main - firmware: Map '@' in filenames to '_' in symbols. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 628a4156a761d3daac8a4adc0e675c6e6064fd5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655229142; 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=ZiSDlXdCyH53XrwPl5ZGNX/USzEJ1TZz2/AsbChZH20=; b=Ped2+cHuHxDglz8qcgmuMChVpuEfpdURECCnEgiEgLVArlfzY5kZpjpH8CRLfn8btb3j1O W05rcC9y+pycP/UbI5i9Clmj0DtZoNE7MOLoUChqoyIdWOwOCM8Xkm8niJ4GZhGpNr98I8 Hv/PTpiK2iRv9JY8S5SzfH0gu8482eu8/WKm+Ob3led97RtlCwZGLnnhS65sJLBjTx82wv pWkHQmd0ZDQ9s/y23NxbnoguK4j07vfgmOkTubQOd085WHx2eo7vNCkH9kr4hZlLbeBMiP oPRcNpinPlYRV3xrPZqYUVa2mDW95Nyi0nsxvUyB9FNCo16qLmn297NQIGmMrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655229142; a=rsa-sha256; cv=none; b=j4zLdNJLT+WMmf0pQtyeNumSnJ2YgDzwodZHUKW/wKlxU3DaDCCFrGLq0VX6nw9CaLfF4n xw/DQ66TN9IkpsZKwlxM6HvLXNXvdpjioLgiJCAzLSFTHQ54ul3uYmbclfa5SAQCn2aqAw Ja+9Y2Cn3HoSq9Cwl/1lQt5ijctyJTmkOXwy4VPYQ2Sv6zlfTAmupBWA391pE0MwXb0D9V mErF8kaIUiNA1Wp7yScwQSS7E1OUBlvwAJ61W4f4h62mrTPRlLK+c+vxXYcf7up9Jju8NM zYP7rpw9kkQSf952RRhnDIlVbNBBy4TQIPqP/l2e1kWhU1c7ASlR9XoiH0hk/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=628a4156a761d3daac8a4adc0e675c6e6064fd5a commit 628a4156a761d3daac8a4adc0e675c6e6064fd5a Author: John Baldwin AuthorDate: 2022-06-14 17:50:51 +0000 Commit: John Baldwin CommitDate: 2022-06-14 17:50: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 --- 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 b67c84faea07..7ec3c918d5d8 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -199,7 +199,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 , ";