* Re: [PATCH v2] Explicitly check for linking format to use for efiemu64 module
@ 2013-11-26 7:53 Beeblebrox
2013-11-26 8:41 ` Andrey Borzenkov
0 siblings, 1 reply; 9+ messages in thread
From: Beeblebrox @ 2013-11-26 7:53 UTC (permalink / raw)
To: Andrey Borzenkov, The development of GNU GRUB
OK, I'll try it. But I need clarification:
* Should I copy the repo and do a git rollback on the copy?
* Easier to copy only grub/docs to another folder, but how do I start
the build then? The Makefile in grub/docs will fail just as when run
from top-level.
>> just copy grub.texi over
From my current repo, or an older ver?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] Explicitly check for linking format to use for efiemu64 module
2013-11-26 7:53 [PATCH v2] Explicitly check for linking format to use for efiemu64 module Beeblebrox
@ 2013-11-26 8:41 ` Andrey Borzenkov
0 siblings, 0 replies; 9+ messages in thread
From: Andrey Borzenkov @ 2013-11-26 8:41 UTC (permalink / raw)
To: Raif S. Berent; +Cc: The development of GNU GRUB
On Tue, Nov 26, 2013 at 11:53 AM, Beeblebrox <zaphod@berentweb.com> wrote:
> OK, I'll try it. But I need clarification:
>
> * Should I copy the repo and do a git rollback on the copy?
Just setup separate tree to perform build. The actual state does not
really matter; you can use current master, ignore doc build error for
now.
> * Easier to copy only grub/docs to another folder, but how do I start
> the build then? The Makefile in grub/docs will fail just as when run
> from top-level.
>
>>> just copy grub.texi over
> From my current repo, or an older ver?
git clone grub-repo
git bisect start
git bisect bad
git bisect good OLD-COMMIT-ID
cp docs/grub.texi /path/to/build/tree/docs/grub.texi
(cd /path/to/build/tree; make)
git bisect good|bad
cp docs/grub.texi /path/to/build/tree/docs/grub.texi
(cd /path/to/build/tree; make)
...
repeat until you find the first bad commit.man git-bisect.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] Explicitly check for linking format to use for efiemu64 module
@ 2013-11-26 7:31 Beeblebrox
2013-11-26 7:35 ` Andrey Borzenkov
0 siblings, 1 reply; 9+ messages in thread
From: Beeblebrox @ 2013-11-26 7:31 UTC (permalink / raw)
To: Andrey Borzenkov; +Cc: The development of GNU GRUB
> Did earlier versions grub.texi compiled?
Yes, earlier versions of grub.texi did compile.
> Setup build tree outside of git checkout and just copy
> grub.texi over; it is self contained.
It's OK, I don't need it really. Unless you need me to test and get
back to you with results.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] Explicitly check for linking format to use for efiemu64 module
@ 2013-11-26 7:19 Beeblebrox
2013-11-26 7:25 ` Andrey Borzenkov
0 siblings, 1 reply; 9+ messages in thread
From: Beeblebrox @ 2013-11-26 7:19 UTC (permalink / raw)
To: Andrey Borzenkov; +Cc: The development of GNU GRUB
>> Or just update to current trunk, I committed this patch.
Updated to trunk, it all works & gets compiled.
Still have to manually clean out the "docs" references in Makefile however.
Thanks for the swift work.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Explicitly check for linking format to use for efiemu64 module
@ 2013-11-25 17:51 Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-25 18:13 ` [PATCH v2] " Andrey Borzenkov
0 siblings, 1 reply; 9+ messages in thread
From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-25 17:51 UTC (permalink / raw)
To: The development of GNU GRUB
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
On 25.11.2013 18:42, Andrey Borzenkov wrote:
> В Mon, 25 Nov 2013 05:22:58 +0100
> Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
>
>>> + CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
>>> + LDFLAGS="-m64 -Wl,$format -nostdlib"
>> You need -static as otherwise on Apple systems it will try to pull in
>> the dynamic linker which we don't want (scratch comment about other
>> thread, I though of adding -static everywhere but it's no necessarry
>> after all)
>
> I used the same flags as in Makefile. If -static is needed here should
> not it be added to grub-core/Makefile.am as well?
>
>>> diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
>>> index e2da083..e6862b7 100644
>>> --- a/grub-core/Makefile.am
>>> +++ b/grub-core/Makefile.am
>>> @@ -421,7 +421,7 @@ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
>>> $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
>>> rm -f $@.bin; \
>> Here the check for apple linker has to be adjusted as
>> x$(EFIEMU64_LINK_FORMAT) = x-arch,x86_64
>
> Mmm ... but I assume apple linker case *did* work before and it broke
> only for the case !TARGET_APPLE_LINKER. Should $(EFIEMU64_LINK_FORMAT)
> be added for apple linker case as well? I have no way to test it.
>
What I mean is that TARGET_APPLE_LINKER is conditioned on link_format.
And in this case we should check for efiemu64_link_format. As for the
exact command, don't worry too much about it, I'll clean it up and unify
the two cases after your patch is merged.
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 291 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] Explicitly check for linking format to use for efiemu64 module
2013-11-25 17:51 [PATCH] " Vladimir 'φ-coder/phcoder' Serbinenko
@ 2013-11-25 18:13 ` Andrey Borzenkov
2013-11-25 18:19 ` Vladimir 'φ-coder/phcoder' Serbinenko
0 siblings, 1 reply; 9+ messages in thread
From: Andrey Borzenkov @ 2013-11-25 18:13 UTC (permalink / raw)
To: grub-devel; +Cc: Beeblebrox
Similar to check for target linking format, also check for efiemu64
instead of hardcoding -melf_x86_64. This fixes compilation on *BSD
variants. We cannot easily reuse main target check because platforms
are different (main target is 32 bit and efiemu64 - 64 bit).
This commit adds EFIEMU64_LINK_FORMAT that contains detected
link option and is used in efiemu64.o linking instead of hardcoded
value.
Reported-By: Beeblebrox <zaphod@berentweb.com>
---
configure.ac | 29 +++++++++++++++++++++++++++--
grub-core/Makefile.am | 9 ++++-----
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index d1292c9..1989f87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,6 +654,30 @@ if test x"$efiemu_excuse" = x ; then
efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
fi
fi
+if test x"$efiemu_excuse" = x ; then
+ AC_CACHE_CHECK([for efiemu64 linking format], [grub_cv_target_cc_efiemu64_link_format], [
+ grub_cv_target_cc_efiemu64_link_format=unknown
+ for format in -melf_x86_64 -melf_x86_64_fbsd -melf_x86_64_obsd -melf_x86_64_haiku -arch,x86_64; do
+ CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
+ LDFLAGS="-m64 -Wl,$format -nostdlib -static"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ asm (".globl _start; _start:");
+ asm (".globl __start; __start:");
+ void __main (void);
+ void __main (void) {}
+ ]], [[]])], [flag=1], [flag=0])
+ if test x"$flag" = x1; then
+ grub_cv_target_cc_efiemu64_link_format="$format"
+ break;
+ fi
+ done])
+ if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
+ efiemu_excuse="no suitable link format for efiemu64 found"
+ else
+ EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
+ fi
+fi
if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
fi
@@ -663,11 +687,12 @@ else
enable_efiemu=no
fi
AC_SUBST([enable_efiemu])
+AC_SUBST([EFIEMU64_LINK_FORMAT])
CFLAGS="$TARGET_CFLAGS"
if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
- AC_CACHE_CHECK([for linking format], [grub_cv_target_cc_link_format], [
+ AC_CACHE_CHECK([for target linking format], [grub_cv_target_cc_link_format], [
grub_cv_target_cc_link_format=unknown
for format in -melf_${target_cpu} -melf_${target_cpu}_fbsd -melf_${target_cpu}_obsd -melf_${target_cpu}_haiku -m${target_cpu}pe -arch,${target_cpu}; do
if test x${target_cpu} != xi386 && test x$format = x${target_cpu}pe; then
@@ -681,7 +706,7 @@ if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
asm (".globl __start; __start:");
void __main (void);
void __main (void) {}
- ]], [[]])], [flag=1], [])
+ ]], [[]])], [flag=1], [flag=0])
if test x"$flag" = x1; then
grub_cv_target_cc_link_format="$format"
break;
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index e2da083..3ca52ea 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -399,7 +399,7 @@ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
fi
efiemu64_c.o: efiemu/runtime/efiemu.c
- if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+ if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
else \
$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
@@ -407,7 +407,7 @@ efiemu64_c.o: efiemu/runtime/efiemu.c
efiemu64_s.o: efiemu/runtime/efiemu.S
-rm -f $@
- if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+ if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
else \
$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
@@ -415,14 +415,13 @@ efiemu64_s.o: efiemu/runtime/efiemu.S
efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
-rm -f $@; \
- if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+ if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
rm -f $@.bin; \
$(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
$(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
rm -f $@.bin; \
else \
- $(TARGET_CC) -m64 -Wl,-melf_x86_64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
- if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+ $(TARGET_CC) -m64 $(EFIEMU64_LINK_FORMAT) -nostdlib -Wl,-r -o $@ $^ || exit 1; \
fi
platform_DATA += efiemu32.o efiemu64.o
--
1.8.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2] Explicitly check for linking format to use for efiemu64 module
2013-11-25 18:13 ` [PATCH v2] " Andrey Borzenkov
@ 2013-11-25 18:19 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-25 18:34 ` Andrey Borzenkov
0 siblings, 1 reply; 9+ messages in thread
From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2013-11-25 18:19 UTC (permalink / raw)
To: grub-devel
[-- Attachment #1: Type: text/plain, Size: 5382 bytes --]
On 25.11.2013 19:13, Andrey Borzenkov wrote:
> Similar to check for target linking format, also check for efiemu64
> instead of hardcoding -melf_x86_64. This fixes compilation on *BSD
> variants. We cannot easily reuse main target check because platforms
> are different (main target is 32 bit and efiemu64 - 64 bit).
>
> This commit adds EFIEMU64_LINK_FORMAT that contains detected
> link option and is used in efiemu64.o linking instead of hardcoded
> value.
Go ahead
>
> Reported-By: Beeblebrox <zaphod@berentweb.com>
> ---
> configure.ac | 29 +++++++++++++++++++++++++++--
> grub-core/Makefile.am | 9 ++++-----
> 2 files changed, 31 insertions(+), 7 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index d1292c9..1989f87 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -654,6 +654,30 @@ if test x"$efiemu_excuse" = x ; then
> efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
> fi
> fi
> +if test x"$efiemu_excuse" = x ; then
> + AC_CACHE_CHECK([for efiemu64 linking format], [grub_cv_target_cc_efiemu64_link_format], [
> + grub_cv_target_cc_efiemu64_link_format=unknown
> + for format in -melf_x86_64 -melf_x86_64_fbsd -melf_x86_64_obsd -melf_x86_64_haiku -arch,x86_64; do
> + CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
> + LDFLAGS="-m64 -Wl,$format -nostdlib -static"
> + AC_LINK_IFELSE([AC_LANG_PROGRAM([[
> + asm (".globl start; start:");
> + asm (".globl _start; _start:");
> + asm (".globl __start; __start:");
> + void __main (void);
> + void __main (void) {}
> + ]], [[]])], [flag=1], [flag=0])
> + if test x"$flag" = x1; then
> + grub_cv_target_cc_efiemu64_link_format="$format"
> + break;
> + fi
> + done])
> + if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
> + efiemu_excuse="no suitable link format for efiemu64 found"
> + else
> + EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
> + fi
> +fi
> if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
> AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
> fi
> @@ -663,11 +687,12 @@ else
> enable_efiemu=no
> fi
> AC_SUBST([enable_efiemu])
> +AC_SUBST([EFIEMU64_LINK_FORMAT])
>
> CFLAGS="$TARGET_CFLAGS"
>
> if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
> - AC_CACHE_CHECK([for linking format], [grub_cv_target_cc_link_format], [
> + AC_CACHE_CHECK([for target linking format], [grub_cv_target_cc_link_format], [
> grub_cv_target_cc_link_format=unknown
> for format in -melf_${target_cpu} -melf_${target_cpu}_fbsd -melf_${target_cpu}_obsd -melf_${target_cpu}_haiku -m${target_cpu}pe -arch,${target_cpu}; do
> if test x${target_cpu} != xi386 && test x$format = x${target_cpu}pe; then
> @@ -681,7 +706,7 @@ if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
> asm (".globl __start; __start:");
> void __main (void);
> void __main (void) {}
> - ]], [[]])], [flag=1], [])
> + ]], [[]])], [flag=1], [flag=0])
> if test x"$flag" = x1; then
> grub_cv_target_cc_link_format="$format"
> break;
> diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
> index e2da083..3ca52ea 100644
> --- a/grub-core/Makefile.am
> +++ b/grub-core/Makefile.am
> @@ -399,7 +399,7 @@ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
> fi
>
> efiemu64_c.o: efiemu/runtime/efiemu.c
> - if test "x$(TARGET_APPLE_LINKER)" = x1; then \
> + if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
> $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
> else \
> $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
> @@ -407,7 +407,7 @@ efiemu64_c.o: efiemu/runtime/efiemu.c
>
> efiemu64_s.o: efiemu/runtime/efiemu.S
> -rm -f $@
> - if test "x$(TARGET_APPLE_LINKER)" = x1; then \
> + if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
> $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
> else \
> $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
> @@ -415,14 +415,13 @@ efiemu64_s.o: efiemu/runtime/efiemu.S
>
> efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
> -rm -f $@; \
> - if test "x$(TARGET_APPLE_LINKER)" = x1; then \
> + if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
> rm -f $@.bin; \
> $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
> $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
> rm -f $@.bin; \
> else \
> - $(TARGET_CC) -m64 -Wl,-melf_x86_64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
> - if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
> + $(TARGET_CC) -m64 $(EFIEMU64_LINK_FORMAT) -nostdlib -Wl,-r -o $@ $^ || exit 1; \
> fi
>
> platform_DATA += efiemu32.o efiemu64.o
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 291 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] Explicitly check for linking format to use for efiemu64 module
2013-11-25 18:19 ` Vladimir 'φ-coder/phcoder' Serbinenko
@ 2013-11-25 18:34 ` Andrey Borzenkov
0 siblings, 0 replies; 9+ messages in thread
From: Andrey Borzenkov @ 2013-11-25 18:34 UTC (permalink / raw)
To: grub-devel
[-- Attachment #1: Type: text/plain, Size: 5827 bytes --]
В Mon, 25 Nov 2013 19:19:00 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com> пишет:
> On 25.11.2013 19:13, Andrey Borzenkov wrote:
> > Similar to check for target linking format, also check for efiemu64
> > instead of hardcoding -melf_x86_64. This fixes compilation on *BSD
> > variants. We cannot easily reuse main target check because platforms
> > are different (main target is 32 bit and efiemu64 - 64 bit).
> >
> > This commit adds EFIEMU64_LINK_FORMAT that contains detected
> > link option and is used in efiemu64.o linking instead of hardcoded
> > value.
> Go ahead
Committed with additional comment in grub-core/Makefile.am that
-arch,x86_64 == Apple linker
> >
> > Reported-By: Beeblebrox <zaphod@berentweb.com>
> > ---
> > configure.ac | 29 +++++++++++++++++++++++++++--
> > grub-core/Makefile.am | 9 ++++-----
> > 2 files changed, 31 insertions(+), 7 deletions(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index d1292c9..1989f87 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -654,6 +654,30 @@ if test x"$efiemu_excuse" = x ; then
> > efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
> > fi
> > fi
> > +if test x"$efiemu_excuse" = x ; then
> > + AC_CACHE_CHECK([for efiemu64 linking format], [grub_cv_target_cc_efiemu64_link_format], [
> > + grub_cv_target_cc_efiemu64_link_format=unknown
> > + for format in -melf_x86_64 -melf_x86_64_fbsd -melf_x86_64_obsd -melf_x86_64_haiku -arch,x86_64; do
> > + CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
> > + LDFLAGS="-m64 -Wl,$format -nostdlib -static"
> > + AC_LINK_IFELSE([AC_LANG_PROGRAM([[
> > + asm (".globl start; start:");
> > + asm (".globl _start; _start:");
> > + asm (".globl __start; __start:");
> > + void __main (void);
> > + void __main (void) {}
> > + ]], [[]])], [flag=1], [flag=0])
> > + if test x"$flag" = x1; then
> > + grub_cv_target_cc_efiemu64_link_format="$format"
> > + break;
> > + fi
> > + done])
> > + if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
> > + efiemu_excuse="no suitable link format for efiemu64 found"
> > + else
> > + EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
> > + fi
> > +fi
> > if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
> > AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
> > fi
> > @@ -663,11 +687,12 @@ else
> > enable_efiemu=no
> > fi
> > AC_SUBST([enable_efiemu])
> > +AC_SUBST([EFIEMU64_LINK_FORMAT])
> >
> > CFLAGS="$TARGET_CFLAGS"
> >
> > if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
> > - AC_CACHE_CHECK([for linking format], [grub_cv_target_cc_link_format], [
> > + AC_CACHE_CHECK([for target linking format], [grub_cv_target_cc_link_format], [
> > grub_cv_target_cc_link_format=unknown
> > for format in -melf_${target_cpu} -melf_${target_cpu}_fbsd -melf_${target_cpu}_obsd -melf_${target_cpu}_haiku -m${target_cpu}pe -arch,${target_cpu}; do
> > if test x${target_cpu} != xi386 && test x$format = x${target_cpu}pe; then
> > @@ -681,7 +706,7 @@ if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
> > asm (".globl __start; __start:");
> > void __main (void);
> > void __main (void) {}
> > - ]], [[]])], [flag=1], [])
> > + ]], [[]])], [flag=1], [flag=0])
> > if test x"$flag" = x1; then
> > grub_cv_target_cc_link_format="$format"
> > break;
> > diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
> > index e2da083..3ca52ea 100644
> > --- a/grub-core/Makefile.am
> > +++ b/grub-core/Makefile.am
> > @@ -399,7 +399,7 @@ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
> > fi
> >
> > efiemu64_c.o: efiemu/runtime/efiemu.c
> > - if test "x$(TARGET_APPLE_LINKER)" = x1; then \
> > + if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
> > $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
> > else \
> > $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
> > @@ -407,7 +407,7 @@ efiemu64_c.o: efiemu/runtime/efiemu.c
> >
> > efiemu64_s.o: efiemu/runtime/efiemu.S
> > -rm -f $@
> > - if test "x$(TARGET_APPLE_LINKER)" = x1; then \
> > + if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
> > $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
> > else \
> > $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
> > @@ -415,14 +415,13 @@ efiemu64_s.o: efiemu/runtime/efiemu.S
> >
> > efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
> > -rm -f $@; \
> > - if test "x$(TARGET_APPLE_LINKER)" = x1; then \
> > + if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
> > rm -f $@.bin; \
> > $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
> > $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
> > rm -f $@.bin; \
> > else \
> > - $(TARGET_CC) -m64 -Wl,-melf_x86_64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
> > - if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
> > + $(TARGET_CC) -m64 $(EFIEMU64_LINK_FORMAT) -nostdlib -Wl,-r -o $@ $^ || exit 1; \
> > fi
> >
> > platform_DATA += efiemu32.o efiemu64.o
> >
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-11-26 8:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-26 7:53 [PATCH v2] Explicitly check for linking format to use for efiemu64 module Beeblebrox
2013-11-26 8:41 ` Andrey Borzenkov
-- strict thread matches above, loose matches on Subject: below --
2013-11-26 7:31 Beeblebrox
2013-11-26 7:35 ` Andrey Borzenkov
2013-11-26 7:19 Beeblebrox
2013-11-26 7:25 ` Andrey Borzenkov
2013-11-25 17:51 [PATCH] " Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-25 18:13 ` [PATCH v2] " Andrey Borzenkov
2013-11-25 18:19 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-11-25 18:34 ` Andrey Borzenkov
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).