From nobody Sat Apr 16 03:56:10 2022 X-Original-To: dev-commits-ports-all@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 2788F5D0137; Sat, 16 Apr 2022 03:56:11 +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 4KgKB30bFpz3HwZ; Sat, 16 Apr 2022 03:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650081371; 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=wJjtmSN+B99YDKs+i3r5teqs3NUn5JlVBe1kx/aTfQs=; b=dTNVkSplPBEPf4eBoTNhBqmYiEdyxYevts5ZvKuQOxrtT4XSyHWV6YTajRZzWyWFm85umE zlmxrGx2H2jMY8swnt2u+GqkwzuiHtyAUkIQ2zGNzlkldUZBAjG85drtK7OvA1qShWa3oR u5YkCFWAZqYW/56wNg+FVXy/BG7t0AZZ4+w8wCDhVxCLokGnQx99HTbAlnwg4l+zq8D07+ rG/BlI9FsH2AT2sSTxrx8YeIVwb0hejYgT0w3ae5iA5HCnYpFmIUK0/WtLE3ITgp1v1yt7 BgKsbWyVKn116rvgMSYFohvWI3aveiBtPHP8GeYrNCHcaYdCDTwr+5V0XU6W7w== 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 E8990221E9; Sat, 16 Apr 2022 03:56:10 +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 23G3uA5t059478; Sat, 16 Apr 2022 03:56:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G3uAPl059477; Sat, 16 Apr 2022 03:56:10 GMT (envelope-from git) Date: Sat, 16 Apr 2022 03:56:10 GMT Message-Id: <202204160356.23G3uAPl059477@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: e24e8beab8d6 - main - lang/spidermonkey91: More i386 build fixes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: e24e8beab8d68de47eaf9b1e960c3a00c4213d16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650081371; 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=wJjtmSN+B99YDKs+i3r5teqs3NUn5JlVBe1kx/aTfQs=; b=SGAEUDeR1x8zw08NGUaOp1YAWaqqAfQY5EyuFKxNrUASgEltCYSuvVpjYWLUwR6UlfDZZ6 RJiqE7dRd0ayw4e4eJcp5fs3kspIUnywEY5I1Fl/MSpClzABaoBHIUUi4NXAYRcklozPl8 giGYuLIOQH3zSaZ8DGNq34gk/+IYss7NilFqp/9vq/ZYvj2dPDDXtKMqwZEX8SxC9lP4oh nqB38o0SoM5qvTQDzLSWB1/tu6KRUPHtdRejIqH8NfHMDu6/vWMjO8+xfTBGfLb38nf8Ci Cx8pTWmMbbnSEbUcQ6WG47hfflFsRGWD8blVI0VNsEmh+buCypQILvtsK0bPZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650081371; a=rsa-sha256; cv=none; b=u+4K5JCQwPC5F9h6h8K211+srFnwa4YVpS6vCoNEv9gHjz2EORv4kScu/AOmZxFvWF0WTD XxqWHgCn9dcgXt6UZn3xIvzqfcOI7k3xRP9amNQeIgOK3WNZyFKXDKk1tHgggm/0PFDfwm 61awcyg4dLN1vKG6S+Ke/Fd5vrN4ue9Zd0AxfStlvMEJndJ5uC8ZrB+H+LCXV2Rbz4mmPY QTq4CCIIX5JR4RxOTgmYBVkiE7G4LBscwM3sBJIoFL3XcrP3MI9IKhrk05AZOwV8YURdEk O7XIe/9khWaFlH7ZWObLrDMSdPrE5Txm+DjNjWChCzSETKgHgX/QQ0RVBedoWQ== 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=e24e8beab8d68de47eaf9b1e960c3a00c4213d16 commit e24e8beab8d68de47eaf9b1e960c3a00c4213d16 Author: Neel Chauhan AuthorDate: 2022-04-16 03:53:53 +0000 Commit: Neel Chauhan CommitDate: 2022-04-16 03:53:53 +0000 lang/spidermonkey91: More i386 build fixes --- .../files/patch-modules_fdlibm_src_math__private.h | 40 +++++++++++++--------- 1 file changed, 24 insertions(+), 16 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 9294fa86f804..8be5854b5160 100644 --- a/lang/spidermonkey91/files/patch-modules_fdlibm_src_math__private.h +++ b/lang/spidermonkey91/files/patch-modules_fdlibm_src_math__private.h @@ -1,24 +1,25 @@ -Index: modules/fdlibm/src/math_private.h ---- modules/fdlibm/src/math_private.h.orig 2022-04-16 01:44:07 UTC +--- modules/fdlibm/src/math_private.h.orig 2022-04-16 03:20:29 UTC +++ modules/fdlibm/src/math_private.h -@@ -634,6 +634,34 @@ rnint(__double_t x) - return ((double)(x + 0x1.8p52) - 0x1.8p52); - } +@@ -30,7 +30,9 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ -+#ifdef __i386__ -+typedef long double __double_t; -+#else -+typedef double __double_t; ++#ifndef __FreeBSD__ + typedef double __double_t; +#endif -+typedef __double_t double_t; + typedef __double_t double_t; + + /* +@@ -636,6 +638,33 @@ rnint(__double_t x) + * sometimes be more efficient because no rounding is required. + */ + #if (defined(amd64) || defined(__i386__)) && defined(__GNUCLIKE_ASM) + -+/* This is needed on FreeBSD i386. */ -+#if defined(__i386__) && defined(__GNUCLIKE_ASM) ++#if defined(__i386__) +static __inline int +irintf(float x) +{ + int n; -+ + __asm("fistl %0" : "=m" (n) : "t" (x)); + return (n); +} @@ -27,12 +28,19 @@ Index: modules/fdlibm/src/math_private.h +irintd(double x) +{ + int n; ++ __asm("fistl %0" : "=m" (n) : "t" (x)); ++ return (n); ++} + ++static __inline int ++irintl(long 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 + #define irint(x) \ + (sizeof(x) == sizeof(float) && \ + sizeof(__float_t) == sizeof(long double) ? irintf(x) : \