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

merge mainline into newreloc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-29 18:54:50 +02:00
commit a9c8da60f3
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.core.def (kernel): Add kern/mips/cache_flush.S to
extra_dist.
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/efiemu/runtime/efiemu.sh: Removed.
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com> 2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.util.def (grub-ofpathname): Add missing ldadd. * Makefile.util.def (grub-ofpathname): Add missing ldadd.

1
grub-core/Makefile.core.def
View file

@ -168,6 +168,7 @@ kernel = {
extra_dist = kern/i386/realmode.S; extra_dist = kern/i386/realmode.S;
extra_dist = kern/i386/pc/lzma_decode.S; extra_dist = kern/i386/pc/lzma_decode.S;
extra_dist = kern/mips/cache_flush.S;
}; };
program = { program = {

4
grub-core/efiemu/runtime/efiemu.sh
View file

@ -1,4 +0,0 @@
gcc -c -m32 -DELF32 -o efiemu32.o ./efiemu.c -Wall -Werror -nostdlib -O2 -I. -I../../include
gcc -c -m64 -DELF64 -o efiemu64_c.o ./efiemu.c -Wall -Werror -mcmodel=large -O2 -I. -I../../include
gcc -c -m64 -DELF64 -o efiemu64_s.o ./efiemu.S -Wall -Werror -mcmodel=large -O2 -I. -I../../include
ld -o efiemu64.o -r efiemu64_s.o efiemu64_c.o -nostdlib