mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 05:52:36 +02:00
Leah Rowe
d22f7f9633
This brings these extra changes: * eaa3b8f0f Bump version to 2.15 * d38d6a1a9 Release 2.14 * 35bfd6c47 build: Add grub-core/tests/crypto_cipher_mode_vectors.h file to EXTRA_DIST * ac042f3f5 configure: Print a more helpful error if autoconf-archive is not installed * e37d02158 kern/ieee1275/openfw: Add a check for invalid partition number * f94eae0f8 grub-mkimage: Do not generate empty SBAT metadata * 1aa0dd0c0 configure: Defer check for -mcmodel=large until PIC/PIE checks are done * ff1edd975 util/grub-mkimagexx: Stop generating unaligned appended signatures * 51ebc6f67 tests: Add functional tests for ecb/cbc helpers * caaf50b9a osdep/aros/hostdisk: Fix use-after-free bug during MsgPort deletion * 18f08826f kern/efi/sb: Enable loading GRUB_FILE_TYPE_CRYPTODISK_ENCRYPTION_KEY and GRUB_FILE_TYPE_CRYPTODISK_DETACHED_HEADER NOTE: This patch was reversed: * ac042f3f5 configure: Print a more helpful error if autoconf-archive is not installed Because it quite unhelpfully broke the build. Signed-off-by: Leah Rowe <leah@libreboot.org>
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
From cf791012987ea90f7a88edd21a0f619fbc40986d Mon Sep 17 00:00:00 2001
|
|
From: Leah Rowe <leah@libreboot.org>
|
|
Date: Wed, 24 Dec 2025 01:42:17 +0100
|
|
Subject: [PATCH 21/21] 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 d8ca1b7c1..041cfbab4 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
|
|
|
|
@@ -1798,18 +1800,6 @@ grub_PROG_TARGET_CC
|
|
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"],
|
|
- [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.47.3
|
|
|