keep dlopen(0, RTLD_LAZY)(sysem library) handle to handle and handle2 for #elif defined(ARM) && defined(__ARM_ARCH_7A__) /* not (defined(x86_64) || defined(aarch64)) */

Author: k-okada

lisp/c/eus.c

@@ -776,11 +776,15 @@ static void initclasses()
 /* 16    ---new for Solaris */
   LDMODULE=basicclass("LOAD-MODULE",C_CODE, &ldmodulecp,
 #if ARM // ARM uses entry2 in struct ldmodule in eus.h
-		      4,"ENTRY2",
+		      5,"ENTRY2",
 #else
 		      3,
 #endif
-		      "SYMBOL-TABLE","OBJECT-FILE", "HANDLE");
+		      "SYMBOL-TABLE","OBJECT-FILE", "HANDLE"
+#if ARM
+		      ,"HANDLE2"
+#endif
+		      );
   C_LDMOD=speval(LDMODULE);
 /*17*/
   LABREF=basicclass("LABEL-REFERENCE",C_OBJECT,&labrefcp,4,
@@ -971,7 +975,11 @@ static void initfeatures()
   /*system function module*/
   sysmod=makemodule(ctx,0);
   sysmod->c.ldmod.codevec=makeint(0);
-  sysmod->c.ldmod.handle=makeint((eusinteger_t)dlopen(0, RTLD_LAZY)>>2);
+  void *handle = dlopen(0, RTLD_LAZY);
+  sysmod->c.ldmod.handle=makeint((eusinteger_t)handle>>2);
+#if ARM
+  sysmod->c.ldmod.handle2=makeint((eusinteger_t)handle&0x0000ffff);
+#endif
   sysobj=cons(ctx,sysmod, sysobj);
   }
 

lisp/c/eus.h

@@ -256,7 +256,11 @@ struct ldmodule {	/*foreign language object module*/
 #endif
     pointer symtab;
     pointer objname;
-    pointer handle;};	/* dl's handle */
+    pointer handle;
+#if ARM
+    pointer handle2;     /* some archtecture did not set code on 4 byte alignment */
+#endif
+    };
 
 struct closure {
     pointer codevec;

lisp/c/makes.c

@@ -501,6 +501,9 @@ int size;
   mod->c.ldmod.symtab=NIL;
   mod->c.ldmod.objname=NIL;
   mod->c.ldmod.handle=NIL;
+#if ARM
+  mod->c.ldmod.handle2=NIL;
+#endif
   return(mod);}
 
 pointer makeclosure(code,quote,f,e0,e1,e2)

lisp/xwindow/xforeign.c.c

@@ -433,7 +433,13 @@ char *xentry;
      dlhandle=(eusinteger_t)dlopen("libX11.dylib", RTLD_LAZY);
    entry=(eusinteger_t)dlsym((void *)dlhandle, xentry);
 #else
-  entry=(eusinteger_t)dlsym((void *)((eusinteger_t)(sysmod->c.ldmod.handle) & ~3), xentry);
+  eusinteger_t dlhandle = (eusinteger_t)(sysmod->c.ldmod.handle) & ~3;
+#if ARM
+  if ( sysmod->c.ldmod.handle2 != NIL ) {
+    dlhandle = (dlhandle & 0xffff0000) | (intval(sysmod->c.ldmod.handle2) & 0x0000ffff);
+  }
+#endif
+  entry=(eusinteger_t)dlsym((void *)(dlhandle), xentry);
 #endif
   if (entry){
     xsym=intern(ctx,lname, len-1, xpkg);