From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 30 Nov 2013 18:36:10 +0000 (+0400)
Subject: fix libgrub.pp build post arm64 merge
X-Git-Tag: grub-2.02-beta1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5037aa9a7be2e244c7328fc3737a436ebcf05232;p=thirdparty%2Fgrub.git

fix libgrub.pp build post arm64 merge

grub-core/kern/arm64/dl_helper.c:26:28: fatal error: grub/cpu/reloc.h: No such file or directory
---

diff --git a/ChangeLog b/ChangeLog
index 1e306862b..7b663dbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-30  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* grub-core/kern/arm64/dl_helper.c: Include grub/arm64/reloc.h
+	directly, not via `cpu' link, to fix libgrub.pp generation.
+
 2013-11-30  Leif Lindholm <leif.lindholm@linaro.org>
 
 	New port arm64-efi.
diff --git a/grub-core/kern/arm64/dl_helper.c b/grub-core/kern/arm64/dl_helper.c
index b2f7ee591..6f99087e3 100644
--- a/grub-core/kern/arm64/dl_helper.c
+++ b/grub-core/kern/arm64/dl_helper.c
@@ -23,7 +23,7 @@
 #include <grub/err.h>
 #include <grub/mm.h>
 #include <grub/i18n.h>
-#include <grub/cpu/reloc.h>
+#include <grub/arm64/reloc.h>
 
 static grub_ssize_t
 sign_compress_offset (grub_ssize_t offset, int bitpos)