From nobody Sat Apr 16 01:53:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 439045D0FB6; Sat, 16 Apr 2022 01:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgGSb1QPpz4hHr; Sat, 16 Apr 2022 01:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650074015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8u39LiWyCwUzn9cMF+FmEIwaQ9EfBvT5DVMjhWMjmM=; b=aLwYiqpgRfHNmihgGUA8b4CYtGoq3ZlJNLZsdGqDGhIEbW58flcDJ0BQtxBFfy/9mHsQTq SXF5Au1gapS/wwaTPxR/iIEMxEGT/zIriyfzWYmweorU/wZ68ZrhXzJEO8Sbbq0DBX7nKi ik23ueY4CC5MRXzyhwSUDecuUeanIUnEbfjpnS6CZe2kYXHxkSCB0cIQncDtVyQIKuD5vH /T6Wzslg1bNh6J0BsKcKfY1+hrE++l3UKgzE+tCQJq0KVpiBBInydUy41LaU8Z84Pqa6zp 6YGsBY76jIiicRBx4PCcY+A2TVy0PRYhrQSJhEFxmO/Pliw6Uj4j9EdqTMnPFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1147D2073E; Sat, 16 Apr 2022 01:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23G1rY09096858; Sat, 16 Apr 2022 01:53:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G1rYkD096857; Sat, 16 Apr 2022 01:53:34 GMT (envelope-from git) Date: Sat, 16 Apr 2022 01:53:34 GMT Message-Id: <202204160153.23G1rYkD096857@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 2a8218e9dbbe - main - lang/spidermonkey91: Fix build on i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a8218e9dbbeb207291b8604fcf34825ea9492b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650074015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8u39LiWyCwUzn9cMF+FmEIwaQ9EfBvT5DVMjhWMjmM=; b=xw6+6n3pY8nZMHam6vl/llwnfDE6dLOnWaATGhpiK5Ef0ZE4pdDTkuYDUEPDdASjKhJLGs bEWHdC1dDYgCbGU7tAbYhZfSdu1imYVOo7rGNpFj9cbXWGLgQ5+jjqbQXhFD1S+JBoVsaw IfPISbuJL6VpugHuT2Cea8Cm2shSfCl9okOsso7+tUB4fmdm/eaRHvZI0hDzGSNEcGLrgi A/nWFr+cWA4hkBk+8EKi9G9UqbAyUl5DJWushhveSAhIpPql7xTC/OmtqIDqFc4IO68wIZ 7x/7kSqeqW3FHpYerhn21VztTTs11BdfSzjN9HGlh3TfXJR7GiFG9zAnCME8IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650074015; a=rsa-sha256; cv=none; b=Ufqjs/HiCtTMVIO+umcBHxJJncj9nVm+hqXKJw1vxihQFAVkH2UmGHmGMkx63TftIwSl1c i/6d0cj+KQDfxt3isNFfjo0fqNG75OXVsNbz4hoyz6YPlF51qFBTzR7Ui+mi7inqR9TQGW tctsdSai5IdM8SfAkW+8BU4e49TZ8IJ7UNWiWNL5vAWpJAGU4i4M1M6kKydP6TJsTGP97V Hu3IaN6gpB0iZWIsVIuxxHEEmSp62wcj9o076pX5wbk0mmvqZ6JOB97Stm0aK55VO2SDc0 evq1kDczXQBtJH0KSU4KXFyAxoRLuOSY8OkVIQGi38Qepj70W5Dll+bh9NpjNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a8218e9dbbeb207291b8604fcf34825ea9492b4 commit 2a8218e9dbbeb207291b8604fcf34825ea9492b4 Author: Neel Chauhan AuthorDate: 2022-04-16 01:53:31 +0000 Commit: Neel Chauhan CommitDate: 2022-04-16 01:53:31 +0000 lang/spidermonkey91: Fix build on i386 --- .../files/patch-modules_fdlibm_src_math__private.h | 37 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/lang/spidermonkey91/files/patch-modules_fdlibm_src_math__private.h b/lang/spidermonkey91/files/patch-modules_fdlibm_src_math__private.h index db521fc65645..9294fa86f804 100644 --- a/lang/spidermonkey91/files/patch-modules_fdlibm_src_math__private.h +++ b/lang/spidermonkey91/files/patch-modules_fdlibm_src_math__private.h @@ -1,15 +1,38 @@ Index: modules/fdlibm/src/math_private.h ---- modules/fdlibm/src/math_private.h.orig 2022-03-30 19:25:49 UTC +--- modules/fdlibm/src/math_private.h.orig 2022-04-16 01:44:07 UTC +++ modules/fdlibm/src/math_private.h -@@ -30,7 +30,11 @@ - * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t - */ +@@ -634,6 +634,34 @@ rnint(__double_t x) + return ((double)(x + 0x1.8p52) - 0x1.8p52); + } +#ifdef __i386__ +typedef long double __double_t; +#else - typedef double __double_t; ++typedef double __double_t; +#endif - typedef __double_t double_t; - ++typedef __double_t double_t; ++ ++/* This is needed on FreeBSD i386. */ ++#if defined(__i386__) && defined(__GNUCLIKE_ASM) ++static __inline int ++irintf(float x) ++{ ++ int n; ++ ++ __asm("fistl %0" : "=m" (n) : "t" (x)); ++ return (n); ++} ++ ++static __inline int ++irintd(double x) ++{ ++ int n; ++ ++ __asm("fistl %0" : "=m" (n) : "t" (x)); ++ return (n); ++} ++#endif ++ /* + * irint() and i64rint() give the same result as casting to their integer + * return type provided their arg is a floating point integer. They can