Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2217422/?format=api
{ "id": 2217422, "url": "http://patchwork.ozlabs.org/api/patches/2217422/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/patch/20260328191521.138176-1-bernd@kuhls.net/", "project": { "id": 27, "url": "http://patchwork.ozlabs.org/api/projects/27/?format=api", "name": "Buildroot development", "link_name": "buildroot", "list_id": "buildroot.buildroot.org", "list_email": "buildroot@buildroot.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260328191521.138176-1-bernd@kuhls.net>", "list_archive_url": null, "date": "2026-03-28T19:15:21", "name": "[v2,1/1] package/gnu-efi: bump version to 4.0.4", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b93c683eb1cbf910f37901cf4ae094a4b415794c", "submitter": { "id": 86624, "url": "http://patchwork.ozlabs.org/api/people/86624/?format=api", "name": "Bernd Kuhls", "email": "bernd@kuhls.net" }, "delegate": { "id": 89618, "url": "http://patchwork.ozlabs.org/api/users/89618/?format=api", "username": "juju", "first_name": "Julien", "last_name": "Olivain", "email": "juju@cotds.org" }, "mbox": "http://patchwork.ozlabs.org/project/buildroot/patch/20260328191521.138176-1-bernd@kuhls.net/mbox/", "series": [ { "id": 497889, "url": "http://patchwork.ozlabs.org/api/series/497889/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/list/?series=497889", "date": "2026-03-28T19:15:21", "name": "[v2,1/1] package/gnu-efi: bump version to 4.0.4", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/497889/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2217422/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2217422/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<buildroot-bounces@buildroot.org>", "X-Original-To": [ "incoming-buildroot@patchwork.ozlabs.org", "buildroot@buildroot.org" ], "Delivered-To": [ "patchwork-incoming-buildroot@legolas.ozlabs.org", "buildroot@buildroot.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=buildroot.org header.i=@buildroot.org\n header.a=rsa-sha256 header.s=default header.b=E//ijap7;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fjnKP6fqzz1y1j\n\tfor <incoming-buildroot@patchwork.ozlabs.org>;\n Sun, 29 Mar 2026 06:15:37 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 19BB440793;\n\tSat, 28 Mar 2026 19:15:31 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id FJ44WcCx28lY; Sat, 28 Mar 2026 19:15:29 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 9987F407AA;\n\tSat, 28 Mar 2026 19:15:29 +0000 (UTC)", "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n by lists1.osuosl.org (Postfix) with ESMTP id 9F97C353\n for <buildroot@buildroot.org>; Sat, 28 Mar 2026 19:15:27 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id 9190B4020A\n for <buildroot@buildroot.org>; Sat, 28 Mar 2026 19:15:27 +0000 (UTC)", "from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id sKvBvzTYLTJN for <buildroot@buildroot.org>;\n Sat, 28 Mar 2026 19:15:26 +0000 (UTC)", "from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57])\n by smtp2.osuosl.org (Postfix) with ESMTPS id B74FD40105\n for <buildroot@buildroot.org>; Sat, 28 Mar 2026 19:15:25 +0000 (UTC)", "from fli4l.lan.fli4l (p5b3a0ba3.dip0.t-ipconnect.de [91.58.11.163])\n by dd20012.kasserver.com (Postfix) with ESMTPSA id EF1AFA4C2018;\n Sat, 28 Mar 2026 20:15:21 +0100 (CET)", "from bruckner.lan.fli4l ([192.168.1.1]:58888)\n by fli4l.lan.fli4l with esmtp (Exim 4.99.1)\n (envelope-from <bernd@kuhls.net>) id 1w6Z7x-000000002yW-0kBX;\n Sat, 28 Mar 2026 19:15:21 +0000" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9987F407AA", "OpenDKIM Filter v2.11.0 smtp2.osuosl.org B74FD40105" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=buildroot.org;\n\ts=default; t=1774725329;\n\tbh=7IQs5+xrxjQi2k1it5Ji6pO1ivghub3J0nCE6BQi+PY=;\n\th=From:To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive:\n\t List-Post:List-Help:List-Subscribe:From;\n\tb=E//ijap7xtMEzezp0dK+WClaVRbbBFpz5/9gpASQ+e79VgAhb76ZpfUwKZZ221xyF\n\t Viy6e7kBwpx5vRetXLURmHEENnFck2O3B+4rCA2VAVy+XbLgnFzkrlgJZttCozKs7L\n\t H+Irt7kBeKRPwD8cjQ+1F7A6vArTWonxhXl3tTpMM9Lul3oO3OzOcFtJli0/Zwo1aP\n\t JlBmIpO1HFZZRQq8eU3z/ejf00ohGEJN7gUFbBBEm7u1cxWr+BmqY6XJUPRFdi2YhI\n\t 44cDVvHhC6T2s4ojzKqkvKQ4JbIyLYMtrS00oTCJBkD71SPjgGzkGNnhbxZblwpssg\n\t YEUI/QD20aR9w==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=85.13.140.57;\n helo=dd20012.kasserver.com; envelope-from=bernd@kuhls.net;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp2.osuosl.org B74FD40105", "From": "Bernd Kuhls <bernd@kuhls.net>", "To": "buildroot@buildroot.org", "Cc": "Thomas Petazzoni <thomas.petazzoni@bootlin.com>", "Date": "Sat, 28 Mar 2026 20:15:21 +0100", "Message-ID": "<20260328191521.138176-1-bernd@kuhls.net>", "X-Mailer": "git-send-email 2.47.3", "MIME-Version": "1.0", "X-Spamd-Bar": "--", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=kuhls.net;\n s=kas202511301023; t=1774725322;\n bh=Ca76WvK+oNxTjihD/iIZimrsw2o8BXUwFjEVu3CN7FY=;\n h=From:To:Cc:Subject:Date:From;\n b=FF6V/iN9+2Nxs7/ohJpNwdlpAkEzGzR/biz4q1zBSgWOuB/CL0q4CQonJrTRXYMHa\n ldU/VR7KgOP7nB9svS41cAGUblPTiuLU7keotNrJEaNHN8HXzlihVoYe3K7bqJlHUm\n AjBZOar6KeuK8A6bfmyL8tK2OETpaeoNMOapwKa7VyY8jekXQV/mXRtB0NmDxb8mdE\n WkB7xvZTdZtvXPeJ8oOQJwNTAuluvDRdhM46QYA2a7C+2jqoGygBsYKgl1hjRjL3Qp\n 1sBOva8uaMCVN0uzYC+Txa7ZVFrbidUuqnosJOIZV4BvqaqGZmU5Vpe/JmDaUntY7r\n PtNBEHmKc7/9g==", "X-Mailman-Original-Authentication-Results": [ "smtp2.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=kuhls.net", "smtp2.osuosl.org;\n dkim=pass (2048-bit key,\n unprotected) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256\n header.s=kas202511301023 header.b=FF6V/iN9" ], "Subject": "[Buildroot] [PATCH v2 1/1] package/gnu-efi: bump version to 4.0.4", "X-BeenThere": "buildroot@buildroot.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Discussion and development of buildroot <buildroot.buildroot.org>", "List-Unsubscribe": "<https://lists.buildroot.org/mailman/options/buildroot>,\n <mailto:buildroot-request@buildroot.org?subject=unsubscribe>", "List-Archive": "<http://lists.buildroot.org/pipermail/buildroot/>", "List-Post": "<mailto:buildroot@buildroot.org>", "List-Help": "<mailto:buildroot-request@buildroot.org?subject=help>", "List-Subscribe": "<https://lists.buildroot.org/mailman/listinfo/buildroot>,\n <mailto:buildroot-request@buildroot.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "buildroot-bounces@buildroot.org", "Sender": "\"buildroot\" <buildroot-bounces@buildroot.org>" }, "content": "https://github.com/ncroxon/gnu-efi/releases/tag/4.0.1\nhttps://github.com/ncroxon/gnu-efi/releases/tag/4.0.2\nhttps://github.com/ncroxon/gnu-efi/releases/tag/4.0.3\nhttps://github.com/ncroxon/gnu-efi/releases/tag/4.0.4\n\nRemoved patch due to upstream commit\nhttps://github.com/ncroxon/gnu-efi/commit/f3ececb9eba2ad3104b6d39bd33e579091fce888\nwhich contains a different fix.\n\nAdded patch to fix build errors with syslinux:\nbuild/syslinux-6.03/com32/lib/exit.c:57:(.text+0x19):\n undefined reference to `longjmp'\nbuild/syslinux-6.03/com32/lib/sys/module/exec.c:206:(.text+0xdc):\n undefined reference to `setjmp'\n\nLICENSE was claried and new license files were in:\nhttps://github.com/ncroxon/gnu-efi/commit/71d5d1746ba50378e0e2d563f7d132c421b7b4f8\n\nlicenses/LICENSE.efilib: was updated in:\nhttps://github.com/ncroxon/gnu-efi/commit/71b05279b196beea0c8ee4398c7dd0c7963d78ab\n\nThis commit reflects those changes by updating _LICENSE_FILES and\nadding the new license hashes.\n\nSigned-off-by: Bernd Kuhls <bernd@kuhls.net>\n---\nv2: fixed syslinux build, updated licenses (Julien)\n\n .checkpackageignore | 1 -\n ...n-t-override-ARCH-when-cross-compili.patch | 32 ---\n ...tjmp-longjmp-ABI-break-in-ncroxon-77.patch | 250 ++++++++++++++++++\n package/gnu-efi/gnu-efi.hash | 10 +-\n package/gnu-efi/gnu-efi.mk | 17 +-\n 5 files changed, 271 insertions(+), 39 deletions(-)\n delete mode 100644 package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch\n create mode 100644 package/gnu-efi/0001-Revert-setjmp-longjmp-ABI-break-in-ncroxon-77.patch", "diff": "diff --git a/.checkpackageignore b/.checkpackageignore\nindex 243077da82..e034ea96bf 100644\n--- a/.checkpackageignore\n+++ b/.checkpackageignore\n@@ -400,7 +400,6 @@ package/gerbera/S99gerbera lib_sysv.Indent\n package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream\n package/glorytun/0001-Add-support-for-Apple-silicon.patch lib_patch.Upstream\n package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch lib_patch.Upstream\n-package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch lib_patch.Upstream\n package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_patch.Upstream\n package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream\n package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream\ndiff --git a/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch b/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch\ndeleted file mode 100644\nindex cbba80b00a..0000000000\n--- a/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-From 893a75202407e8ff3d75b217813a5df87da7c807 Mon Sep 17 00:00:00 2001\n-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Date: Sun, 20 Jan 2019 21:07:11 +0100\n-Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling\n-\n-Don't override the user-provided ARCH when cross-compiling otherwise\n-ARCH won't be correct for armv5, aarch64 and x86_64\n-\n-Fixes:\n- - http://autobuild.buildroot.org/results/2dfc0e10da25a8382a43557420d7dc3444c02dbb\n-\n-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n----\n- Make.defaults | 2 +-\n- 1 file changed, 1 insertion(+), 1 deletion(-)\n-\n-diff --git a/Make.defaults b/Make.defaults\n-index 1347aca..bb21874 100755\n---- a/Make.defaults\n-+++ b/Make.defaults\n-@@ -99,7 +99,7 @@ ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[34567\n- \n- # Get ARCH from the compiler if cross compiling \n- ifneq ($(CROSS_COMPILE),)\n-- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' )\n-+ ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' )\n- endif\n- \n- # FreeBSD (and possibly others) reports amd64 instead of x86_64\n--- \n-2.47.1\n-\ndiff --git a/package/gnu-efi/0001-Revert-setjmp-longjmp-ABI-break-in-ncroxon-77.patch b/package/gnu-efi/0001-Revert-setjmp-longjmp-ABI-break-in-ncroxon-77.patch\nnew file mode 100644\nindex 0000000000..fe2bd60686\n--- /dev/null\n+++ b/package/gnu-efi/0001-Revert-setjmp-longjmp-ABI-break-in-ncroxon-77.patch\n@@ -0,0 +1,250 @@\n+From 2e3092703698657703e0af9d463c289d78c3c195 Mon Sep 17 00:00:00 2001\n+From: lzcunt <lzcunt@rawr.fun>\n+Date: Tue, 9 Dec 2025 15:37:03 +0300\n+Subject: [PATCH] Revert setjmp/longjmp ABI break in #77\n+\n+aa27c28 introduced an ABI break in a minor version which broke syslinux.\n+syslinux externs the setjmp/longjmp implementation of GNU-EFI, therefore\n+depends on the symbol name.\n+\n+Let's alias base_setjmp and base_longjmp to setjmp and longjmp\n+respectively so syslinux builds again.\n+\n+Signed-off-by: lzcunt <lzcunt@rawr.fun>\n+\n+Upstream: https://github.com/ncroxon/gnu-efi/pull/77#ref-commit-2e30927\n+\n+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>\n+---\n+ lib/aarch64/setjmp.S | 6 ++++++\n+ lib/arm/setjmp.S | 6 ++++++\n+ lib/ia32/setjmp.S | 14 +++++++++++---\n+ lib/ia64/setjmp.S | 6 ++++++\n+ lib/loongarch64/setjmp.S | 7 ++++++-\n+ lib/mips64el/setjmp.S | 6 ++++++\n+ lib/riscv64/setjmp.S | 6 ++++++\n+ lib/x86_64/setjmp.S | 8 ++++++++\n+ 8 files changed, 55 insertions(+), 4 deletions(-)\n+\n+diff --git a/lib/aarch64/setjmp.S b/lib/aarch64/setjmp.S\n+index a83eb88e..27acce71 100644\n+--- a/lib/aarch64/setjmp.S\n++++ b/lib/aarch64/setjmp.S\n+@@ -33,6 +33,9 @@ BASIS,\n+ #define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS]\n+ #define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS]\n+ \n++\t.globl\tsetjmp\n++\t.type\tsetjmp, @function\n++setjmp:\n+ \t.globl\tbase_setjmp\n+ \t.type\tbase_setjmp, @function\n+ base_setjmp:\n+@@ -48,6 +51,9 @@ base_setjmp:\n+ #define REG_PAIR(REG1, REG2, OFFS) ldp REG1, REG2, [x0, OFFS]\n+ #define REG_ONE(REG1, OFFS) ldr REG1, [x0, OFFS]\n+ \n++\t.globl\tlongjmp\n++\t.type\tlongjmp, @function\n++longjmp:\n+ \t.globl\tbase_longjmp\n+ \t.type\tbase_longjmp, @function\n+ base_longjmp:\n+diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S\n+index 2f0b9543..8fe3a439 100644\n+--- a/lib/arm/setjmp.S\n++++ b/lib/arm/setjmp.S\n+@@ -11,6 +11,9 @@\n+ */\n+ \t.text\n+ \t.arm\n++\t.globl\tsetjmp\n++\t.type\tsetjmp, %function\n++setjmp:\n+ \t.globl\tbase_setjmp\n+ \t.type\tbase_setjmp, %function\n+ base_setjmp:\n+@@ -19,6 +22,9 @@ base_setjmp:\n+ \teor\tr0, r0, r0\n+ \tbx\tlr\n+ \n++\t.globl\tlongjmp\n++\t.type\tlongjmp, %function\n++longjmp:\n+ \t.globl\tbase_longjmp\n+ \t.type\tbase_longjmp, %function\n+ base_longjmp:\n+diff --git a/lib/ia32/setjmp.S b/lib/ia32/setjmp.S\n+index b59e7391..2708d1a7 100644\n+--- a/lib/ia32/setjmp.S\n++++ b/lib/ia32/setjmp.S\n+@@ -13,12 +13,16 @@ BASIS,\n+ * IMPLIED.\n+ */\n+ \t.text\n++\t.globl\tsetjmp\n+ \t.globl\tbase_setjmp\n+ #ifndef __MINGW32__\n+-\t.type base_setjmp, @function\n++\t.type\tsetjmp, @function\n++\t.type\tbase_setjmp, @function\n+ #else\n+-\t.def base_setjmp; .scl 2; .type 32; .endef\n++\t.def\tsetjmp; .scl 2; .type 32; .endef\n++\t.def\tbase_setjmp; .scl 2; .type 32; .endef\n+ #endif\n++setjmp:\n+ base_setjmp:\n+ \tpop\t%ecx\n+ \tmovl\t(%esp), %edx\n+@@ -30,12 +34,16 @@ base_setjmp:\n+ \txorl\t%eax, %eax\n+ \tjmp\t*%ecx\n+ \n++\t.globl\tlongjmp\n+ \t.globl\tbase_longjmp\n+ #ifndef __MINGW32__\n++\t.type\tlongjmp, @function\n+ \t.type\tbase_longjmp, @function\n+ #else\n+-\t.def base_longjmp; .scl 2; .type 32; .endef\n++\t.def\tlongjmp; .scl 2; .type 32; .endef\n++\t.def\tbase_longjmp; .scl 2; .type 32; .endef\n+ #endif\n++longjmp:\n+ base_longjmp:\n+ \tpop\t%eax\n+ \tpop\t%edx\n+diff --git a/lib/ia64/setjmp.S b/lib/ia64/setjmp.S\n+index 3ab9a153..26d35530 100644\n+--- a/lib/ia64/setjmp.S\n++++ b/lib/ia64/setjmp.S\n+@@ -13,6 +13,9 @@ BASIS,\n+ * IMPLIED.\n+ */\n+ \t.text\n++\t.globl\tsetjmp\n++\t.type\tsetjmp, @function\n++setjmp:\n+ \t.globl\tbase_setjmp\n+ \t.type\tbase_setjmp, @function\n+ base_setjmp:\n+@@ -96,6 +99,9 @@ base_setjmp:\n+ \tbr.ret.sptk\tb0\n+ \t;;\n+ \n++\t.globl\tlongjmp\n++\t.type\tlongjmp, @function\n++longjmp:\n+ \t.globl\tbase_longjmp\n+ \t.type\tbase_longjmp, @function\n+ \t.regstk 2, 0, 0, 0\n+diff --git a/lib/loongarch64/setjmp.S b/lib/loongarch64/setjmp.S\n+index 42f411e0..9f043593 100644\n+--- a/lib/loongarch64/setjmp.S\n++++ b/lib/loongarch64/setjmp.S\n+@@ -20,7 +20,9 @@\n+ \t.text\n+ \t.p2align 3\n+ \n+-\n++\t.globl\tsetjmp\n++\t.type\tsetjmp, @function\n++setjmp:\n+ \t.globl\tbase_setjmp\n+ \t.type\tbase_setjmp, @function\n+ base_setjmp:\n+@@ -40,6 +42,9 @@ base_setjmp:\n+ \tmove $a0, $zero\n+ \tjr $ra\n+ \n++\t.globl\tlongjmp\n++\t.type\tlongjmp, @function\n++longjmp:\n+ \t.globl\tbase_longjmp\n+ \t.type\tbase_longjmp, @function\n+ base_longjmp:\n+diff --git a/lib/mips64el/setjmp.S b/lib/mips64el/setjmp.S\n+index c07e239d..5bbbed5f 100644\n+--- a/lib/mips64el/setjmp.S\n++++ b/lib/mips64el/setjmp.S\n+@@ -18,6 +18,9 @@ BASIS,\n+ \t.text\n+ \t.p2align 3\n+ \n++\t.globl\tsetjmp\n++\t.type\tsetjmp, @function\n++setjmp:\n+ \t.globl\tbase_setjmp\n+ \t.type\tbase_setjmp, @function\n+ base_setjmp:\n+@@ -54,6 +57,9 @@ base_setjmp:\n+ \tmove\t$v0, $zero\n+ \tjr\t$ra\n+ \n++\t.globl\tlongjmp\n++\t.type\tlongjmp, @function\n++longjmp:\n+ \t.globl\tbase_longjmp\n+ \t.type\tbase_longjmp, @function\n+ base_longjmp:\n+diff --git a/lib/riscv64/setjmp.S b/lib/riscv64/setjmp.S\n+index 2f96e18d..f9552b55 100644\n+--- a/lib/riscv64/setjmp.S\n++++ b/lib/riscv64/setjmp.S\n+@@ -39,6 +39,9 @@\n+ #define REG_ONE(R, P) sd R, P(a0)\n+ #define FREG_ONE(R, P) fsd R, P(a0)\n+ \n++\t.globl\tsetjmp\n++\t.type\tsetjmp, @function\n++setjmp:\n+ \t.globl base_setjmp\n+ \t.type base_setjmp, @function\n+ \n+@@ -56,6 +59,9 @@ base_setjmp:\n+ #define REG_ONE(R, P) ld R, P(a0)\n+ #define FREG_ONE(R, P) fld R, P(a0)\n+ \n++\t.globl\tlongjmp\n++\t.type\tlobgjmp, @function\n++longjmp:\n+ \t.globl base_longjmp\n+ \t.type base_longjmp, @function\n+ \n+diff --git a/lib/x86_64/setjmp.S b/lib/x86_64/setjmp.S\n+index 719b0219..bf320c83 100644\n+--- a/lib/x86_64/setjmp.S\n++++ b/lib/x86_64/setjmp.S\n+@@ -1,10 +1,14 @@\n+ \t.text\n++\t.globl\tsetjmp\n+ \t.globl\tbase_setjmp\n+ #ifndef __MINGW32__\n++\t.type\tsetjmp, @function\n+ \t.type base_setjmp, @function\n+ #else\n+ \t.def base_setjmp; .scl 2; .type 32; .endef\n++\t.def setjmp; .scl 2; .type 32; .endef\n+ #endif\n++setjmp:\n+ base_setjmp:\n+ \tpop\t%rsi\n+ \tmovq\t%rbx,0x00(%rdi)\n+@@ -19,12 +23,16 @@ base_setjmp:\n+ \txor\t%rax,%rax\n+ \tret\n+ \n++\t.globl\tlongjmp\n+ \t.globl\tbase_longjmp\n+ #ifndef __MINGW32__\n++\t.type\tlongjmp, @function\n+ \t.type\tbase_longjmp, @function\n+ #else\n++\t.def longjmp; .scl 2; .type 32; .endef\n+ \t.def base_longjmp; .scl 2; .type 32; .endef\n+ #endif\n++longjmp:\n+ base_longjmp:\n+ \tmovl\t%esi, %eax\n+ \tmovq\t0x00(%rdi), %rbx\ndiff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash\nindex 5a2f47cfae..74487834cd 100644\n--- a/package/gnu-efi/gnu-efi.hash\n+++ b/package/gnu-efi/gnu-efi.hash\n@@ -1,5 +1,9 @@\n # Locally computed\n-sha256 a2e5dfd25e7fc0cd2027d75dc2517b4c74d94f801ff4784eca557ac1b9835899 gnu-efi-4.0.0.tar.gz\n-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE\n-sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 licenses/LICENSE.efilib\n+sha256 40b61e842a4efcbf80f3e53b2f220c044e8cfe46eb4dd6396c83b751240b1c0d gnu-efi-4.0.4.tar.gz\n+sha256 e2b4e4a370f19dfdb3c84256ccb1d545ee98329faa20adbb5a06797119c3cd55 LICENSE\n+sha256 01852478a0585ed9955de5d674f417ced8ef8934c300f124ab66a8cf251c46d8 licenses/LICENSE.BSD-3-Clause\n sha256 7aa278b6f1a2125d0a0c596fa537caca5a41e7b03f7d2dd0489905f65ffdb984 licenses/LICENSE.edk2\n+sha256 146958d2c66a609a6ea72f73017ca626023e0cb3ecbfd9f55722f493427253e7 licenses/LICENSE.efilib\n+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/LICENSE.GPL-2.0-or-later\n+sha256 4796125347fa98a7f3f056117fff04191712538ab9d9ab797075daad808bb538 licenses/LICENSE.GPL-3.0-or-later\n+sha256 c0e22e2ea9fe4e12448ab248194a3d53703a13f67a4bb7a412715cb05cd1b274 licenses/LICENSE.LGPL-3.0-or-later\ndiff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk\nindex 268e5350cf..f615df91bc 100644\n--- a/package/gnu-efi/gnu-efi.mk\n+++ b/package/gnu-efi/gnu-efi.mk\n@@ -4,11 +4,22 @@\n #\n ################################################################################\n \n-GNU_EFI_VERSION = 4.0.0\n+GNU_EFI_VERSION = 4.0.4\n GNU_EFI_SITE = $(call github,ncroxon,gnu-efi,$(GNU_EFI_VERSION))\n GNU_EFI_INSTALL_STAGING = YES\n-GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib), BSD-2-Clause-Patent (EDK2 routines)\n-GNU_EFI_LICENSE_FILES = LICENSE licenses/LICENSE.edk2 licenses/LICENSE.efilib\n+\n+GNU_EFI_LICENSE = \\\n+\tBSD-3-Clause and/or GPL-2.0+ (gnuefi), \\\n+\tBSD-3-Clause (efilib), \\\n+\tBSD-2-Clause-Patent (EDK2 routines)\n+GNU_EFI_LICENSE_FILES = \\\n+\tLICENSE \\\n+\tlicenses/LICENSE.BSD-3-Clause \\\n+\tlicenses/LICENSE.edk2 \\\n+\tlicenses/LICENSE.efilib \\\n+\tlicenses/LICENSE.GPL-2.0-or-later \\\n+\tlicenses/LICENSE.GPL-3.0-or-later \\\n+\tlicenses/LICENSE.LGPL-3.0-or-later\n \n # gnu-efi is a set of library and header files used to build\n # standalone EFI applications such as bootloaders. There is no point\n", "prefixes": [ "v2", "1/1" ] }