From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 11 Nov 2011 23:26:04 +0000 (+0100)
Subject: 	* include/grub/dl.h (GRUB_ARCH_DL_TRAMP_SIZE) [__ia64__]: Add back
X-Git-Tag: 2.00~958
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b50787de091db9e94dc48fe68e3d79d5126d065d;p=thirdparty%2Fgrub.git

	* include/grub/dl.h (GRUB_ARCH_DL_TRAMP_SIZE) [__ia64__]: Add back
	forgotten define.
	(GRUB_ARCH_DL_GOT_ALIGN) [__ia64__]: Redefine in terms of
	GRUB_IA64_DL_GOT_ALIGN.
	(GRUB_ARCH_DL_TRAMP_ALIGN) [__ia64__]: Redefine in terms of
	GRUB_IA64_DL_TRAMP_ALIGN.
---

diff --git a/ChangeLog b/ChangeLog
index 6b726987a..3970ec293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,15 @@
 	* util/getroot.c (grub_util_get_geom_abstraction): Remove
 	__attribute__((unused)) from `os_dev', which *is* being used.
 
+2011-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/dl.h (GRUB_ARCH_DL_TRAMP_SIZE) [__ia64__]: Add back
+	forgotten define.
+	(GRUB_ARCH_DL_GOT_ALIGN) [__ia64__]: Redefine in terms of
+	GRUB_IA64_DL_GOT_ALIGN.
+	(GRUB_ARCH_DL_TRAMP_ALIGN) [__ia64__]: Redefine in terms of
+	GRUB_IA64_DL_TRAMP_ALIGN.
+
 2011-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Replace grub_fatal with normal errors in i386 linux loader.
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 886e966cc..d5f009829 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -178,8 +178,9 @@ grub_ia64_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
 				 grub_size_t *got);
 
 #if defined (__ia64__)
-#define GRUB_ARCH_DL_TRAMP_ALIGN 16
-#define GRUB_ARCH_DL_GOT_ALIGN 16
+#define GRUB_ARCH_DL_TRAMP_ALIGN GRUB_IA64_DL_TRAMP_ALIGN
+#define GRUB_ARCH_DL_GOT_ALIGN GRUB_IA64_DL_GOT_ALIGN
+#define GRUB_ARCH_DL_TRAMP_SIZE GRUB_IA64_DL_TRAMP_SIZE
 #define grub_arch_dl_get_tramp_got_size grub_ia64_dl_get_tramp_got_size
 #else
 void