From nobody Tue Feb 06 22:51:05 2024 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 4TTz4V0qrFz5B7Bx; Tue, 6 Feb 2024 22:51:06 +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 4TTz4T6tWvz4n8L; Tue, 6 Feb 2024 22:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707259866; 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=Fo2zmxtfGn5TEXVNTSo7z1zy2bXrrJMu8LiJtU5sOvg=; b=E7OKa5Hq4Z8UJroStiI/2rbHCiP+qxfsknA6P1N07xDzXEnPVISu+oKfveZ+X7fhX3lfOA KUBROTmGNUJYzPA3AumPKjHojm7sduQLyPr3LKRpevhRxSxYN6VxPD2HJv57H23MYq8J+j BKSRPWHOgaj7Q6R6geENq1Nx4C+FWRbQYD+eOFUonU/kjOGQM1BSZj7Y7UouEQTjGtEirH JztzvUde+LJeJQ/X2wpq5PfWPHSQCXCEkogdJLL0FZZoTVdv8BpMcwyKZ5muOAmDEtwXFF 2EYvdCXKBsXHNtckwKGb8niaycJAtUxVGN35INpLEXF2Q9qLRy+WUCgcn7wnIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707259866; 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=Fo2zmxtfGn5TEXVNTSo7z1zy2bXrrJMu8LiJtU5sOvg=; b=wik927MEoEzs/d3rs2rl0EvKoJ+ibSvbchkenOGeJnPSe9qYOj998UHijBFPfM3xy7ebcf hqAbYFgdkh7LiG3MSeF8ZZJEZfRqpyru0UcS3n4SCxG9foP5gAqFXlSG9zzr+z8HWBQL3y 8XmSQL6PWrkly8cKsEYpK7M9ZaX7ZMxkxY+onq+A7PfvW+fgAWYjswP7Ew9zut3+GB6fs2 /4sta63BELPE48CCTahU5IIMDJZeBV3Xv8VvYb/1kTmMS5dHycekcLd44A4GORe8yGtbja 1OxanThlIw8WDcKtGUz72g/5xFzSUHhXm6KEwS1UrQax1nhSbdy0f/YyiD/0lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707259866; a=rsa-sha256; cv=none; b=QZ03pUT7sJLIIEc70xZzF21JYUqtjl43tx7RMcH0rVBLnlehw4Qaai2hXCObODnFR5gBTs 36h2w5vBGZoJgMqvkTz5sWb/tpMF0ZingEvxo0y8epF6otiKT8itPd2bpuhwx+kmp82r6v epSR3GAAELoupQ5E0ljABJNY+jzPq24hZwgwujw/zIqSLSUK4HCPy60Uo7pvrzb4CZEFt/ /eKHizu1ayxXO0F2r8JAhWcdL+YQMLJtOHGlpJDSVuAxki5W22xHw6xgJHo2dvZhV88l9e 3gQuIn0AeiI5KIPDz/ivESwU+cozBiAjJHX5Vib+Klbqf4sNEgeWP2SIYbv0+A== 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 4TTz4T5ggGzjTl; Tue, 6 Feb 2024 22:51:05 +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 416Mp5Oo014503; Tue, 6 Feb 2024 22:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 416Mp5To014500; Tue, 6 Feb 2024 22:51:05 GMT (envelope-from git) Date: Tue, 6 Feb 2024 22:51:05 GMT Message-Id: <202402062251.416Mp5To014500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6949ce0486ba - main - arm: Use locore-v6.S directly 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6949ce0486baa2cb602a1d8cb7cfb390639f31e8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6949ce0486baa2cb602a1d8cb7cfb390639f31e8 commit 6949ce0486baa2cb602a1d8cb7cfb390639f31e8 Author: Warner Losh AuthorDate: 2024-02-06 22:42:03 +0000 Commit: Warner Losh CommitDate: 2024-02-06 22:42:03 +0000 arm: Use locore-v6.S directly Use locore-v6.S directly, rather than indirectly via including locore.S. This loses acle-compat.h inclusion, but that's only needed for gcc 4.8 and earlier. Since we don't support anything that old, there's no need for it here. Sponsored by: Netflix --- sys/arm/arm/locore.S | 35 ----------------------------------- sys/conf/files.arm | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S deleted file mode 100644 index bbca07f65ef3..000000000000 --- a/sys/arm/arm/locore.S +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * Copyright (c) 2014 Ian Lepore - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * The kernel build machinery wants the file containing the entry point to be - * named locore.S, but we want separate files for v4 and v6 builds, so just - * include the arch-appropriate file from this properly-named file. - */ - -#include - -#include "locore-v6.S" diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 28e80016d97b..3526a14a50b7 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -37,7 +37,7 @@ arm/arm/identcpu-v6.c standard arm/arm/in_cksum_arm.S optional inet | inet6 arm/arm/in_cksum_machdep.c optional inet | inet6 kern/subr_intr.c standard -arm/arm/locore.S standard no-obj +arm/arm/locore-v6.S standard no-obj arm/arm/hypervisor-stub.S standard arm/arm/machdep.c standard arm/arm/machdep_boot.c standard