Get all the definitions from DEFS.h and not directly from asmacros.h

if KERNEL is not defined.  lib/msun/i387/*.S include asmacros.h to
get the definitions of ENTRY(), etc.  This is bogus since asmacros.h
is only supposed to give definitions suitable for the kernel.  The
current definitions for the kernel almost worked but are missing
the ".type" declarations.  This caused the linker to print warnings
about doubtful relocations for almost anything linked to libm[sun].

Uniformize name and use of idempotence identifier.

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_ */