Skip to content

Commit 27c08e8

Browse files
committed
fix CLOSURE and LDMODULE of ARM compile, because of ENTORY2
1 parent fc4bf15 commit 27c08e8

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

lisp/c/eus.c

+21-4
Original file line numberDiff line numberDiff line change
@@ -756,14 +756,31 @@ static void initclasses()
756756
C_FCODE=speval(FCODE);
757757
/*15*/
758758
#if (WORD_SIZE == 64)
759-
CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,3,"ENV0","ENV1","ENV2");
759+
CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,
760+
#if ARM // ARM uses entry2 in struct closure in eus.h
761+
4,"ENTRY2",
760762
#else
761-
CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,2,"ENV1","ENV2");
763+
3,
764+
#endif
765+
"ENV0","ENV1","ENV2");
766+
#else
767+
CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,
768+
#if ARM // ARM uses entry2 in struct closure in eus.h
769+
3,"ENTRY2",
770+
#else
771+
2,
772+
#endif
773+
"ENV1","ENV2");
762774
#endif
763775
C_CLOSURE=speval(CLOSURE);
764776
/* 16 ---new for Solaris */
765-
LDMODULE=basicclass("LOAD-MODULE",C_CODE, &ldmodulecp, 3,
766-
"SYMBOL-TABLE","OBJECT-FILE", "HANDLE");
777+
LDMODULE=basicclass("LOAD-MODULE",C_CODE, &ldmodulecp,
778+
#if ARM // ARM uses entry2 in struct ldmodule in eus.h
779+
4,"ENTRY2",
780+
#else
781+
3,
782+
#endif
783+
"SYMBOL-TABLE","OBJECT-FILE", "HANDLE");
767784
C_LDMOD=speval(LDMODULE);
768785
/*17*/
769786
LABREF=basicclass("LABEL-REFERENCE",C_OBJECT,&labrefcp,4,

0 commit comments

Comments
 (0)