Move asm.h from /usr/include/sys to /usr/include/machine.

lib/libc/i386/DEFS.h

@@ -1 +1 @@
-#include <sys/asm.h>
+#include <machine/asm.h>

lib/libc/i386/SYS.h

@@ -36,7 +36,7 @@
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  */
 
-#include <sys/asm.h>
+#include <machine/asm.h>
 #include <sys/syscall.h>
 
 #define	SYSCALL(x)	2: jmp cerror; ENTRY(x); lea SYS_/**/x,%eax; LCALL(7,0); jb 2b

lib/libc/i386/gen/modf.s

@@ -38,7 +38,7 @@
 	.asciz "@(#)modf.s	5.5 (Berkeley) 3/18/91"
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/asm.h>
+#include "DEFS.h"
 
 /*
  * modf(value, iptr): return fractional part of value, and stores the

lib/libc/i386/string/bcopy.s

@@ -33,12 +33,12 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/asm.h>
-
 #if defined(LIBC_RCS) && !defined(lint)
-	.asciz "$ID$"
+	.asciz "$Id $"
 #endif /* LIBC_RCS and not lint */
 
+#include "DEFS.h"
+
 	/*
 	 * (ov)bcopy (src,dst,cnt)
 	 *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800

lib/libc/i386/string/bzero.s

@@ -38,7 +38,7 @@
 	.asciz "@(#)bzero.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/asm.h>
+#include "DEFS.h"
 
 /* bzero (base,cnt) */
 

lib/libc/i386/string/memmove.s

@@ -33,12 +33,12 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/asm.h>
-
 #if defined(LIBC_RCS) && !defined(lint)
-	.asciz "$ID$"
+	.asciz "$Id $"
 #endif /* LIBC_RCS and not lint */
 
+#include "DEFS.h"
+
 	/*
 	 * (ov)bcopy (src,dst,cnt)
 	 *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800

sys/arch/i386/i386/microtime.s

@@ -30,10 +30,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: microtime.s,v 1.3 1993/06/15 20:54:06 mycroft Exp $
+ *	$Id: microtime.s,v 1.4 1993/06/16 21:42:43 mycroft Exp $
  */
 
-#include "asm.h"
+#include "../include/asm.h"
 #include "../isa/isa.h"
 #include "../isa/timerreg.h"
 

sys/arch/i386/include/asm.h

@@ -0,0 +1,71 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
+ *	$Id: asm.h,v 1.1 1993/06/16 21:42:47 mycroft Exp $
+ */
+
+#ifndef _SYS_ASM_H_
+#define _SYS_ASM_H_
+
+/*
+ * XXX assumes that arguments are not passed in %eax
+ */
+
+#ifdef PROF
+# define _BEGIN_ENTRY	.data; 1:; .long 0; .text; .align 2
+# define _END_ENTRY	movl $1b,%eax; call mcount
+#else
+# define _BEGIN_ENTRY	.text; .align 2
+# define _END_ENTRY
+#endif
+
+#ifdef STDC
+# define _C_FUNC(x)	_ ## x
+#else
+# define _C_FUNC(x)	_/**/x
+#endif
+#define	_ASM_FUNC(x)	x
+
+#define _ENTRY(x)	.globl x; x:
+
+#define	ENTRY(y)	_BEGIN_ENTRY; _ENTRY(_C_FUNC(y)); _END_ENTRY
+#define	TWOENTRY(y,z)	_BEGIN_ENTRY; _ENTRY(_C_FUNC(y)); _ENTRY(_C_FUNC(z)); \
+			_END_ENTRY
+#define	ASENTRY(y)	_BEGIN_ENTRY; _ENTRY(_ASM_FUNC(y)); _END_ENTRY
+
+#define	ASMSTR		.asciz
+
+#endif /* !_SYS_ASM_H_ */