Fix .org

diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
index ad24d4e2180fe8bd4329952659995cf5b0d5fe39..d17a1389ea015ec5359f014a085f7a5f0e1eaa08 100644 (file)
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -165,8 +165,8 @@ start:
         * this area.
         */
 
-       .org _start + GRUB_BOOT_MACHINE_BPB_START
-       .org _start + 4
+       .org GRUB_BOOT_MACHINE_BPB_START
+       .org 4
 #endif
 #ifdef HYBRID_BOOT
        floppy
@@ -174,7 +174,7 @@ start:
        scratch
 #endif
 
-       .org _start + GRUB_BOOT_MACHINE_BPB_END
+       .org GRUB_BOOT_MACHINE_BPB_END
        /*
         * End of BIOS parameter block.
         */
@@ -183,14 +183,14 @@ kernel_address:
        .word   GRUB_BOOT_MACHINE_KERNEL_ADDR
 
 #ifndef HYBRID_BOOT
-       .org _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
+       .org GRUB_BOOT_MACHINE_KERNEL_SECTOR
 kernel_sector:
        .long   1
 kernel_sector_high:
        .long   0
 #endif
 
-       .org _start + GRUB_BOOT_MACHINE_BOOT_DRIVE
+       .org GRUB_BOOT_MACHINE_BOOT_DRIVE
 boot_drive:
        .byte 0xff      /* the disk to load kernel from */
                        /* 0xff means use the boot drive */
@@ -208,7 +208,7 @@ LOCAL(after_BPB):
          * possible boot drive. If GRUB is installed into a floppy,
          * this does nothing (only jump).
          */
-       .org _start + GRUB_BOOT_MACHINE_DRIVE_CHECK
+       .org GRUB_BOOT_MACHINE_DRIVE_CHECK
 boot_drive_check:
         jmp     3f     /* grub-setup may overwrite this jump */
         testb   $0x80, %dl
@@ -511,13 +511,13 @@ LOCAL(message):
         */
 
 #ifdef HYBRID_BOOT
-       .org _start + 0x1b0
+       .org 0x1b0
 kernel_sector:
        .long   1
 kernel_sector_high:
        .long   0
 #endif
-       .org _start + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
+       .org GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
 nt_magic:
        .long 0
        .word 0
@@ -528,7 +528,7 @@ nt_magic:
         *  sneaky, huh?
        */
 
-       .org _start + GRUB_BOOT_MACHINE_PART_START
+       .org GRUB_BOOT_MACHINE_PART_START
 
 #ifndef HYBRID_BOOT
        floppy
@@ -536,7 +536,7 @@ nt_magic:
        scratch
 #endif
 
-       .org _start + GRUB_BOOT_MACHINE_PART_END
+       .org GRUB_BOOT_MACHINE_PART_END
        
 /* the last 2 bytes in the sector 0 contain the signature */
        .word   GRUB_BOOT_MACHINE_SIGNATURE

diff --git a/grub-core/boot/i386/pc/cdboot.S b/grub-core/boot/i386/pc/cdboot.S
index a2aed2cf20fc8f990f421a92d35011a416419033..de4f80929823891e61f738cc39de11c02a668f1d 100644 (file)
--- a/grub-core/boot/i386/pc/cdboot.S
+++ b/grub-core/boot/i386/pc/cdboot.S
@@ -43,7 +43,7 @@ _start:
 LOCAL(next):
        jmp     1f
 
-       .org start + 8
+       .org 8
 
 bi_pvd:
        .long 0         /* LBA of primary volume descriptor.  */
@@ -168,6 +168,6 @@ err_noboot_msg:
 err_cdfail_msg:
        .ascii  "cdrom read fails\0"
 
-       .org start + 0x7FF
+       .org 0x7FF
 
        .byte   0

diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
index 680c4b16c374a547cd0d3183a0f31c8c2f794478..1ee4cf5b2e0fd03ba177e953fafdaf5e0ca457a6 100644 (file)
--- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S
@@ -362,7 +362,7 @@ LOCAL(message):
        .word 0
        .word 0
 
-       .org _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
+       .org 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
 LOCAL(firstlist):      /* this label has to be before the first list entry!!! */
         /* fill the first data listing with the default */
 blocklist_default_start:

diff --git a/grub-core/boot/i386/pc/lnxboot.S b/grub-core/boot/i386/pc/lnxboot.S
index bf09577a6d522dd8eed8dd39d61a39ee39ab565c..292b77631b0f04fb47236f3f51d871d7062a8776 100644 (file)
--- a/grub-core/boot/i386/pc/lnxboot.S
+++ b/grub-core/boot/i386/pc/lnxboot.S
@@ -41,7 +41,7 @@ data_start:
        xorl    %ebp, %ebp
        jmp     LOCAL(linux_next)
 
-       .org data_start + 0x1F1
+       .org    0x1F1
 
 setup_sects:
        .byte   CODE_SECTORS
@@ -292,4 +292,4 @@ LOCAL(fail):
 err_int15_msg:
        .ascii  "move memory fails\0"
 
-       .org _start + CODE_SECTORS * 512
+       .org _start - data_start + CODE_SECTORS * 512

diff --git a/grub-core/boot/i386/pc/pxeboot.S b/grub-core/boot/i386/pc/pxeboot.S
index ac44ebcce73b45b3a5c63f5fcf6401cfb03df011..6ba91e99ca05c4852db5216edb19aec96f4fcc74 100644 (file)
--- a/grub-core/boot/i386/pc/pxeboot.S
+++ b/grub-core/boot/i386/pc/pxeboot.S
@@ -38,5 +38,5 @@ start:
        /* This region is a junk. Do you say that this is wasteful?
           But I like that the memory layout of the body is consistent
           among different kernels rather than scamping just for 1.5KB. */
-       .org _start + 0x8200 - 0x7C00 - 0x200 - 1
+       .org 0x8200 - 0x7C00 - 0x200 - 1
        .byte   0

diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 4b498cbae1d8d5d59eabf008d46a2b5e6007a69b..8bce7985c33b65e3d6e23b818b1f8c91708d8a1b 100644 (file)
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -50,23 +50,23 @@ LOCAL (base):
         *  This is a special data area.
         */
 
-       .org _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+       .org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 LOCAL(compressed_size):
        .long 0
-       .org _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+       .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 LOCAL(uncompressed_size):
        .long 0
 
-       .org _start + GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
+       .org GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
 reed_solomon_redundancy:
        .long   0
-       .org _start + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
+       .org GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
        .short  (LOCAL(reed_solomon_part) - _start)
 
 /*
  *  This is the area for all of the special variables.
  */
-       .org _start + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
+       .org GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
 LOCAL(boot_dev):
        .byte   0xFF, 0xFF, 0xFF
 LOCAL(boot_drive):

diff --git a/grub-core/boot/i386/qemu/boot.S b/grub-core/boot/i386/qemu/boot.S
index 70774d032b23577e435a0d294cd8f3109e447f0a..b07e1912d9a51c838a5f4c79ab6b6cc4978068fc 100644 (file)
--- a/grub-core/boot/i386/qemu/boot.S
+++ b/grub-core/boot/i386/qemu/boot.S
@@ -31,7 +31,7 @@ _start:
 
        jmp     1f
 
-       .org _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
+       .org GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
        .long   0
 1:

diff --git a/grub-core/boot/mips/loongson/fwstart.S b/grub-core/boot/mips/loongson/fwstart.S
index 4da6a6b88dffcaab0d60fea169c4707fd3306edc..71bab6dc8bd633480108de394d59538ea4d2135b 100644 (file)
--- a/grub-core/boot/mips/loongson/fwstart.S
+++ b/grub-core/boot/mips/loongson/fwstart.S
@@ -162,7 +162,7 @@ retry_cs5536:
 
        b continue
 
-       .org start + GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
+       .org GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
 tlb_refill:    
        mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
        mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
@@ -196,13 +196,13 @@ tlb_refill:
        b fatal
         addiu $a0, $a0, %lo(unhandled_tlb_refill)
 
-       .org start + GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
+       .org GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
 cache_error:
        lui $a0, %hi(unhandled_cache_error)
        b fatal
         addiu $a0, $a0, %lo(unhandled_cache_error)
 
-       .org start + GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
+       .org GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
 other_exception:
        mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE
        mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC

diff --git a/grub-core/boot/mips/startup_raw.S b/grub-core/boot/mips/startup_raw.S
index 9f399562516e949d3a1eab755b443635dd376ab6..2c990685f4e8de871b0aadc1f794162b2db01c02 100644 (file)
--- a/grub-core/boot/mips/startup_raw.S
+++ b/grub-core/boot/mips/startup_raw.S
@@ -39,13 +39,13 @@ start:
        bal codestart
         nop
 base:  
-       .org _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+       .org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 compressed_size:
        .long 0
-       .org _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+       .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 uncompressed_size:
        .long 0
-       .org _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
+       .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
 uncompressed_addr:
        .long 0
 codestart:

diff --git a/grub-core/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S
index c648c46c61ebe9a7a503b50e43b7678ede3282a5..586efb4014e8648e560fb43eee8eea8b09da669b 100644 (file)
--- a/grub-core/boot/sparc64/ieee1275/boot.S
+++ b/grub-core/boot/sparc64/ieee1275/boot.S
@@ -41,9 +41,9 @@ pic_base:
         * After loading in that block we will execute it by jumping to the
         * load address plus the size of the prepended A.OUT header (32 bytes).
         */
-       .org _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH
+       .org GRUB_BOOT_MACHINE_BOOT_DEVPATH
 boot_path:
-       .org _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
+       .org GRUB_BOOT_MACHINE_KERNEL_BYTE
 boot_path_end:
 kernel_byte:           .xword (2 << 9)
 kernel_address:                .word  GRUB_BOOT_MACHINE_KERNEL_ADDR
@@ -52,7 +52,7 @@ kernel_address:               .word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 #define boot_path_end (_start + 1024)
 #include <grub/offsets.h>
 
-       .org _start + 8
+       .org 8
 kernel_byte:           .xword (2 << 9)
 kernel_size:           .word  512
 kernel_address:                .word  GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS
@@ -224,7 +224,7 @@ bootpath_known:
 #else
         nop
 #endif
-       .org _start + GRUB_BOOT_MACHINE_CODE_END
+       .org GRUB_BOOT_MACHINE_CODE_END
 
 /* the last 4 bytes in the sector 0 contain the signature */
        .word   GRUB_BOOT_MACHINE_SIGNATURE

diff --git a/grub-core/boot/sparc64/ieee1275/diskboot.S b/grub-core/boot/sparc64/ieee1275/diskboot.S
index f84a5b453d8248eb3fbb0f41a4406c3b9d08a4b5..35e02c1b6d23a845f9a122242ec64a9072ab09ff 100644 (file)
--- a/grub-core/boot/sparc64/ieee1275/diskboot.S
+++ b/grub-core/boot/sparc64/ieee1275/diskboot.S
@@ -136,7 +136,7 @@ lastlist:
        .word   0
        .word   0
 
-       .org _start + (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
+       .org (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
 blocklist_default_start:
        .word   0
        .word   2

diff --git a/grub-core/kern/arm/uboot/startup.S b/grub-core/kern/arm/uboot/startup.S
index 0c4a5f6705733ca6a016f242e17783c4e549b555..a89de97dd966ac5efd3335e5aebae7779b2d8f99 100644 (file)
--- a/grub-core/kern/arm/uboot/startup.S
+++ b/grub-core/kern/arm/uboot/startup.S
@@ -51,7 +51,7 @@ FUNCTION(_start)
        b       codestart
        
        @ Size of final image integrated module blob - set by grub-mkimage
-       .org _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+       .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 VARIABLE(grub_total_module_size)
        .long   0
 

diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
index e2d5f562a76588fc3c62857ff37326c0937397a1..84084c904cbaae383ce8b0267c951c2044776e36 100644 (file)
--- a/grub-core/kern/i386/qemu/startup.S
+++ b/grub-core/kern/i386/qemu/startup.S
@@ -28,7 +28,7 @@
 _start:
        jmp     codestart
 
-       .org _start + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
+       .org GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
        .long   0
 

diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index 25d5fa583ed1145e5508714c64a3369c5c65ce7d..339ab337e507837d289e82591b967d9c7157666f 100644 (file)
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -36,7 +36,7 @@ start:
        bal cont
         nop
 
-       .org _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+       .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 VARIABLE(grub_total_modules_size)
        .long 0
 

diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
index 36f9691ae416f5cfde335fd54f8c4ba05303a2d5..03b916f053436467f2f8c8ec7f9810f63df9eda9 100644 (file)
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -27,7 +27,7 @@ _start:
        ba      codestart
         mov  %o4, %o0
 
-       .org EXT_C(_start) + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+       .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 
 VARIABLE(grub_total_module_size)
        .word   0

diff --git a/grub-core/tests/boot/kernel-8086.S b/grub-core/tests/boot/kernel-8086.S
index a2d1e6649e202f84650082eb8d5104c10d592abb..14b3bfab682b8b0935805790f70c87f0e126f8e8 100644 (file)
--- a/grub-core/tests/boot/kernel-8086.S
+++ b/grub-core/tests/boot/kernel-8086.S
@@ -46,5 +46,5 @@ message:
        .ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
        .byte 0
 
-       .org base + 510
+       .org 510
        .short 0xaa55
\ No newline at end of file