Further Unicos fixes for Mark Lutz.

p4raw-id: //depot/cfgperl@5941

diff --git a/hints/unicos.sh b/hints/unicos.sh
index ddbdee4..5d29754 100644 (file)
--- a/hints/unicos.sh
+++ b/hints/unicos.sh
@@ -2,10 +2,10 @@ case `uname -r` in
 6.1*) shellflags="-m+65536" ;;
 esac
 case "$optimize" in
-'') optimize="-O1 -h nofastmd" ;;
+'') optimize="-h nofastmd" ;; # fastmd: integer values limited to 46 bits
 esac
 case `uname -r` in
-10.*) pp_ctl_cflags='ccflags="$ccflags -DUNICOS_BROKEN_VOLATILE' ;;
+10.*) pp_ctl_cflags='optimize="$optimize -h scalar 0 -h vector 0"' ;;
 esac
 d_setregid='undef'
 d_setreuid='undef'

diff --git a/pp_ctl.c b/pp_ctl.c
index 8c16af9..4fcfb57 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2561,26 +2561,14 @@ S_docatch_body(pTHX)
     return NULL;
 }
 
-/* In Unicos 10.0.0.6 (T90) the cc seems to botch optimization so that
- * if cursi is an auto variable inside S_docatch() cursi doesn't get
- * properly saved/restored across longjmps. &/
-#ifdef UNICOS_BROKEN_VOLATILE
-volatile PERL_SI *cursi;
-#endif
-
 STATIC OP *
 S_docatch(pTHX_ OP *o)
 {
     dTHR;
     int ret;
     OP *oldop = PL_op;
-#ifdef UNICOS_BROKEN_VOLATILE
-    dJMPENV;
-    cursi = PL_curstackinfo;
-#else
     volatile PERL_SI *cursi = PL_curstackinfo;
     dJMPENV;
-#endif
 
 #ifdef DEBUGGING
     assert(CATCH_GET == TRUE);