From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Jan Beulich" <JBeulich@suse.com>,
"Roger Pau Monné" <roger.pau@citrix.com>, "Wei Liu" <wl@xen.org>,
"Anthony PERARD" <anthony.perard@citrix.com>
Subject: [PATCH v2 2/3] x86/build: Don't convert boot/{cmdline,head}.bin back to .S
Date: Fri, 12 Aug 2022 13:55:08 +0100 [thread overview]
Message-ID: <20220812125508.26104-1-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <20220414114708.4788-3-andrew.cooper3@citrix.com>
There's no point wasting time converting binaries back to asm source. Just
use .incbin directly. Explain in head.S what these binaries are.
Also, explicitly align the blobs. They contain 4-byte objects, and happen to
be 4-byte aligned currently because of the position of `lret` and the size of
cmdline.S but this is incredibly fragile.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Wei Liu <wl@xen.org>
CC: Anthony PERARD <anthony.perard@citrix.com>
v2:
* Drop CFLAGS -iquote
---
xen/arch/x86/boot/Makefile | 10 ++--------
xen/arch/x86/boot/head.S | 10 ++++++++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
index 1fb0ca02e87f..96beb420a260 100644
--- a/xen/arch/x86/boot/Makefile
+++ b/xen/arch/x86/boot/Makefile
@@ -7,10 +7,8 @@ targets += $(head-srcs:.S=.o)
head-srcs := $(addprefix $(obj)/, $(head-srcs))
-ifdef building_out_of_srctree
-$(obj)/head.o: CFLAGS-y += -iquote $(obj)
-endif
-$(obj)/head.o: $(head-srcs)
+$(obj)/head.o: AFLAGS-y += -Wa$(comma)-I$(obj)
+$(obj)/head.o: $(head-srcs:.S=.bin)
CFLAGS_x86_32 := $(subst -m64,-m32 -march=i686,$(XEN_TREEWIDE_CFLAGS))
$(call cc-options-add,CFLAGS_x86_32,CC,$(EMBEDDED_EXTRA_CFLAGS))
@@ -27,10 +25,6 @@ $(head-srcs:.S=.o): XEN_CFLAGS := $(CFLAGS_x86_32) -fpic
LDFLAGS_DIRECT-$(call ld-option,--warn-rwx-segments) := --no-warn-rwx-segments
LDFLAGS_DIRECT += $(LDFLAGS_DIRECT-y)
-$(head-srcs): %.S: %.bin
- (od -v -t x $< | tr -s ' ' | awk 'NR > 1 {print s} {s=$$0}' | \
- sed 's/ /,0x/g' | sed 's/,0x$$//' | sed 's/^[0-9]*,/ .long /') >$@
-
%.bin: %.lnk
$(OBJCOPY) -j .text -O binary $< $@
diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
index 3db47197b841..0fb7dd3029f2 100644
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -777,11 +777,17 @@ trampoline_setup:
/* Jump into the relocated trampoline. */
lret
+ /*
+ * cmdline and reloc are written in C, and linked to be 32bit PIC with
+ * entrypoints at 0 and using the stdcall convention.
+ */
+ ALIGN
cmdline_parse_early:
-#include "cmdline.S"
+ .incbin "cmdline.bin"
+ ALIGN
reloc:
-#include "reloc.S"
+ .incbin "reloc.bin"
ENTRY(trampoline_start)
#include "trampoline.S"
--
2.11.0
next prev parent reply other threads:[~2022-08-12 12:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-14 11:47 [PATCH 0/3] x86/build: Clean up 32bit boot objects Andrew Cooper
2022-04-14 11:47 ` [PATCH 1/3] x86/build: Rework binary conversion for boot/{cmdline,reloc}.c Andrew Cooper
2022-04-20 10:15 ` Jan Beulich
2022-04-14 11:47 ` [PATCH 2/3] x86/build: Don't convert boot/{cmdline,head}.bin back to .S Andrew Cooper
2022-04-14 16:27 ` [PATCH v1.1 " Andrew Cooper
2022-04-14 17:28 ` Anthony PERARD
2022-04-20 12:11 ` Jan Beulich
2022-04-20 12:47 ` Andrew Cooper
2022-08-12 12:55 ` Andrew Cooper [this message]
2022-08-12 13:26 ` [PATCH v2 " Jan Beulich
2022-04-14 11:47 ` [PATCH 3/3] x86/build: Clean up boot/Makefile Andrew Cooper
2022-04-14 17:45 ` Anthony PERARD
2022-04-14 19:27 ` Andrew Cooper
2022-04-20 12:07 ` 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=20220812125508.26104-1-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=anthony.perard@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.