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/i386/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/i386/include')
| -rw-r--r-- | sys/arch/i386/include/asm.h | 16 | ||||
| -rw-r--r-- | sys/arch/i386/include/i82093reg.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h index 0504d196be7..a58990d973a 100644 --- a/sys/arch/i386/include/asm.h +++ b/sys/arch/i386/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.18 2022/08/30 16:26:29 miod Exp $ */ +/* $OpenBSD: asm.h,v 1.19 2022/12/08 01:25:45 guenther Exp $ */ /* $NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ call 666f; \ 666: \ popl %ebx; \ - addl $_C_LABEL(_GLOBAL_OFFSET_TABLE_)+[.-666b], %ebx + addl $_GLOBAL_OFFSET_TABLE_+[.-666b], %ebx #define PIC_EPILOGUE \ popl %ebx #define PIC_PLT(x) x@PLT @@ -61,7 +61,7 @@ #define _C_LABEL(name) name #define _ASM_LABEL(x) x -#define CVAROFF(x, y) _C_LABEL(x) + y +#define CVAROFF(x, y) x + y #ifdef __STDC__ # define __CONCAT(x,y) x ## y @@ -113,14 +113,14 @@ # define _PROF_PROLOGUE #endif -#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE +#define ENTRY(y) _ENTRY(y); _PROF_PROLOGUE #define ENTRY_NB(y) _ENTRY_NB(y); _PROF_PROLOGUE -#define NENTRY(y) _ENTRY(_C_LABEL(y)) -#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE -#define NASENTRY(y) _ENTRY(_ASM_LABEL(y)) +#define NENTRY(y) _ENTRY(y) +#define ASENTRY(y) _ENTRY(y); _PROF_PROLOGUE +#define NASENTRY(y) _ENTRY(y) #define END(y) .size y, . - y -#define ALTENTRY(name) .globl _C_LABEL(name); _C_LABEL(name): +#define ALTENTRY(name) .globl name; name: #ifdef _KERNEL diff --git a/sys/arch/i386/include/i82093reg.h b/sys/arch/i386/include/i82093reg.h index 9de8480ea63..a4b9451f3a3 100644 --- a/sys/arch/i386/include/i82093reg.h +++ b/sys/arch/i386/include/i82093reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82093reg.h,v 1.5 2011/06/05 19:36:25 deraadt Exp $ */ +/* $OpenBSD: i82093reg.h,v 1.6 2022/12/08 01:25:45 guenther Exp $ */ /* $NetBSD: i82093reg.h,v 1.1.2.2 2000/02/21 18:54:07 sommerfeld Exp $ */ /*- @@ -113,6 +113,6 @@ #ifdef _KERNEL #define ioapic_asm_ack(num) \ - movl $0,_C_LABEL(local_apic) + LAPIC_EOI + movl $0,local_apic + LAPIC_EOI #endif |