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 5/8] x86: drop use of prelink-efi.o
Date: Thu, 1 Apr 2021 11:46:00 +0200 [thread overview]
Message-ID: <ea4fd135-fe9a-ecea-c03f-0b518b800d4b@suse.com> (raw)
In-Reply-To: <b327185f-db31-50c8-ec76-6ef8f2fcfdfd@suse.com>
Now that its contents matches prelink.o, use that one uniformly.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -142,18 +142,12 @@ prelink_lto.o: $(ALL_OBJS) $(ALL_LIBS)
# Link it with all the binary objects
prelink.o: $(patsubst %/built_in.o,%/built_in_bin.o,$(ALL_OBJS)) prelink_lto.o FORCE
$(call if_changed,ld)
-
-prelink-efi.o: $(patsubst %/built_in.o,%/built_in_bin.o,$(ALL_OBJS)) prelink_lto.o FORCE
- $(call if_changed,ld)
else
prelink.o: $(ALL_OBJS) $(ALL_LIBS) FORCE
$(call if_changed,ld)
-
-prelink-efi.o: $(ALL_OBJS) $(ALL_LIBS) FORCE
- $(call if_changed,ld)
endif
-targets += prelink.o prelink-efi.o
+targets += prelink.o
$(TARGET)-syms: prelink.o xen.lds
$(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \
@@ -214,7 +208,7 @@ endif
note_file_option ?= $(note_file)
ifeq ($(XEN_BUILD_PE),y)
-$(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc
+$(TARGET).efi: prelink.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
$(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
$(BASEDIR)/common/symbols-dummy.o $(note_file_option) -o $(@D)/.$(@F).$(base).0 &&) :
next prev parent reply other threads:[~2021-04-01 9:46 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 ` [PATCH 3/8] x86/EFI: program headers are an ELF concept Jan Beulich
2021-04-21 9:11 ` 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 ` Jan Beulich [this message]
2021-04-21 9:51 ` [PATCH 5/8] x86: drop use of prelink-efi.o 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=ea4fd135-fe9a-ecea-c03f-0b518b800d4b@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 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.