From nobody Sun Jun 12 20:40:36 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 6CE7D85774E; Sun, 12 Jun 2022 20:40:37 +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 4LLmmj0h6Jz3lLQ; Sun, 12 Jun 2022 20:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655066437; 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=Wpj+zd49YA+xWpjtOW/ZHDPWPARx/pQTrt/HAcSP8D4=; b=s+NxQIm8Y2jXR2yJNsupKsu7D08udtWAG22ABcNdONsa2zdweXBPwMUgc6EgoxS1ZEdO5V bjx/pJhQi6tjqEOOkW68oTdEBCF6RZDAvEZZGWDTJaLkkwVRmUjB2yHu9JhIhrsHGamxsz CePsiMrCi0fNVmgofFCF7aI91OpNNpXOTM6LzDcaC9lGdjZTGqXYxb8mVXCdSTvjHeTQjY L4FlIzzBcXZlsw2O60BLFYhAO3j7Zt3jwqGLPXyPrEA4VUrN+lH0dgCDAFAAgFBFJ4/6f9 26fqDbv70+rubGcsTYL3OaOO06IM4aqs3sgEE/oiec7LUM+L6bQPkC3S5425Mw== 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 EC49CDF; Sun, 12 Jun 2022 20:40:36 +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 25CKeaCC072065; Sun, 12 Jun 2022 20:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25CKeaHl072064; Sun, 12 Jun 2022 20:40:36 GMT (envelope-from git) Date: Sun, 12 Jun 2022 20:40:36 GMT Message-Id: <202206122040.25CKeaHl072064@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 5f104f3192f7 - main - x11-toolkits/copperspice: fix build on armv7 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f104f3192f7fbbe809570b9b3d85ba778e5207f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655066437; 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=Wpj+zd49YA+xWpjtOW/ZHDPWPARx/pQTrt/HAcSP8D4=; b=n8wc0dfvSLn8qUioP0yBmS0+ik0DkVNTlEkz7sAlxSmzXCKmplN6+JfzxGtyZlDQK0kHnd j76N69R2ly3Z14WxuRNFglhTnKBUOtF8MtIoIXFxB3Tb/uga970dWeNyiafeQYR4F9OStO aN7FdxVc6Af130jVrrQ0f0svkSR+s7UQpVll9bSa1+7NKkE9vzv1EYehfEVVL6dBPAxgOl weS1577uiBt2Xhcwu5wsIlHEi5A71n9nXBFRmoTN1EbD0C8iecZLkwb2bpLC65DhrbMsrL SHg7e62+AD50UKD+SZN4M0zutgjJa8ogc/XFGR776tMxvzivnxUv1d66TXX6Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655066437; a=rsa-sha256; cv=none; b=pq6pLBMOgsEx1oLXQ8TPhu5+fIdAaTjk9YKqFMRn747XrpYI1ST9MbDYquT24BPMV2Goeh vuELvtsimn4PzuWhNRi9Z3cUKagfTevgotBT7i/H81zU4cCDcrK2botk7i3cRCLoGwVZBn 2gVv0OjaNrPq6fCC2i8U4u1JaqOa5aWhf+a0zClVDRPnjTgidceBYxitFIe9A6lFJslxEA pGH6L/uRU0UUDU8zTjvU+eBvd3lVPdQDobWXgMgHVZj0DPEU5TK87j1BbyZ1Erw72WwG+F yrdUkMjiy5eyTQ1MvTQTsqV2W82vE+U3ygG9SYW7BXb7FovIA/dfzwpB83hleg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f104f3192f7fbbe809570b9b3d85ba778e5207f commit 5f104f3192f7fbbe809570b9b3d85ba778e5207f Author: Robert Clausecker AuthorDate: 2022-06-05 00:15:51 +0000 Commit: Adriaan de Groot CommitDate: 2022-06-12 20:40:11 +0000 x11-toolkits/copperspice: fix build on armv7 PR: 264506 --- ...Source_JavaScriptCore_jit_ExecutableAllocator.h | 27 ++++++++++++++++++++++ .../files/patch-src_core_global_qglobal.h | 19 +++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h b/x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h new file mode 100644 index 000000000000..0045c5a8e6f3 --- /dev/null +++ b/x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h @@ -0,0 +1,27 @@ +--- src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h.orig 2022-06-05 21:14:42 UTC ++++ src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h +@@ -54,6 +54,10 @@ + #include + #endif + ++#if OS(FREEBSD) ++#include ++#endif ++ + #if OS(WINCE) + // From pkfuncs.h (private header file from the Platform Builder) + #define CACHE_SYNC_ALL 0x07F +@@ -304,6 +308,13 @@ class ExecutableAllocator { (public) + : + : "r" (code), "r" (reinterpret_cast(code) + size) + : "r0", "r1", "r2"); ++ } ++#elif (CPU(ARM_TRADITIONAL) || CPU(ARM_THUMB2)) && OS(FREEBSD) ++ static void cacheFlush(void *code, size_t size) ++ { ++ struct arm_sync_icache_args asia = { reinterpret_cast(code), size }; ++ ++ sysarch(ARM_SYNC_ICACHE, &asia); + } + #elif OS(WINCE) + static void cacheFlush(void* code, size_t size) diff --git a/x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h b/x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h new file mode 100644 index 000000000000..e3dc6e83a2df --- /dev/null +++ b/x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h @@ -0,0 +1,19 @@ +--- src/core/global/qglobal.h.orig 2022-06-04 14:31:11 UTC ++++ src/core/global/qglobal.h +@@ -101,13 +101,13 @@ + + # define Q_PROCESSOR_ARM_32 + +-# if defined(__ARM_ARCH_7__) ++# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) + # define Q_PROCESSOR_ARM 7 + # define Q_PROCESSOR_ARM_V7 + +-# elif defined(__ARM_ARCH_6__) ++# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6KZ__) + # define Q_PROCESSOR_ARM 6 +-# define Q_PROCESSOR_ARM_V8 ++# define Q_PROCESSOR_ARM_V6 + + # elif defined(__ARM_ARCH_5__) + # define Q_PROCESSOR_ARM 5