From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH 3/8] x86/EFI: program headers are an ELF concept
Date: Thu, 1 Apr 2021 11:45:09 +0200 [thread overview]
Message-ID: <017478f9-76d2-4dc4-de93-b662c4552968@suse.com> (raw)
In-Reply-To: <b327185f-db31-50c8-ec76-6ef8f2fcfdfd@suse.com>
While they apparently do no harm when building xen.efi, their use is
potentially misleading. Conditionalize their use to be for just the ELF
binary we produce.
No change to the resulting binaries.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -34,13 +34,19 @@ OUTPUT_FORMAT(FORMAT, FORMAT, FORMAT)
OUTPUT_ARCH(i386:x86-64)
+#ifndef EFI
PHDRS
{
text PT_LOAD ;
-#if (defined(BUILD_ID) || defined (CONFIG_PVH_GUEST)) && !defined(EFI)
+#if defined(BUILD_ID) || defined(CONFIG_PVH_GUEST)
note PT_NOTE ;
#endif
}
+#define PHDR(x) :x
+#else
+#define PHDR(x)
+#endif
+
SECTIONS
{
#if !defined(EFI)
@@ -83,7 +89,7 @@ SECTIONS
*(.text.kexec)
*(.gnu.warning)
_etext = .; /* End of text section */
- } :text = 0x9090
+ } PHDR(text) = 0x9090
. = ALIGN(SECTION_ALIGN);
__2M_text_end = .;
@@ -134,7 +140,7 @@ SECTIONS
*(SORT(.data.vpci.*))
__end_vpci_array = .;
#endif
- } :text
+ } PHDR(text)
#if defined(CONFIG_PVH_GUEST) && !defined(EFI)
DECL_SECTION(.note.Xen) {
@@ -160,7 +166,7 @@ SECTIONS
__note_gnu_build_id_start = .;
*(.buildid)
__note_gnu_build_id_end = .;
- } :text
+ }
#endif
#endif
@@ -260,7 +266,7 @@ SECTIONS
*(SORT(.data.vpci.*))
__end_vpci_array = .;
#endif
- } :text
+ } PHDR(text)
. = ALIGN(SECTION_ALIGN);
__init_end = .;
@@ -281,7 +287,7 @@ SECTIONS
*(.data.paramhypfs)
__paramhypfs_end = .;
#endif
- } :text
+ } PHDR(text)
DECL_SECTION(.data) {
*(.data.page_aligned)
@@ -289,7 +295,7 @@ SECTIONS
*(.data.rel)
*(.data.rel.*)
CONSTRUCTORS
- } :text
+ } PHDR(text)
DECL_SECTION(.bss) {
__bss_start = .;
@@ -306,7 +312,7 @@ SECTIONS
*(.bss)
. = ALIGN(POINTER_ALIGN);
__bss_end = .;
- } :text
+ } PHDR(text)
_end = . ;
. = ALIGN(SECTION_ALIGN);
@@ -316,12 +322,12 @@ SECTIONS
. = ALIGN(4);
DECL_SECTION(.reloc) {
*(.reloc)
- } :text
+ }
/* Trick the linker into setting the image size to exactly 16Mb. */
. = ALIGN(__section_alignment__);
DECL_SECTION(.pad) {
. = ALIGN(MB(16));
- } :text
+ }
#endif
#ifndef XEN_BUILD_EFI
next prev parent reply other threads:[~2021-04-01 9:45 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 9:43 [PATCH 0/8] x86/EFI: build adjustments Jan Beulich
2021-04-01 9:44 ` [PATCH 1/8] x86/EFI: drop stale section special casing when generating base relocs Jan Beulich
2021-04-01 11:51 ` Andrew Cooper
2021-04-01 9:44 ` [PATCH 2/8] x86/EFI: sections may not live at VA 0 in PE binaries Jan Beulich
2021-04-01 12:01 ` Andrew Cooper
2021-04-01 13:51 ` Jan Beulich
2021-04-21 8:52 ` Roger Pau Monné
2021-04-21 10:32 ` Jan Beulich
2021-04-21 12:57 ` Roger Pau Monné
2021-04-21 13:28 ` Jan Beulich
2021-04-01 9:45 ` Jan Beulich [this message]
2021-04-21 9:11 ` [PATCH 3/8] x86/EFI: program headers are an ELF concept Roger Pau Monné
2021-04-21 10:36 ` Jan Beulich
2021-04-21 14:21 ` Roger Pau Monné
2021-04-21 14:30 ` Jan Beulich
2021-04-01 9:45 ` [PATCH 4/8] x86/EFI: redo .reloc section bounds determination Jan Beulich
2021-04-21 9:46 ` Roger Pau Monné
2021-04-21 10:44 ` Jan Beulich
2021-04-21 14:54 ` Roger Pau Monné
2021-04-01 9:46 ` [PATCH 5/8] x86: drop use of prelink-efi.o Jan Beulich
2021-04-21 9:51 ` Roger Pau Monné
2021-04-01 9:46 ` [PATCH 6/8] x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible Jan Beulich
2021-04-21 10:21 ` Roger Pau Monné
2021-04-21 12:03 ` Jan Beulich
2021-04-21 15:20 ` Roger Pau Monné
2021-04-21 15:34 ` Jan Beulich
2021-04-22 7:22 ` Roger Pau Monné
2021-04-22 10:42 ` Jan Beulich
2021-04-01 9:47 ` [PATCH 7/8] x86/EFI: keep debug info in xen.efi Jan Beulich
2021-04-21 11:15 ` Roger Pau Monné
2021-04-21 13:06 ` Jan Beulich
2021-04-21 15:30 ` Roger Pau Monné
2021-04-21 15:38 ` Jan Beulich
2021-04-22 8:14 ` Roger Pau Monné
2021-04-22 11:03 ` Jan Beulich
2021-04-22 14:56 ` Roger Pau Monné
2021-04-22 15:46 ` Jan Beulich
2021-04-22 15:53 ` Roger Pau Monné
2021-04-22 16:01 ` Jan Beulich
2021-04-23 7:30 ` Roger Pau Monné
2021-04-23 8:51 ` Jan Beulich
2021-04-23 10:07 ` Roger Pau Monné
2021-04-23 10:45 ` Jan Beulich
2021-04-23 10:58 ` Roger Pau Monné
2021-04-01 9:47 ` [PATCH 8/8] x86/EFI: don't have an overly large image size Jan Beulich
2021-04-21 11:18 ` Roger Pau Monné
2021-04-21 13:15 ` Jan Beulich
2021-04-15 9:53 ` Ping: [PATCH 0/8] x86/EFI: build adjustments Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=017478f9-76d2-4dc4-de93-b662c4552968@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).