|
 |
c577568 |
--- xen-4.8.0/xen/arch/x86/Makefile.orig 2016-12-05 12:03:27.000000000 +0000
|
|
|
c577568 |
+++ xen-4.8.0/xen/arch/x86/Makefile 2017-02-28 00:02:27.989589825 +0000
|
|
|
c577568 |
@@ -73,6 +73,7 @@
|
|
|
c577568 |
efi-y := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \
|
|
|
c577568 |
-O $(BASEDIR)/include/xen/compile.h ]; then \
|
|
|
c577568 |
echo '$(TARGET).efi'; fi)
|
|
|
c577568 |
+LD_EFI ?= $(LD)
|
|
|
c577568 |
|
|
|
c577568 |
ifneq ($(build_id_linker),)
|
|
|
c577568 |
notes_phdrs = --notes
|
|
|
c577568 |
@@ -173,20 +174,20 @@
|
|
|
e2943f8 |
|
|
|
f8e0147 |
$(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
|
|
|
c9994c1 |
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
|
|
c9994c1 |
- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
|
|
c9994c1 |
+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
|
|
f8e0147 |
$(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
|
|
|
c9994c1 |
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
|
|
|
e2943f8 |
$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \
|
|
|
e2943f8 |
| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S
|
|
|
c9994c1 |
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
|
|
|
c9994c1 |
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
|
|
c9994c1 |
- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
|
|
c9994c1 |
+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
|
|
f8e0147 |
$(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :
|
|
|
c9994c1 |
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
|
|
|
e2943f8 |
$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \
|
|
|
e2943f8 |
| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S
|
|
|
c9994c1 |
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
|
|
|
c9994c1 |
- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
|
|
c9994c1 |
+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
|
|
e2943f8 |
$(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@
|
|
|
f8e0147 |
if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \
|
|
|
f8e0147 |
else $(NM) -pa --format=sysv $(@D)/$(@F) \
|
|
|
c577568 |
--- xen-4.8.0/xen/arch/x86/efi/Makefile.orig 2016-12-05 12:03:27.000000000 +0000
|
|
|
c577568 |
+++ xen-4.8.0/xen/arch/x86/efi/Makefile 2017-02-28 00:02:44.704192006 +0000
|
|
|
c577568 |
@@ -1,4 +1,5 @@
|
|
|
c577568 |
CFLAGS += -fshort-wchar
|
|
|
c577568 |
+LD_EFI ?= $(LD)
|
|
|
c577568 |
|
|
|
c577568 |
obj-y += stub.o
|
|
|
c577568 |
|
|
|
c577568 |
@@ -6,7 +7,7 @@
|
|
|
c9994c1 |
|
|
|
e2943f8 |
efi := y$(shell rm -f disabled)
|
|
|
a4a0b81 |
efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y))
|
|
|
c9994c1 |
-efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
|
|
|
c9994c1 |
+efi := $(if $(efi),$(shell $(LD_EFI) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
|
|
|
c9994c1 |
efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o)))
|
|
|
c9994c1 |
|
|
|
f8e0147 |
extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o buildid.o
|
|
|
c577568 |
--- xen-4.8.0/xen/Makefile.orig 2016-12-05 12:03:27.000000000 +0000
|
|
|
c577568 |
+++ xen-4.8.0/xen/Makefile 2017-02-28 00:02:54.080529810 +0000
|
|
|
c577568 |
@@ -20,6 +20,7 @@
|
|
|
e2943f8 |
MAKEFLAGS += -rR
|
|
|
c9994c1 |
|
|
|
a36066c |
EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi
|
|
|
c9994c1 |
+EFI_VENDOR=fedora
|
|
|
c9994c1 |
|
|
|
e2943f8 |
ARCH=$(XEN_TARGET_ARCH)
|
|
|
e2943f8 |
SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
|