mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging
This commit is contained in:
Jan Beulich committed
commit
76c7367d76
3 files changed
+156
-121
No files matched your search
+10
-33
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <xen/cache.h>
|
||||
#include <xen/lib.h>
|
||||
#include <xen/xen.lds.h>
|
||||
#include <asm/page.h>
|
||||
#undef ENTRY
|
||||
#undef ALIGN
|
||||
@@ -68,12 +69,7 @@ SECTIONS
|
||||
*(.proc.info)
|
||||
__proc_info_end = .;
|
||||
|
||||
#ifdef CONFIG_HAS_VPCI
|
||||
. = ALIGN(POINTER_ALIGN);
|
||||
__start_vpci_array = .;
|
||||
*(SORT(.data.vpci.*))
|
||||
__end_vpci_array = .;
|
||||
#endif
|
||||
VPCI_ARRAY
|
||||
} :text
|
||||
|
||||
#if defined(BUILD_ID)
|
||||
@@ -109,12 +105,7 @@ SECTIONS
|
||||
*(.data.schedulers)
|
||||
__end_schedulers_array = .;
|
||||
|
||||
#ifdef CONFIG_HYPFS
|
||||
. = ALIGN(8);
|
||||
__paramhypfs_start = .;
|
||||
*(.data.paramhypfs)
|
||||
__paramhypfs_end = .;
|
||||
#endif
|
||||
HYPFS_PARAM
|
||||
|
||||
*(.data .data.*)
|
||||
CONSTRUCTORS
|
||||
@@ -178,12 +169,7 @@ SECTIONS
|
||||
*(.altinstructions)
|
||||
__alt_instructions_end = .;
|
||||
|
||||
#ifdef CONFIG_DEBUG_LOCK_PROFILE
|
||||
. = ALIGN(POINTER_ALIGN);
|
||||
__lock_profile_start = .;
|
||||
*(.lockprofile.data)
|
||||
__lock_profile_end = .;
|
||||
#endif
|
||||
LOCK_PROFILE_DATA
|
||||
|
||||
*(.init.data)
|
||||
*(.init.data.rel)
|
||||
@@ -222,22 +208,13 @@ SECTIONS
|
||||
/* Section for the device tree blob (if any). */
|
||||
.dtb : { *(.dtb) } :text
|
||||
|
||||
/* Sections to be discarded */
|
||||
/DISCARD/ : {
|
||||
*(.exit.text)
|
||||
*(.exit.data)
|
||||
*(.exitcall.exit)
|
||||
*(.eh_frame)
|
||||
}
|
||||
DWARF2_DEBUG_SECTIONS
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
DISCARD_SECTIONS
|
||||
|
||||
STABS_DEBUG_SECTIONS
|
||||
|
||||
ELF_DETAILS_SECTIONS
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
+9
-88
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <xen/cache.h>
|
||||
#include <xen/lib.h>
|
||||
#include <xen/xen.lds.h>
|
||||
#include <asm/page.h>
|
||||
#undef ENTRY
|
||||
#undef ALIGN
|
||||
@@ -13,13 +14,6 @@
|
||||
#undef __XEN_VIRT_START
|
||||
#define __XEN_VIRT_START __image_base__
|
||||
#define DECL_SECTION(x) x :
|
||||
/*
|
||||
* Use the NOLOAD directive, despite currently ignored by (at least) GNU ld
|
||||
* for PE output, in order to record that we'd prefer these sections to not
|
||||
* be loaded into memory.
|
||||
*/
|
||||
#define DECL_DEBUG(x, a) #x ALIGN(a) (NOLOAD) : { *(x) }
|
||||
#define DECL_DEBUG2(x, y, a) #x ALIGN(a) (NOLOAD) : { *(x) *(y) }
|
||||
|
||||
ENTRY(efi_start)
|
||||
|
||||
@@ -27,8 +21,6 @@ ENTRY(efi_start)
|
||||
|
||||
#define FORMAT "elf64-x86-64"
|
||||
#define DECL_SECTION(x) #x : AT(ADDR(#x) - __XEN_VIRT_START)
|
||||
#define DECL_DEBUG(x, a) #x 0 : { *(x) }
|
||||
#define DECL_DEBUG2(x, y, a) #x 0 : { *(x) *(y) }
|
||||
|
||||
ENTRY(start_pa)
|
||||
|
||||
@@ -159,12 +151,7 @@ SECTIONS
|
||||
*(.note.gnu.build-id)
|
||||
__note_gnu_build_id_end = .;
|
||||
#endif
|
||||
#ifdef CONFIG_HAS_VPCI
|
||||
. = ALIGN(POINTER_ALIGN);
|
||||
__start_vpci_array = .;
|
||||
*(SORT(.data.vpci.*))
|
||||
__end_vpci_array = .;
|
||||
#endif
|
||||
VPCI_ARRAY
|
||||
} PHDR(text)
|
||||
|
||||
#if defined(CONFIG_PVH_GUEST) && !defined(EFI)
|
||||
@@ -278,12 +265,7 @@ SECTIONS
|
||||
*(.altinstructions)
|
||||
__alt_instructions_end = .;
|
||||
|
||||
#ifdef CONFIG_DEBUG_LOCK_PROFILE
|
||||
. = ALIGN(POINTER_ALIGN);
|
||||
__lock_profile_start = .;
|
||||
*(.lockprofile.data)
|
||||
__lock_profile_end = .;
|
||||
#endif
|
||||
LOCK_PROFILE_DATA
|
||||
|
||||
. = ALIGN(8);
|
||||
__ctors_start = .;
|
||||
@@ -335,12 +317,7 @@ SECTIONS
|
||||
*(.data.schedulers)
|
||||
__end_schedulers_array = .;
|
||||
|
||||
#ifdef CONFIG_HYPFS
|
||||
. = ALIGN(8);
|
||||
__paramhypfs_start = .;
|
||||
*(.data.paramhypfs)
|
||||
__paramhypfs_end = .;
|
||||
#endif
|
||||
HYPFS_PARAM
|
||||
} PHDR(text)
|
||||
|
||||
DECL_SECTION(.data) {
|
||||
@@ -387,33 +364,7 @@ SECTIONS
|
||||
efi = .;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Explicitly list debug sections, first of all to avoid these sections being
|
||||
* viewed as "orphan" by the linker.
|
||||
*
|
||||
* For the PE output this is further necessary so that they don't end up at
|
||||
* VA 0, which is below image base and thus invalid. Note that we're past
|
||||
* _end here, so if these sections get loaded they'll be discarded at runtime
|
||||
* anyway.
|
||||
*/
|
||||
DECL_DEBUG(.debug_abbrev, 1)
|
||||
DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1)
|
||||
DECL_DEBUG(.debug_types, 1)
|
||||
DECL_DEBUG(.debug_str, 1)
|
||||
DECL_DEBUG2(.debug_line, .debug_line.*, 1)
|
||||
DECL_DEBUG(.debug_line_str, 1)
|
||||
DECL_DEBUG(.debug_names, 4)
|
||||
DECL_DEBUG(.debug_frame, 4)
|
||||
DECL_DEBUG(.debug_loc, 1)
|
||||
DECL_DEBUG(.debug_loclists, 4)
|
||||
DECL_DEBUG(.debug_macinfo, 1)
|
||||
DECL_DEBUG(.debug_macro, 1)
|
||||
DECL_DEBUG(.debug_ranges, 8)
|
||||
DECL_DEBUG(.debug_rnglists, 4)
|
||||
DECL_DEBUG(.debug_addr, 8)
|
||||
DECL_DEBUG(.debug_aranges, 1)
|
||||
DECL_DEBUG(.debug_pubnames, 1)
|
||||
DECL_DEBUG(.debug_pubtypes, 1)
|
||||
DWARF2_DEBUG_SECTIONS
|
||||
|
||||
#ifdef EFI
|
||||
/* Trick the linker into setting the image size to no less than 16Mb. */
|
||||
@@ -427,42 +378,12 @@ SECTIONS
|
||||
hv_hcall_page = ABSOLUTE(HV_HCALL_PAGE - XEN_VIRT_START + __XEN_VIRT_START);
|
||||
#endif
|
||||
|
||||
/* Sections to be discarded */
|
||||
/DISCARD/ : {
|
||||
*(.text.exit)
|
||||
*(.exit.text)
|
||||
*(.exit.data)
|
||||
*(.exitcall.exit)
|
||||
*(.discard)
|
||||
*(.discard.*)
|
||||
*(.eh_frame)
|
||||
*(.dtors)
|
||||
*(.dtors.*)
|
||||
*(.fini_array)
|
||||
*(.fini_array.*)
|
||||
#ifdef EFI
|
||||
*(.comment)
|
||||
*(.comment.*)
|
||||
*(.note.*)
|
||||
#endif
|
||||
}
|
||||
DISCARD_SECTIONS
|
||||
|
||||
#ifndef EFI
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) *(.comment.*) }
|
||||
/*
|
||||
* LLVM ld also wants .symtab, .strtab, and .shstrtab placed. These look to
|
||||
* be benign to GNU ld, so we can have them here unconditionally.
|
||||
*/
|
||||
.symtab 0 : { *(.symtab) }
|
||||
.strtab 0 : { *(.strtab) }
|
||||
.shstrtab 0 : { *(.shstrtab) }
|
||||
STABS_DEBUG_SECTIONS
|
||||
|
||||
ELF_DETAILS_SECTIONS
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
#ifndef __XEN_LDS_H__
|
||||
#define __XEN_LDS_H__
|
||||
|
||||
/*
|
||||
* Common macros to be used in architecture specific linker scripts.
|
||||
*/
|
||||
|
||||
/*
|
||||
* To avoid any confusion, please note that the EFI macro does not correspond
|
||||
* to EFI support and is used when linking a native EFI (i.e. PE/COFF) binary,
|
||||
* hence its usage in this header.
|
||||
*/
|
||||
|
||||
/* Macros to declare debug sections. */
|
||||
#ifdef EFI
|
||||
/*
|
||||
* Use the NOLOAD directive, despite currently ignored by (at least) GNU ld
|
||||
* for PE output, in order to record that we'd prefer these sections to not
|
||||
* be loaded into memory.
|
||||
*/
|
||||
#define DECL_DEBUG(x, a) #x ALIGN(a) (NOLOAD) : { *(x) }
|
||||
#define DECL_DEBUG2(x, y, a) #x ALIGN(a) (NOLOAD) : { *(x) *(y) }
|
||||
#else
|
||||
#define DECL_DEBUG(x, a) #x 0 : { *(x) }
|
||||
#define DECL_DEBUG2(x, y, a) #x 0 : { *(x) *(y) }
|
||||
#endif
|
||||
|
||||
/*
|
||||
* DWARF2+ debug sections.
|
||||
* Explicitly list debug sections, first of all to avoid these sections being
|
||||
* viewed as "orphan" by the linker.
|
||||
*
|
||||
* For the PE output this is further necessary so that they don't end up at
|
||||
* VA 0, which is below image base and thus invalid. Note that this macro is
|
||||
* to be used after _end, so if these sections get loaded they'll be discarded
|
||||
* at runtime anyway.
|
||||
*/
|
||||
#define DWARF2_DEBUG_SECTIONS \
|
||||
DECL_DEBUG(.debug_abbrev, 1) \
|
||||
DECL_DEBUG2(.debug_info, .gnu.linkonce.wi.*, 1) \
|
||||
DECL_DEBUG(.debug_types, 1) \
|
||||
DECL_DEBUG(.debug_str, 1) \
|
||||
DECL_DEBUG2(.debug_line, .debug_line.*, 1) \
|
||||
DECL_DEBUG(.debug_line_str, 1) \
|
||||
DECL_DEBUG(.debug_names, 4) \
|
||||
DECL_DEBUG(.debug_frame, 4) \
|
||||
DECL_DEBUG(.debug_loc, 1) \
|
||||
DECL_DEBUG(.debug_loclists, 4) \
|
||||
DECL_DEBUG(.debug_macinfo, 1) \
|
||||
DECL_DEBUG(.debug_macro, 1) \
|
||||
DECL_DEBUG(.debug_ranges, POINTER_ALIGN) \
|
||||
DECL_DEBUG(.debug_rnglists, 4) \
|
||||
DECL_DEBUG(.debug_addr, POINTER_ALIGN) \
|
||||
DECL_DEBUG(.debug_aranges, 1) \
|
||||
DECL_DEBUG(.debug_pubnames, 1) \
|
||||
DECL_DEBUG(.debug_pubtypes, 1)
|
||||
|
||||
/* Stabs debug sections. */
|
||||
#define STABS_DEBUG_SECTIONS \
|
||||
.stab 0 : { *(.stab) } \
|
||||
.stabstr 0 : { *(.stabstr) } \
|
||||
.stab.excl 0 : { *(.stab.excl) } \
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) } \
|
||||
.stab.index 0 : { *(.stab.index) } \
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
|
||||
/*
|
||||
* ELF sections.
|
||||
*
|
||||
* LLVM ld also wants .symtab, .strtab, and .shstrtab placed. These look to
|
||||
* be benign to GNU ld, so we can have them here unconditionally.
|
||||
*/
|
||||
#define ELF_DETAILS_SECTIONS \
|
||||
.comment 0 : { *(.comment) *(.comment.*) } \
|
||||
.symtab 0 : { *(.symtab) } \
|
||||
.strtab 0 : { *(.strtab) } \
|
||||
.shstrtab 0 : { *(.shstrtab) }
|
||||
|
||||
#ifdef EFI
|
||||
#define DISCARD_EFI_SECTIONS \
|
||||
*(.comment) \
|
||||
*(.comment.*) \
|
||||
*(.note.*)
|
||||
#else
|
||||
#define DISCARD_EFI_SECTIONS
|
||||
#endif
|
||||
|
||||
/* Sections to be discarded. */
|
||||
#define DISCARD_SECTIONS \
|
||||
/DISCARD/ : { \
|
||||
*(.text.exit) \
|
||||
*(.exit.text) \
|
||||
*(.exit.data) \
|
||||
*(.exitcall.exit) \
|
||||
*(.discard) \
|
||||
*(.discard.*) \
|
||||
*(.eh_frame) \
|
||||
*(.dtors) \
|
||||
*(.dtors.*) \
|
||||
*(.fini_array) \
|
||||
*(.fini_array.*) \
|
||||
DISCARD_EFI_SECTIONS \
|
||||
}
|
||||
|
||||
/* List of constructs other than *_SECTIONS in alphabetical order. */
|
||||
|
||||
#ifdef CONFIG_HYPFS
|
||||
#define HYPFS_PARAM \
|
||||
. = ALIGN(POINTER_ALIGN); \
|
||||
__paramhypfs_start = .; \
|
||||
*(.data.paramhypfs) \
|
||||
__paramhypfs_end = .;
|
||||
#else
|
||||
#define HYPFS_PARAM
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DEBUG_LOCK_PROFILE
|
||||
#define LOCK_PROFILE_DATA \
|
||||
. = ALIGN(POINTER_ALIGN); \
|
||||
__lock_profile_start = .; \
|
||||
*(.lockprofile.data) \
|
||||
__lock_profile_end = .;
|
||||
#else
|
||||
#define LOCK_PROFILE_DATA
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_HAS_VPCI
|
||||
#define VPCI_ARRAY \
|
||||
. = ALIGN(POINTER_ALIGN); \
|
||||
__start_vpci_array = .; \
|
||||
*(SORT(.data.vpci.*)) \
|
||||
__end_vpci_array = .;
|
||||
#else
|
||||
#define VPCI_ARRAY
|
||||
#endif
|
||||
|
||||
#endif /* __XEN_LDS_H__ */
|
||||