git: 6949ce0486ba - main - arm: Use locore-v6.S directly

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=6949ce0486baa2cb602a1d8cb7cfb390639f31e8

commit 6949ce0486baa2cb602a1d8cb7cfb390639f31e8
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-06 22:42:03 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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 <ian@freebsd.org>
- * 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 <machine/acle-compat.h>
-
-#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