From nobody Fri Sep 30 08:24:28 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 4Mf3DY03Zcz4YLSw; Fri, 30 Sep 2022 08:24:29 +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 4Mf3DX6clMz3DTj; Fri, 30 Sep 2022 08:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664526268; 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=HCo81qU7mKJvmhboYTR/ySkYATAh7IVu53af9KErC+o=; b=gb5SgOKkAKau3pIlTuE7rlPc47hBLg+LoUcOUWuM/TA+ISFb64o3hqxKC/mFUKqXOpt/1b +ahHwMzvVkUyVAIxYAnUYMOmpE7oDiuBFcV5FeY6vbLRi6J7LNmlXe8mQt5Y2tnxlwDK9B EdlvzSQuycZNfWSFER3zVw3q5fz6ORF9jc6hFpFV2C5WmgT9ayGM7Kwccm/jZ0o7guGKD6 jJj5xEjJ/OhaYoBYa0AQ5wvqilYYk3LCj4QFrNbW+xmO2MlthTAQ8mbp5CsqjNP1VNlN0G BVu8e2NZp3SjqQMtjCWt6ijDhuN1FCeKlZ+54Mf0ntkoI0UN3dhKzC/hqVvnUQ== 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 4Mf3DX5MRjz16J4; Fri, 30 Sep 2022 08:24:28 +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 28U8OSUK072048; Fri, 30 Sep 2022 08:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28U8OS0U072047; Fri, 30 Sep 2022 08:24:28 GMT (envelope-from git) Date: Fri, 30 Sep 2022 08:24:28 GMT Message-Id: <202209300824.28U8OS0U072047@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5953f15101db - main - devel/zydis: fix build on riscv64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5953f15101db1fee998b4f17d4ef683427ff9c88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664526268; 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=HCo81qU7mKJvmhboYTR/ySkYATAh7IVu53af9KErC+o=; b=Zm8gL2Vl8HUo51696TQ4ZzZ0tLiKbZK0D0YKvcbSNRVJGyBw2oCOzWd4uemEnWkKjRCGB9 5R9fYUnkhLpXNllU1ssl/TOsR4i4cz4SfKrmhOzhW7l1EyKUiLsTkkhyLnU0pCpnaFG6yo +2qDjNOWDAjMrCQ/e5NZncPmBvFbbNx9TkhpmGKRKi626MQFOUXH9Rg8eN8JIL7P/ErMJq 29/7Q5yWhM8kfgQesiXp4qF8v5DQV8aYm9/iJrAFsSw27pNBfLAvJ1lkH5GuVbmoMyuMNS 41cMMgnuYWBxAqWkETy1m0S232r+scUl/7cc8E7MVNyetJuhRbYLSrErcQEWBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664526268; a=rsa-sha256; cv=none; b=lTDcxN1wGRrJy6ZS/jse9AoCDj8EH8JYGYYHpicIJOkuahYx96Wq13LTTLlg1qKqcCroRd AWQn3V3mbniesnI9vYuPJ4vPjaWMGewsaHRlFAjb0mQ13hB1VriXV9NaHnDCckqYrbuiIW zTRFyqa0WlmFb9fGMdPtY2EOzyoTZ628DcmY215DuDkUT/bMyDd8pSrjpjMnO2kxnoGkRC lnFM1Ymks/ola/iuP0QUXR1BrrZ3O28xXpDWDpRCP5F6giwL7cxns0dgRdMeUzfrLb561T 9T86XNDENkedDuGx4qNrGR5CXIBIEAJpS2ZozASnTsFzrQUV3BwAyklaJ/kS0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=5953f15101db1fee998b4f17d4ef683427ff9c88 commit 5953f15101db1fee998b4f17d4ef683427ff9c88 Author: Piotr Kubaj AuthorDate: 2022-09-30 08:23:52 +0000 Commit: Piotr Kubaj CommitDate: 2022-09-30 08:24:22 +0000 devel/zydis: fix build on riscv64 --- devel/zydis/Makefile | 2 +- devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h | 4 +++- devel/zydis/files/patch-dependencies_zycore_src_Format.c | 4 ++-- devel/zydis/files/patch-src_String.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/devel/zydis/Makefile b/devel/zydis/Makefile index 044319d5b8cc..d89aa8cb484d 100644 --- a/devel/zydis/Makefile +++ b/devel/zydis/Makefile @@ -10,7 +10,7 @@ WWW= https://zydis.re LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 riscv64 ONLY_FOR_ARCHS_REASON= see definitions in include/Zycore/Defines.h USES= cmake cpe dos2unix localbase:ldflags diff --git a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h index 82cd1dcc2051..c320cd4c421e 100644 --- a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h +++ b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h @@ -1,6 +1,6 @@ --- dependencies/zycore/include/Zycore/Defines.h.orig 2022-09-29 22:15:50 UTC +++ dependencies/zycore/include/Zycore/Defines.h -@@ -131,6 +131,10 @@ +@@ -131,6 +131,12 @@ # define ZYAN_AARCH64 #elif defined(_M_ARM) || defined(_M_ARMT) || defined(__arm__) || defined(__thumb__) # define ZYAN_ARM @@ -8,6 +8,8 @@ +# define ZYAN_PPC64 +#elif defined(__powerpc__) +# define ZYAN_PPC ++#elif defined(__riscv) && __riscv_xlen == 64 ++# define ZYAN_RISCV64 #elif defined(__EMSCRIPTEN__) // Nothing to do, `ZYAN_EMSCRIPTEN` is both platform and arch macro for this one. #else diff --git a/devel/zydis/files/patch-dependencies_zycore_src_Format.c b/devel/zydis/files/patch-dependencies_zycore_src_Format.c index c207378cc1a2..63287a0d6ace 100644 --- a/devel/zydis/files/patch-dependencies_zycore_src_Format.c +++ b/devel/zydis/files/patch-dependencies_zycore_src_Format.c @@ -23,7 +23,7 @@ ZyanStatus ZyanStringAppendDecU(ZyanString* string, ZyanU64 value, ZyanU8 padding_length) { -#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) return ZyanStringAppendDecU64(string, value, padding_length); #else // Working with 64-bit values is slow on non 64-bit systems @@ -32,7 +32,7 @@ ZyanBool uppercase) { -#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) return ZyanStringAppendHexU64(string, value, padding_length, uppercase); #else // Working with 64-bit values is slow on non 64-bit systems diff --git a/devel/zydis/files/patch-src_String.c b/devel/zydis/files/patch-src_String.c index 70044c976829..ec8eb9e43828 100644 --- a/devel/zydis/files/patch-src_String.c +++ b/devel/zydis/files/patch-src_String.c @@ -23,7 +23,7 @@ } -#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) ZYAN_CHECK(ZydisStringAppendDecU64(string, value, padding_length)); #else if (value & 0xFFFFFFFF00000000) @@ -32,7 +32,7 @@ } -#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) -+#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) || defined(ZYAN_RISCV64) ZYAN_CHECK(ZydisStringAppendHexU64(string, value, padding_length, uppercase)); #else if (value & 0xFFFFFFFF00000000)