* grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu

platforms.
(grub-emu-lite): Remove kern/emu/cache.S.

diff --git a/ChangeLog b/ChangeLog
index c6bbffd99b53bab5bf4c5fbdf4bf5ffebc6e05c7..39a6b5146a30e6777d307c3e52203bdc3549866e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-24  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu
+       platforms.
+       (grub-emu-lite): Remove kern/emu/cache.S.
+
 2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/deviceiter.c (compare_devices): If the by-id link for a

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 46c65adac6fbf4de0a475809a3963fc048748fdd..098df91dc0955041d31d8a190bd5153f69ddb44c 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -162,6 +162,7 @@ kernel = {
   emu = disk/host.c;
   emu = gnulib/progname.c;
   emu = gnulib/error.c;
+  emu = kern/emu/cache.S;
   emu = kern/emu/console.c;
   emu = kern/emu/getroot.c;
   emu = kern/emu/hostdisk.c;
@@ -208,7 +209,6 @@ program = {
   name = grub-emu-lite;
 
   emu = kern/emu/lite.c;
-  emu = kern/emu/cache.S;
   emu_nodist = symlist.c;
 
   ldadd = 'kernel.img$(EXEEXT)';