fix-lwp-includes-again-20040803

Fix lwp includes AGAIN.

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 07c3a8a..bbc8a85 100644 (file)
--- 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 2770823..f304ecb 100644 (file)
--- 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 951ca0d..c3969c5 100644 (file)
--- 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"