diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1994-09-08 12:25:18 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1994-09-08 12:25:18 +0000 |
| commit | ab9678ac9dee54e8e752fc53f9c518c5fb2d31a6 (patch) | |
| tree | 5d3d8370201e756d5a497a3f748bbc0cd84ecb78 /sys/i386/include/asmacros.h | |
| parent | fe7bb84c740bec107274398d17fb2a845a157318 (diff) | |
Notes
Diffstat (limited to 'sys/i386/include/asmacros.h')
| -rw-r--r-- | sys/i386/include/asmacros.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index 6b4e27b23bdf..b2a6dc839f2e 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -30,11 +30,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asmacros.h,v 1.3 1994/08/02 07:38:40 davidg Exp $ + * $Id: asmacros.h,v 1.4 1994/08/19 11:20:11 jkh Exp $ */ -#ifndef _ASMACROS_H_ -#define _ASMACROS_H_ 1 +#ifndef _MACHINE_ASMACROS_H_ +#define _MACHINE_ASMACROS_H_ + +#ifdef KERNEL #define ALIGN_DATA .align 2 /* 4 byte alignment, zero filled */ #define ALIGN_TEXT .align 2,0x90 /* 4-byte alignment, nop filled */ @@ -85,8 +87,14 @@ #define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax #endif +#else /* !KERNEL */ + +#include "/usr/src/lib/libc/i386/DEFS.h" /* XXX blech */ + #ifndef RCSID #define RCSID(a) #endif -#endif /* _ASMACROS_H_ */ +#endif /* KERNEL */ + +#endif /* !_MACHINE_ASMACROS_H_ */ |