added pmax/mips changes

SCCS-vsn: include/a.out.h 5.8
SCCS-vsn: include/setjmp.h 5.6

diff --git a/usr/src/include/a.out.h b/usr/src/include/a.out.h
index 2a0f759..ae2ce4f 100644 (file)
--- a/usr/src/include/a.out.h
+++ b/usr/src/include/a.out.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)a.out.h     5.7 (Berkeley) %G%
+ *     @(#)a.out.h     5.8 (Berkeley) %G%

  */
 
 #ifndef        _AOUT_H_
  */
 
 #ifndef        _AOUT_H_


@@ -12,7 +12,7 @@
 
 #include <sys/exec.h>
 
 
 #include <sys/exec.h>
 

-#if defined(hp300) || defined(i386)
+#if defined(hp300) || defined(i386) || defined(mips)

 #define        __LDPGSZ        4096
 #endif
 #if defined(tahoe) || defined(vax)
 #define        __LDPGSZ        4096
 #endif
 #if defined(tahoe) || defined(vax)


@@ -25,6 +25,7 @@
            (ex).a_magic != ZMAGIC)
 
 /* Address of the bottom of the text segment. */
            (ex).a_magic != ZMAGIC)
 
 /* Address of the bottom of the text segment. */

+#ifndef mips

 #define N_TXTADDR(X)   0
 
 /* Address of the bottom of the data segment. */
 #define N_TXTADDR(X)   0
 
 /* Address of the bottom of the data segment. */


@@ -58,6 +59,9 @@ struct relocation_info {
                        r_extern :  1,  /* 1 if need to add symbol to value */
                                 :  4;  /* reserved */
 };
                        r_extern :  1,  /* 1 if need to add symbol to value */
                                 :  4;  /* reserved */
 };

+#else /* mips */
+#define N_TXTADDR(X)   0x400000
+#endif /* mips */

 
 #define _AOUT_INCLUDE_
 #include <nlist.h>
 
 #define _AOUT_INCLUDE_
 #include <nlist.h>

diff --git a/usr/src/include/setjmp.h b/usr/src/include/setjmp.h
index b00e422..ab7d089 100644 (file)
--- a/usr/src/include/setjmp.h
+++ b/usr/src/include/setjmp.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)setjmp.h    5.5 (Berkeley) %G%
+ *     @(#)setjmp.h    5.6 (Berkeley) %G%

  */
 
 #ifndef _SETJMP_H_
  */
 
 #ifndef _SETJMP_H_


@@ -18,6 +18,10 @@
 #define _JBLEN 10
 #endif
 
 #define _JBLEN 10
 #endif
 

+#if defined(mips) || defined(__mips__)
+#define _JBLEN 83
+#endif
+

 #if defined(tahoe) || defined(__tahoe__)
 #define _JBLEN 10
 #endif
 #if defined(tahoe) || defined(__tahoe__)
 #define _JBLEN 10
 #endif