This patch updates conf/i386-cygwin-img.lds to use the _grub_text_base
symbol just like conf/i386-pc-kernel.lds. It also updates configure.ac
to account for this change.

Signed-off-by: Nicholas Vinson <[email protected]>
---
 conf/i386-cygwin-img.lds | 1 +
 configure.ac             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/i386-cygwin-img.lds b/conf/i386-cygwin-img.lds
index 578da91b0..e7ed1c523 100644
--- a/conf/i386-cygwin-img.lds
+++ b/conf/i386-cygwin-img.lds
@@ -2,6 +2,7 @@
 
 SECTIONS
 {
+  . = _grub_text_base;
   .text :
   {
     start = . ;
diff --git a/configure.ac b/configure.ac
index 94218e014..560c8a320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1462,7 +1462,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.lds"
   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
   TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img.lds"
-  TARGET_IMG_BASE_LDOPT=
+  TARGET_IMG_BASE_LDOPT="-Wl,--defsym,_grub_text_base"
   TARGET_IMG_BASE_LDOPT_ARG_SEP=","
   TARGET_IMG_CFLAGS=
 else
-- 
2.53.0


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

Reply via email to