The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=472f84817dabacf8df43bc8ed783b714586de6a1

commit 472f84817dabacf8df43bc8ed783b714586de6a1
Author:     Warner Losh <[email protected]>
AuthorDate: 2024-02-06 22:46:06 +0000
Commit:     Warner Losh <[email protected]>
CommitDate: 2024-02-06 22:49:08 +0000

    arm: Move locore-v6.S to locore.S
    
    As a separate commit, now move locore-v6.S to locore.S. This makes git
    annotate work, at least back to 2014 when Ian created locore-v6.S. svn
    didn't save enough metadata for the converter to allow it to go back
    further.
    
    Sponsored by:           Netflix
---
 sys/arm/arm/{locore-v6.S => locore.S} | 0
 sys/conf/files.arm                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore.S
similarity index 100%
rename from sys/arm/arm/locore-v6.S
rename to sys/arm/arm/locore.S
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 3526a14a50b7..28e80016d97b 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-v6.S            standard        no-obj
+arm/arm/locore.S               standard        no-obj
 arm/arm/hypervisor-stub.S      standard
 arm/arm/machdep.c              standard
 arm/arm/machdep_boot.c         standard

Reply via email to