More compile fixes

grub-core/disk/alpha/srm/srmdisk.c

@@ -79,9 +79,12 @@ srmdisk_hash_add (char *devpath)
 
 
 static int
-grub_srmdisk_iterate (int (*hook) (const char *name))
+grub_srmdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
+		      grub_disk_pull_t pull)
 {
   (void) hook;
+  (void) pull;
+  (void) hook_data;
   return 0;
 }
 

grub-core/kern/alpha/dl.c

@@ -23,6 +23,8 @@
 #include <grub/cpu/types.h>
 #include <grub/mm.h>
 
+#pragma GCC diagnostic ignored "-Wcast-align"
+
 void
 grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
 				 grub_size_t *got)
@@ -30,7 +32,6 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
   const Elf64_Ehdr *e = ehdr;
   grub_size_t cntt = 0, cntg = 0;;
   const Elf64_Shdr *s;
-  Elf64_Word entsize;
   unsigned i;
 
   /* Find a symbol table.  */
@@ -43,7 +44,6 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
   if (i == grub_le_to_cpu16 (e->e_shnum))
     return;
 
-  entsize = s->sh_entsize;
 
   for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu32 (e->e_shoff));
        i < grub_le_to_cpu16 (e->e_shnum);

grub-core/kern/alpha/srm/init.c

@@ -82,6 +82,8 @@ get_pfn (grub_addr_t va, grub_uint64_t ptbr)
 
 void pal_init(void);
 
+grub_addr_t grub_modbase;
+
 void
 grub_machine_init (void)
 {
@@ -93,6 +95,7 @@ grub_machine_init (void)
   grub_uint64_t low_pfn = ~0ULL, high_pfn = 0;
 
   grub_arch_pccclock = GRUB_ALPHA_SRM_HWRPB.pcc_freq;
+  grub_modbase = (grub_addr_t) _end;
 
   grub_console_init_early ();
 
@@ -165,12 +168,6 @@ grub_machine_fini (void)
 {
 }
 
-void
-grub_machine_set_prefix (void)
-{
-  grub_env_set ("prefix", grub_prefix);
-}
-
 void
 grub_exit (void)
 {
@@ -183,14 +180,8 @@ grub_reboot (void)
   while (1);
 }
 
-grub_addr_t
-grub_arch_modules_addr (void)
-{
-  return (grub_addr_t) _end;
-}
-
 grub_err_t
-grub_machine_mmap_iterate (grub_memory_hook_t hook)
+grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
 {
   struct grub_alpha_srm_memdesc *memdesc;
   unsigned i;
@@ -204,19 +195,19 @@ grub_machine_mmap_iterate (grub_memory_hook_t hook)
       case GRUB_ALPHA_SRM_MEMDESC_ENTRY_TYPE_AVAILABLE:
 	hook (memdesc->entries[i].start_page << log_page_size,
 	      memdesc->entries[i].num_pages << log_page_size,
-	      GRUB_MEMORY_AVAILABLE);
+	      GRUB_MEMORY_AVAILABLE, hook_data);
 	break;
       case GRUB_ALPHA_SRM_MEMDESC_ENTRY_TYPE_NONVOLATILE:
 	hook (memdesc->entries[i].start_page << log_page_size,
 	      memdesc->entries[i].num_pages << log_page_size,
-	      GRUB_MEMORY_NVRAM);
+	      GRUB_MEMORY_NVRAM, hook_data);
 	break;
       case GRUB_ALPHA_SRM_MEMDESC_ENTRY_TYPE_RESERVED1:
       case GRUB_ALPHA_SRM_MEMDESC_ENTRY_TYPE_RESERVED2:
       default:
 	hook (memdesc->entries[i].start_page << log_page_size,
 	      memdesc->entries[i].num_pages << log_page_size,
-	      GRUB_MEMORY_RESERVED);
+	      GRUB_MEMORY_RESERVED, hook_data);
 	break;
       }
   return GRUB_ERR_NONE;

grub-core/lib/setjmp.S

@@ -13,6 +13,7 @@
 #include "./ia64/longjmp.S"
 #elif defined(__arm__)
 #include "./arm/setjmp.S"
+#elif defined(__alpha__)
 #else
 #error "Unknown target cpu type"
 #endif

grub-core/term/alpha/srm/console.c

@@ -71,8 +71,7 @@ static struct grub_terminfo_input_state grub_console_terminfo_input =
 static struct grub_terminfo_output_state grub_console_terminfo_output =
   {
     .put = put,
-    .width = 80,
+    .size = { 80, 24 }
-    .height = 25
   };
 
 static struct grub_term_input grub_console_term_input =
@@ -96,8 +95,7 @@ static struct grub_term_output grub_console_term_output =
     .setcursor = grub_terminfo_setcursor,
     .flags = GRUB_TERM_CODE_TYPE_ASCII,
     .data = &grub_console_terminfo_output,
-    .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+    .progress_update_divisor = GRUB_PROGRESS_FAST
-    .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
 
 void
@@ -109,8 +107,6 @@ grub_console_init_early (void)
   grub_term_register_output ("console", &grub_console_term_output);
 }
 
-void grub_terminfo_init (void);
-
 void
 grub_console_init_lately (void)
 {

include/grub/dl.h

@@ -254,9 +254,6 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
 
 #ifdef __alpha__
 #define GRUB_ARCH_DL_TRAMP_SIZE 0
-void
-grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
-				 grub_size_t *got);
 #define GRUB_ARCH_DL_TRAMP_ALIGN 16
 #define GRUB_ARCH_DL_GOT_ALIGN 16
 #endif

include/grub/kernel.h

@@ -78,8 +78,9 @@ struct grub_module_info64
 #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) \
   || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) \
   || defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_ARC) \
-  || defined (__sparc__) || defined (GRUB_MACHINE_UBOOT)
+  || defined (__sparc__) || defined (GRUB_MACHINE_UBOOT) \
-/* FIXME: stack is between 2 heap regions. Move it.  */
+  || defined (GRUB_MACHINE_ALPHA_SRM)
+/* FIXME: stack is between 2 heap regions on sparc. Move it.  */
 #define GRUB_KERNEL_PRELOAD_SPACE_REUSABLE 1
 #endif