Re: [PATCH 4/5] Revert "configure: Check linker for --image-base support"

2026-02-03 Thread Nicholas Vinson 



On 1/27/26 11:36, Daniel Kiper wrote:

On Mon, Jan 26, 2026 at 06:59:35AM -0500, Nicholas Vinson wrote:

This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.

Signed-off-by: Nicholas Vinson 


Reviewed-by: Daniel Kiper 

... and commit 3c9c2a629 (INSTALL: Add note that the GNU Autoconf
Archive may be needed) has to be reverted as well...


done.



Daniel



___
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH 4/5] Revert "configure: Check linker for --image-base support"

2026-01-27 Thread Daniel Kiper 
On Mon, Jan 26, 2026 at 06:59:35AM -0500, Nicholas Vinson wrote:
> This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.
>
> Signed-off-by: Nicholas Vinson 

Reviewed-by: Daniel Kiper 

... and commit 3c9c2a629 (INSTALL: Add note that the GNU Autoconf
Archive may be needed) has to be reverted as well...

Daniel

___
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

[PATCH 4/5] Revert "configure: Check linker for --image-base support"

2026-01-26 Thread Nicholas Vinson 
This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.

Signed-off-by: Nicholas Vinson 
---
 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 45f19f188..209c0fb11 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,0x40],
-[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


___
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel