[arch-commits] Commit in gnu-efi-libs/repos (8 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Fri Feb 22 11:34:01 UTC 2013
Date: Friday, February 22, 2013 @ 12:34:00
Author: tpowa
Revision: 178437
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnu-efi-libs/repos/testing-i686/
gnu-efi-libs/repos/testing-i686/PKGBUILD
(from rev 178436, gnu-efi-libs/trunk/PKGBUILD)
gnu-efi-libs/repos/testing-i686/disable-ms_abi-flag.patch
(from rev 178436, gnu-efi-libs/trunk/disable-ms_abi-flag.patch)
gnu-efi-libs/repos/testing-i686/gnu-efi-libs-x86_64-call-fix.patch
(from rev 178436, gnu-efi-libs/trunk/gnu-efi-libs-x86_64-call-fix.patch)
gnu-efi-libs/repos/testing-x86_64/
gnu-efi-libs/repos/testing-x86_64/PKGBUILD
(from rev 178436, gnu-efi-libs/trunk/PKGBUILD)
gnu-efi-libs/repos/testing-x86_64/disable-ms_abi-flag.patch
(from rev 178436, gnu-efi-libs/trunk/disable-ms_abi-flag.patch)
gnu-efi-libs/repos/testing-x86_64/gnu-efi-libs-x86_64-call-fix.patch
(from rev 178436, gnu-efi-libs/trunk/gnu-efi-libs-x86_64-call-fix.patch)
---------------------------------------------------+
testing-i686/PKGBUILD | 77 ++++
testing-i686/disable-ms_abi-flag.patch | 16
testing-i686/gnu-efi-libs-x86_64-call-fix.patch | 327 ++++++++++++++++++++
testing-x86_64/PKGBUILD | 77 ++++
testing-x86_64/disable-ms_abi-flag.patch | 16
testing-x86_64/gnu-efi-libs-x86_64-call-fix.patch | 327 ++++++++++++++++++++
6 files changed, 840 insertions(+)
Copied: gnu-efi-libs/repos/testing-i686/PKGBUILD (from rev 178436, gnu-efi-libs/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-02-22 11:34:00 UTC (rev 178437)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+
+_pkgver="3.0"
+pkgname="gnu-efi-libs"
+pkgver="${_pkgver}t"
+pkgrel="1"
+pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('pciutils')
+if [[ "${CARCH}" == "x86_64" ]]; then
+ makedepends+=('lib32-glibc')
+fi
+conflicts=('gnu-efi')
+provides=('gnu-efi')
+replaces=('gnu-efi')
+options=('!strip' '!makeflags')
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+_build_gnu-efi-libs-x86_64() {
+ cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
+ cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
+ ARCH="x86_64" make
+ ARCH="x86_64" make -C apps all
+}
+
+_build_gnu-efi-libs-i386() {
+ cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-i386"
+ cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
+ ARCH="ia32" make
+ ARCH="ia32" make -C apps all
+}
+
+build() {
+ cd ${srcdir}/gnu-efi-${_pkgver}
+ # fix broken ms_abi flags, causing weird issues with bootloaders
+ # patch -Np1 -i ../disable-ms_abi-flag.patch
+ ## Fix Makefiles to enable compile for both UEFI arch
+ sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults
+ sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults
+ sed 's|ARCH :=|ARCH ?=|g' -i Make.defaults
+ sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i Make.defaults
+ 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}/gnu-efi-${_pkgver}-x86_64/"
+ make ARCH="x86_64" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install
+ install -d "${pkgdir}/usr/share/gnu-efi/x86_64/"
+ install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/"
+}
+
+_package_gnu-efi-libs-i386() {
+ cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
+ make ARCH="ia32" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install
+ install -d "${pkgdir}/usr/share/gnu-efi/i386/"
+ install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-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
+}
+md5sums=('95916208cf543699799230ac1ea14272')
Copied: gnu-efi-libs/repos/testing-i686/disable-ms_abi-flag.patch (from rev 178436, gnu-efi-libs/trunk/disable-ms_abi-flag.patch)
===================================================================
--- testing-i686/disable-ms_abi-flag.patch (rev 0)
+++ testing-i686/disable-ms_abi-flag.patch 2013-02-22 11:34:00 UTC (rev 178437)
@@ -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
++CPPFLAGS += -maccumulate-outgoing-args
+ 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
Copied: gnu-efi-libs/repos/testing-i686/gnu-efi-libs-x86_64-call-fix.patch (from rev 178436, gnu-efi-libs/trunk/gnu-efi-libs-x86_64-call-fix.patch)
===================================================================
--- testing-i686/gnu-efi-libs-x86_64-call-fix.patch (rev 0)
+++ testing-i686/gnu-efi-libs-x86_64-call-fix.patch 2013-02-22 11:34:00 UTC (rev 178437)
@@ -0,0 +1,327 @@
+diff -ur gnu-efi-3.0/lib/x86_64/efi_stub.S gnu-efi-3.0-mod/lib/x86_64/efi_stub.S
+--- gnu-efi-3.0/lib/x86_64/efi_stub.S 2012-04-30 17:35:44.000000000 +0200
++++ gnu-efi-3.0-mod/lib/x86_64/efi_stub.S 2012-10-12 00:39:09.300289985 +0200
+@@ -4,6 +4,7 @@
+ * Copyright (C) 2007 Intel Corp
+ * Bibo Mao <bibo.mao at intel.com>
+ * Huang Ying <ying.huang at intel.com>
++ * Copyright (C) 2012 Felipe Contreras <felipe.contreras at gmail.com>
+ */
+
+ /*
+@@ -14,152 +15,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
+@@ -167,20 +110,14 @@
+ /* 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
+@@ -188,23 +125,16 @@
+ /* 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
+@@ -212,26 +142,18 @@
+ /* 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
+@@ -239,29 +161,20 @@
+ /* 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
+@@ -269,6 +182,5 @@
+ /* mov %rdx, %rdx */
+ mov %rsi, %rcx
+ call *%rdi
+- addq $80, %rsp
+- unpad_stack
++ addq $88, %rsp
+ ret
Copied: gnu-efi-libs/repos/testing-x86_64/PKGBUILD (from rev 178436, gnu-efi-libs/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-02-22 11:34:00 UTC (rev 178437)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+
+_pkgver="3.0"
+pkgname="gnu-efi-libs"
+pkgver="${_pkgver}t"
+pkgrel="1"
+pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('pciutils')
+if [[ "${CARCH}" == "x86_64" ]]; then
+ makedepends+=('lib32-glibc')
+fi
+conflicts=('gnu-efi')
+provides=('gnu-efi')
+replaces=('gnu-efi')
+options=('!strip' '!makeflags')
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+_build_gnu-efi-libs-x86_64() {
+ cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
+ cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
+ ARCH="x86_64" make
+ ARCH="x86_64" make -C apps all
+}
+
+_build_gnu-efi-libs-i386() {
+ cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-i386"
+ cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
+ ARCH="ia32" make
+ ARCH="ia32" make -C apps all
+}
+
+build() {
+ cd ${srcdir}/gnu-efi-${_pkgver}
+ # fix broken ms_abi flags, causing weird issues with bootloaders
+ # patch -Np1 -i ../disable-ms_abi-flag.patch
+ ## Fix Makefiles to enable compile for both UEFI arch
+ sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults
+ sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults
+ sed 's|ARCH :=|ARCH ?=|g' -i Make.defaults
+ sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i Make.defaults
+ 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}/gnu-efi-${_pkgver}-x86_64/"
+ make ARCH="x86_64" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install
+ install -d "${pkgdir}/usr/share/gnu-efi/x86_64/"
+ install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/"
+}
+
+_package_gnu-efi-libs-i386() {
+ cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
+ make ARCH="ia32" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install
+ install -d "${pkgdir}/usr/share/gnu-efi/i386/"
+ install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-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
+}
+md5sums=('95916208cf543699799230ac1ea14272')
Copied: gnu-efi-libs/repos/testing-x86_64/disable-ms_abi-flag.patch (from rev 178436, gnu-efi-libs/trunk/disable-ms_abi-flag.patch)
===================================================================
--- testing-x86_64/disable-ms_abi-flag.patch (rev 0)
+++ testing-x86_64/disable-ms_abi-flag.patch 2013-02-22 11:34:00 UTC (rev 178437)
@@ -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
++CPPFLAGS += -maccumulate-outgoing-args
+ 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
Copied: gnu-efi-libs/repos/testing-x86_64/gnu-efi-libs-x86_64-call-fix.patch (from rev 178436, gnu-efi-libs/trunk/gnu-efi-libs-x86_64-call-fix.patch)
===================================================================
--- testing-x86_64/gnu-efi-libs-x86_64-call-fix.patch (rev 0)
+++ testing-x86_64/gnu-efi-libs-x86_64-call-fix.patch 2013-02-22 11:34:00 UTC (rev 178437)
@@ -0,0 +1,327 @@
+diff -ur gnu-efi-3.0/lib/x86_64/efi_stub.S gnu-efi-3.0-mod/lib/x86_64/efi_stub.S
+--- gnu-efi-3.0/lib/x86_64/efi_stub.S 2012-04-30 17:35:44.000000000 +0200
++++ gnu-efi-3.0-mod/lib/x86_64/efi_stub.S 2012-10-12 00:39:09.300289985 +0200
+@@ -4,6 +4,7 @@
+ * Copyright (C) 2007 Intel Corp
+ * Bibo Mao <bibo.mao at intel.com>
+ * Huang Ying <ying.huang at intel.com>
++ * Copyright (C) 2012 Felipe Contreras <felipe.contreras at gmail.com>
+ */
+
+ /*
+@@ -14,152 +15,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
+@@ -167,20 +110,14 @@
+ /* 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
+@@ -188,23 +125,16 @@
+ /* 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
+@@ -212,26 +142,18 @@
+ /* 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
+@@ -239,29 +161,20 @@
+ /* 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
+@@ -269,6 +182,5 @@
+ /* mov %rdx, %rdx */
+ mov %rsi, %rcx
+ call *%rdi
+- addq $80, %rsp
+- unpad_stack
++ addq $88, %rsp
+ ret
More information about the arch-commits
mailing list