Attachment 216177 Details for Bug 247743 – Diff

[patch] Diff

swi-pl-8.2.1.diff (text/plain), 2.89 KB, created by Nikolaj Thygesen on 2020-07-03 16:26:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolaj Thygesen

Created: 2020-07-03 16:26:24 UTC

Size: 2.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 541119)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	swi-pl
>-DISTVERSION=	8.2.0
>+DISTVERSION=	8.2.1
> CATEGORIES=	lang
> MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/
> DISTNAME=	swipl-${DISTVERSION}
>@@ -12,7 +12,6 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-BROKEN_i386=	fails to link: libswipl.so: undefined reference to __atomic_compare_exchange_8
> BROKEN_mips=	fails to link: libswipl.so: undefined reference to '__sync_sub_and_fetch_4'
> BROKEN_mips64=	fails to link: libswipl.so: undefined reference to '__sync_sub_and_fetch_4'
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 541119)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1587312848
>-SHA256 (swipl-8.2.0.tar.gz) = d8c9f3adb9cd997a5fed7b5f5dbfe971d2defda969b9066ada158e4202c09c3c
>-SIZE (swipl-8.2.0.tar.gz) = 10955744
>+SHA256 (swipl-8.2.1.tar.gz) = 331bc5093d72af0c9f18fc9ed83b88ef9ddec0c8d379e6c49fa43739c8bda2fb
>+SIZE (swipl-8.2.1.tar.gz) = 10969688
>Index: files/patch-src_pl-inline.h
>===================================================================
>--- files/patch-src_pl-inline.h	(nonexistent)
>+++ files/patch-src_pl-inline.h	(working copy)
>@@ -0,0 +1,15 @@
>+--- src/pl-inline.h.orig	2020-05-27 11:55:29 UTC
>++++ src/pl-inline.h
>+@@ -131,9 +131,9 @@ __builtin_popcount(size_t sz)
>+ #define ATOMIC_OR(ptr, v)	__atomic_fetch_or(ptr, v, __ATOMIC_SEQ_CST)
>+ #define ATOMIC_AND(ptr, v)	__atomic_fetch_and(ptr, v, __ATOMIC_SEQ_CST)
>+ 
>+-#define __COMPARE_AND_SWAP(at, from, to) \
>+-	__atomic_compare_exchange_n(at, &(from), to, FALSE, \
>+-				    __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
>++#define __COMPARE_AND_SWAP(at, from, to) sizeof(from) > sizeof(void *) \
>++	? __atomic_compare_exchange(at, &(from), &(to), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) \
>++	: __atomic_compare_exchange_n(at, &(from), to, FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
>+ 
>+ static inline int
>+ COMPARE_AND_SWAP_PTR(void *at, void *from, void *to)
>
>Property changes on: files/patch-src_pl-inline.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 541119)
>+++ pkg-plist	(working copy)
>@@ -420,7 +420,7 @@
> lib/swipl/lib/%%ARCH%%-%%OS%%/libedit4pl.so
> lib/swipl/lib/%%ARCH%%-%%OS%%/libswipl.so
> lib/swipl/lib/%%ARCH%%-%%OS%%/libswipl.so.8
>-lib/swipl/lib/%%ARCH%%-%%OS%%/libswipl.so.8.2.0
>+lib/swipl/lib/%%ARCH%%-%%OS%%/libswipl.so.8.2.1
> lib/swipl/lib/%%ARCH%%-%%OS%%/md54pl.so
> lib/swipl/lib/%%ARCH%%-%%OS%%/memfile.so
> lib/swipl/lib/%%ARCH%%-%%OS%%/ntriples.so

Actions: View | Diff

Attachments on bug 247743: 216177 | 216254