From nobody Tue Aug 29 03:10:26 2023 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 4RZXVV6Dlyz4rGMQ; Tue, 29 Aug 2023 03:10:26 +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 4RZXVV5qXfz3RX2; Tue, 29 Aug 2023 03:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693278626; 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=+JFyXe+f3vDiemv51YLwokgpopIeoBZIAUeqBGbcm78=; b=IZP2upkoSzZ9rzYWkeKNpuNSluT2b46HLvuJ6KcZ8jXBq+4P9EJbMbw3QdMt6h22xPuXb8 3IN2lfAKnc3lkm3k8DTCyTaZMyaKKfuVo5086zse6Ifpi58Cdajn6XvLfny9udidcx8PJM 0thZcw80TBcKm9iLTdgvNZJkq/gjRM87ph/xyHktR/uk47wBU0kYqFh+sjlE9y+Yikr0nv 5vApn/ELXuQ7G4tGWRZIxH7KBYEXVMdNKzVkTyOJpHDNFt/RcvA0t4xSHz60gK7JnJfMl2 /76e5+pABxvn4gcL7F6WXV9LXwgQ+/NxhmzQKxFDgtztoSh5jLxybWo7ui+8iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693278626; a=rsa-sha256; cv=none; b=x8Lj7j/AHLP4xQmVm9rQJRyLcfUzzFYwQpZJrNuBdJOlsTNIFdb4GkgbYKycr1huiiWNLo VwPqmSjg/RJkWr2QqPOUh8CSXCv74OvfBVaghuWvcOkAmGIyEAQUXYQII2n5Z84xgYkHEd dxip9dHig+hv9CJphl79K7ImLUrwgovcQosKyElXQOQtFQCCou7dVe09ZqgzFzy0KN83LO S/ttEGO9Duh55hLTNX6B2Da7X3oLUaaug1VupOD+JdSB4TAOJs6Emh26NieGnnWlhG7vTk XfIpqsrjjgBZhD5qxa6Eke27bdI0W8E5icF1BNXPCaJDtRKCx3sQXtE3kzWIyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693278626; 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=+JFyXe+f3vDiemv51YLwokgpopIeoBZIAUeqBGbcm78=; b=qJDJ1XuoKEY8liQGs6N5gh6iRmcZLIIaGG4b0bP2+8jZpfUdQ3Lqw82yxpGUFUArIUybF/ ncI6rIYPinIT39ufeuZU+0tON4OZgewGTgy1+Tq5OGdz82uxtI6TUjL2U/Mzhvcm0FDSZn KME/SPJacszjYymNWxNHCGtzasgmqyy9vXXu7AFN4x1SyQCldeU9w22Ry0udvp+6l8Zh+8 AdSydlM6gU38X4AUhuM9/v7haV63sTQrCx5BV5H8P3QQxlCWRjVx4q2wWyBxqwE1RVNIHt hbqiL7L5E8pZGnmSwMchtA1EyUC4/BTNQBkHP7hn18PlDJnSTWtBcWsZhU+9RA== 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 4RZXVV4tLwzb5H; Tue, 29 Aug 2023 03:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37T3AQdU036833; Tue, 29 Aug 2023 03:10:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37T3AQrk036830; Tue, 29 Aug 2023 03:10:26 GMT (envelope-from git) Date: Tue, 29 Aug 2023 03:10:26 GMT Message-Id: <202308290310.37T3AQrk036830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 042ea7345754 - main - net/ipxe: Add patch to fix build with upcoming binutils 2.41 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 042ea734575462e59b9901bf3dc037d17c1c3050 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=042ea734575462e59b9901bf3dc037d17c1c3050 commit 042ea734575462e59b9901bf3dc037d17c1c3050 Author: Yasuhiro Kimura AuthorDate: 2023-08-09 07:49:19 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-08-29 03:06:38 +0000 net/ipxe: Add patch to fix build with upcoming binutils 2.41 Obtained from: https://github.com/ipxe/ipxe/pull/1011 PR: 273024 Approved by: maintainer --- net/ipxe/files/patch-src_arch_x86_include_librm.h | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/net/ipxe/files/patch-src_arch_x86_include_librm.h b/net/ipxe/files/patch-src_arch_x86_include_librm.h new file mode 100644 index 000000000000..2e23880efa62 --- /dev/null +++ b/net/ipxe/files/patch-src_arch_x86_include_librm.h @@ -0,0 +1,47 @@ +From 08caa8be3a143d6f33782f398b7937efb39ff283 Mon Sep 17 00:00:00 2001 +From: Justin Cano <5184128+jstncno@users.noreply.github.com> +Date: Thu, 3 Aug 2023 09:58:11 -0700 +Subject: [PATCH] Use the right sized register for the push operand based on + the size of the value being pushed + +Fixes https://github.com/ipxe/ipxe/issues/997 +--- + src/arch/x86/include/librm.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git src/arch/x86/include/librm.h src/arch/x86/include/librm.h +index 5196d390..d9e748ad 100644 +--- arch/x86/include/librm.h ++++ arch/x86/include/librm.h +@@ -250,8 +250,10 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size ); + /* CODE_DEFAULT: restore default .code32/.code64 directive */ + #ifdef __x86_64__ + #define CODE_DEFAULT ".code64" ++#define PUSH "pushq" + #else + #define CODE_DEFAULT ".code32" ++#define PUSH "pushl" + #endif + + /* LINE_SYMBOL: declare a symbol for the current source code line */ +@@ -268,7 +270,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size ); + + /* REAL_CODE: declare a fragment of code that executes in real mode */ + #define REAL_CODE( asm_code_str ) \ +- "push $1f\n\t" \ ++ PUSH " $1f\n\t" \ + "call real_call\n\t" \ + TEXT16_CODE ( "\n1:\n\t" \ + asm_code_str \ +@@ -277,7 +279,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size ); + + /* PHYS_CODE: declare a fragment of code that executes in flat physical mode */ + #define PHYS_CODE( asm_code_str ) \ +- "push $1f\n\t" \ ++ PUSH " $1f\n\t" \ + "call phys_call\n\t" \ + ".section \".text.phys\", \"ax\", @progbits\n\t"\ + "\n" LINE_SYMBOL "\n\t" \ +-- +2.41.0 +