diff options
| author | Warner Losh <imp@FreeBSD.org> | 2024-02-06 22:42:03 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-02-06 22:42:03 +0000 |
| commit | 6949ce0486baa2cb602a1d8cb7cfb390639f31e8 (patch) | |
| tree | 2e32107b042911aeff8ee3367aea9a83f165844f /sys/arm | |
| parent | fc2b8ee6da64ff6fe6ccc848df941699499f4a65 (diff) | |
| download | src-6949ce0486baa2cb602a1d8cb7cfb390639f31e8.tar.gz src-6949ce0486baa2cb602a1d8cb7cfb390639f31e8.zip | |
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
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/locore.S | 35 |
1 files changed, 0 insertions, 35 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" |