* 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 6b726987af74963a581058d3e8ef8191643896e0..3970ec2931c088e3c0d11124f6ba4eaef65ef597 100644 (file)
--- 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 886e966cc37cdf8c30ae58093cdcdda8e1acf045..d5f009829c3eb15913730f53ef358412caf9520f 100644 (file)
--- 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