Plan 9 update

6 files changed, 37 insertions, 30 deletions

diff --git a/plan9/buildinfo b/plan9/buildinfo
index 849d3cef65..4fcbae698f 100644
--- a/plan9/buildinfo
+++ b/plan9/buildinfo
@@ -1 +1 @@
-p9pvers = 5.003_05
+p9pvers = 5.003_08
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index 1e4ec52521..b10c75852f 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -1,22 +1,14 @@
-/* This file (config_H) is a sample config.h file.  If you are unable
-   to successfully run Configure, copy this file to config.h and
-   edit it to suit your system.
-*/
 /*
- * This file was produced by running the config_h.SH script, which
- * gets its values from config.sh, which is generally produced by
- * running Configure.
- *
- * Feel free to modify any of this as the need arises.  Note, however,
- * that running config_h.SH again will wipe out any changes you've made.
- * For a more permanent change edit config.sh and rerun config_h.SH.
- *
- * $Id: Config_h.U,v 3.0.1.4 1995/09/25 09:10:49 ram Exp $
- */
+ * This file is mangled by fndvers (and perhaps other scripts) to produce the config.h 
+ * for Plan 9. It was handwritten because the standard configuration scripts were
+ * written in a shell dialect incomprehensible to Plan 9. 
+ * config.h for Plan 9
+ * Version: 5.004
+ */                 
 
-/* Configuration time: Thu Feb  8 17:15:11 EST 1996
- * Configured by: doughera
- * Target system: sunos fractal 5.4 generic_101946-29 i86pc i386 
+/* Configuration time: 21-Oct-1996 15:11
+ * Configured by: Luther Huffman, lutherh@stratcom.com
+ * Target system: Plan 9
  */
 
 #ifndef _config_h_
@@ -43,7 +35,15 @@
  *	This symbol contains the number of bytes required to align a
  *	double. Usual values are 2, 4 and 8.
  */
-#define MEM_ALIGNBYTES 8	/* config-skip */
+#if (_P9P_OBJTYPE == 386) || (_P9P_OBJTYPE==power)
+#	define MEM_ALIGNBYTES 4	 /* config-skip */
+#else
+# if _P9P_OBJTYPE == 68020
+#	define MEM_ALIGNBYTES 2  /* config-skip */
+# else
+#	define MEM_ALIGNBYTES 8 /* config-skip */
+# endif
+#endif
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
diff --git a/plan9/exclude b/plan9/exclude
index 2b941ff99c..7d9fc3c8af 100644
--- a/plan9/exclude
+++ b/plan9/exclude
@@ -2,6 +2,8 @@ comp/cpp.t
 io/dup.t
 io/fs.t
 lib/anydbm.t
+lib/complex.t
+lib/filefind.t
 lib/io_dup.t
 lib/io_pipe.t
 lib/io_sock.t
diff --git a/plan9/genconfig.pl b/plan9/genconfig.pl
index edcaf338db..c23bd885b6 100644
--- a/plan9/genconfig.pl
+++ b/plan9/genconfig.pl
@@ -82,7 +82,6 @@ eunicefix=':'
 hint='none'
 hintfile=''
 intsize='4'
-alignbytes='8'
 shrplib='define'
 usemymalloc='n'
 usevfork='true'
@@ -127,24 +126,26 @@ print OUT "siglongjmp='siglongjmp(buf,retval) '\n";
 print OUT "exe_ext=''\n";
 if ($p9p_objtype eq '386') {
 	$objext = '.8';
+	$alignbytes = '4';
+	$cstflags = 2;
 }
 elsif ($p9p_objtype eq '68020') {
 	$objext = '.2';
+	$alignbytes = '2';
+	$cstflags = 0;
 }
 elsif ($p9p_objtype eq 'mips') {
 	$objext = '.v';
+	$alignbytes = '8';
+	$cstflags = 0;
 }
 elsif ($p9p_objtype eq 'sparc') {
 	$objext = '.k';
-}
-print OUT "obj_ext='$objext'\n";
-
-if ($p9p_objtype eq '386') {
-	$cstflags = 2;
-}
-else {
+	$alignbytes = '4';
 	$cstflags = 0;
 }
+print OUT "obj_ext='$objext'\n";
+print OUT "alignbytes='$alignbytes'\n";
 print OUT "castflags='$cstflags'\n";
 
 $myname = $ENV{'site'} ;
diff --git a/plan9/mkfile b/plan9/mkfile
index dc10cf6a70..938b8e6a6d 100644
--- a/plan9/mkfile
+++ b/plan9/mkfile
@@ -8,7 +8,7 @@ archlib = /$objtype/lib/perl/$p9pvers
 sitelib = $privlib/site_perl
 sitearch = $archlib/site_perl
 
-CFLAGS =  -B  -D_POSIX_SOURCE -D_BSD_EXTENSION -DNO_EMBED -DMY_UV_MAX=0x7fffffffUL
+CFLAGS =  -B  -D_POSIX_SOURCE -D_BSD_EXTENSION -DMY_UV_MAX=0x7fffffffUL
 LDFLAGS = -B 
 
 CCCMD = $CC  -c $CFLAGS 
@@ -40,6 +40,7 @@ testlist = base/*.t comp/*.t cmd/*.t io/*.t op/*.t
 install:V:	perl preplibrary 
 		cp perl /$objtype/bin/perl
 		cp plan9/aperl /rc/bin/Perl
+		mk man
 		
 perl:		config.h miniperlmain.$O miniperl $archlib/Config.pm perlmain.$O $perlshr 
 		$LD $CFLAGS -o perl perlmain.$O $perllib $perlshr
diff --git a/plan9/setup.rc b/plan9/setup.rc
index 037ecfb25c..dd96c1f9c7 100644
--- a/plan9/setup.rc
+++ b/plan9/setup.rc
@@ -9,8 +9,11 @@
 awk -f versnum ../patchlevel.h
 . buildinfo
 builddir = `{ cd .. ; pwd } 
-if(flag a) platforms = (386 mips sparc 68020)
-if not platforms = $objtype
+if (~ $#* 0) platforms = $objtype
+if not switch($1) {
+	case -a ; platforms = (386 mips sparc 68020)
+	case * ; echo 'Usage: setup.rc [-a]' >[1=2] ; exit
+}
 sourcedir=/sys/src/cmd/perl/$p9pvers
 privlib=/sys/lib/perl
 sitelib=$privlib/site_perl