boot: Fix debug experience

src/boot/efi/meson.build

@@ -92,6 +92,13 @@ efi_c_args += cc.get_supported_arguments(
         '-maccumulate-outgoing-args',
 )
 
+# Debug information has little value in release builds as no normal human being knows
+# how to attach a debugger to EFI binaries running on real hardware. Anyone who does
+# certainly has the means to do their own dev build.
+if get_option('mode') == 'developer' and get_option('debug')
+        efi_c_args += '-DEFI_DEBUG'
+endif
+
 efi_c_ld_args = [
         # We only support bfd. gold is going away, lld has issues with LTO on x86
         # and mold does not support linker scripts.

src/boot/efi/util.c

@@ -508,9 +508,9 @@ uint64_t get_os_indications_supported(void) {
 }
 
 #ifdef EFI_DEBUG
-extern uint8_t _text, _data;
+extern uint8_t __ImageBase;
 __attribute__((noinline)) void notify_debugger(const char *identity, volatile bool wait) {
-        printf("%s@%p,%p\n", identity, &_text, &_data);
+        printf("%s@%p\n", identity, &__ImageBase);
         if (wait)
                 printf("Waiting for debugger to attach...\n");