From 4805c6fd9d86c1469045cc3e669eebf84fc07ca8 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft>
Date: Wed, 16 Jun 1993 21:31:12 +0000
Subject: [PATCH] Clean up this bullshit.

---
 lib/libc/i386/DEFS.h | 48 +-------------------------------------------
 lib/libc/i386/SYS.h  | 10 +--------
 2 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h
index 6b888c470a3c..1de9f0add632 100644
--- a/lib/libc/i386/DEFS.h
+++ b/lib/libc/i386/DEFS.h
@@ -1,47 +1 @@
-/*-
- * 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.
- *
- *	@(#)DEFS.h	5.1 (Berkeley) 4/23/90
- */
-
-#ifdef PROF
-#define	ENTRY(x)	.globl _/**/x; _/**/x:  \
-			.data; 1:; .long 0; .text; lea 1b,%eax ; call mcount
-#define	ASENTRY(x)	.globl x; x: \
-			.data; 1:; .long 0; .text; lea 1b,%eax ; call mcount
-#else
-#define	ENTRY(x)	.globl _/**/x; _/**/x: 
-#define	ASENTRY(x)	.globl x; x: 
-#endif
+#include <sys/asm.h>
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 30dd5559560a..e6e31fe490ae 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -36,15 +36,9 @@
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  */
 
+#include <sys/asm.h>
 #include <sys/syscall.h>
 
-#ifdef PROF
-#define	ENTRY(x)	.globl _/**/x; \
-			.data; 1:; .long 0; .text; .align 2; _/**/x: \
-			movl $1b,%eax; call mcount
-#else
-#define	ENTRY(x)	.globl _/**/x; .text; .align 2; _/**/x: 
-#endif PROF
 #define	SYSCALL(x)	2: jmp cerror; ENTRY(x); lea SYS_/**/x,%eax; LCALL(7,0); jb 2b
 #define	RSYSCALL(x)	SYSCALL(x); ret
 #define	PSEUDO(x,y)	ENTRY(x); lea SYS_/**/y, %eax; ; LCALL(7,0); ret
@@ -52,6 +46,4 @@
 /* gas fucks up offset -- although we don't currently need it, do for BCS */
 #define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
 
-#define	ASMSTR		.asciz
-
 	.globl	cerror