* grub-core/Makefile.am (efiemu64.o): Explicitly set link format.

diff --git a/ChangeLog b/ChangeLog
index f785f28af27b18b6971c8e57c1a02b38b8fd532e..4728f8ae4c86628bde9e53255608ae6dd60766f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/Makefile.am (efiemu64.o): Explicitly set link format.
+
 2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * Makefile.am (default_payload.elf): New target for easier coreboot

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 6c20c7d590ac01ff099c086b5d4b088d93613bd9..e081559f8cc2a4841994ed1eaff0899c3c0bba81 100644 (file)
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -421,7 +421,7 @@ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
          $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
          rm -f $@.bin; \
        else \
-         $(TARGET_CC) -m64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
+         $(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; \
        fi