On Thu, 24 Feb 2022 11:12:50 +0100 Omar Polo <o...@openbsd.org> wrote:
> Attaching an updated diff with the correct types (for cs-version too as > you spotted in a previous mail.) ok gkoehler@ "make test" on powerpc with sbcl-2.2.1 is much like 2.1.11. 2.1.11 -> https://marc.info/?l=openbsd-ports&m=163954004504504&w=2 2.2.1 "FLAVOR=threads make test" got stuck in "Running :C-CALL-SAVE-P" so I didn't finish it. (2.1.11 also got stuck somewhere.) 2.2.1 without threads got these results, Status: Expected failure: array.pure.lisp / CHECK-BOUND-SIGNED-BOUND-NOTES Expected failure: compiler-2.pure.lisp / (MAP-ALLOCATED-OBJECTS NO-CONSING) Expected failure: compiler-2.pure.lisp / DEDUPLICATED-FDEFNS Expected failure: compiler.pure.lisp / (ODDP BIGNUM NO-CONSING) Expected failure: compiler.pure.lisp / (LOGTEST BIGNUM NO-CONSING) Failure: compiler.pure.lisp / REDUCING-CONSTANTS Failure: compiler.pure.lisp / REDUCING-CONSTANTS.2 Expected failure: dynamic-extent.pure.lisp / DX-COMPILER-NOTES Expected failure: float.pure.lisp / (ADDITION-OVERFLOW BUG-372) Expected failure: float.pure.lisp / (ADDITION-OVERFLOW BUG-372 TAKE-2) Expected failure: hash.pure.lisp / SXHASH-ON-DISPLACED-STRING Skipped (broken): interface.pure.lisp / RESTART-BOGUS-ARG-TO-VALUES-LIST-ERROR Expected failure: random.pure.lisp / FLOAT-NO-CONSING Expected failure: selfbuild-output.pure.lisp / MAKE-LIST-%MAKE-LIST-NOT-CALLED Failure: unicode-misc.pure.lisp / (CL-CASE-INVERTIBILITY) Expected failure: block-compile.impure.lisp / BLOCK-DEFCONSTANT-HAIRY-EQNESS-TEST Expected failure: compiler.impure.lisp / BUG-308921 Expected failure: compiler.impure.lisp / FTYPE-RETURN-TYPE-CONFLICT Unexpected success: debug.impure.lisp / (TRACE ENCAPSULATE NIL) Unexpected success: debug.impure.lisp / (TRACE ENCAPSULATE NIL RECURSIVE) Expected failure: fopcompiler.impure.lisp / FOPCOMPILER-DEPRECATED-VAR-WARNING Expected failure: full-eval.impure.lisp / INLINE-FUN-CAPTURES-DECL Failure: hash-table.impure.lisp / HASH-TABLE-ITERATOR-NO-NOTES Expected failure: packages.impure.lisp / USE-PACKAGE-CONFLICT-SET Expected failure: packages.impure.lisp / IMPORT-SINGLE-CONFLICT Skipped (broken): timer.impure.lisp / (TIMER PARALLEL-UNSCHEDULE) Expected failure: walk.impure.lisp / (WALK MULTIPLE-VALUE-BIND) Expected failure: walk.impure.lisp / (WALK MULTIPLE-VALUE-BIND SPECIAL) (121 tests skipped for this combination of platform and features) test failed, expected 104 return code, got 1 --George > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/sbcl/Makefile,v > retrieving revision 1.47 > diff -u -p -r1.47 Makefile > --- Makefile 31 Dec 2021 09:53:11 -0000 1.47 > +++ Makefile 24 Feb 2022 10:22:51 -0000 > @@ -1,35 +1,17 @@ > # $OpenBSD: Makefile,v 1.47 2021/12/31 09:53:11 solene Exp $ > > -BROKEN-i386 = build fails in "Compiling file > [...]/src/compiler/generic/genesis.lisp" > -# ;; Compiling file > /pobj/sbcl-2.0.1/sbcl-2.0.1/src/compiler/generic/genesis.lisp ... > -# ;; Wrote file > /pobj/sbcl-2.0.1/sbcl-2.0.1/obj/from-host/src/compiler/generic/genesis.fas-tmp > -# 0 errors, 0 warnings > -# ;; Loading file obj/from-host/src/compiler/generic/genesis.fas ... > -# ;; Loaded file obj/from-host/src/compiler/generic/genesis.fas > -# *** - OPEN: File > -# #P"/pobj/sbcl-2.0.1/sbcl-2.0.1/obj/from-xc/tls-init.lisp-expr" does > not > -# exist > -# The following restarts are available: > -# SKIP :R1 skip (GENESIS OBJECT-FILE-NAMES # ...) > -# RETRY :R2 retry (GENESIS OBJECT-FILE-NAMES # ...) > -# STOP :R3 stop loading file > /pobj/sbcl-2.0.1/sbcl-2.0.1/make-genesis-2.lisp > -# ABORT-BUILD :R4 Abort building SBCL. > -# ABORT :R5 Abort main loop > -# //testing for consistency of first and second GENESIS passes > -# diff: output/genesis-2: No such file or directory > -# error: header files do not match between first and second GENESIS > - > # not yet ported to other arches > ONLY_FOR_ARCHS = amd64 i386 powerpc > USE_WXNEEDED = Yes > > COMMENT= compiler and runtime system for ANSI Common Lisp > > -V = 2.1.11 > +V = 2.2.1 > DISTNAME= sbcl-${V}-source > PKGNAME= sbcl-${V} > WRKDIST= ${WRKDIR}/sbcl-${V} > EXTRACT_SUFX= .tar.bz2 > +PATCHORIG = .orig.port > > CATEGORIES= lang > HOMEPAGE= http://www.sbcl.org/ > @@ -58,10 +40,17 @@ WANTLIB+= pthread > MAKE_PARAMS += --with-sb-core-compression \ > --with-sb-xref-for-internals > > +# contrib/sb-capstone/test.lisp uses it at build-time if present > +BUILD_DEPENDS = devel/capstone/main > + > .if ${FLAVOR:Mnative_bootstrap} > BUILD_DEPENDS+= lang/sbcl > BOOTSTRAP_CMD= ${LOCALBASE}/bin/sbcl \ > --disable-debugger --no-sysinit --no-userinit > +.elif ${MACHINE_ARCH:Mi386} > +# ecl is slower but lang/clips fails to build sbcl on i386 > +BUILD_DEPENDS += lang/ecl > +BOOTSTRAP_CMD = ${LOCALBASE}/bin/ecl -q --norc > .else > BUILD_DEPENDS += lang/clisp > BOOTSTRAP_CMD = ${LOCALBASE}/bin/clisp -q -norc > Index: distinfo > =================================================================== > RCS file: /cvs/ports/lang/sbcl/distinfo,v > retrieving revision 1.21 > diff -u -p -r1.21 distinfo > --- distinfo 31 Dec 2021 09:53:11 -0000 1.21 > +++ distinfo 24 Feb 2022 10:22:51 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (sbcl-2.1.11-source.tar.bz2) = > v8FIHef9vfru8qsPDo6E79NDQz3qjSHPvqiwFGy9/v0= > -SIZE (sbcl-2.1.11-source.tar.bz2) = 6687529 > +SHA256 (sbcl-2.2.1-source.tar.bz2) = > Xdbm4/CLfG7fJioOhEqfi15WLMoIFVA0wfLAFPyQh9o= > +SIZE (sbcl-2.2.1-source.tar.bz2) = 6701705 > Index: patches/patch-contrib_sb-capstone_capstone_lisp > =================================================================== > RCS file: patches/patch-contrib_sb-capstone_capstone_lisp > diff -N patches/patch-contrib_sb-capstone_capstone_lisp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-contrib_sb-capstone_capstone_lisp 24 Feb 2022 10:22:51 > -0000 > @@ -0,0 +1,29 @@ > +$OpenBSD$ > + > +sync a couple of size mismatches with capstone.h; fixes the build on > +32bit arches (i386, powerpc.) > + > +Index: contrib/sb-capstone/capstone.lisp > +--- contrib/sb-capstone/capstone.lisp.orig > ++++ contrib/sb-capstone/capstone.lisp > +@@ -285,7 +285,7 @@ > + (define-alien-type cs-insn > + (struct nil > + (insn-id int) > +- (insn-addr unsigned) > ++ (insn-addr (unsigned 64)) > + (insn-size short) > + (insn-bytes (array char 16)) > + (insn-mnemonic (array char 32)) > +@@ -310,9 +310,9 @@ > + > + ;; The handle returned by cs-open will be represented as being of type > unsigned > + > +-(define-alien-routine cs-open int (arch int) (mode (integer 64)) (handle > unsigned :out)) > ++(define-alien-routine cs-open int (arch int) (mode unsigned-int) (handle > unsigned :out)) > + > +-(define-alien-routine cs-version unsigned (major int :out) (minor int :out)) > ++(define-alien-routine cs-version unsigned-int (major int :out) (minor int > :out)) > + > + (define-alien-routine cs-close int (handle unsigned :in-out)) > + > -- George Koehler <kern...@gmail.com>
