diff mbox series

Revert "grub: add patch to use medany for riscv64"

Message ID 20260321153154.1816865-1-tgamblin@baylibre.com
State New
Headers show
Series Revert "grub: add patch to use medany for riscv64" | expand

Commit Message

Trevor Gamblin March 21, 2026, 3:31 p.m. UTC 
This reverts commit 2d8da77f28ed3fd7a5715fde02715c7d59f6b991.

This patch is still carried by Fedora, but is no longer a problem
anymore in grub 2.14+. See:

https://lists.gnu.org/archive/html/grub-devel/2026-03/msg00044.html
---
 ...any-instead-of-large-model-for-RISCV.patch | 39 -------------------
 meta/recipes-bsp/grub/grub2.inc               |  1 -
 2 files changed, 40 deletions(-)
 delete mode 100644 meta/recipes-bsp/grub/files/0263-Use-medany-instead-of-large-model-for-RISCV.patch
diff mbox series

Patch

diff --git a/meta/recipes-bsp/grub/files/0263-Use-medany-instead-of-large-model-for-RISCV.patch b/meta/recipes-bsp/grub/files/0263-Use-medany-instead-of-large-model-for-RISCV.patch
deleted file mode 100644
index e10a116ae3..0000000000
--- a/meta/recipes-bsp/grub/files/0263-Use-medany-instead-of-large-model-for-RISCV.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From fcf4b96cfd3a04e1cfa177b08afba4fd80c9978e Mon Sep 17 00:00:00 2001
-From: Jason Montleon <jason@montleon.com>
-Date: Fri, 3 May 2024 13:18:37 -0400
-Subject: [PATCH] Use medany instead of large model for RISCV
-
-Upstream-Status: Submitted [https://savannah.gnu.org/bugs/?65909]
-
-Signed-off-by: Jason Montleon <jason@montleon.com>
-Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
----
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0d693f8..0289fe1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1653,7 +1653,7 @@ fi]
- 
- CFLAGS="$TARGET_CFLAGS"
- 
--if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64 ; then
-+if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 ; then
-   # Use large model to support 4G memory
-   AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
-     CFLAGS="$TARGET_CFLAGS -mcmodel=large"
-@@ -1663,9 +1663,11 @@ if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_
-   ])
-   if test "x$grub_cv_cc_mcmodel" = xyes; then
-     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
--  elif test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64; then
-+  elif test "$target_cpu" = sparc64; then
-     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
-   fi
-+elif test "$target_cpu" = riscv64 ; then
-+    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
- fi
- 
- # Stack smashing protector.
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 7cdeff5edd..8c62315e69 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -19,7 +19,6 @@  SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
            file://0003-grub.d-10_linux.in-add-oe-s-kernel-name.patch \
            file://0001-Revert-configure-Check-linker-for-image-base-support.patch \
            file://0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch \
-           file://0263-Use-medany-instead-of-large-model-for-RISCV.patch \
 "
 
 SRC_URI[sha256sum] = "d0415fbb3e739237064e173743a6e5f60c33a81ec02a069cc9152d80efff4967"