Michael Chang
b0ea2bc257
* grub-2.14.tar.xz - Removed tarball * grub-2.12.tar.xz - Patch rediff * use-grub2-as-a-package-name.patch * grub2-secureboot-add-linuxefi.patch * grub2-secureboot-no-insmod-on-sb.patch * grub2-secureboot-chainloader.patch * grub2-linguas.sh-no-rsync.patch * grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch * grub2-s390x-03-output-7-bit-ascii.patch * grub2-s390x-04-grub2-install.patch * grub2-efi-chainload-harder.patch * grub2-emu-4-all.patch * grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch * grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch * grub2-btrfs-03-follow_default.patch * grub2-btrfs-05-grub2-mkconfig.patch * grub2-btrfs-06-subvol-mount.patch * grub2-btrfs-10-config-directory.patch * grub2-efi-xen-cmdline.patch * grub2-Add-hidden-menu-entries.patch * grub2-suse-remove-linux-root-param.patch * 0003-bootp-New-net_bootp6-command.patch * 0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch * 0001-add-support-for-UEFI-network-protocols.patch * 0001-kern-mm.c-Make-grub_calloc-inline.patch * 0002-cmdline-Provide-cmdline-functions-as-module.patch * 0002-ieee1275-powerpc-enables-device-mapper-discovery.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=571
70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
From a2d103ac650e5ea10ac6d40f3a5c1a136ee96613 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Mon, 19 Jan 2026 14:29:05 +0800
|
|
Subject: [PATCH 2/2] Revert "configure: Check linker for --image-base support"
|
|
|
|
This reverts commit 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 b4d4db944..450524d47 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
|
|
|