Avoid -fwhole-program on broken gcc instead of stopping build.

[seabios.git] / src / boot.c

diff --git a/src/boot.c b/src/boot.c
index 45d808f7eacc8be28b3f59c2774404d732660edc..26427ba51f8e46e6988eb3a486449d9ee861d219 100644 (file)
--- a/src/boot.c
+++ b/src/boot.c
@@ -205,7 +205,7 @@ interactive_bootmenu()
 
     printf("Press F12 for boot menu.\n\n");
 
-    int scan_code = get_keystroke(2500);
+    int scan_code = get_keystroke(CONFIG_BOOTMENU_WAIT);
     if (scan_code != 0x86)
         /* not F12 */
         return;
@@ -309,7 +309,7 @@ boot_prep()
 static void
 call_boot_entry(u16 bootseg, u16 bootip, u8 bootdrv)
 {
-    dprintf(1, "Booting from %x:%x\n", bootseg, bootip);
+    dprintf(1, "Booting from %04x:%04x\n", bootseg, bootip);
 
     struct bregs br;
     memset(&br, 0, sizeof(br));
@@ -463,7 +463,3 @@ handle_19()
     SET_EBDA(boot_sequence, 0);
     do_boot(0);
 }
-
-// Ughh - some older gcc compilers have a bug which causes VISIBLE32
-// functions to not be exported as global variables.
-asm(".global handle_18, handle_19");