|
|
e2943f8 |
--- xen-4.7.0/xen/arch/x86/Makefile.orig 2015-11-17 11:58:03.000000000 +0000
|
|
|
e2943f8 |
+++ xen-4.7.0/xen/arch/x86/Makefile 2015-12-02 20:37:06.659988893 +0000
|
|
|
e2943f8 |
@@ -132,20 +132,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) \
|
|
|
e2943f8 |
--- xen-4.7.0/xen/arch/x86/efi/Makefile.orig 2016-01-17 15:19:00.906417625 +0000
|
|
|
e2943f8 |
+++ xen-4.7.0/xen/arch/x86/efi/Makefile 2016-01-17 15:21:21.135489438 +0000
|
|
|
c9994c1 |
@@ -6,7 +6,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
|
|
|
e2943f8 |
--- xen-4.7.0/xen/Makefile.orig 2016-01-17 15:19:00.907417661 +0000
|
|
|
e2943f8 |
+++ xen-4.7.0/xen/Makefile 2016-01-17 15:25:22.916243997 +0000
|
|
|
e2943f8 |
@@ -19,6 +19,8 @@
|
|
|
e2943f8 |
MAKEFLAGS += -rR
|
|
|
c9994c1 |
|
|
|
a36066c |
EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi
|
|
|
c9994c1 |
+EFI_VENDOR=fedora
|
|
|
c9994c1 |
+LD_EFI ?= $(LD)
|
|
|
c9994c1 |
|
|
|
e2943f8 |
ARCH=$(XEN_TARGET_ARCH)
|
|
|
e2943f8 |
SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g')
|