diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-02-07 00:26:37 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-02-07 00:26:37 +0000 |
| commit | b2ed3221cca70ec017a1473436f63c123ae51c40 (patch) | |
| tree | 72d23cc198bc802ab307a95f1d736563b26c726c | |
| parent | Shrink the I/O map from 64KB to 16KB. This map is only used for (diff) | |
| download | wireguard-openbsd-b2ed3221cca70ec017a1473436f63c123ae51c40.tar.xz wireguard-openbsd-b2ed3221cca70ec017a1473436f63c123ae51c40.zip | |
Delete non-ELF support, in particular .align 12 (always a bit jarring)
ok miod
| -rw-r--r-- | sys/arch/amd64/amd64/vector.S | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/apicvec.s | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S index 2e23826add2..9f87751b8ea 100644 --- a/sys/arch/amd64/amd64/vector.S +++ b/sys/arch/amd64/amd64/vector.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.S,v 1.35 2014/11/23 00:25:05 guenther Exp $ */ +/* $OpenBSD: vector.S,v 1.36 2015/02/07 00:26:37 deraadt Exp $ */ /* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */ /* @@ -307,11 +307,7 @@ calltrap: */ /* XXX See comment in locore.s */ -#ifdef __ELF__ #define XINTR(name,num) Xintr_##name##num -#else -#define XINTR(name,num) _Xintr_##name##num -#endif #if NLAPIC > 0 #ifdef MULTIPROCESSOR diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s index 07ac34192ff..6de0c7eebcf 100644 --- a/sys/arch/i386/i386/apicvec.s +++ b/sys/arch/i386/i386/apicvec.s @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvec.s,v 1.28 2013/11/28 19:30:46 brad Exp $ */ +/* $OpenBSD: apicvec.s,v 1.29 2015/02/07 00:26:37 deraadt Exp $ */ /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */ /*- @@ -35,11 +35,7 @@ #include <machine/i82093reg.h> #include <machine/i82489reg.h> -#ifdef __ELF__ #define XINTR(vec) Xintr##vec -#else -#define XINTR(vec) _Xintr##vec -#endif .globl _C_LABEL(apic_stray) diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index 4c24cb91987..9fcfd84aa61 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.148 2014/11/23 00:25:05 guenther Exp $ */ +/* $OpenBSD: locore.s,v 1.149 2015/02/07 00:26:37 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -184,11 +184,7 @@ .globl _C_LABEL(lapic_tpr) #if NLAPIC > 0 -#ifdef __ELF__ .align NBPG -#else - .align 12 -#endif .globl _C_LABEL(local_apic), _C_LABEL(lapic_id) _C_LABEL(local_apic): .space LAPIC_ID |