extra/gnu-efi-libs fixes

This commit is contained in:
Kevin Mihelich 2015-12-18 05:22:24 +00:00
parent 9301cb54fd
commit e6e33532da
3 changed files with 55 additions and 2 deletions

View file

@ -4,6 +4,7 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - define aarch64
# - patches to fix build
buildarch=8
@ -21,8 +22,19 @@ license=('GPL')
arch=('x86_64' 'i686')
options=('!strip' '!makeflags' '!buildflags')
makedepends=('pciutils')
source=("http://download.sourceforge.net/gnu-efi/gnu-efi-${pkgver}.tar.bz2")
md5sums=('15a4bcbc18a9a5e8110ed955970622e6')
source=("http://download.sourceforge.net/gnu-efi/gnu-efi-${pkgver}.tar.bz2"
'lib-arm-setjmp.S-Use-function-instead-of-function.patch'
'explicit-build-id.patch')
md5sums=('15a4bcbc18a9a5e8110ed955970622e6'
'3c904fdc8208110ecd3d8d1f5da6c8c5'
'a104721985027e427f3215a542e6c7b3')
prepare() {
cd "${srcdir}/gnu-efi-${_pkgver}/"
patch -p1 -i ../lib-arm-setjmp.S-Use-function-instead-of-function.patch
patch -p1 -i ../explicit-build-id.patch
}
build() {
cd "${srcdir}/gnu-efi-${_pkgver}/"

View file

@ -0,0 +1,11 @@
diff -urN a/gnuefi/elf_aarch64_efi.lds b/gnuefi/elf_aarch64_efi.lds
--- a/gnuefi/elf_aarch64_efi.lds 2015-08-17 14:06:47.000000000 -0600
+++ b/gnuefi/elf_aarch64_efi.lds 2015-12-17 22:20:26.182403513 -0700
@@ -38,6 +38,7 @@
. = ALIGN(16);
_bss_end = .;
}
+ .note.gnu.build-id : { *(.note.gnu.build-id) }
.rela.dyn : { *(.rela.dyn) }
.rela.plt : { *(.rela.plt) }
.rela.got : { *(.rela.got) }

View file

@ -0,0 +1,30 @@
From: Julian Andres Klode <jak@debian.org>
Date: Sun, 29 Nov 2015 12:31:06 +0100
Subject: lib/arm/setjmp.S: Use %function instead of @function
@ is a comment character on ARM, so use % instead.
---
lib/arm/setjmp.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S
index 6e3fbf0..85c8705 100644
--- a/lib/arm/setjmp.S
+++ b/lib/arm/setjmp.S
@@ -15,7 +15,7 @@ BASIS,
.text
.arm
.globl setjmp
- .type setjmp, @function
+ .type setjmp, %function
setjmp:
mov r3, r13
stmia r0, {r3-r12,r14}
@@ -23,6 +23,6 @@ setjmp:
bx lr
.globl longjmp
- .type longjmp, @function
+ .type longjmp, %function
longjmp:
ldmia r0, {r3-r12,r14}