Initial Commit

7 files changed, 576 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..d006eb4324f2
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,24 @@
+pkgbase = gnu-efi-libs-fedora-git
+	pkgdesc = Library for building x86_64 and i386 UEFI Applications using GNU toolchain - Fedora GIT Version
+	pkgver = 20121112
+	pkgrel = 1
+	url = http://sourceforge.net/projects/gnu-efi/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = pciutils
+	provides = gnu-efi-libs
+	conflicts = gnu-efi-libs
+	options = !strip
+	options = !makeflags
+	source = gnu-efi-fix-x86_64-uefi-call-wrapper.patch
+	source = gnu-efi-fedora-disable-USE_MS_ABI.patch
+	source = gnu-efi-fedora-IA32-build-fix.patch
+	source = gnu-efi-fedora-fix-makefile-vars.patch
+	sha1sums = 8918de3aefba2a3dc367bbb28611394c4c300a6d
+	sha1sums = 5e6b30cdf2c1d89ccb3f5314bb3e0ef0d45b0001
+	sha1sums = 51ac3eb4667f75dd50acbc3b8805f75fa64b4d7e
+	sha1sums = 09144dd3ec664b96714fe92d823e31bd1bb747e9
+
+pkgname = gnu-efi-libs-fedora-git
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..052b8ece5212
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+src/
+pkg/
+*.tar.xz
+*.tar.gz
+*.sig
+*.log*
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..81afca5cfb81
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,151 @@
+# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+
+pkgname="gnu-efi-libs-fedora-git"
+pkgver="20121112"
+pkgrel="1"
+pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain - Fedora GIT Version"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('pciutils')
+options=('!strip' '!makeflags')
+
+if [[ "${CARCH}" == "x86_64" ]]; then
+	makedepends+=('lib32-glibc')
+fi
+
+conflicts=('gnu-efi-libs')
+provides=('gnu-efi-libs')
+
+source=('gnu-efi-fix-x86_64-uefi-call-wrapper.patch'
+        'gnu-efi-fedora-disable-USE_MS_ABI.patch'
+        'gnu-efi-fedora-IA32-build-fix.patch'
+        'gnu-efi-fedora-fix-makefile-vars.patch')
+
+sha1sums=('8918de3aefba2a3dc367bbb28611394c4c300a6d'
+          '5e6b30cdf2c1d89ccb3f5314bb3e0ef0d45b0001'
+          '51ac3eb4667f75dd50acbc3b8805f75fa64b4d7e'
+          '09144dd3ec664b96714fe92d823e31bd1bb747e9')
+
+_gitroot="git://github.com/vathpela/gnu-efi.git"
+_gitname="gnu-efi-fedora"
+_gitbranch="fedora"
+
+_update_git() {
+	cd "${srcdir}/"
+	
+	msg "Connecting to GIT server...."
+	
+	if [[ -d "${srcdir}/${_gitname}/" ]]; then
+		cd "${srcdir}/${_gitname}/"
+		git reset --hard
+		git fetch
+		git checkout "${_gitbranch}"
+		git merge "remotes/origin/${_gitbranch}"
+		msg "The local GIT repo has been updated."
+	else
+		git clone "${_gitroot}" "${_gitname}"
+		cd "${srcdir}/${_gitname}/"
+		git checkout "${_gitbranch}"
+		msg "GIT checkout done or server timeout"
+	fi
+	
+	echo
+}
+
+_build_gnu-efi-libs-x86_64() {
+	cp -r "${srcdir}/${_gitname}_build" "${srcdir}/${_gitname}_build-x86_64"
+	cd "${srcdir}/${_gitname}_build-x86_64/"
+	
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	
+	ARCH="x86_64" make -j1
+	echo
+	
+	ARCH="x86_64" make -j1 -C apps all
+	echo
+}
+
+_build_gnu-efi-libs-i386() {
+	cp -r "${srcdir}/${_gitname}_build" "${srcdir}/${_gitname}_build-i386"
+	cd "${srcdir}/${_gitname}_build-i386/"
+	
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	
+	ARCH="ia32" make -j1
+	echo
+	
+	ARCH="ia32" make -j1 -C apps all
+	echo
+}
+
+build() {
+	_update_git
+	
+	rm -rf "${srcdir}/${_gitname}_build/" || true
+	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
+	
+	cd "${srcdir}/${_gitname}_build"
+	
+	## Fix x86_64 UEFI call wrapper http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423
+	patch -Np1 -i "${srcdir}/gnu-efi-fix-x86_64-uefi-call-wrapper.patch"
+	echo
+	
+	## Disable GCC MS_ABI CFLAGS
+	patch -Np1 -i "${srcdir}/gnu-efi-fedora-disable-USE_MS_ABI.patch"
+	echo
+	
+	## Fix missing header file for IA32 build
+	patch -Np1 -i "${srcdir}/gnu-efi-fedora-IA32-build-fix.patch"
+	echo
+	
+	## Fix Makefiles to enable compile for both UEFI arch
+	patch -Np1 -i "${srcdir}/gnu-efi-fedora-fix-makefile-vars.patch"
+	echo
+	
+	if [[ "${CARCH}" == "x86_64" ]]; then
+		_build_gnu-efi-libs-x86_64
+	fi
+	
+	_build_gnu-efi-libs-i386
+}
+
+_package_gnu-efi-libs-x86_64() {
+	cd "${srcdir}/${_gitname}_build-x86_64/"
+	
+	make ARCH="x86_64" INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
+	echo
+	
+	install -d "${pkgdir}/usr/share/gnu-efi/x86_64/"
+	install -D -m0644 "${srcdir}/${_gitname}_build-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/"
+}
+
+_package_gnu-efi-libs-i386() {
+	cd "${srcdir}/${_gitname}_build-i386/"
+	
+	make ARCH="ia32" INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/${_LIBDIR32}" install
+	echo
+	
+	install -d "${pkgdir}/usr/share/gnu-efi/i386/"
+	install -D -m0644 "${srcdir}/${_gitname}_build-i386/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/i386/"
+}
+
+package() {
+	if [[ "${CARCH}" == "x86_64" ]]; then
+		_package_gnu-efi-libs-x86_64
+		
+		_LIBDIR32="lib32"
+		_package_gnu-efi-libs-i386
+	else
+		_LIBDIR32="lib"
+		_package_gnu-efi-libs-i386
+	fi
+}
diff --git a/gnu-efi-fedora-IA32-build-fix.patch b/gnu-efi-fedora-IA32-build-fix.patch
new file mode 100644
index 000000000000..bfc89d13f1d1
--- /dev/null
+++ b/gnu-efi-fedora-IA32-build-fix.patch
@@ -0,0 +1,26 @@
+diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
+index dc64e49..36360a4 100644
+--- a/inc/ia32/efibind.h
++++ b/inc/ia32/efibind.h
+@@ -75,6 +75,8 @@ Revision History
+        typedef unsigned char       uint8_t;
+        typedef char                int8_t;
+     #endif
++#elif defined(__GNUC__)
++    #include <stdint-gcc.h>
+ #endif
+ 
+ //
+diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h
+index 871a1df..d936257 100644
+--- a/inc/ia64/efibind.h
++++ b/inc/ia64/efibind.h
+@@ -62,6 +62,8 @@ Revision History
+         typedef unsigned char       uint8_t;
+         typedef char                int8_t;
+     #endif
++#elif defined(__GNUC__)
++    #include <stdint-gcc.h>
+ #endif
+ 
+ //
diff --git a/gnu-efi-fedora-disable-USE_MS_ABI.patch b/gnu-efi-fedora-disable-USE_MS_ABI.patch
new file mode 100644
index 000000000000..e363e6481fea
--- /dev/null
+++ b/gnu-efi-fedora-disable-USE_MS_ABI.patch
@@ -0,0 +1,16 @@
+diff --git a/Make.defaults b/Make.defaults
+index 38da180..aa1f4de 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -54,9 +54,9 @@ GCCNEWENOUGH := $(shell ([ $(GCCVERSION) -gt "4" ] || ([ $(GCCVERSION) -eq "4" ]
+ 
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+ ifeq ($(GCCNEWENOUGH),1)
+-CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
++CPPFLAGS   += -maccumulate-outgoing-args --std=c11
+ endif
+-CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
++CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-stack-protector -fno-merge-constants
+ ASFLAGS    = $(ARCH3264)
+ LDFLAGS	   = -nostdlib
+ INSTALL	   = install
diff --git a/gnu-efi-fedora-fix-makefile-vars.patch b/gnu-efi-fedora-fix-makefile-vars.patch
new file mode 100644
index 000000000000..cf527379f9b1
--- /dev/null
+++ b/gnu-efi-fedora-fix-makefile-vars.patch
@@ -0,0 +1,23 @@
+diff --git a/Make.defaults b/Make.defaults
+index 38da180..5799032 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -38,14 +38,14 @@
+ # Where to install the package. GNU-EFI will create and access
+ # lib and include under the root
+ #
+-INSTALLROOT := /
+-PREFIX := /usr/local
+-LIBDIR := ${PREFIX}/lib
++INSTALLROOT ?= /
++PREFIX ?= /usr
++LIBDIR ?= ${PREFIX}/lib
+ 
+ TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+ 
+ HOSTARCH   = $(shell uname -m | sed s,i[3456789]86,ia32,)
+-ARCH	   := $(shell uname -m | sed s,i[3456789]86,ia32,)
++ARCH	   ?= $(shell uname -m | sed s,i[3456789]86,ia32,)
+ OS	   = $(shell uname -s)
+ INCDIR	   = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol 
+ GCCVERSION := $(shell gcc -dumpversion | cut -f1 -d.)
diff --git a/gnu-efi-fix-x86_64-uefi-call-wrapper.patch b/gnu-efi-fix-x86_64-uefi-call-wrapper.patch
new file mode 100644
index 000000000000..da495c4543d8
--- /dev/null
+++ b/gnu-efi-fix-x86_64-uefi-call-wrapper.patch
@@ -0,0 +1,330 @@
+diff --git a/lib/x86_64/efi_stub.S b/lib/x86_64/efi_stub.S
+index a5e278b..b431255 100644
+--- a/lib/x86_64/efi_stub.S
++++ b/lib/x86_64/efi_stub.S
+@@ -4,6 +4,7 @@
+  * Copyright (C) 2007 Intel Corp
+  *	Bibo Mao <bibo.mao@intel.com>
+  *	Huang Ying <ying.huang@intel.com>
++ * Copyright (C) 2012 Felipe Contreras <felipe.contreras@gmail.com>
+  */
+ 
+ #if !defined(HAVE_USE_MS_ABI)
+@@ -15,152 +16,94 @@
+  *
+  * Basically here are the conversion rules:
+  * a) our function pointer is in %rdi
+- * b) ELF gives us 8-byte aligned %rsp, so we need to pad out to 16-byte
+- *    alignment.
+- * c) inside each call thunker, we can only adjust the stack by
+- *    multiples of 16 bytes. "offset" below refers to however much
+- *    we allocate inside a thunker.
+- * d) rsi through r8 (elf) aka rcx through r9 (ms) require stack space
++ * b) rsi through r8 (elf) aka rcx through r9 (ms) require stack space
+  *    on the MS side even though it's not getting used at all.
+- * e) arguments are as follows: (elf -> ms)
++ * c) 8(%rsp) is always aligned to 16 in ELF, so %rsp is shifted 8 bytes extra
++ * d) arguments are as follows: (elf -> ms)
+  *   1) rdi -> rcx (32 saved)
+  *   2) rsi -> rdx (32 saved)
+- *   3) rdx -> r8 ( 32 saved)
++ *   3) rdx -> r8 (32 saved)
+  *   4) rcx -> r9 (32 saved)
+- *   5) r8 -> 32(%rsp) (48 saved)
++ *   5) r8 -> 32(%rsp) (32 saved)
+  *   6) r9 -> 40(%rsp) (48 saved)
+- *   7) pad+offset+0(%rsp) -> 48(%rsp) (64 saved)
+- *   8) pad+offset+8(%rsp) -> 56(%rsp) (64 saved)
+- *   9) pad+offset+16(%rsp) -> 64(%rsp) (80 saved)
+- *  10) pad+offset+24(%rsp) -> 72(%rsp) (80 saved)
+- *  11) pad+offset+32(%rsp) -> 80(%rsp) (96 saved)
+- *  12) pad+offset+40(%rsp) -> 88(%rsp) (96 saved)
+- * f) because the first argument we recieve in a thunker is actually the
++ *   7) 8(%rsp) -> 48(%rsp) (48 saved)
++ *   8) 16(%rsp) -> 56(%rsp) (64 saved)
++ *   9) 24(%rsp) -> 64(%rsp) (64 saved)
++ *  10) 32(%rsp) -> 72(%rsp) (80 saved)
++ * e) because the first argument we recieve in a thunker is actually the
+  *    function to be called, arguments are offset as such:
+  *   0) rdi -> caller
+  *   1) rsi -> rcx (32 saved)
+  *   2) rdx -> rdx (32 saved)
+  *   3) rcx -> r8 (32 saved)
+  *   4) r8 -> r9 (32 saved)
+- *   5) r9 -> 32(%rsp) (48 saved)
+- *   6) pad+offset+0(%rsp) -> 40(%rsp) (48 saved)
+- *   7) pad+offset+8(%rsp) -> 48(%rsp) (64 saved)
+- *   8) pad+offset+16(%rsp) -> 56(%rsp) (64 saved)
+- *   9) pad+offset+24(%rsp) -> 64(%rsp) (80 saved)
+- *  10) pad+offset+32(%rsp) -> 72(%rsp) (80 saved)
+- *  11) pad+offset+40(%rsp) -> 80(%rsp) (96 saved)
+- *  12) pad+offset+48(%rsp) -> 88(%rsp) (96 saved)
+- * e) arguments need to be moved in opposite order to avoid clobbering
+- * f) pad_stack leaves the amount of padding it added in %r11 for functions
+- *    to use
+- * g) efi -> elf calls don't need to pad the stack, because the 16-byte
+- *    alignment is also always 8-byte aligned.
++ *   5) r9 -> 32(%rsp) (32 saved)
++ *   6) 8(%rsp) -> 40(%rsp) (48 saved)
++ *   7) 16(%rsp) -> 48(%rsp) (48 saved)
++ *   8) 24(%rsp) -> 56(%rsp) (64 saved)
++ *   9) 32(%rsp) -> 64(%rsp) (64 saved)
++ *  10) 40(%rsp) -> 72(%rsp) (80 saved)
++ * f) arguments need to be moved in opposite order to avoid clobbering
+  */
+ 
+ #define ENTRY(name)	\
+ 	.globl name;	\
+ 	name:
+ 
+-#define out(val)		\
+-	push %rax ;		\
+-	mov val, %rax ;		\
+-	out %al, $128 ;		\
+-	pop %rax
+-
+-#define pad_stack							\
+-	subq $8, %rsp ; /* must be a multiple of 16 - sizeof(%rip) */	\
+-	/* stash some handy integers */					\
+-	mov $0x8, %rax ;						\
+-	mov $0x10, %r10 ;						\
+-	/* see if we need padding */					\
+-	and %rsp, %rax ;						\
+-	/* store the pad amount in %r11 */				\
+-	cmovnz %rax, %r11 ;						\
+-	cmovz %r10, %r11 ;						\
+-	/* insert the padding */					\
+-	subq %r11, %rsp ;						\
+-	/* add the $8 we saved above in %r11 */				\
+-	addq $8, %r11 ;							\
+-	/* store the pad amount */					\
+-	mov %r11, (%rsp) ;						\
+-	/* compensate for %rip being stored on the stack by call */	\
+-	addq $8, %r11
+-
+-#define unpad_stack							\
+-	/* fetch the pad amount	we saved (%r11 has been clobbered) */	\
+-	mov (%rsp), %r11 ;						\
+-	/* remove the padding */					\
+-	addq %r11, %rsp
+-
+ ENTRY(efi_call0)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call1)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	mov  %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call2)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	/* mov %rdx, %rdx */
+ 	mov  %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call3)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	mov  %rcx, %r8
+ 	/* mov %rdx, %rdx */
+ 	mov  %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call4)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	mov %r8, %r9
+ 	mov %rcx, %r8
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call5)
+-	pad_stack
+-	subq $48, %rsp
++	subq $40, %rsp
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+ 	mov %rcx, %r8
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $48, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call6)
+-	pad_stack
+-	subq $48, %rsp
+-	addq $48, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $56, %rsp
++	mov 56+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -168,20 +111,14 @@ ENTRY(efi_call6)
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $48, %rsp
+-	unpad_stack
++	addq $56, %rsp
+ 	ret
+ 
+ ENTRY(efi_call7)
+-	pad_stack
+-	subq $64, %rsp
+-	addq $64, %r11
+-	addq $8, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $56, %rsp
++	mov 56+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 56+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -189,23 +126,16 @@ ENTRY(efi_call7)
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $64, %rsp
+-	unpad_stack
++	addq $56, %rsp
+ 	ret
+ 
+ ENTRY(efi_call8)
+-	pad_stack
+-	subq $64, %rsp
+-	addq $64, %r11
+-	addq $16, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $72, %rsp
++	mov 72+24(%rsp), %rax
+ 	mov %rax, 56(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -213,26 +143,18 @@ ENTRY(efi_call8)
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $64, %rsp
+-	unpad_stack
++	addq $72, %rsp
+ 	ret
+ 
+ ENTRY(efi_call9)
+-	pad_stack
+-	subq $80, %rsp
+-	addq $80, %r11
+-	addq $24, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $72, %rsp
++	mov 72+32(%rsp), %rax
+ 	mov %rax, 64(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+24(%rsp), %rax
+ 	mov %rax, 56(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -240,29 +162,20 @@ ENTRY(efi_call9)
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $80, %rsp
+-	unpad_stack
++	addq $72, %rsp
+ 	ret
+ 
+ ENTRY(efi_call10)
+-	pad_stack
+-	subq $80, %rsp
+-	addq $80, %r11
+-	addq $32, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $88, %rsp
++	mov 88+40(%rsp), %rax
+ 	mov %rax, 72(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+32(%rsp), %rax
+ 	mov %rax, 64(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+24(%rsp), %rax
+ 	mov %rax, 56(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -270,8 +183,7 @@ ENTRY(efi_call10)
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $80, %rsp
+-	unpad_stack
++	addq $88, %rsp
+ 	ret
+ 
+ #endif