VM/ESA update.

p4raw-id: //depot/cfgperl@2026

diff --git a/Makefile.SH b/Makefile.SH
index 9d8a697..dd96712 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -658,6 +658,8 @@ case "$ebcdic" in
 $define)
     xxx=''
     echo "This is an EBCDIC system, checking if any parser files need regenerating." >&4
+case "$osname" in
+os390)
     rm -f y.tab.c y.tab.h
     yacc -d perly.y >/dev/null 2>&1
     if cmp -s y.tab.c perly.c; then
@@ -713,6 +715,10 @@ $define)
         xxx="$xxx a2p.h"
     fi
     cd ..
+    ;;
+vmesa)
+    # Do nothing in VM/ESA.
+    ;;
     case "$xxx" in
     '') echo "No parser files were regenerated.  That's okay." >&2 ;;
     esac

diff --git a/vmesa/vmesa.c b/vmesa/vmesa.c
index 0e9baf3..6169e70 100644 (file)
--- a/vmesa/vmesa.c
+++ b/vmesa/vmesa.c
@@ -126,7 +126,7 @@ do_aspawn(SV* really, SV **mark, SV **sp)
        while (++mark <= sp)
        {
            if (*mark)
-              *a++ = SvPVx(*mark, na);
+              *a++ = SvPVx(*mark, PL_na);
            else
               *a++ = "";
        }
@@ -142,7 +142,7 @@ do_aspawn(SV* really, SV **mark, SV **sp)
        /*-----------------------------------------------------*/
        if (*PL_Argv[0] != '/')
            TAINT_ENV();
-       if (really && *(tmps = SvPV(really, na)))
+       if (really && *(tmps = SvPV(really, PL_na)))
            pid = spawnp(tmps, nFd, fdMap, &inherit,
                         (const char **) PL_Argv,
                         (const char **) environ);
@@ -477,33 +477,6 @@ my_pclose(FILE *fp)
 
 }
 
-/*===================== End of my_pclose ===================*/
-
-/************************************************************/
-/*                                                          */
-/* Name      - getTHR.                                      */
-/*                                                          */
-/* Function  - Use pclose to terminate a piped command      */
-/*             file stream.                                 */
-/*                                                          */
-/* On Exit   - Thread specific data returned.               */
-/*                                                          */
-/************************************************************/
-
-struct perl_thread *
-getTHR()
-{
- int status;
- struct perl_thread *pThread;
-
-   status = pthread_getspecific(PL_thr_key, (void **) &pThread);
-   if (status != 0)
-      pThread = NULL;
-   return (pThread);
-}
-
-/*===================== End of getTHR ======================*/
-
 /************************************************************/
 /*                                                          */
 /* Name      - dlopen.                                      */

diff --git a/vmesa/vmesaish.h b/vmesa/vmesaish.h
index f4f87a9..379d5b4 100644 (file)
--- a/vmesa/vmesaish.h
+++ b/vmesa/vmesaish.h
@@ -12,4 +12,5 @@
 # define YIELD pthread_yield(NULL)
 # define pthread_mutexattr_default NULL
 # define pthread_condattr_default NULL
+ typedef void * pthread_addr_t;
 #endif