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/arm/include | |
| 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/arm/include')
| -rw-r--r-- | sys/arch/arm/include/asm.h | 10 | ||||
| -rw-r--r-- | sys/arch/arm/include/frame.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h index d67f1bc9a28..f9b399bd821 100644 --- a/sys/arch/arm/include/asm.h +++ b/sys/arch/arm/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.12 2022/08/30 16:26:29 miod Exp $ */ +/* $OpenBSD: asm.h,v 1.13 2022/12/08 01:25:44 guenther Exp $ */ /* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */ /* @@ -74,11 +74,11 @@ # define _PROF_PROLOGUE #endif -#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE -#define ENTRY_NP(y) _ENTRY(_C_LABEL(y)) +#define ENTRY(y) _ENTRY(y); _PROF_PROLOGUE +#define ENTRY_NP(y) _ENTRY(y) #define ENTRY_NB(y) _ENTRY_NB(y); _PROF_PROLOGUE -#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE -#define ASENTRY_NP(y) _ENTRY(_ASM_LABEL(y)) +#define ASENTRY(y) _ENTRY(y); _PROF_PROLOGUE +#define ASENTRY_NP(y) _ENTRY(y) #define END(y) .size y, . - y #if defined(__PIC__) diff --git a/sys/arch/arm/include/frame.h b/sys/arch/arm/include/frame.h index 4645031b40d..15abcba2b7f 100644 --- a/sys/arch/arm/include/frame.h +++ b/sys/arch/arm/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.13 2018/06/30 15:23:37 deraadt Exp $ */ +/* $OpenBSD: frame.h,v 1.14 2022/12/08 01:25:44 guenther Exp $ */ /* $NetBSD: frame.h,v 1.9 2003/12/01 08:48:33 scw Exp $ */ /* @@ -173,7 +173,7 @@ struct frame { #define AST_LOCALS \ .Laflt_astpending: ;\ - .word _C_LABEL(astpending) + .word astpending #define DO_AST \ ldr r0, [sp] /* Get the SPSR from stack */ ;\ @@ -193,7 +193,7 @@ struct frame { msr cpsr_c, r4 /* Restore interrupts */ ;\ mov r0, sp ;\ adr lr, 1b ;\ - b _C_LABEL(ast) /* ast(frame) */ ;\ + b ast /* ast(frame) */ ;\ 2: /* |