build: Remove multiple definitions of _start

Use _elf_start for entrypoints, and leave _start paired with _end for the
image.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/arch/x86/hvm/head.S b/arch/x86/hvm/head.S
index f7dc72b58ab9ec68538f0087969ab6f72d181d80..a5c11501b2bcdce81d81a06bd19383db68dbee03 100644 (file)
--- a/arch/x86/hvm/head.S
+++ b/arch/x86/hvm/head.S
@@ -8,7 +8,7 @@
 #include <xen/elfnote.h>
 
         .code32                 /* Always starts in 32bit flat mode. */
-GLOBAL(_start)                  /* HVM common setup. */
+GLOBAL(_elf_start)              /* HVM common setup. */
 
 #if CONFIG_PAGING_LEVELS > 0    /* Paging setup for CR3 and CR4 */
 
@@ -90,14 +90,14 @@ GLOBAL(_start)                  /* HVM common setup. */
         push $.Lmain_err_msg
 #endif
         call panic
-ENDFUNC(_start)
+ENDFUNC(_elf_start)
 
 DECLSTR(.Lmain_err_msg, "xtf_main() returned\n")
 
 /* All HVM XTF guests are compatible with the PVH ABI. */
 ENTRY(_pvh_start)
         mov %ebx, pvh_start_info
-        jmp _start
+        jmp _elf_start
 ENDFUNC(_pvh_start)
 ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY, .long _pvh_start)
 

diff --git a/arch/x86/link.lds.S b/arch/x86/link.lds.S
index 91df1e898a5110578d44f89722e094ec6c180cc0..f7356dd31f8a9474921ad144f5835dab8dbda5c9 100644 (file)
--- a/arch/x86/link.lds.S
+++ b/arch/x86/link.lds.S
@@ -22,7 +22,7 @@ OUTPUT_ARCH(i386)
 # error Bad architecture to link with
 #endif
 
-ENTRY(_start)
+ENTRY(_elf_start)
 
 PHDRS
 {

diff --git a/arch/x86/pv/head.S b/arch/x86/pv/head.S
index 7ccf482e7771c93b42d7a69ff7a50d51177696b1..5ff8b8a747f415fbc9e49f92e7757535a47b4eba 100644 (file)
--- a/arch/x86/pv/head.S
+++ b/arch/x86/pv/head.S
@@ -21,7 +21,7 @@ ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes")
         __ASM_SEL(.code32, .code64)
 
  /* PV entry point. */
-GLOBAL(_start)
+GLOBAL(_elf_start)
 
         /* Stash the pv_start_info pointer from domain builder. */
         mov %_ASM_SI, pv_start_info
@@ -38,7 +38,7 @@ GLOBAL(_start)
         push $.Lmain_err_msg
 #endif
         call panic
-ENDFUNC(_start)
+ENDFUNC(_elf_start)
 
 DECLSTR(.Lmain_err_msg, "xtf_main() returned\n")