Fixup VOS builds of miniperl

Message-Id: <200205060311.XAA12996@mailhub1.stratus.com>

p4raw-id: //depot/perl@16422

diff --git a/vos/build.cm b/vos/build.cm
index 991530f..a07dad3 100644 (file)
--- a/vos/build.cm
+++ b/vos/build.cm
@@ -38,6 +38,12 @@
       &return 1
       &end
 &
+&if &compiler& = gcc & &cpu& = pa8000
+&then &do
+      &display_line build: "-compiler gcc" is incompatible with "-processor pa8000"
+      &return 1
+      &end
+&
 & Set up the appropriate directory suffix for each architecture.
 &
 &if &cpu& = mc68020
@@ -206,6 +212,8 @@
 &if (command_status) ^= 0 &then &return
 !&compiler& <<xsutils.c &diag& &cpu& &cflags& -o xsutils&s&
 &if (command_status) ^= 0 &then &return
+!&compiler& <vos.c &diag& &cpu& &cflags& -o vos&s&
+&if (command_status) ^= 0 &then &return
 &if &version& = alpha
 &then &do
 !&compiler& <vos_dummies.c &cpu& -O4 -o vos_dummies&s&
@@ -214,11 +222,11 @@
 &
 &if &compiler& = gcc
 &then &do
- !delete_file perl.a
+ &if (exists -file perl.a) &then !delete_file perl.a
  !ar rc perl.a av.o deb.o doio.o doop.o dump.o globals.o gv.o hv.o locale.o &+
  mg.o numeric.o op.o perl.o perlapi.o perlio.o perly.o pp.o pp_ctl.o &+
  pp_hot.o pp_pack.o pp_sort.o pp_sys.o reentr.o regcomp.o regexec.o run.o &+
- scope.o sv.o taint.o toke.o universal.o utf8.o util.o xsutils.o
+ scope.o sv.o taint.o toke.o universal.o utf8.o util.o vos.o xsutils.o
  !delete_file *.o -no_ask -brief
 &end
 &else &do

diff --git a/vos/compile_perl.cm b/vos/compile_perl.cm
index 367b079..c5c7c1e 100644 (file)
--- a/vos/compile_perl.cm
+++ b/vos/compile_perl.cm
@@ -38,6 +38,21 @@
  &display_line GCC is not supported by the alpha version of POSIX support.
  &return e$translation_failed
 &end
+&if &cpu& = mc68020 & &version& = ga
+&then &do
+ &display_line The mc68020 CPU is not supported by the GA version of POSIX support.
+ &return e$translation_failed
+&end
+&if &cpu& = i80860 & &version& = ga
+&then &do
+ &display_line The i80860 CPU is not supported by the GA version of POSIX support.
+ &return e$translation_failed
+&end
+&if &cpu& = pa8000 & &compiler& = gcc
+&then &do
+ &display_line The pa8000 CPU is not supported by the GNU GCC compiler.
+ &return e$translation_failed
+&end
 &if ^ (exists obj&obj& -directory)
 &then !create_dir obj&obj&
 &

diff --git a/vos/perl.bind b/vos/perl.bind
index 6531c05..7206c36 100644 (file)
--- a/vos/perl.bind
+++ b/vos/perl.bind
@@ -26,6 +26,7 @@ modules:  miniperlmain,
           pp_sort,
           pp_sys,
           reentr,
+          regcomp,
           regexec,
           run,
           scope,
@@ -35,6 +36,7 @@ modules:  miniperlmain,
           universal,
           utf8,
           util,
+          vos,
           xsutils;
 
 end;