From nobody Thu Sep 29 22:30:20 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 4Mdp311dr7z4YKxF; Thu, 29 Sep 2022 22:30:21 +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 4Mdp3119TJz3SPW; Thu, 29 Sep 2022 22:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664490621; 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=SbfgHu2Lxca5H22ZMHlNJlj3UiQePckaphsu6sG9IX8=; b=j4J4YWWqcPBDN8koBrb16sBtbkIzj97HMS/36ei7hzdnBa8Ap7TXb/XMLHI1SR74hAb0Ph dnppxYi/L7uIwgTIY8O2MVU+uQt44xEiTyGDEHsIqJ/KTA1M18qVz0EIMhA1BO/PpqjAkT AppioUsUO+jv1IvH5zLjIFadimvN13XZWIG/u7dBJHy9sbcTrO54vfED6MaRn+B1VnYsbu zYs0zFHnwmtNkEnQquWUYNdaq0bsHHL7eWln6XHMr+d/9VsG+eU1to7JDFY1hNlqlbT9Cp bssx3zLTjUbSxzmDIxM4whss+05wESZQ/E8HjjiZpH0B3ut/fq+MQgVQ5+cFKQ== 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 4Mdp310G67zxkH; Thu, 29 Sep 2022 22:30:21 +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 28TMUKEt034761; Thu, 29 Sep 2022 22:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TMUK2r034752; Thu, 29 Sep 2022 22:30:20 GMT (envelope-from git) Date: Thu, 29 Sep 2022 22:30:20 GMT Message-Id: <202209292230.28TMUK2r034752@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: 8ee6579926f8 - main - devel/zydis: enable on powerpc / powerpc64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ee6579926f8aeb687ce365fda5dab8d640fc104 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664490621; 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=SbfgHu2Lxca5H22ZMHlNJlj3UiQePckaphsu6sG9IX8=; b=f5T3jDwxHSrypUU9q7wAgm9sNQvQKvgaKL1+ukoO7iKjngvnYIOyOLyd0JxzRL1aa9Yu3u ELcNhiAB6Yz3vj8Qz4pI6DdACI4vX/1/X9phNe6ecAWhIpEy2NFEtKpDHeGJVtbD9dMk9y eZ3lbQar17TVvmljyW8lrRNxLJlEqhGEjqAUwcI40IsAS5zT+sefyH3TUWR5vJGPTCSqiK FjS3vztxtHd80asaOy8KOvzOEG/INKhxdsSMWdT016oMKnvBaAcR9aafwqti0r27kpb4nn Kd+GB6UB3Qs8r1uc17fRQujO/gX2oKp7AFN6DXR42GcPf8YiPTxD5rwP0Xh3dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664490621; a=rsa-sha256; cv=none; b=cFQ0jlJqmlkDsvaZVluS1PxnQKapN8GpaEGZl1yIME7fqOb8SbbRTWM71/rX68IvvxGdHM N9mw8fg9qkWLvKRCD+1kUSEaqeJdgLBvZOW09DNyH/fmn5SeNTHHGZh3Q41J95ak/+hVsn 0924RPGHmdecixdyuGgzMfC1yO2m/IQJXIkq971pzpo9S7abrFwyvbYScrrLVgWp3KuRfu xdK6Zc5uEufs8p1d4Qh8YgsPE95Wjp/aJG2CdGUPfvz5OJBVzRDdVBGSaxTIO7vElWxAVp y76AHpAFG7QXolhu374CrQup4kn/pCxb35Xctl4xOiMSYqQr4QbIHqE+tpj9Xg== 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=8ee6579926f8aeb687ce365fda5dab8d640fc104 commit 8ee6579926f8aeb687ce365fda5dab8d640fc104 Author: Piotr Kubaj AuthorDate: 2022-09-29 22:29:34 +0000 Commit: Piotr Kubaj CommitDate: 2022-09-29 22:30:11 +0000 devel/zydis: enable on powerpc / powerpc64 --- devel/zydis/Makefile | 5 +-- ...ch-dependencies_zycore_include_Zycore_Defines.h | 13 ++++++++ .../files/patch-dependencies_zycore_src_Format.c | 38 ++++++++++++++++++++++ devel/zydis/files/patch-src_String.c | 38 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/devel/zydis/Makefile b/devel/zydis/Makefile index cec11579fbad..044319d5b8cc 100644 --- a/devel/zydis/Makefile +++ b/devel/zydis/Makefile @@ -10,11 +10,12 @@ WWW= https://zydis.re LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 ONLY_FOR_ARCHS_REASON= see definitions in include/Zycore/Defines.h -USES= cmake cpe localbase:ldflags +USES= cmake cpe dos2unix localbase:ldflags USE_GITHUB= yes +DOS2UNIX_FILES= src/String.c GH_ACCOUNT= zyantific GH_TUPLE= zyantific:zycore-c:273e26a:zydis/dependencies/zycore CPE_VENDOR= zyantific diff --git a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h new file mode 100644 index 000000000000..82cd1dcc2051 --- /dev/null +++ b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h @@ -0,0 +1,13 @@ +--- dependencies/zycore/include/Zycore/Defines.h.orig 2022-09-29 22:15:50 UTC ++++ dependencies/zycore/include/Zycore/Defines.h +@@ -131,6 +131,10 @@ + # define ZYAN_AARCH64 + #elif defined(_M_ARM) || defined(_M_ARMT) || defined(__arm__) || defined(__thumb__) + # define ZYAN_ARM ++#elif defined(__powerpc64__) ++# define ZYAN_PPC64 ++#elif defined(__powerpc__) ++# define ZYAN_PPC + #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 new file mode 100644 index 000000000000..c207378cc1a2 --- /dev/null +++ b/devel/zydis/files/patch-dependencies_zycore_src_Format.c @@ -0,0 +1,38 @@ +--- dependencies/zycore/src/Format.c.orig 2022-09-29 22:16:44 UTC ++++ dependencies/zycore/src/Format.c +@@ -83,7 +83,7 @@ static const ZyanStringView STR_SUB = ZYAN_DEFINE_STRI + /* Decimal */ + /* ---------------------------------------------------------------------------------------------- */ + +-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) ++#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC) + ZyanStatus ZyanStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length) + { + if (!string) +@@ -179,7 +179,7 @@ ZyanStatus ZyanStringAppendDecU64(ZyanString* string, + /* Hexadecimal */ + /* ---------------------------------------------------------------------------------------------- */ + +-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) ++#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC) + ZyanStatus ZyanStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length, + ZyanBool uppercase) + { +@@ -423,7 +423,7 @@ ZyanStatus ZyanStringAppendFormat(ZyanString* string, + + 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) + return ZyanStringAppendDecU64(string, value, padding_length); + #else + // Working with 64-bit values is slow on non 64-bit systems +@@ -464,7 +464,7 @@ ZyanStatus ZyanStringAppendDecS(ZyanString* string, Zy + ZyanStatus ZyanStringAppendHexU(ZyanString* string, ZyanU64 value, ZyanU8 padding_length, + ZyanBool uppercase) + { +-#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) + 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 new file mode 100644 index 000000000000..70044c976829 --- /dev/null +++ b/devel/zydis/files/patch-src_String.c @@ -0,0 +1,38 @@ +--- src/String.c.orig 2022-09-29 22:19:15 UTC ++++ src/String.c +@@ -65,7 +65,7 @@ static const char* const DECIMAL_LOOKUP = + /* Decimal */ + /* ---------------------------------------------------------------------------------------------- */ + +-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) ++#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC) + ZyanStatus ZydisStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length) + { + ZYAN_ASSERT(string); +@@ -157,7 +157,7 @@ ZyanStatus ZydisStringAppendDecU64(ZyanString* string, + /* Hexadecimal */ + /* ---------------------------------------------------------------------------------------------- */ + +-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) ++#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC) + ZyanStatus ZydisStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length, + ZyanBool uppercase) + { +@@ -312,7 +312,7 @@ ZyanStatus ZydisStringAppendDecU(ZyanString* string, Z + ZYAN_CHECK(ZydisStringAppend(string, prefix)); + } + +-#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) + ZYAN_CHECK(ZydisStringAppendDecU64(string, value, padding_length)); + #else + if (value & 0xFFFFFFFF00000000) +@@ -337,7 +337,7 @@ ZyanStatus ZydisStringAppendHexU(ZyanString* string, Z + ZYAN_CHECK(ZydisStringAppend(string, prefix)); + } + +-#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) ++#if defined(ZYAN_X64) || defined(ZYAN_AARCH64) || defined(ZYAN_PPC64) + ZYAN_CHECK(ZydisStringAppendHexU64(string, value, padding_length, uppercase)); + #else + if (value & 0xFFFFFFFF00000000)