diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-12-08 01:25:47 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-12-08 01:25:47 +0000 |
| commit | 99f092cb54970a4a2f138ab15c178ba402c6cb20 (patch) | |
| tree | 33e206da5f6ee96bfb2b8b41acc6d5b3cc135e1c /sys/arch/armv7 | |
| parent | 7276046ee3e5ed97bbac25157fd0d675281cac9b (diff) | |
_C_LABEL() and _ASM_LABEL() are no longer useful in the "everything
is ELF" world. Eliminate use of them in amd64, arm64, armv7, i386,
macppc, mips64, and sparc64 code.
ok deraadt@ jca@ krw@
Diffstat (limited to 'sys/arch/armv7')
| -rw-r--r-- | sys/arch/armv7/armv7/locore0.S | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/start.S | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/armv7/armv7/locore0.S b/sys/arch/armv7/armv7/locore0.S index 93f5a5e33e3..a1b7d879096 100644 --- a/sys/arch/armv7/armv7/locore0.S +++ b/sys/arch/armv7/armv7/locore0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore0.S,v 1.7 2022/01/02 23:29:12 jsg Exp $ */ +/* $OpenBSD: locore0.S,v 1.8 2022/12/08 01:25:44 guenther Exp $ */ /* $NetBSD: lubbock_start.S,v 1.1 2003/06/18 10:51:15 bsh Exp $ */ /* @@ -56,8 +56,8 @@ */ .text - .global _C_LABEL(bootstrap_start) -_C_LABEL(bootstrap_start): + .global bootstrap_start +bootstrap_start: /* Save U-Boot arguments */ mov r6, r0 mov r7, r1 diff --git a/sys/arch/armv7/stand/efiboot/start.S b/sys/arch/armv7/stand/efiboot/start.S index c5c9cf96dda..34f53cd179d 100644 --- a/sys/arch/armv7/stand/efiboot/start.S +++ b/sys/arch/armv7/stand/efiboot/start.S @@ -1,4 +1,4 @@ -/* $OpenBSD: start.S,v 1.3 2018/03/31 18:07:14 patrick Exp $ */ +/* $OpenBSD: start.S,v 1.4 2022/12/08 01:25:44 guenther Exp $ */ /*- * Copyright (c) 2014, 2015 Andrew Turner * All rights reserved. @@ -154,7 +154,7 @@ _start: ldr r1, .Ldynamic add r1, r1, r5 - bl _C_LABEL(self_reloc) + bl self_reloc /* Zero the BSS, _reloc fixed the values for us */ ldr r0, .Lbss @@ -168,7 +168,7 @@ _start: 2: pop {r0, r1} - bl _C_LABEL(efi_main) + bl efi_main 1: b 1b |