sunx86-20041207

update to provide sun x86 support

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 2fc0097..c88ab6e 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -60,7 +60,7 @@ process.o     : process.s process.i386.s process.c
                ${AS} process.ss -o process.o ;  \
                $(RM) -f process.S ;;\
        ncrx86_* | sunx86_*) \
-               /usr/ccs/lib/cpp -P -D__i386 -DIGNORE_STDS_H -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
+               /usr/ccs/lib/cpp -P -D__sun -D__i386 -DIGNORE_STDS_H -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        alpha_nbsd* ) \

diff --git a/src/lwp/lwp_elf.h b/src/lwp/lwp_elf.h
index f304ecb..6ba2ff4 100644 (file)
--- a/src/lwp/lwp_elf.h
+++ b/src/lwp/lwp_elf.h
@@ -39,25 +39,25 @@
  */
 
 #ifndef _C_LABEL
-#if !defined(SYSV) && !defined(__ELF__) && !defined(AFS_SUN5_ENV)
+#if defined(SYSV) || defined(__ELF__) || (defined(AFS_SUN5_ENV) && defined(__sun))
+#define _C_LABEL(name)  name
+#else /* SYSV || __ELF__ || __sun */
 #ifdef __STDC__
 #define _C_LABEL(name)     _##name
 #else
 #define _C_LABEL(name)  _/**/name
 #endif
-#else /* SYSV || __ELF__ || AFS_SUN5_ENV */
-#define _C_LABEL(name)  name
 #endif
 #endif /* _C_LABEL */
 
 #ifndef ENTRY
-#if !defined(SYSV) && !defined(__ELF__) && !defined(AFS_SUN5_ENV)
+#if defined(SYSV) || defined(__ELF__) || (defined(AFS_SUN5_ENV) && defined(__sun))
+#define ENTRY(name)     name:
+#else
 #ifdef __STDC__
 #define ENTRY(name)    _##name##:
 #else
 #define ENTRY(name)     _/**/name/**/:
 #endif
-#else /* SYSV || __ELF__ || AFS_SUN5_ENV */
-#define ENTRY(name)     name:
 #endif
 #endif /* _C_LABEL */

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 2c55f3d..41e5606 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -345,7 +345,7 @@ casestrcpy.o: ${UTIL}/casestrcpy.c
        ${CCRULE}
 
 assert.o: ${UTIL}/assert.c
-       ${CCRULE} ${UTIL}/assert.c
+       ${CCRULE}
 
 base64.o: ${UTIL}/base64.c
        ${CCRULE}