[2039] 2009-03-22 Pavel Roskin <[email protected]>

Pavel Roskin <[email protected]>
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]> 
Revision: 2039
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2039
Author:   proski
Date:     2009-03-22 00:37:49 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
2009-03-22  Pavel Roskin  <[email protected]>

	* kern/powerpc/ieee1275/startup.S: Replace EXT_C(start) with
	_start.
	* kern/i386/pc/startup.S: Likewise.
	* kern/i386/efi/startup.S: Likewise.
	* kern/i386/ieee1275/startup.S: Likewise.
	* kern/i386/coreboot/startup.S: Likewise.
	* kern/x86_64/efi/startup.S: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/i386/coreboot/startup.S
    trunk/grub2/kern/i386/efi/startup.S
    trunk/grub2/kern/i386/ieee1275/startup.S
    trunk/grub2/kern/i386/pc/startup.S
    trunk/grub2/kern/powerpc/ieee1275/startup.S
    trunk/grub2/kern/x86_64/efi/startup.S

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/ChangeLog	2009-03-22 00:37:49 UTC (rev 2039)
@@ -1,5 +1,13 @@
 2009-03-22  Pavel Roskin  <[email protected]>
 
+	* kern/powerpc/ieee1275/startup.S: Replace EXT_C(start) with
+	_start.
+	* kern/i386/pc/startup.S: Likewise.
+	* kern/i386/efi/startup.S: Likewise.
+	* kern/i386/ieee1275/startup.S: Likewise.
+	* kern/i386/coreboot/startup.S: Likewise.
+	* kern/x86_64/efi/startup.S: Likewise.
+
 	* aclocal.m4 (grub_CHECK_START_SYMBOL): Remove.
 	* configure.ac: Don't call grub_CHECK_START_SYMBOL.
 	* kern/i386/pc/startup.S: Use _start instead of START_SYMBOL.

Modified: trunk/grub2/kern/i386/coreboot/startup.S
===================================================================
--- trunk/grub2/kern/i386/coreboot/startup.S	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/kern/i386/coreboot/startup.S	2009-03-22 00:37:49 UTC (rev 2039)
@@ -44,7 +44,7 @@
 	 *  This is a special data area at a fixed offset from the beginning.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -53,7 +53,7 @@
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
 
 /*
  *  Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).

Modified: trunk/grub2/kern/i386/efi/startup.S
===================================================================
--- trunk/grub2/kern/i386/efi/startup.S	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/kern/i386/efi/startup.S	2009-03-22 00:37:49 UTC (rev 2039)
@@ -34,14 +34,14 @@
          *  These MUST be at byte offset 6 and 7 of the executable
          *  DO NOT MOVE !!!
          */
-        . = EXT_C(start) + 0x6
+        . = _start + 0x6
         .byte   GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 
         /*
          *  This is a special data area 8 bytes from the beginning.
          */
 
-        . = EXT_C(start) + 0x8
+        . = _start + 0x8
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -50,7 +50,7 @@
          *  Leave some breathing room for the prefix.
          */
 
-        . = EXT_C(start) + 0x50
+        . = _start + 0x50
 
 codestart:
 	/*

Modified: trunk/grub2/kern/i386/ieee1275/startup.S
===================================================================
--- trunk/grub2/kern/i386/ieee1275/startup.S	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/kern/i386/ieee1275/startup.S	2009-03-22 00:37:49 UTC (rev 2039)
@@ -45,7 +45,7 @@
 	 *  This is a special data area at a fixed offset from the beginning.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -54,7 +54,7 @@
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
 
 codestart:
 	movl %eax, EXT_C(grub_ieee1275_entry_fn)

Modified: trunk/grub2/kern/i386/pc/startup.S
===================================================================
--- trunk/grub2/kern/i386/pc/startup.S	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/kern/i386/pc/startup.S	2009-03-22 00:37:49 UTC (rev 2039)
@@ -53,7 +53,7 @@
 #include <multiboot.h>
 #include <multiboot2.h>
 		
-#define ABS(x)	((x) - EXT_C(start) + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
+#define ABS(x)	((x) - _start + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
 	
 	.file	"startup.S"
 
@@ -77,14 +77,14 @@
 	 *  These MUST be at byte offset 6 and 7 of the executable
 	 *  DO NOT MOVE !!!
 	 */
-	. = EXT_C(start) + 0x6
+	. = _start + 0x6
 	.byte	GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 
 	/*
 	 *  This is a special data area 8 bytes from the beginning.
 	 */
 
-	. = EXT_C(start) + 0x8
+	. = _start + 0x8
 
 VARIABLE(grub_total_module_size)
 	.long	0
@@ -103,7 +103,7 @@
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 /*
  * Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).
@@ -510,7 +510,7 @@
  * The code beyond this point is compressed.  Assert that the uncompressed
  * code fits GRUB_KERNEL_MACHINE_RAW_SIZE.
  */
-	. = EXT_C(start) + GRUB_KERNEL_MACHINE_RAW_SIZE
+	. = _start + GRUB_KERNEL_MACHINE_RAW_SIZE
 
 /*
  *  This call is special...  it never returns...  in fact it should simply

Modified: trunk/grub2/kern/powerpc/ieee1275/startup.S
===================================================================
--- trunk/grub2/kern/powerpc/ieee1275/startup.S	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/kern/powerpc/ieee1275/startup.S	2009-03-22 00:37:49 UTC (rev 2039)
@@ -30,7 +30,7 @@
 _start:
 	b	codestart
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkelfimage */
@@ -39,7 +39,7 @@
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
 
 codestart:
 	li      2, 0

Modified: trunk/grub2/kern/x86_64/efi/startup.S
===================================================================
--- trunk/grub2/kern/x86_64/efi/startup.S	2009-03-22 00:31:30 UTC (rev 2038)
+++ trunk/grub2/kern/x86_64/efi/startup.S	2009-03-22 00:37:49 UTC (rev 2039)
@@ -36,14 +36,14 @@
          *  These MUST be at byte offset 6 and 7 of the executable
          *  DO NOT MOVE !!!
          */
-        . = EXT_C(start) + 0x6
+        . = _start + 0x6
         .byte   GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 
         /*
          *  This is a special data area 8 bytes from the beginning.
          */
 
-        . = EXT_C(start) + 0x8
+        . = _start + 0x8
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -52,7 +52,7 @@
          *  Leave some breathing room for the prefix.
          */
 
-        . = EXT_C(start) + 0x50
+        . = _start + 0x50
 
 codestart:
 	movq	%rcx, EXT_C(grub_efi_image_handle)(%rip)
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.