pull the sparcv9 workshop libraries in front of loclibpth

[p5sagit/p5-mst-13.2.git] / ext / DynaLoader / dl_aix.xs

diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs
index e3a4113..35242ed 100644 (file)
--- a/ext/DynaLoader/dl_aix.xs
+++ b/ext/DynaLoader/dl_aix.xs
@@ -20,6 +20,15 @@
 #include "perl.h"
 #include "XSUB.h"
 
+/* When building as a 64-bit binary on AIX, define this to get the
+ * correct structure definitions.  Also determines the field-name
+ * macros and gates some logic in readEntries().  -- Steven N. Hirsch
+ * <hirschs@btv.ibm.com> */
+#ifdef USE_64_BIT_ALL
+#   define __XCOFF64__
+#   define __XCOFF32__
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -29,14 +38,34 @@
 #include <a.out.h>
 #include <ldfcn.h>
 
+#ifdef USE_64_BIT_ALL
+#   define AIX_SCNHDR SCNHDR_64
+#   define AIX_LDHDR LDHDR_64
+#   define AIX_LDSYM LDSYM_64
+#   define AIX_LDHDRSZ LDHDRSZ_64
+#else
+#   define AIX_SCNHDR SCNHDR
+#   define AIX_LDHDR LDHDR
+#   define AIX_LDSYM LDSYM
+#   define AIX_LDHDRSZ LDHDRSZ
+#endif
+
 /* When using Perl extensions written in C++ the longer versions
  * of load() and unload() from libC and libC_r need to be used,
  * otherwise statics in the extensions won't get initialized right.
  * -- Stephanie Beals <bealzy@us.ibm.com> */
-#ifdef USE_xlC /* The define comes, when it comes, from hints/aix.pl. */
-#   define LOAD   loadAndInitialize
+
+/* Older AIX C compilers cannot deal with C++ double-slash comments in
+   the ibmcxx and/or xlC includes.  Since we only need a single file,
+   be more fine-grained about what's included <hirschs@btv.ibm.com> */
+#ifdef USE_libC /* The define comes, when it comes, from hints/aix.pl. */
+#   define LOAD   loadAndInit
 #   define UNLOAD terminateAndUnload
-#   include <load.h>
+#   if defined(USE_xlC_load_h)
+#       include "/usr/lpp/xlC/include/load.h"
+#   elif defined(USE_ibmcxx_load_h)
+#       include "/usr/ibmcxx/include/load.h"
+#   endif
 #else
 #   define LOAD   load
 #   define UNLOAD unload
@@ -392,10 +421,10 @@ static int readExports(ModulePtr mp)
 {
        dTHX;
        LDFILE *ldp = NULL;
-       SCNHDR sh;
-       LDHDR *lhp;
+       AIX_SCNHDR sh;
+       AIX_LDHDR *lhp;
        char *ldbuf;
-       LDSYM *ls;
+       AIX_LDSYM *ls;
        int i;
        ExportPtr ep;
 
@@ -461,7 +490,11 @@ static int readExports(ModulePtr mp)
                        return -1;
                }
        }
+#ifdef USE_64_BIT_ALL
+       if (TYPE(ldp) != U803XTOCMAGIC) {
+#else
        if (TYPE(ldp) != U802TOCMAGIC) {
+#endif
                errvalid++;
                strcpy(errbuf, "readExports: bad magic");
                while(ldclose(ldp) == FAILURE)
@@ -509,8 +542,8 @@ static int readExports(ModulePtr mp)
                        ;
                return -1;
        }
-       lhp = (LDHDR *)ldbuf;
-       ls = (LDSYM *)(ldbuf+LDHDRSZ);
+       lhp = (AIX_LDHDR *)ldbuf;
+       ls = (AIX_LDSYM *)(ldbuf+AIX_LDHDRSZ);
        /*
         * Count the number of exports to include in our export table.
         */
@@ -534,15 +567,19 @@ static int readExports(ModulePtr mp)
         * the entry point we got from load.
         */
        ep = mp->exports;
-       ls = (LDSYM *)(ldbuf+LDHDRSZ);
+       ls = (AIX_LDSYM *)(ldbuf+AIX_LDHDRSZ);
        for (i = lhp->l_nsyms; i; i--, ls++) {
                char *symname;
                if (!LDR_EXPORT(*ls))
                        continue;
+#ifndef USE_64_BIT_ALL
                if (ls->l_zeroes == 0)
+#endif
                        symname = ls->l_offset+lhp->l_stoff+ldbuf;
+#ifndef USE_64_BIT_ALL
                else
                        symname = ls->l_name;
+#endif
                ep->name = savepv(symname);
                ep->addr = (void *)((unsigned long)mp->entry + ls->l_value);
                ep++;
@@ -556,7 +593,7 @@ static int readExports(ModulePtr mp)
 /* dl_dlopen.xs
  * 
  * Platform:   SunOS/Solaris, possibly others which use dlopen.
- * Author:     Paul Marquess (pmarquess@bfsec.bt.co.uk)
+ * Author:     Paul Marquess (Paul.Marquess@btinternet.com)
  * Created:    10th July 1994
  *
  * Modified: