conf/i386-cygwin-img.lds: Update to use _grub_text_base symbol

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 <nvinson234@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/conf/i386-cygwin-img.lds b/conf/i386-cygwin-img.lds
index 578da91b02337762b3f0d2106777908c0841aecc..e7ed1c523fa0e5654e86c5be0bf0b97809e7c91c 100644 (file)
--- 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 a8672eaa11aaf189dbac612b627d71bfb8b7381e..d19fb625d28e18b6a27e18b516d572120c04cf55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1462,8 +1462,8 @@ 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_ARG_SEP=","
+  TARGET_IMG_BASE_LDOPT="-Wl,--defsym=_grub_text_base"
+  TARGET_IMG_BASE_LDOPT_ARG_SEP="="
   TARGET_IMG_CFLAGS=
 else
   TARGET_APPLE_LINKER=0