* Re: [PATCH 2/2] grub-efi: allow compilation without large model support [not found] ` <ad8e0d90b31413651a29270546493a6b3ce32865.1385113330.git.jackie.huang@windriver.com> @ 2013-11-22 10:06 ` Vladimir 'φ-coder/phcoder' Serbinenko 2013-11-22 10:24 ` jhuang0 0 siblings, 1 reply; 6+ messages in thread From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-22 10:06 UTC (permalink / raw) To: jackie.huang; +Cc: The development of GRUB 2, dvhart, openembedded-core [-- Attachment #1: Type: text/plain, Size: 262 bytes --] On 22.11.2013 11:00, jackie.huang@windriver.com wrote: > +Upstream-Status: Inappropriate [compatibility] Should be backport as I'm about to commit my patch upstream once I've finished xen part and some documentation pertaining to introduced limits (2GiB) [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 291 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] grub-efi: allow compilation without large model support 2013-11-22 10:06 ` [PATCH 2/2] grub-efi: allow compilation without large model support Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-22 10:24 ` jhuang0 0 siblings, 0 replies; 6+ messages in thread From: jhuang0 @ 2013-11-22 10:24 UTC (permalink / raw) To: Vladimir 'φ-coder/phcoder' Serbinenko Cc: The development of GRUB 2, dvhart, openembedded-core On 11/22/2013 6:06 PM, Vladimir 'φ-coder/phcoder' Serbinenko wrote: > On 22.11.2013 11:00, jackie.huang@windriver.com wrote: >> +Upstream-Status: Inappropriate [compatibility] > Should be backport as I'm about to commit my patch upstream once I've > finished xen part and some documentation pertaining to introduced limits > (2GiB) Ok, thanks, changed to backport. Thanks, Jackie > -- Jackie Huang WIND RIVER | China Development Center MSN:jackielily@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <cover.1385104509.git.jackie.huang@windriver.com>]
[parent not found: <b55ef9e73d2bcd60a3faabd9c65c3704ec732eeb.1385104509.git.jackie.huang@windriver.com>]
* Re: [PATCH 2/2] grub-efi: allow compilation without large model support [not found] ` <b55ef9e73d2bcd60a3faabd9c65c3704ec732eeb.1385104509.git.jackie.huang@windriver.com> @ 2013-11-22 7:42 ` Vladimir 'φ-coder/phcoder' Serbinenko 2013-11-22 8:00 ` Vladimir 'φ-coder/phcoder' Serbinenko 1 sibling, 0 replies; 6+ messages in thread From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-22 7:42 UTC (permalink / raw) To: jackie.huang; +Cc: The development of GRUB 2, dvhart, openembedded-core [-- Attachment #1: Type: text/plain, Size: 5021 bytes --] On 22.11.2013 08:23, jackie.huang@windriver.com wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > -mcmodel=large is not supported by gcc with version lower > than 4.4, but we don't need to use memory over 4GiB, so add > a patch to allow compilation without large model support. > This patch is wrong and would reintroduce a bug. Removing AC_MSG_ERROR is all that's needed from this patch. But on the other hand dl.c needs safeguards to prevent silent overflow. > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > ...allow-a-compilation-without-mcmodel-large.patch | 81 ++++++++++++++++++++++ > meta/recipes-bsp/grub/grub-efi_2.00.bb | 1 + > 2 files changed, 82 insertions(+) > create mode 100644 meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch > > diff --git a/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch > new file mode 100644 > index 0000000..c6a30c8 > --- /dev/null > +++ b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch > @@ -0,0 +1,81 @@ > +From 0cea0e4266214da1f11e812834f5d5c47a6e04e6 Mon Sep 17 00:00:00 2001 > +From: Jackie Huang <jackie.huang@windriver.com> > +Date: Tue, 5 Nov 2013 07:23:32 -0500 > +Subject: [PATCH] Allow a compilation without -mcmodel=large > + > +* kern/efi/mm.c (grub_efi_allocate_pages): don't allocate >4GiB > + when compiled without -mcmodel=large > + (filter_memory_map): remove memory post 4 GiB when compiled > + without -mcmodel=large > +* configure.ac: add -DMCMODEL_SMALL=1 to TARGET_CFLAGS when > + -mcmodel=large isn't supported > + > +It's ported from old version of grub which was deliberately > +removed in current and newer version: > + > +2009-06-04 Vladimir Serbinenko <phcoder@gmail.com> > + > + Allow a compilation without -mcmodel=large > + > +2010-04-21 Vladimir Serbinenko <phcoder@gmail.com> > + > + * configure.ac: Refuse to compile for x86_64-efi is mcmodel=large > + is not supported. > + > +Upstream-Status: Inappropriate [compatibility] > + > +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > +--- > + configure.ac | 4 +++- > + grub-core/kern/efi/mm.c | 6 +++--- > + 2 files changed, 6 insertions(+), 4 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 319d063..ee72fee 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -567,7 +567,9 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then > + [grub_cv_cc_mcmodel=no]) > + ]) > + if test "x$grub_cv_cc_mcmodel" = xno; then > +- AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.]) > ++ CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1" > ++ TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1" > ++ AC_MSG_WARN([-mcmodel=large not supported. You won't be able to use the memory over 4GiB. Upgrade your gcc.]) > + else > + TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large" > + fi > +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c > +index a2edc84..c67dd13 100644 > +--- a/grub-core/kern/efi/mm.c > ++++ b/grub-core/kern/efi/mm.c > +@@ -62,7 +62,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address, > + return 0; > + #endif > + > +-#if 1 > ++#if defined (MCMODEL_SMALL) > + if (address == 0) > + { > + type = GRUB_EFI_ALLOCATE_MAX_ADDRESS; > +@@ -305,7 +305,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 1 > ++#if defined (MCMODEL_SMALL) > + && desc->physical_start <= 0xffffffff > + #endif > + && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000 > +@@ -321,7 +321,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map, > + desc->physical_start = 0x100000; > + } > + > +-#if 1 > ++#if defined (MCMODEL_SMALL) > + if (BYTES_TO_PAGES (filtered_desc->physical_start) > + + filtered_desc->num_pages > + > BYTES_TO_PAGES (0x100000000LL)) > +-- > +1.7.1 > + > diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb > index 2fe688c..deb9514 100644 > --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb > +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb > @@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ > file://grub-no-unused-result.patch \ > file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ > file://fix-issue-with-flex-2.5.37.patch \ > + file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ > " > SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" > SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" > [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 291 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] grub-efi: allow compilation without large model support [not found] ` <b55ef9e73d2bcd60a3faabd9c65c3704ec732eeb.1385104509.git.jackie.huang@windriver.com> 2013-11-22 7:42 ` Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-22 8:00 ` Vladimir 'φ-coder/phcoder' Serbinenko 2013-11-22 8:13 ` jhuang0 1 sibling, 1 reply; 6+ messages in thread From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-22 8:00 UTC (permalink / raw) To: jackie.huang; +Cc: The development of GRUB 2, dvhart, openembedded-core [-- Attachment #1.1: Type: text/plain, Size: 4870 bytes --] On 22.11.2013 08:23, jackie.huang@windriver.com wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > -mcmodel=large is not supported by gcc with version lower > than 4.4, but we don't need to use memory over 4GiB, so add > a patch to allow compilation without large model support. > Please try attached patch instead > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > ...allow-a-compilation-without-mcmodel-large.patch | 81 ++++++++++++++++++++++ > meta/recipes-bsp/grub/grub-efi_2.00.bb | 1 + > 2 files changed, 82 insertions(+) > create mode 100644 meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch > > diff --git a/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch > new file mode 100644 > index 0000000..c6a30c8 > --- /dev/null > +++ b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch > @@ -0,0 +1,81 @@ > +From 0cea0e4266214da1f11e812834f5d5c47a6e04e6 Mon Sep 17 00:00:00 2001 > +From: Jackie Huang <jackie.huang@windriver.com> > +Date: Tue, 5 Nov 2013 07:23:32 -0500 > +Subject: [PATCH] Allow a compilation without -mcmodel=large > + > +* kern/efi/mm.c (grub_efi_allocate_pages): don't allocate >4GiB > + when compiled without -mcmodel=large > + (filter_memory_map): remove memory post 4 GiB when compiled > + without -mcmodel=large > +* configure.ac: add -DMCMODEL_SMALL=1 to TARGET_CFLAGS when > + -mcmodel=large isn't supported > + > +It's ported from old version of grub which was deliberately > +removed in current and newer version: > + > +2009-06-04 Vladimir Serbinenko <phcoder@gmail.com> > + > + Allow a compilation without -mcmodel=large > + > +2010-04-21 Vladimir Serbinenko <phcoder@gmail.com> > + > + * configure.ac: Refuse to compile for x86_64-efi is mcmodel=large > + is not supported. > + > +Upstream-Status: Inappropriate [compatibility] > + > +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > +--- > + configure.ac | 4 +++- > + grub-core/kern/efi/mm.c | 6 +++--- > + 2 files changed, 6 insertions(+), 4 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 319d063..ee72fee 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -567,7 +567,9 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then > + [grub_cv_cc_mcmodel=no]) > + ]) > + if test "x$grub_cv_cc_mcmodel" = xno; then > +- AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.]) > ++ CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1" > ++ TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1" > ++ AC_MSG_WARN([-mcmodel=large not supported. You won't be able to use the memory over 4GiB. Upgrade your gcc.]) > + else > + TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large" > + fi > +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c > +index a2edc84..c67dd13 100644 > +--- a/grub-core/kern/efi/mm.c > ++++ b/grub-core/kern/efi/mm.c > +@@ -62,7 +62,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address, > + return 0; > + #endif > + > +-#if 1 > ++#if defined (MCMODEL_SMALL) > + if (address == 0) > + { > + type = GRUB_EFI_ALLOCATE_MAX_ADDRESS; > +@@ -305,7 +305,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 1 > ++#if defined (MCMODEL_SMALL) > + && desc->physical_start <= 0xffffffff > + #endif > + && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000 > +@@ -321,7 +321,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map, > + desc->physical_start = 0x100000; > + } > + > +-#if 1 > ++#if defined (MCMODEL_SMALL) > + if (BYTES_TO_PAGES (filtered_desc->physical_start) > + + filtered_desc->num_pages > + > BYTES_TO_PAGES (0x100000000LL)) > +-- > +1.7.1 > + > diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb > index 2fe688c..deb9514 100644 > --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb > +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb > @@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ > file://grub-no-unused-result.patch \ > file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ > file://fix-issue-with-flex-2.5.37.patch \ > + file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ > " > SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" > SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" > [-- Attachment #1.2: mcmodel.diff --] [-- Type: application/x-patch, Size: 4269 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 291 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] grub-efi: allow compilation without large model support 2013-11-22 8:00 ` Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-22 8:13 ` jhuang0 2013-11-22 9:59 ` jhuang0 0 siblings, 1 reply; 6+ messages in thread From: jhuang0 @ 2013-11-22 8:13 UTC (permalink / raw) To: Vladimir 'φ-coder/phcoder' Serbinenko Cc: The development of GRUB 2, dvhart, openembedded-core On 11/22/2013 4:00 PM, Vladimir 'φ-coder/phcoder' Serbinenko wrote: > On 22.11.2013 08:23, jackie.huang@windriver.com wrote: >> From: Jackie Huang <jackie.huang@windriver.com> >> >> -mcmodel=large is not supported by gcc with version lower >> than 4.4, but we don't need to use memory over 4GiB, so add >> a patch to allow compilation without large model support. >> > Please try attached patch instead Thanks, I'm going to try with your patch. Thanks, Jackie >> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> >> --- >> ...allow-a-compilation-without-mcmodel-large.patch | 81 ++++++++++++++++++++++ >> meta/recipes-bsp/grub/grub-efi_2.00.bb | 1 + >> 2 files changed, 82 insertions(+) >> create mode 100644 meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >> >> diff --git a/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >> new file mode 100644 >> index 0000000..c6a30c8 >> --- /dev/null >> +++ b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >> @@ -0,0 +1,81 @@ >> +From 0cea0e4266214da1f11e812834f5d5c47a6e04e6 Mon Sep 17 00:00:00 2001 >> +From: Jackie Huang <jackie.huang@windriver.com> >> +Date: Tue, 5 Nov 2013 07:23:32 -0500 >> +Subject: [PATCH] Allow a compilation without -mcmodel=large >> + >> +* kern/efi/mm.c (grub_efi_allocate_pages): don't allocate >4GiB >> + when compiled without -mcmodel=large >> + (filter_memory_map): remove memory post 4 GiB when compiled >> + without -mcmodel=large >> +* configure.ac: add -DMCMODEL_SMALL=1 to TARGET_CFLAGS when >> + -mcmodel=large isn't supported >> + >> +It's ported from old version of grub which was deliberately >> +removed in current and newer version: >> + >> +2009-06-04 Vladimir Serbinenko <phcoder@gmail.com> >> + >> + Allow a compilation without -mcmodel=large >> + >> +2010-04-21 Vladimir Serbinenko <phcoder@gmail.com> >> + >> + * configure.ac: Refuse to compile for x86_64-efi is mcmodel=large >> + is not supported. >> + >> +Upstream-Status: Inappropriate [compatibility] >> + >> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> >> +--- >> + configure.ac | 4 +++- >> + grub-core/kern/efi/mm.c | 6 +++--- >> + 2 files changed, 6 insertions(+), 4 deletions(-) >> + >> +diff --git a/configure.ac b/configure.ac >> +index 319d063..ee72fee 100644 >> +--- a/configure.ac >> ++++ b/configure.ac >> +@@ -567,7 +567,9 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then >> + [grub_cv_cc_mcmodel=no]) >> + ]) >> + if test "x$grub_cv_cc_mcmodel" = xno; then >> +- AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.]) >> ++ CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1" >> ++ TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1" >> ++ AC_MSG_WARN([-mcmodel=large not supported. You won't be able to use the memory over 4GiB. Upgrade your gcc.]) >> + else >> + TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large" >> + fi >> +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c >> +index a2edc84..c67dd13 100644 >> +--- a/grub-core/kern/efi/mm.c >> ++++ b/grub-core/kern/efi/mm.c >> +@@ -62,7 +62,7 @@ grub_efi_allocate_pages (grub_efi_physical_address_t address, >> + return 0; >> + #endif >> + >> +-#if 1 >> ++#if defined (MCMODEL_SMALL) >> + if (address == 0) >> + { >> + type = GRUB_EFI_ALLOCATE_MAX_ADDRESS; >> +@@ -305,7 +305,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 1 >> ++#if defined (MCMODEL_SMALL) >> + && desc->physical_start <= 0xffffffff >> + #endif >> + && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000 >> +@@ -321,7 +321,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map, >> + desc->physical_start = 0x100000; >> + } >> + >> +-#if 1 >> ++#if defined (MCMODEL_SMALL) >> + if (BYTES_TO_PAGES (filtered_desc->physical_start) >> + + filtered_desc->num_pages >> + > BYTES_TO_PAGES (0x100000000LL)) >> +-- >> +1.7.1 >> + >> diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb >> index 2fe688c..deb9514 100644 >> --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb >> +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb >> @@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ >> file://grub-no-unused-result.patch \ >> file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ >> file://fix-issue-with-flex-2.5.37.patch \ >> + file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ >> " >> SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" >> SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" >> > -- Jackie Huang WIND RIVER | China Development Center MSN:jackielily@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] grub-efi: allow compilation without large model support 2013-11-22 8:13 ` jhuang0 @ 2013-11-22 9:59 ` jhuang0 0 siblings, 0 replies; 6+ messages in thread From: jhuang0 @ 2013-11-22 9:59 UTC (permalink / raw) To: Vladimir 'φ-coder/phcoder' Serbinenko, openembedded-core Cc: The development of GRUB 2, dvhart On 11/22/2013 4:13 PM, jhuang0 wrote: > > > On 11/22/2013 4:00 PM, Vladimir 'φ-coder/phcoder' Serbinenko wrote: >> On 22.11.2013 08:23, jackie.huang@windriver.com wrote: >>> From: Jackie Huang <jackie.huang@windriver.com> >>> >>> -mcmodel=large is not supported by gcc with version lower >>> than 4.4, but we don't need to use memory over 4GiB, so add >>> a patch to allow compilation without large model support. >>> >> Please try attached patch instead > > Thanks, I'm going to try with your patch. Tested with Vladimir's patch, it works fine. I'm going send v5 for this. Thanks, Jackie > > Thanks, > Jackie > >>> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> >>> --- >>> ...allow-a-compilation-without-mcmodel-large.patch | 81 >>> ++++++++++++++++++++++ >>> meta/recipes-bsp/grub/grub-efi_2.00.bb | 1 + >>> 2 files changed, 82 insertions(+) >>> create mode 100644 >>> meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >>> >>> >>> diff --git >>> a/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >>> b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >>> >>> new file mode 100644 >>> index 0000000..c6a30c8 >>> --- /dev/null >>> +++ >>> b/meta/recipes-bsp/grub/files/grub-efi-allow-a-compilation-without-mcmodel-large.patch >>> >>> @@ -0,0 +1,81 @@ >>> +From 0cea0e4266214da1f11e812834f5d5c47a6e04e6 Mon Sep 17 00:00:00 2001 >>> +From: Jackie Huang <jackie.huang@windriver.com> >>> +Date: Tue, 5 Nov 2013 07:23:32 -0500 >>> +Subject: [PATCH] Allow a compilation without -mcmodel=large >>> + >>> +* kern/efi/mm.c (grub_efi_allocate_pages): don't allocate >4GiB >>> + when compiled without -mcmodel=large >>> + (filter_memory_map): remove memory post 4 GiB when compiled >>> + without -mcmodel=large >>> +* configure.ac: add -DMCMODEL_SMALL=1 to TARGET_CFLAGS when >>> + -mcmodel=large isn't supported >>> + >>> +It's ported from old version of grub which was deliberately >>> +removed in current and newer version: >>> + >>> +2009-06-04 Vladimir Serbinenko <phcoder@gmail.com> >>> + >>> + Allow a compilation without -mcmodel=large >>> + >>> +2010-04-21 Vladimir Serbinenko <phcoder@gmail.com> >>> + >>> + * configure.ac: Refuse to compile for x86_64-efi is mcmodel=large >>> + is not supported. >>> + >>> +Upstream-Status: Inappropriate [compatibility] >>> + >>> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> >>> +--- >>> + configure.ac | 4 +++- >>> + grub-core/kern/efi/mm.c | 6 +++--- >>> + 2 files changed, 6 insertions(+), 4 deletions(-) >>> + >>> +diff --git a/configure.ac b/configure.ac >>> +index 319d063..ee72fee 100644 >>> +--- a/configure.ac >>> ++++ b/configure.ac >>> +@@ -567,7 +567,9 @@ if test "$target_cpu"-"$platform" = x86_64-efi; >>> then >>> + [grub_cv_cc_mcmodel=no]) >>> + ]) >>> + if test "x$grub_cv_cc_mcmodel" = xno; then >>> +- AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.]) >>> ++ CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1" >>> ++ TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1" >>> ++ AC_MSG_WARN([-mcmodel=large not supported. You won't be able to >>> use the memory over 4GiB. Upgrade your gcc.]) >>> + else >>> + TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large" >>> + fi >>> +diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c >>> +index a2edc84..c67dd13 100644 >>> +--- a/grub-core/kern/efi/mm.c >>> ++++ b/grub-core/kern/efi/mm.c >>> +@@ -62,7 +62,7 @@ grub_efi_allocate_pages >>> (grub_efi_physical_address_t address, >>> + return 0; >>> + #endif >>> + >>> +-#if 1 >>> ++#if defined (MCMODEL_SMALL) >>> + if (address == 0) >>> + { >>> + type = GRUB_EFI_ALLOCATE_MAX_ADDRESS; >>> +@@ -305,7 +305,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 1 >>> ++#if defined (MCMODEL_SMALL) >>> + && desc->physical_start <= 0xffffffff >>> + #endif >>> + && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > >>> 0x100000 >>> +@@ -321,7 +321,7 @@ filter_memory_map (grub_efi_memory_descriptor_t >>> *memory_map, >>> + desc->physical_start = 0x100000; >>> + } >>> + >>> +-#if 1 >>> ++#if defined (MCMODEL_SMALL) >>> + if (BYTES_TO_PAGES (filtered_desc->physical_start) >>> + + filtered_desc->num_pages >>> + > BYTES_TO_PAGES (0x100000000LL)) >>> +-- >>> +1.7.1 >>> + >>> diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb >>> b/meta/recipes-bsp/grub/grub-efi_2.00.bb >>> index 2fe688c..deb9514 100644 >>> --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb >>> +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb >>> @@ -27,6 +27,7 @@ SRC_URI = >>> "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ >>> file://grub-no-unused-result.patch \ >>> file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ >>> file://fix-issue-with-flex-2.5.37.patch \ >>> + >>> file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ >>> " >>> SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" >>> SRC_URI[sha256sum] = >>> "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" >>> >> > -- Jackie Huang WIND RIVER | China Development Center MSN:jackielily@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-22 14:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1385113330.git.jackie.huang@windriver.com>
[not found] ` <ad8e0d90b31413651a29270546493a6b3ce32865.1385113330.git.jackie.huang@windriver.com>
2013-11-22 10:06 ` [PATCH 2/2] grub-efi: allow compilation without large model support Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-22 10:24 ` jhuang0
[not found] <cover.1385104509.git.jackie.huang@windriver.com>
[not found] ` <b55ef9e73d2bcd60a3faabd9c65c3704ec732eeb.1385104509.git.jackie.huang@windriver.com>
2013-11-22 7:42 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-22 8:00 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-22 8:13 ` jhuang0
2013-11-22 9:59 ` jhuang0
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).