Rmys
102 lines
3.2 KiB
Diff
102 lines
3.2 KiB
Diff
From f0de21acceb48ab5303917b102a7b57a23dda775 Mon Sep 17 00:00:00 2001
|
|
From: Mike Gilbert <floppym@gentoo.org>
|
|
Date: Sun, 18 Jan 2026 19:45:53 -0500
|
|
Subject: [PATCH 1/2] Revert "configure: Print a more helpful error if
|
|
autoconf-archive is not installed"
|
|
|
|
Reverts: ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb
|
|
---
|
|
configure.ac | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 47a96c36f..1919b8f52 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1792,11 +1792,6 @@ LIBS=""
|
|
# Defined in acinclude.m4.
|
|
grub_ASM_USCORE
|
|
grub_PROG_TARGET_CC
|
|
-
|
|
-# The error message produced by autoconf if autoconf-archive is not installed is
|
|
-# quite misleading and not very helpful. So, try point people in the right direction.
|
|
-m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
|
|
-
|
|
if test "x$TARGET_APPLE_LINKER" != x1 ; then
|
|
AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
|
|
[TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
|
|
--
|
|
2.52.0
|
|
|
|
|
|
From b54f00dc03b6edeead907315cbb3ede1ad1411ff Mon Sep 17 00:00:00 2001
|
|
From: Mike Gilbert <floppym@gentoo.org>
|
|
Date: Sun, 18 Jan 2026 19:35:09 -0500
|
|
Subject: [PATCH 2/2] Revert "configure: Check linker for --image-base support"
|
|
|
|
Bug: https://bugs.gentoo.org/965424
|
|
Reverts: 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960
|
|
---
|
|
acinclude.m4 | 5 -----
|
|
configure.ac | 14 ++------------
|
|
2 files changed, 2 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/acinclude.m4 b/acinclude.m4
|
|
index 70c1912f8..fa7840f09 100644
|
|
--- a/acinclude.m4
|
|
+++ b/acinclude.m4
|
|
@@ -79,11 +79,6 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
|
|
[AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses])
|
|
AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
|
|
[cat > conftest.c <<\EOF
|
|
-asm (
|
|
- ".globl start, _start, __start\n"
|
|
- ".ifdef cmain; .set start = _start = __start = cmain\n.endif\n"
|
|
- ".ifdef _cmain; .set start = _start = __start = _cmain\n.endif\n"
|
|
-);
|
|
void cmain (void);
|
|
void
|
|
cmain (void)
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1919b8f52..0d693f8d1 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c
|
|
TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc"
|
|
TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
|
|
TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc"
|
|
+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
|
|
TARGET_IMG_CFLAGS=
|
|
else
|
|
TARGET_APPLE_LINKER=0
|
|
@@ -1468,6 +1469,7 @@ else
|
|
TARGET_IMG_LDSCRIPT=
|
|
TARGET_IMG_LDFLAGS='-Wl,-N'
|
|
TARGET_IMG_LDFLAGS_AC='-Wl,-N'
|
|
+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
|
|
TARGET_IMG_CFLAGS=
|
|
fi
|
|
|
|
@@ -1793,18 +1795,6 @@ LIBS=""
|
|
grub_ASM_USCORE
|
|
grub_PROG_TARGET_CC
|
|
if test "x$TARGET_APPLE_LINKER" != x1 ; then
|
|
-AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
|
|
- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
|
|
- [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
|
|
- [],
|
|
- [AC_LANG_SOURCE([
|
|
-asm (".globl start; start:");
|
|
-asm (".globl _start; _start:");
|
|
-asm (".globl __start; __start:");
|
|
-void __main (void);
|
|
-void __main (void) {}
|
|
-int main (void);
|
|
- ])])
|
|
grub_PROG_OBJCOPY_ABSOLUTE
|
|
fi
|
|
grub_PROG_LD_BUILD_ID_NONE
|
|
--
|
|
2.52.0
|
|
|