From b29ab8b194e3543aa481568e4af0e9ffbad01636 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 21 Jul 2015 20:30:00 -0400 Subject: [PATCH 1/6] Put the correct .file directives in our .S files. The wrong path makes generating debuginfo not work correctly. Signed-off-by: Peter Jones --- grub-core/boot/i386/pc/boot.S | 2 +- grub-core/boot/i386/pc/cdboot.S | 2 +- grub-core/boot/i386/pc/diskboot.S | 2 +- grub-core/boot/i386/pc/lnxboot.S | 2 +- grub-core/boot/i386/pc/pxeboot.S | 2 +- grub-core/boot/i386/pc/startup_raw.S | 2 +- grub-core/efiemu/runtime/efiemu.S | 2 +- grub-core/kern/arm/cache.S | 2 +- grub-core/kern/arm/cache_armv6.S | 2 +- grub-core/kern/arm/cache_armv7.S | 4 ++-- grub-core/kern/arm/compiler-rt.S | 2 +- grub-core/kern/arm/efi/startup.S | 2 +- grub-core/kern/arm64/cache_flush.S | 2 +- grub-core/kern/arm64/efi/startup.S | 2 +- grub-core/kern/i386/coreboot/startup.S | 2 +- grub-core/kern/i386/efi/startup.S | 2 +- grub-core/kern/i386/ieee1275/startup.S | 2 +- grub-core/kern/i386/pc/startup.S | 2 +- grub-core/kern/i386/xen/startup.S | 2 +- grub-core/kern/sparc64/cache.S | 2 +- grub-core/kern/x86_64/efi/callwrap.S | 2 +- grub-core/kern/x86_64/efi/startup.S | 2 +- grub-core/kern/x86_64/xen/startup.S | 2 +- grub-core/lib/arm/setjmp.S | 2 +- grub-core/lib/arm64/setjmp.S | 2 +- grub-core/lib/i386/setjmp.S | 2 +- grub-core/lib/ia64/setjmp.S | 2 +- grub-core/lib/mips/setjmp.S | 2 +- grub-core/lib/powerpc/setjmp.S | 2 +- grub-core/lib/sparc64/setjmp.S | 2 +- grub-core/lib/x86_64/setjmp.S | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S index ea167fe..96ced2f 100644 --- a/grub-core/boot/i386/pc/boot.S +++ b/grub-core/boot/i386/pc/boot.S @@ -108,7 +108,7 @@ cylinder_start: /* more space... */ .endm - .file "boot.S" + .file "grub-core/boot/i386/pc/boot.S" .text diff --git a/grub-core/boot/i386/pc/cdboot.S b/grub-core/boot/i386/pc/cdboot.S index de4f809..d30b4be 100644 --- a/grub-core/boot/i386/pc/cdboot.S +++ b/grub-core/boot/i386/pc/cdboot.S @@ -22,7 +22,7 @@ #include #include - .file "cdboot.S" + .file "grub-core/boot/i386/pc/cdboot.S" #define CODE_ADDR 0x6000 #define DATA_ADDR ((GRUB_BOOT_MACHINE_KERNEL_ADDR) + 0x200) diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S index c8b87ed..14c6d83 100644 --- a/grub-core/boot/i386/pc/diskboot.S +++ b/grub-core/boot/i386/pc/diskboot.S @@ -25,7 +25,7 @@ #define MSG(x) movw $x, %si; call LOCAL(message) - .file "diskboot.S" + .file "grub-core/boot/i386/pc/diskboot.S" .text diff --git a/grub-core/boot/i386/pc/lnxboot.S b/grub-core/boot/i386/pc/lnxboot.S index 2dda0e0..ca8e2b9 100644 --- a/grub-core/boot/i386/pc/lnxboot.S +++ b/grub-core/boot/i386/pc/lnxboot.S @@ -23,7 +23,7 @@ #include #include - .file "lnxboot.S" + .file "grub-core/boot/i386/pc/lnxboot.S" #define CODE_ADDR 0x6000 #define CODE_SECTORS 1 diff --git a/grub-core/boot/i386/pc/pxeboot.S b/grub-core/boot/i386/pc/pxeboot.S index b695b24..d200c69 100644 --- a/grub-core/boot/i386/pc/pxeboot.S +++ b/grub-core/boot/i386/pc/pxeboot.S @@ -18,7 +18,7 @@ #include - .file "pxeboot.S" + .file "grub-core/boot/i386/pc/pxeboot.S" .text /* Start with the prehistoric environment... */ diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S index 8bce798..ded7060 100644 --- a/grub-core/boot/i386/pc/startup_raw.S +++ b/grub-core/boot/i386/pc/startup_raw.S @@ -25,7 +25,7 @@ #define ABS(x) ((x) - LOCAL (base) + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200) - .file "startup_raw.S" + .file "grub-core/boot/i386/pc/startup_raw.S" .text diff --git a/grub-core/efiemu/runtime/efiemu.S b/grub-core/efiemu/runtime/efiemu.S index b502314..cca0e6c 100644 --- a/grub-core/efiemu/runtime/efiemu.S +++ b/grub-core/efiemu/runtime/efiemu.S @@ -30,7 +30,7 @@ * */ - .file "efiemu.S" + .file "grub-core/efiemu/runtime/efiemu.S" .text FUNCTION (efiemu_get_time) diff --git a/grub-core/kern/arm/cache.S b/grub-core/kern/arm/cache.S index 354a069..85f93dd 100644 --- a/grub-core/kern/arm/cache.S +++ b/grub-core/kern/arm/cache.S @@ -18,7 +18,7 @@ #include - .file "cache.S" + .file "grub-core/kern/arm/cache.S" .text .syntax unified #if !defined (__thumb2__) || !defined (ARMV7) diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S index dfaded0..4e592b3 100644 --- a/grub-core/kern/arm/cache_armv6.S +++ b/grub-core/kern/arm/cache_armv6.S @@ -18,7 +18,7 @@ #include - .file "cache_armv6.S" + .file "grub-core/kern/arm/cache_armv6.S" .text .syntax unified .arm diff --git a/grub-core/kern/arm/cache_armv7.S b/grub-core/kern/arm/cache_armv7.S index 1ef2754..bb4f0ad 100644 --- a/grub-core/kern/arm/cache_armv7.S +++ b/grub-core/kern/arm/cache_armv7.S @@ -18,7 +18,7 @@ #include - .file "cache_armv7.S" + .file "grub-core/kern/arm/cache_armv7.S" .text .syntax unified #if !defined (__thumb2__) @@ -123,4 +123,4 @@ clean_invalidate_dcache: pop {r4-r12, lr} bx lr -#include "cache.S" \ No newline at end of file +#include "cache.S" diff --git a/grub-core/kern/arm/compiler-rt.S b/grub-core/kern/arm/compiler-rt.S index 645b42f..8b9168d 100644 --- a/grub-core/kern/arm/compiler-rt.S +++ b/grub-core/kern/arm/compiler-rt.S @@ -19,7 +19,7 @@ #include #include - .file "misc.S" + .file "grub-core/kern/arm/compiler-rt.S" .text .syntax unified #if !defined (__thumb2__) diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S index 9f82653..09009f3 100644 --- a/grub-core/kern/arm/efi/startup.S +++ b/grub-core/kern/arm/efi/startup.S @@ -20,7 +20,7 @@ #include - .file "startup.S" + .file "grub-core/kern/arm/efi/startup.S" .text .arm FUNCTION(_start) diff --git a/grub-core/kern/arm64/cache_flush.S b/grub-core/kern/arm64/cache_flush.S index e064f7e..bf8192b 100644 --- a/grub-core/kern/arm64/cache_flush.S +++ b/grub-core/kern/arm64/cache_flush.S @@ -18,7 +18,7 @@ #include - .file "cache_flush.S" + .file "grub-core/kern/arm64/cache_flush.S" .text /* diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S index 666a7ee..82b566c 100644 --- a/grub-core/kern/arm64/efi/startup.S +++ b/grub-core/kern/arm64/efi/startup.S @@ -18,7 +18,7 @@ #include - .file "startup.S" + .file "grub-core/kern/arm64/efi/startup.S" .text FUNCTION(_start) /* diff --git a/grub-core/kern/i386/coreboot/startup.S b/grub-core/kern/i386/coreboot/startup.S index c848654..7bdbfcc 100644 --- a/grub-core/kern/i386/coreboot/startup.S +++ b/grub-core/kern/i386/coreboot/startup.S @@ -31,7 +31,7 @@ * with "ret $N" where N is ((the number of arguments) - 3) * 4. */ - .file "startup.S" + .file "grub-core/kern/i386/coreboot/startup.S" .text .globl start, _start start: diff --git a/grub-core/kern/i386/efi/startup.S b/grub-core/kern/i386/efi/startup.S index fc5ea3d..5f27e07 100644 --- a/grub-core/kern/i386/efi/startup.S +++ b/grub-core/kern/i386/efi/startup.S @@ -20,7 +20,7 @@ #include #include - .file "startup.S" + .file "grub-core/kern/i386/efi/startup.S" .text .globl start, _start start: diff --git a/grub-core/kern/i386/ieee1275/startup.S b/grub-core/kern/i386/ieee1275/startup.S index 245583b..ae6476c 100644 --- a/grub-core/kern/i386/ieee1275/startup.S +++ b/grub-core/kern/i386/ieee1275/startup.S @@ -30,7 +30,7 @@ * with "ret $N" where N is ((the number of arguments) - 3) * 4. */ - .file "startup.S" + .file "grub-core/kern/i386/ieee1275/startup.S" .text .globl start, _start diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S index b8a9b33..e7eb91c 100644 --- a/grub-core/kern/i386/pc/startup.S +++ b/grub-core/kern/i386/pc/startup.S @@ -48,7 +48,7 @@ #include #endif - .file "startup.S" + .file "grub-core/kern/i386/pc/startup.S" .text diff --git a/grub-core/kern/i386/xen/startup.S b/grub-core/kern/i386/xen/startup.S index fbe8300..52b2926 100644 --- a/grub-core/kern/i386/xen/startup.S +++ b/grub-core/kern/i386/xen/startup.S @@ -20,7 +20,7 @@ #include #include - .file "startup.S" + .file "grub-core/kern/i386/xen/startup.S" .text .globl start, _start .code32 diff --git a/grub-core/kern/sparc64/cache.S b/grub-core/kern/sparc64/cache.S index 1a16add..15cfadf 100644 --- a/grub-core/kern/sparc64/cache.S +++ b/grub-core/kern/sparc64/cache.S @@ -19,7 +19,7 @@ #include - .file "cache.S" + .file "grub-core/kern/sparc64/cache.S" .text diff --git a/grub-core/kern/x86_64/efi/callwrap.S b/grub-core/kern/x86_64/efi/callwrap.S index 1337fd9..ba6f306 100644 --- a/grub-core/kern/x86_64/efi/callwrap.S +++ b/grub-core/kern/x86_64/efi/callwrap.S @@ -32,7 +32,7 @@ * */ - .file "callwrap.S" + .file "grub-core/kern/x86_64/efi/callwrap.S" .text FUNCTION(efi_wrap_0) diff --git a/grub-core/kern/x86_64/efi/startup.S b/grub-core/kern/x86_64/efi/startup.S index 9357e5c..d223648 100644 --- a/grub-core/kern/x86_64/efi/startup.S +++ b/grub-core/kern/x86_64/efi/startup.S @@ -20,7 +20,7 @@ #include #include - .file "startup.S" + .file "grub-core/kern/x86_64/efi/startup.S" .text .globl start, _start .code64 diff --git a/grub-core/kern/x86_64/xen/startup.S b/grub-core/kern/x86_64/xen/startup.S index 21a139f..cc74fe9 100644 --- a/grub-core/kern/x86_64/xen/startup.S +++ b/grub-core/kern/x86_64/xen/startup.S @@ -20,7 +20,7 @@ #include #include - .file "startup.S" + .file "grub-core/kern/x86_64/xen/startup.S" .text .globl start, _start .code64 diff --git a/grub-core/lib/arm/setjmp.S b/grub-core/lib/arm/setjmp.S index a5373d3..6f58685 100644 --- a/grub-core/lib/arm/setjmp.S +++ b/grub-core/lib/arm/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/arm/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" diff --git a/grub-core/lib/arm64/setjmp.S b/grub-core/lib/arm64/setjmp.S index eabfd99..006660b 100644 --- a/grub-core/lib/arm64/setjmp.S +++ b/grub-core/lib/arm64/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/arm64/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" .text diff --git a/grub-core/lib/i386/setjmp.S b/grub-core/lib/i386/setjmp.S index 0b0740f..08271c9 100644 --- a/grub-core/lib/i386/setjmp.S +++ b/grub-core/lib/i386/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/i386/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" diff --git a/grub-core/lib/ia64/setjmp.S b/grub-core/lib/ia64/setjmp.S index a0382d8..dba2cbf 100644 --- a/grub-core/lib/ia64/setjmp.S +++ b/grub-core/lib/ia64/setjmp.S @@ -67,7 +67,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/ia64/setjmp.S" GRUB_MOD_LICENSE "GPLv2+" diff --git a/grub-core/lib/mips/setjmp.S b/grub-core/lib/mips/setjmp.S index f012945..365824c 100644 --- a/grub-core/lib/mips/setjmp.S +++ b/grub-core/lib/mips/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/mips/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" diff --git a/grub-core/lib/powerpc/setjmp.S b/grub-core/lib/powerpc/setjmp.S index 716b563..2e6cf16 100644 --- a/grub-core/lib/powerpc/setjmp.S +++ b/grub-core/lib/powerpc/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/powerpc/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" diff --git a/grub-core/lib/sparc64/setjmp.S b/grub-core/lib/sparc64/setjmp.S index 6c11bdd..ef516a5 100644 --- a/grub-core/lib/sparc64/setjmp.S +++ b/grub-core/lib/sparc64/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/sparc64/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" diff --git a/grub-core/lib/x86_64/setjmp.S b/grub-core/lib/x86_64/setjmp.S index 6b151bc..c975897 100644 --- a/grub-core/lib/x86_64/setjmp.S +++ b/grub-core/lib/x86_64/setjmp.S @@ -19,7 +19,7 @@ #include #include - .file "setjmp.S" + .file "grub-core/lib/x86_64/setjmp.S" GRUB_MOD_LICENSE "GPLv3+" -- 2.4.3