On Sat, May 30, 2009 at 4:52 PM, Vladimir 'phcoder' Serbinenko
<phco...@gmail.com> wrote:
> This patch allows 64-bit grub2 to be compiled on older cc/gcc although
> with limitation that it can't access memory beyond 4-GiB
>
> --
> Regards
> Vladimir 'phcoder' Serbinenko
>
--
Regards
Vladimir 'phcoder' Serbinenko
diff --git a/configure.ac b/configure.ac
index 6649cb9..bd89e4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,18 +339,23 @@ fi
if test "$target_cpu"-"$platform" = x86_64-efi; then
# Use large model to support 4G memory
AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
- CFLAGS="-m64 -mcmodel=large"
+ SAVED_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -m64 -mcmodel=large"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[grub_cv_cc_mcmodel=yes],
[grub_cv_cc_mcmodel=no])
])
- if test "x$grub_cv_cc_no_mcmodel" = xno; then
- AC_MSG_ERROR([-mcmodel=large not supported, upgrade your gcc])
+ if test "x$grub_cv_cc_mcmodel" = xno; then
+ CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1"
+ TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1"
+ AC_MSG_WARN([-mcmodel=large not supported. You wan't be able to use the memory over 4GiB. Upgrade your gcc])
+ else
+ TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
fi
# EFI writes to stack below %rsp, we must not use the red zone
AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
- CFLAGS="-m64 -mno-red-zone"
+ CFLAGS="$CFLAGS -m64 -mno-red-zone"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[grub_cv_cc_no_red_zone=yes],
[grub_cv_cc_no_red_zone=no])
@@ -359,7 +364,7 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then
AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
fi
- TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large -mno-red-zone"
+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
fi
#
diff --git a/kern/efi/mm.c b/kern/efi/mm.c
index 4635776..30b5ab4 100644
--- a/kern/efi/mm.c
+++ b/kern/efi/mm.c
@@ -63,7 +63,9 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address,
/* Limit the memory access to less than 4GB for 32-bit platforms. */
if (address > 0xffffffff)
return 0;
+#endif
+#if GRUB_TARGET_SIZEOF_VOID_P < 8 || defined (MCMODEL_SMALL)
if (address == 0)
{
type = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
@@ -218,7 +220,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
{
if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
-#if GRUB_TARGET_SIZEOF_VOID_P < 8
+#if GRUB_TARGET_SIZEOF_VOID_P < 8 || defined (MCMODEL_SMALL)
&& desc->physical_start <= 0xffffffff
#endif
&& desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000
@@ -234,7 +236,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
desc->physical_start = 0x100000;
}
-#if GRUB_TARGET_SIZEOF_VOID_P < 8
+#if GRUB_TARGET_SIZEOF_VOID_P < 8 || defined (MCMODEL_SMALL)
if (BYTES_TO_PAGES (filtered_desc->physical_start)
+ filtered_desc->num_pages
> BYTES_TO_PAGES (0x100000000LL))
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
