vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-14 12:05:48 +01:00
parent 93fcc7ad73
commit ec525c18e1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2013-11-14 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.am (default_payload.elf): New target for easier coreboot * Makefile.am (default_payload.elf): New target for easier coreboot

2
grub-core/Makefile.am
View file

@ -421,7 +421,7 @@ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
$(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \ $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
rm -f $@.bin; \ rm -f $@.bin; \
else \ 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; \ if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
fi fi