From nobody Wed Apr 24 23:58:41 2024 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 4VPwtV01Dyz5JP0c; Wed, 24 Apr 2024 23:58: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 4VPwtT58mlz4sNd; Wed, 24 Apr 2024 23:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003121; 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=HQ/ID2XJVRKSlz/X62TvR97z7n8G5pOlR+VGisAit/w=; b=CRQJOtUTi8NcHdGWujlxBJ+miueZSLbOsL0kJlqCwgFrZVuK2UwGajTNZlp1w3NJjVIGJF ez2OKDB7cvxPVVy9Lv+K3cF73FcoGOetP2j0HtVz8MTfWmL+5UEPSz4BZkmlBQ8GTOOcZT 8Ax+6Vvuawztxxqm9nt4rnZ4/ybUo5Pkpkp0+EIgLlQIujJiTV37CQ0dYstWfylfV0+vna zmAJ/qK68liDvDU72tDWbecj0QMBp3sS8r6HvVr2PXqnHu4EH5TRkqgwSnGCbIcBem2Do2 R5xh3A/4KrFFV+YvdQU3WbladzRzgwgKHvQSAeyMY5p4YEdEV9yMuOZtVW91Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714003121; a=rsa-sha256; cv=none; b=rFFpUlXbF1HK4yeT8pjR2tVC5H24ALzHqugNwvd5T5+gnzT/kmKOPsVdaXuk9iwNZ1ylGy +iUR8mFAUSrFWhx7g3MO7EO2SjqZK7y+S9mFMOUUSKUjXl+vx5RidIpwxndqAQ81+VJKao 3Tl948fmLmvOxutKfntzH45lszqmkpD8hyov3QJxq0aV0tNqSQhLONRcwYs5YVHHBWjC7m e29hbUlcH93uXpWcjGvH06pQ0xaHa8NSOffY7UsXZRZh9nBeu7AFVdeYYGn13Ap05wPpzf KtHokzSq1oUiEvfoHs2tHha1iiKzCfszMDm4GsRvfN/Z6eXYiYBLBVr1NILTHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003121; 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=HQ/ID2XJVRKSlz/X62TvR97z7n8G5pOlR+VGisAit/w=; b=GnnalriSsvn7CzYwtgFtEoeeTe7MbQvdi1NekjzoMbxADzRns1ZaCAAlz8PFTjoHzlIAGr 6Lf9l1hMdTl/p7RNuHRpWY1N20Vf+dIePaoLxx/ZXtdQKThE2xFMbHNA5bau6xKs/2KwOs TqUTB9HpnLJ++BJFgqrJaBOH05grQImeB06xLMSjIDkC3btb7i6lnN3H2V45VY7a+rv+Ye ZXB1aXtHUmdGGyfSFDYL823eQzzTzEbwKsenClQtJAeIoY4NdRdMkCaQXxm0hnH4Y9OOBg qgwrXx3N/mu8Sb+XaSDCcGsMJMv0V8ySheDUPh7ynh4xy8T8s33UT3Kpl7WhXg== 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 4VPwtT4n6gzcKd; Wed, 24 Apr 2024 23:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ONwf7p040400; Wed, 24 Apr 2024 23:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONwfnT040397; Wed, 24 Apr 2024 23:58:41 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:58:41 GMT Message-Id: <202404242358.43ONwfnT040397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9857f824ec77 - stable/14 - arm_kernel_bothdr.awk: Update to latest ota 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9857f824ec77cdc27c82e0871356eb2e9662fc86 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9857f824ec77cdc27c82e0871356eb2e9662fc86 commit 9857f824ec77cdc27c82e0871356eb2e9662fc86 Author: Warner Losh AuthorDate: 2024-04-15 21:07:46 +0000 Commit: Warner Losh CommitDate: 2024-04-24 23:57:55 +0000 arm_kernel_bothdr.awk: Update to latest ota The latest ota is the first one in FreeBSD that treats 0 + "0xf" as being '0' instead of '15'. Don't use this old trick anymore to convert from hexidecimal to a number. Write a function to do that instead. This fixes kernel.bin building on arm*. awk on 14 doesn't need this, but to build FreeBSD stable/14's kernel.bin on 15 we'll need it, so fast MFC. MFC After: 3 days Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44801 (cherry picked from commit de22251127cd0e89ce1edb56c58b202496a97ba3) --- sys/tools/arm_kernel_boothdr.awk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk index dcc65ab40b66..e0f193f7922c 100644 --- a/sys/tools/arm_kernel_boothdr.awk +++ b/sys/tools/arm_kernel_boothdr.awk @@ -47,6 +47,10 @@ BEGIN { } gHdrType = hdrtype + for (i = 0; i < 16; i++) { + hex[sprintf("%x", i)] = i; + hex[sprintf("%X", i)] = i; + } } function addr_to_offset(addr) { @@ -56,11 +60,13 @@ function addr_to_offset(addr) { function hexstr_to_num(str) { - # Prepend a 0x onto the string, then coerce it to a number by doing - # arithmetic with it, which makes awk run it through strtod(), - # which handles hex numbers that have a 0x prefix. + sum = 0; + len = length(str); + for (i = 1; i <= len; i++) { + sum = sum * 16 + hex[substr(str, i, 1)]; + } - return 0 + ("0x" str) + return sum; } function write_le32(num) {