From 268b92917024bab8321b347275afe32ff8e0e5cc Mon Sep 17 00:00:00 2001
From: Jim Rees <rees@umich.edu>
Date: Tue, 3 Aug 2004 15:45:49 +0000
Subject: [PATCH] fix-lwp-includes-again-20040803

Fix lwp includes AGAIN.
---
 src/lwp/Makefile.in    | 2 +-
 src/lwp/lwp_elf.h      | 4 ++--
 src/lwp/process.i386.s | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 07c3a8aa9..bbc8a859a 100644
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -32,6 +32,7 @@ process.s:
 	# This is required so sgi_64+ does not try to build this file.
 
 process.o	: process.s process.i386.s process.c
+	# Making process.o for $(SYS_NAME)
 	@case "$(SYS_NAME)" in \
 	pmax_he1) \
 		$(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \
@@ -50,7 +51,6 @@ process.o	: process.s process.i386.s process.c
 	*_darwin* ) \
 		$(CC) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} -I${TOP_INCDIR} ${srcdir}/process.s;; \
 	i386_*bsd*) \
-		echo foo ; \
 		cp ${srcdir}/process.i386.s process.S ; \
 		${CCOBJ} -E -I${srcdir} -I${TOP_INCDIR} process.S >process.ss ; \
 		${AS} process.ss -o process.o ;  \
diff --git a/src/lwp/lwp_elf.h b/src/lwp/lwp_elf.h
index 277082380..f304ecb90 100644
--- a/src/lwp/lwp_elf.h
+++ b/src/lwp/lwp_elf.h
@@ -32,11 +32,11 @@
  */
 
 /*
- * For common usage of elf platforms
+ * This file is mis-named. It is used by both a.out and elf platforms.
+ * It either adds the leading underscore or not as needed.
  *
  * $Id$
  */
-#include <afs/param.h>
 
 #ifndef _C_LABEL
 #if !defined(SYSV) && !defined(__ELF__) && !defined(AFS_SUN5_ENV)
diff --git a/src/lwp/process.i386.s b/src/lwp/process.i386.s
index 951ca0d56..c3969c507 100644
--- a/src/lwp/process.i386.s
+++ b/src/lwp/process.i386.s
@@ -16,6 +16,8 @@
  * "ojala que es correcto!"
  */
 
+#define IGNORE_STDS_H  1
+#include <afs/param.h>
 #include <lwp_elf.h>
 
 	.file "process.s"
-- 
2.39.5