From nobody Fri Dec 20 12:05:30 2024 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 4YF5hp61bFz5hrxJ; Fri, 20 Dec 2024 12:05:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YF5hp3sxsz4YXS; Fri, 20 Dec 2024 12:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734696330; 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=mXL27vlRe9bmwpZnA7YXad5PTSmhE6CrC+DB1Kx2w2I=; b=hB4bF9SK8aR6pctfNt1MX/TYTFq6M4WREsTYX0LLr7HR89rKhYajia3hWvl3jlTeC4dKtc G8gUz+/zyTRgMOKdObTMC0nZ6bo27IEbJoMYqiEfBAgpFVomD2dJHEbN6NwwSQ4zwmeA0i 58R8dCTtIdtMeD6faT50QZyEWUWxvpy28wtBQ1HBp0bfxS2Uw7YmR9xXO1ZMiemEBHHnh6 ghBqd0Z8/8xGnowcbIjG1tETKbFGvClIW+op1Zdoeso2WW24tkYMIPXAL9WfHZHDFxI4kN 4xfeRTAnw5C4WIeVV0P4nzsCqIg7NMLla1f7BiVlOs/HBfeT0mLOZ3nQBYojtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734696330; 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=mXL27vlRe9bmwpZnA7YXad5PTSmhE6CrC+DB1Kx2w2I=; b=CSRp1sZHu9Jp0tuG/vlMO+Al2fCk0XQVfe+u5nxlJbl7x4CAa6r9XGIhakAnjBUiiEb4GQ eqp9rPTk+8YZyxWlxT/mXO2caGdMdb2mbe7p0B160c1jH/57YAXOz/MqMPjcnUrCW/AYdQ dACmEi08CIfPel9fOExtr+w5j5b6Btx0kysC2bx1nTTzlBoCUx7kWuIBhXRH5gAb4GVG// lCuQpNKT8E5SzEAQUolhxpzNj/4oRuVKh0s7Z0jWk8mCP0vp1iHxY15h/9uT8KUDMqEVwD nd3eNWJ4UvSeECb+BBgvfY4qDrsaEOuEmx/XqxMSDgHH2o7luFkDMyCA5p1hew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734696330; a=rsa-sha256; cv=none; b=uhR1ES1tEbudaabZ6VuZClAtMViXX4uA10Jkju0OTucWvrMsi2ITctZGymclUf6dUBqnhi nSo+F90vDG9F52G/c74nG7MuUo6YzljsIS+7LM2mNu8silbFrW1bC3AyG1oJflb30joXms OOShHSuHddhb6cDwbENUBMtG1D7W6/zfPs9anDLIe+zOlUpErjM4E9ntKMVNmWHw26Bz5w h+ceCK7t3UBguP/403cE952vzaxLq4kpSIeB2+VM+ZvltzgyIM+NCco3M0IyK01SQ/mNBH /bSzLtaAjZ0H6SJgMZg+zNbtIC5b4P4pxwIyQfKZIrnQZ133KWlx4rELtyxGtg== 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 4YF5hp3V7Dzd3B; Fri, 20 Dec 2024 12:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BKC5Unb015473; Fri, 20 Dec 2024 12:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKC5UPr015470; Fri, 20 Dec 2024 12:05:30 GMT (envelope-from git) Date: Fri, 20 Dec 2024 12:05:30 GMT Message-Id: <202412201205.4BKC5UPr015470@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: d21a79dc9040 - main - devel/ocaml-opam: fix build on powerpc64 by copying patches from lang/ocaml 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: d21a79dc9040746093b4de606cff8aa755a00be3 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d21a79dc9040746093b4de606cff8aa755a00be3 commit d21a79dc9040746093b4de606cff8aa755a00be3 Author: Piotr Kubaj AuthorDate: 2024-12-20 12:01:40 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-20 12:05:02 +0000 devel/ocaml-opam: fix build on powerpc64 by copying patches from lang/ocaml --- ...tch-src__ext_ocaml-patches_0002-powerpc64.patch | 253 +++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0002-powerpc64.patch b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0002-powerpc64.patch new file mode 100644 index 000000000000..18d9e466fde8 --- /dev/null +++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0002-powerpc64.patch @@ -0,0 +1,253 @@ +--- src_ext/ocaml-patches/0002-powerpc64.patch 2024-12-20 11:31:53 UTC ++++ src_ext/ocaml-patches/0002-powerpc64.patch +@@ -0,0 +1,250 @@ ++--- a/asmcomp/power/arch.ml.orig 2024-03-14 14:46:35.000000000 +0000 +++++ b/asmcomp/power/arch.ml ++@@ -28,7 +28,7 @@ ++ let abi = ++ match Config.model with ++ | "ppc" -> ELF32 ++- | "ppc64" -> ELF64v1 +++ | "ppc64" -> ELF64v2 ++ | "ppc64le" -> ELF64v2 ++ | _ -> assert false ++ ++--- a/runtime/caml/stack.h.orig 2024-03-14 14:46:35.000000000 +0000 +++++ b/runtime/caml/stack.h ++@@ -35,10 +35,10 @@ ++ #if defined(MODEL_ppc) ++ #define Saved_return_address(sp) *((intnat *)((sp) - 4)) ++ #define Callback_link(sp) ((struct caml_context *)((sp) + 16)) ++-#elif defined(MODEL_ppc64) +++#elif _CALL_ELF == 1 ++ #define Saved_return_address(sp) *((intnat *)((sp) + 16)) ++ #define Callback_link(sp) ((struct caml_context *)((sp) + (48 + 32))) ++-#elif defined(MODEL_ppc64le) +++#elif _CALL_ELF == 2 ++ #define Saved_return_address(sp) *((intnat *)((sp) + 16)) ++ #define Callback_link(sp) ((struct caml_context *)((sp) + (32 + 32))) ++ #else ++--- a/runtime/power.S.orig 2024-03-14 14:46:35.000000000 +0000 +++++ b/runtime/power.S ++@@ -13,7 +13,7 @@ ++ /* */ ++ /**************************************************************************/ ++ ++-#if defined(MODEL_ppc64le) +++#if _CALL_ELF == 2 ++ .abiversion 2 ++ #endif ++ ++@@ -27,7 +27,7 @@ ++ #define DOMAIN_STATE_PTR 30 ++ #define ALLOC_PTR 31 ++ ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ #define EITHER(a,b) b ++ #else ++ #define EITHER(a,b) a ++@@ -52,7 +52,7 @@ ++ #define CALLBACK_LINK_SIZE 16 ++ #define CALLBACK_LINK_OFFSET 0 ++ #endif ++-#if defined(MODEL_ppc64) +++#if _CALL_ELF == 1 ++ #define RESERVED_STACK 48 ++ #define PARAM_SAVE_AREA (8*8) ++ #define LR_SAVE 16 ++@@ -64,7 +64,7 @@ ++ #define CALLBACK_LINK_SIZE 32 ++ #define CALLBACK_LINK_OFFSET 48 ++ #endif ++-#if defined(MODEL_ppc64le) +++#if _CALL_ELF == 2 ++ #define RESERVED_STACK 32 ++ #define PARAM_SAVE_AREA 0 ++ #define LR_SAVE 16 ++@@ -92,7 +92,7 @@ ++ ++ #endif ++ ++-#if defined(MODEL_ppc64) +++#if _CALL_ELF == 1 ++ #define FUNCTION(name) \ ++ .section ".opd","aw"; \ ++ .align 3; \ ++@@ -108,7 +108,7 @@ ++ ++ #endif ++ ++-#if defined(MODEL_ppc64le) +++#if _CALL_ELF == 2 ++ #define FUNCTION(name) \ ++ .section ".text"; \ ++ .globl name; \ ++@@ -133,7 +133,7 @@ ++ addi reg, reg, glob@l ++ #endif ++ ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ ++ #define LSYMB(glob) .L##glob ++ ++@@ -150,7 +150,7 @@ ++ ++ #define Caml_state(var) 8*domain_field_caml_##var(DOMAIN_STATE_PTR) ++ ++-#if defined(MODEL_ppc64) +++#if _CALL_ELF == 1 ++ .section ".opd","aw" ++ #else ++ .section ".text" ++@@ -237,7 +237,7 @@ ++ stfdu 31, 8(11) ++ /* Call the GC */ ++ bl caml_garbage_collection ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ nop ++ #endif ++ /* Reload new allocation pointer */ ++@@ -329,14 +329,14 @@ ++ #if defined(MODEL_ppc) ++ mtctr C_CALL_FUN ++ bctrl ++-#elif defined(MODEL_ppc64) +++#elif _CALL_ELF == 1 ++ ld 0, 0(C_CALL_FUN) ++ mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */ ++ mtctr 0 ++ ld 2, 8(C_CALL_FUN) ++ bctrl ++ mr 2, C_CALL_TOC /* restore current TOC */ ++-#elif defined(MODEL_ppc64le) +++#elif _CALL_ELF == 2 ++ mtctr C_CALL_FUN ++ mr 12, C_CALL_FUN ++ mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */ ++@@ -378,7 +378,7 @@ ++ addi 1, 1, -(PARAM_SAVE_AREA + RESERVED_STACK) ++ /* reserve stack space for C call */ ++ bl caml_stash_backtrace ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ nop ++ #endif ++ mr 3, 27 /* restore exn bucket */ ++@@ -414,7 +414,7 @@ ++ addi 1, 1, -(PARAM_SAVE_AREA + RESERVED_STACK) ++ /* reserve stack space for C call */ ++ bl caml_stash_backtrace ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ nop ++ #endif ++ mr 3, 27 /* restore exn bucket */ ++@@ -507,14 +507,14 @@ ++ #if defined(MODEL_ppc) ++ mtctr 12 ++ .L105: bctrl ++-#elif defined(MODEL_ppc64) +++#elif _CALL_ELF == 1 ++ ld 0, 0(12) ++ mtctr 0 ++ std 2, TOC_SAVE(1) ++ ld 2, 8(12) ++ .L105: bctrl ++ ld 2, TOC_SAVE(1) ++-#elif defined(MODEL_ppc64le) +++#elif _CALL_ELF == 2 ++ mtctr 12 ++ std 2, TOC_SAVE(1) ++ .L105: bctrl ++@@ -633,7 +633,7 @@ ++ b .L102 ++ ENDFUNCTION(caml_callback3_asm) ++ ++-#if defined(MODEL_ppc64) +++#if _CALL_ELF == 1 ++ .section ".opd","aw" ++ #else ++ .section ".text" ++@@ -655,7 +655,7 @@ ++ ++ /* TOC entries */ ++ ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ ++ .section ".toc", "aw" ++ ++--- a/testsuite/tools/asmgen_power.S.orig 2024-03-14 14:46:35.000000000 +0000 +++++ b/testsuite/tools/asmgen_power.S ++@@ -10,7 +10,7 @@ ++ /* */ ++ /*********************************************************************/ ++ ++-#if defined(MODEL_ppc64) || defined(MODEL_ppc64le) +++#if _CALL_ELF == 1 || _CALL_ELF == 2 ++ #define EITHER(a,b) b ++ #else ++ #define EITHER(a,b) a ++@@ -26,11 +26,11 @@ ++ #define RESERVED_STACK 16 ++ #define LR_SAVE_AREA 4 ++ #endif ++-#if defined(MODEL_ppc64) +++#if _CALL_ELF == 1 ++ #define RESERVED_STACK 48 ++ #define LR_SAVE_AREA 16 ++ #endif ++-#if defined(MODEL_ppc64le) +++#if _CALL_ELF == 2 ++ #define RESERVED_STACK 32 ++ #define LR_SAVE_AREA 16 ++ #endif ++@@ -46,7 +46,7 @@ ++ name: ++ #endif ++ ++-#if defined(MODEL_ppc64) +++#if _CALL_ELF == 1 ++ #define FUNCTION(name) \ ++ .section ".opd","aw"; \ ++ .align 3; \ ++@@ -58,7 +58,7 @@ ++ .L.name: ++ #endif ++ ++-#if defined(MODEL_ppc64le) +++#if _CALL_ELF == 2 ++ #define FUNCTION(name) \ ++ .section ".text"; \ ++ .globl name; \ ++@@ -118,11 +118,11 @@ ++ /* Get function pointer in CTR */ ++ #if defined(MODEL_ppc) ++ mtctr 3 ++-#elif defined(MODEL_ppc64) +++#elif _CALL_ELF == 1 ++ ld 0, 0(3) ++ mtctr 0 ++ ld 2, 8(3) ++-#elif defined(MODEL_ppc64le) +++#elif _CALL_ELF == 2 ++ mtctr 3 ++ mr 12, 3 ++ #else ++@@ -184,11 +184,11 @@ ++ /* Jump to C function (address in r28) */ ++ #if defined(MODEL_ppc) ++ mtctr 28 ++-#elif defined(MODEL_ppc64) +++#elif _CALL_ELF == 1 ++ ld 0, 0(28) ++ mtctr 0 ++ ld 2, 8(28) ++-#elif defined(MODEL_ppc64le) +++#elif _CALL_ELF == 2 ++ mtctr 28 ++ mr 12, 28 ++ #else