From b18c32ba8de21fcec1c6792dc570cafd7142ec81 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 2 Feb 2017 13:28:41 -0500 Subject: [PATCH] Update to 3.0.5 Signed-off-by: Peter Jones --- ...issing-URI-device-path-to-the-unions.patch | 34 - ...t-fall-through-so-Wextra-will-work-i.patch | 32 + 0002-Fix-some-types-gcc-doesn-t-like.patch | 72 + 0002-From-Pete-Batard-pete-akeo.ie.patch | 60 - 0003-From-Pete-Batard-pete-akeo.ie.patch | 146 -- ...m-Julian-Andres-Klode-jak-debian.org.patch | 60 - ...Biesheuvel-ard.biesheuvel-linaro.org.patch | 165 --- ...Biesheuvel-ard.biesheuvel-linaro.org.patch | 1215 ----------------- ...Biesheuvel-ard.biesheuvel-linaro.org.patch | 48 - ...Biesheuvel-ard.biesheuvel-linaro.org.patch | 105 -- ...ker-script-for-building-efi-binaries.patch | 40 - ...ace-our-build-id-notes-on-all-arches.patch | 109 -- gnu-efi.spec | 20 +- sources | 2 +- 14 files changed, 113 insertions(+), 1995 deletions(-) delete mode 100644 0001-Add-the-missing-URI-device-path-to-the-unions.patch create mode 100644 0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch create mode 100644 0002-Fix-some-types-gcc-doesn-t-like.patch delete mode 100644 0002-From-Pete-Batard-pete-akeo.ie.patch delete mode 100644 0003-From-Pete-Batard-pete-akeo.ie.patch delete mode 100644 0004-From-Julian-Andres-Klode-jak-debian.org.patch delete mode 100644 0005-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch delete mode 100644 0006-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch delete mode 100644 0007-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch delete mode 100644 0008-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch delete mode 100644 0009-arm-fix-linker-script-for-building-efi-binaries.patch delete mode 100644 0010-Explicitly-place-our-build-id-notes-on-all-arches.patch diff --git a/0001-Add-the-missing-URI-device-path-to-the-unions.patch b/0001-Add-the-missing-URI-device-path-to-the-unions.patch deleted file mode 100644 index 102c103..0000000 --- a/0001-Add-the-missing-URI-device-path-to-the-unions.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a912cb49eb0b6fa63cfb045e549a51746c704d23 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Wed, 19 Aug 2015 07:28:45 -0400 -Subject: [PATCH 01/10] Add the missing URI device path to the unions. - -Signed-off-by: Gary Ching-Pang Lin -SIgned-off-by: Nigel Croxon ---- - inc/efidevp.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/inc/efidevp.h b/inc/efidevp.h -index 38923d9..b20c839 100644 ---- a/inc/efidevp.h -+++ b/inc/efidevp.h -@@ -491,6 +491,7 @@ typedef union { - MAC_ADDR_DEVICE_PATH MacAddr; - IPv4_DEVICE_PATH Ipv4; - IPv6_DEVICE_PATH Ipv6; -+ URI_DEVICE_PATH Uri; - INFINIBAND_DEVICE_PATH InfiniBand; - UART_DEVICE_PATH Uart; - -@@ -525,6 +526,7 @@ typedef union { - MAC_ADDR_DEVICE_PATH *MacAddr; - IPv4_DEVICE_PATH *Ipv4; - IPv6_DEVICE_PATH *Ipv6; -+ URI_DEVICE_PATH *Uri; - INFINIBAND_DEVICE_PATH *InfiniBand; - UART_DEVICE_PATH *Uart; - --- -2.5.0 - diff --git a/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch b/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch new file mode 100644 index 0000000..15cee86 --- /dev/null +++ b/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch @@ -0,0 +1,32 @@ +From f3d3ef07eb69072b8bd2b0c5d4e6243ea38ecec9 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 2 Feb 2017 13:51:27 -0500 +Subject: [PATCH] Mark our explicit fall through so -Wextra will work in gcc 7 + +gcc 7 introduces detection of fall-through behavior in switch/case +statements, and will warn if -Wimplicit-fallthrough is present and there +is no comment stating that the fall-through is intentional. This is +also triggered by -Wextra, as it enables -Wimplicit-fallthrough=1. + +This patch adds the comment in the one place we use fall-through. + +Signed-off-by: Peter Jones +--- + lib/print.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/print.c b/lib/print.c +index b8a9d38..cb732f0 100644 +--- a/lib/print.c ++++ b/lib/print.c +@@ -1131,6 +1131,7 @@ Returns: + case 'X': + Item.Width = Item.Long ? 16 : 8; + Item.Pad = '0'; ++ /* falls through */ + case 'x': + ValueToHex ( + Item.Scratch, +-- +2.9.3 + diff --git a/0002-Fix-some-types-gcc-doesn-t-like.patch b/0002-Fix-some-types-gcc-doesn-t-like.patch new file mode 100644 index 0000000..95efa1a --- /dev/null +++ b/0002-Fix-some-types-gcc-doesn-t-like.patch @@ -0,0 +1,72 @@ +From bbd65152010e04275825736f203a4bf929927a7f Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 2 Feb 2017 14:00:59 -0500 +Subject: [PATCH] Fix some types gcc doesn't like + +Most of these come from building on i386 with -Wextra, but they're still +incorrect everywhere else; they just happen to have identical typedefs +at other places, so the compiler doesn't care. + +Signed-off-by: Peter Jones +--- + apps/AllocPages.c | 2 +- + apps/FreePages.c | 2 +- + apps/route80h.c | 2 +- + inc/efilink.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/apps/AllocPages.c b/apps/AllocPages.c +index 77a082e..bb81849 100644 +--- a/apps/AllocPages.c ++++ b/apps/AllocPages.c +@@ -116,7 +116,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab) + INTN AllocType = -1; + INTN MemType = -1; + INTN NumPages = -1; +- UINTN Addr = 0; ++ EFI_PHYSICAL_ADDRESS Addr = 0; + + InitializeLib(image, systab); + +diff --git a/apps/FreePages.c b/apps/FreePages.c +index bbf2f52..247c75d 100644 +--- a/apps/FreePages.c ++++ b/apps/FreePages.c +@@ -89,7 +89,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab) + INTN err = 0; + + INTN PgCnt = -1; +- UINTN PhysAddr = 0; ++ EFI_PHYSICAL_ADDRESS PhysAddr = 0; + + InitializeLib(image, systab); + +diff --git a/apps/route80h.c b/apps/route80h.c +index b0b142f..723dd85 100644 +--- a/apps/route80h.c ++++ b/apps/route80h.c +@@ -138,7 +138,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab) + lpcif.rcba &= ~1UL; + + Print(L"rcba: 0x%8x\n", lpcif.rcba, lpcif.rcba); +- set_bit((uint32_t *)(uint64_t)(lpcif.rcba + GCS_OFFSET_ADDR), ++ set_bit((uint32_t *)(intptr_t)(lpcif.rcba + GCS_OFFSET_ADDR), + GCS_RPR_SHIFT, GCS_RPR_PCI); + + return EFI_SUCCESS; +diff --git a/inc/efilink.h b/inc/efilink.h +index b2ff4fa..cc5aa2d 100644 +--- a/inc/efilink.h ++++ b/inc/efilink.h +@@ -142,7 +142,7 @@ typedef struct _LIST_ENTRY { + // EFI_FIELD_OFFSET - returns the byte offset to a field within a structure + // + +-#define EFI_FIELD_OFFSET(TYPE,Field) ((UINTN)(&(((TYPE *) 0)->Field))) ++#define EFI_FIELD_OFFSET(TYPE,Field) ((UINTN)(intptr_t)(&(((TYPE *) 0)->Field))) + + // + // CONTAINING_RECORD - returns a pointer to the structure +-- +2.9.3 + diff --git a/0002-From-Pete-Batard-pete-akeo.ie.patch b/0002-From-Pete-Batard-pete-akeo.ie.patch deleted file mode 100644 index b1e284f..0000000 --- a/0002-From-Pete-Batard-pete-akeo.ie.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c875f9935c177161eecf4e7efddfe4cd52c038b7 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Thu, 17 Sep 2015 08:22:39 -0400 -Subject: [PATCH 02/10] From: Pete Batard Date: Wed, 16 Sep 2015 - 18:26:28 +0100 Subject: [PATCH] Fix VS2015 warnings - -* Currently, Visual Studio 2015 generates a lot of warnings such as: - gnu-efi\inc\efipciio.h(7): warning C4091: 'typedef ': ignored on left of '_EFI_PCI_IO' when no variable is declared -* To address this, gnu-efi should define the INTERFACE_DECL() for MS compilers as it does for GNU - -Signed-off-by: Pete Batard -Signed-off-by: Nigel Croxon ---- - inc/ia32/efibind.h | 2 +- - inc/ia64/efibind.h | 2 +- - inc/x86_64/efibind.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h -index b8db581..1b11f10 100644 ---- a/inc/ia32/efibind.h -+++ b/inc/ia32/efibind.h -@@ -272,7 +272,7 @@ typedef uint32_t UINTN; - #ifdef NO_INTERFACE_DECL - #define INTERFACE_DECL(x) - #else --#ifdef __GNUC__ -+#if defined(__GNUC__) || defined(_MSC_EXTENSIONS) - #define INTERFACE_DECL(x) struct x - #else - #define INTERFACE_DECL(x) typedef struct x -diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h -index 6f9a6f7..b415461 100644 ---- a/inc/ia64/efibind.h -+++ b/inc/ia64/efibind.h -@@ -219,7 +219,7 @@ void __mf (void); - #ifdef NO_INTERFACE_DECL - #define INTERFACE_DECL(x) - #else --#ifdef __GNUC__ -+#if defined(__GNUC__) || defined(_MSC_EXTENSIONS) - #define INTERFACE_DECL(x) struct x - #else - #define INTERFACE_DECL(x) typedef struct x -diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h -index 6bbd337..5ee620b 100644 ---- a/inc/x86_64/efibind.h -+++ b/inc/x86_64/efibind.h -@@ -284,7 +284,7 @@ typedef uint64_t UINTN; - #ifdef NO_INTERFACE_DECL - #define INTERFACE_DECL(x) - #else --#ifdef __GNUC__ -+#if defined(__GNUC__) || defined(_MSC_EXTENSIONS) - #define INTERFACE_DECL(x) struct x - #else - #define INTERFACE_DECL(x) typedef struct x --- -2.5.0 - diff --git a/0003-From-Pete-Batard-pete-akeo.ie.patch b/0003-From-Pete-Batard-pete-akeo.ie.patch deleted file mode 100644 index 69bbeff..0000000 --- a/0003-From-Pete-Batard-pete-akeo.ie.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 1e745dbd820ca0f35a078a381480b308a750c624 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Wed, 23 Sep 2015 10:03:31 -0400 -Subject: [PATCH 03/10] From: Pete Batard Subject: [PATCH] Fix - MSVC breakage due to GNU align extensions in setjmp - -* __attribute__((__aligned__(x))), which is used in setjmp, is GNU only => use a macro instead - -Signed-off-by: Pete Batard -Signed-off-by: Nigel Croxon ---- - inc/aarch64/efisetjmp_arch.h | 4 +++- - inc/arm/efisetjmp_arch.h | 4 +++- - inc/efisetjmp.h | 6 ++++++ - inc/ia32/efisetjmp_arch.h | 6 +++--- - inc/ia64/efisetjmp_arch.h | 4 +++- - inc/x86_64/efisetjmp_arch.h | 4 +++- - 6 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/inc/aarch64/efisetjmp_arch.h b/inc/aarch64/efisetjmp_arch.h -index bce9b73..abd7a0e 100644 ---- a/inc/aarch64/efisetjmp_arch.h -+++ b/inc/aarch64/efisetjmp_arch.h -@@ -1,6 +1,8 @@ - #ifndef GNU_EFI_AARCH64_SETJMP_H - #define GNU_EFI_AARCH64_SETJMP_H - -+#define JMPBUF_ALIGN 8 -+ - typedef struct { - /* GP regs */ - UINT64 X19; -@@ -26,6 +28,6 @@ typedef struct { - UINT64 D13; - UINT64 D14; - UINT64 D15; --} __attribute__((__aligned__(8))) jmp_buf; -+} ALIGN(JMPBUF_ALIGN) jmp_buf; - - #endif /* GNU_EFI_AARCH64_SETJMP_H */ -diff --git a/inc/arm/efisetjmp_arch.h b/inc/arm/efisetjmp_arch.h -index 0faf2e2..3a09ea5 100644 ---- a/inc/arm/efisetjmp_arch.h -+++ b/inc/arm/efisetjmp_arch.h -@@ -1,6 +1,8 @@ - #ifndef GNU_EFI_ARM_SETJMP_H - #define GNU_EFI_ARM_SETJMP_H - -+#define JMPBUF_ALIGN 4 -+ - typedef struct { - UINT32 R3; // A copy of R13 - UINT32 R4; -@@ -14,6 +16,6 @@ typedef struct { - UINT32 R12; - UINT32 R13; - UINT32 R14; --} __attribute__((__aligned__(4))) jmp_buf; -+} ALIGN(JMPBUF_ALIGN) jmp_buf; - - #endif /* GNU_EFI_ARM_SETJMP_H */ -diff --git a/inc/efisetjmp.h b/inc/efisetjmp.h -index da8d050..9cb6cec 100644 ---- a/inc/efisetjmp.h -+++ b/inc/efisetjmp.h -@@ -1,6 +1,12 @@ - #ifndef GNU_EFI_SETJMP_H - #define GNU_EFI_SETJMP_H - -+#ifdef _MSC_EXTENSIONS -+#define ALIGN(x) __declspec(align(x)) -+#else -+#define ALIGN(x) __attribute__((__aligned__(x))) -+#endif -+ - #include "efisetjmp_arch.h" - - extern UINTN setjmp(jmp_buf *env); -diff --git a/inc/ia32/efisetjmp_arch.h b/inc/ia32/efisetjmp_arch.h -index ca2e075..17184e7 100644 ---- a/inc/ia32/efisetjmp_arch.h -+++ b/inc/ia32/efisetjmp_arch.h -@@ -1,6 +1,8 @@ - #ifndef GNU_EFI_IA32_SETJMP_H - #define GNU_EFI_IA32_SETJMP_H - -+#define JMPBUF_ALIGN 4 -+ - typedef struct { - UINT32 Ebx; - UINT32 Esi; -@@ -8,8 +10,6 @@ typedef struct { - UINT32 Ebp; - UINT32 Esp; - UINT32 Eip; --} __attribute__((__aligned__(4))) jmp_buf; -- --#define JMPBUF_ALIGN 4 -+} ALIGN(JMPBUF_ALIGN) jmp_buf; - - #endif /* GNU_EFI_IA32_SETJMP_H */ -diff --git a/inc/ia64/efisetjmp_arch.h b/inc/ia64/efisetjmp_arch.h -index dadbe64..3afa044 100644 ---- a/inc/ia64/efisetjmp_arch.h -+++ b/inc/ia64/efisetjmp_arch.h -@@ -1,6 +1,8 @@ - #ifndef GNU_EFI_IA64_SETJMP_H - #define GNU_EFI_IA64_SETJMP_H - -+#define JMPBUF_ALIGN 0x10 -+ - typedef struct { - UINT64 F2[2]; - UINT64 F3[2]; -@@ -40,6 +42,6 @@ typedef struct { - UINT64 Predicates; - UINT64 LoopCount; - UINT64 FPSR; --} __attribute__((__aligned__(0x10))) jmp_buf; -+} ALIGN(JMPBUF_ALIGN) jmp_buf; - - #endif /* GNU_EFI_IA64_SETJMP_H */ -diff --git a/inc/x86_64/efisetjmp_arch.h b/inc/x86_64/efisetjmp_arch.h -index ce4e393..a489993 100644 ---- a/inc/x86_64/efisetjmp_arch.h -+++ b/inc/x86_64/efisetjmp_arch.h -@@ -1,6 +1,8 @@ - #ifndef GNU_EFI_X86_64_SETJMP_H - #define GNU_EFI_X86_64_SETJMP_H - -+#define JMPBUF_ALIGN 8 -+ - typedef struct { - UINT64 Rbx; - UINT64 Rsp; -@@ -15,6 +17,6 @@ typedef struct { - UINT64 Rip; - UINT64 MxCsr; - UINT8 XmmBuffer[160]; // XMM6 - XMM15 --} __attribute__((__aligned__(8))) jmp_buf; -+} ALIGN(JMPBUF_ALIGN) jmp_buf; - - #endif /* GNU_EFI_X86_64_SETJMP_H */ --- -2.5.0 - diff --git a/0004-From-Julian-Andres-Klode-jak-debian.org.patch b/0004-From-Julian-Andres-Klode-jak-debian.org.patch deleted file mode 100644 index 2d60aa1..0000000 --- a/0004-From-Julian-Andres-Klode-jak-debian.org.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b5f22f43118c2c18ae0cc6f2532e5485cdc3d131 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Mon, 30 Nov 2015 08:52:25 -0500 -Subject: [PATCH 04/10] From: Julian Andres Klode Subject: - [PATCH gnu-efi] lib/arm/setjmp.S: Use %function instead of @function - -@ is a comment character on ARM, so use % instead. - -Nigel adjusted the wordwrap on the copyright header. - -Signed-off-by: Julian Andres Klode -Signed-off-by: Nigel Croxon ---- - lib/arm/setjmp.S | 19 ++++++++----------- - 1 file changed, 8 insertions(+), 11 deletions(-) - -diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S -index 6e3fbf0..bd61a8d 100644 ---- a/lib/arm/setjmp.S -+++ b/lib/arm/setjmp.S -@@ -1,21 +1,18 @@ - /* - * Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved. -- * This program and the accompanying materials are licensed and made --available -- * under the terms and conditions of the BSD License which accompanies --this -- * distribution. The full text of the license may be found at -- * http://opensource.org/licenses/bsd-license.php. -+ * This program and the accompanying materials are licensed and made -+ * available under the terms and conditions of the BSD License which -+ * accompanies this distribution. The full text of the license may -+ * be found at http://opensource.org/licenses/bsd-license.php. - * - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" --BASIS, -- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR -- * IMPLIED. -+ * BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER -+ * EXPRESS OR IMPLIED. - */ - .text - .arm - .globl setjmp -- .type setjmp, @function -+ .type setjmp, %function - setjmp: - mov r3, r13 - stmia r0, {r3-r12,r14} -@@ -23,6 +20,6 @@ setjmp: - bx lr - - .globl longjmp -- .type longjmp, @function -+ .type longjmp, %function - longjmp: - ldmia r0, {r3-r12,r14} --- -2.5.0 - diff --git a/0005-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch b/0005-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch deleted file mode 100644 index 6ecc3c2..0000000 --- a/0005-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 8ffbd27504e1c886c92b01b21a215dbb7bd60197 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Wed, 23 Dec 2015 08:19:46 -0500 -Subject: [PATCH 05/10] From: Ard Biesheuvel - Subject: [PATCH 1/2] Relicense ARM and AARCH64 source files as both BSD and - GPL - -This updates the licenses of the files authored by me under lib/arm -and lib/aarch64 to be both 2-clause BSD and GPL v2+ - -Signed-off-by: Ard Biesheuvel -Signed-off-by: Nigel Croxon ---- - gnuefi/crt0-efi-arm.S | 15 +++++++++++---- - lib/aarch64/initplat.c | 17 +++++++++++------ - lib/aarch64/math.c | 17 +++++++++++------ - lib/arm/initplat.c | 17 +++++++++++------ - lib/arm/math.c | 17 +++++++++++------ - 5 files changed, 55 insertions(+), 28 deletions(-) - -diff --git a/gnuefi/crt0-efi-arm.S b/gnuefi/crt0-efi-arm.S -index 3efaf78..c5bb6d4 100644 ---- a/gnuefi/crt0-efi-arm.S -+++ b/gnuefi/crt0-efi-arm.S -@@ -3,10 +3,17 @@ - * - * Copright (C) 2014 Linaro Ltd. - * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. - */ - - .section .text.head -diff --git a/lib/aarch64/initplat.c b/lib/aarch64/initplat.c -index 1c34cef..b4d29a9 100644 ---- a/lib/aarch64/initplat.c -+++ b/lib/aarch64/initplat.c -@@ -1,13 +1,18 @@ - /* -- * aarch64/initplat.c -- * - * Copright (C) 2014 Linaro Ltd. - * Author: Ard Biesheuvel - * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. - */ - - #include "lib.h" -diff --git a/lib/aarch64/math.c b/lib/aarch64/math.c -index d836965..8c16444 100644 ---- a/lib/aarch64/math.c -+++ b/lib/aarch64/math.c -@@ -1,13 +1,18 @@ - /* -- * crt0-efi-aarch64.S - PE/COFF header for Aarch64 EFI applications -- * - * Copright (C) 2014 Linaro Ltd. - * Author: Ard Biesheuvel - * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. - */ - - #include "lib.h" -diff --git a/lib/arm/initplat.c b/lib/arm/initplat.c -index 934289c..a90a457 100644 ---- a/lib/arm/initplat.c -+++ b/lib/arm/initplat.c -@@ -1,13 +1,18 @@ - /* -- * aarch64/initplat.c -- * - * Copright (C) 2014 Linaro Ltd. - * Author: Ard Biesheuvel - * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. - */ - - #include "lib.h" -diff --git a/lib/arm/math.c b/lib/arm/math.c -index 2502a8e..adf79f9 100644 ---- a/lib/arm/math.c -+++ b/lib/arm/math.c -@@ -1,13 +1,18 @@ - /* -- * arm/math.c - math routines for ARM -- * - * Copright (C) 2014 Linaro Ltd. - * Author: Ard Biesheuvel - * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. - */ - - #include "lib.h" --- -2.5.0 - diff --git a/0006-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch b/0006-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch deleted file mode 100644 index b0b552b..0000000 --- a/0006-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch +++ /dev/null @@ -1,1215 +0,0 @@ -From a86ab98d50e3aa15fbdc65cb3bd220fc86f18cad Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Wed, 23 Dec 2015 08:33:02 -0500 -Subject: [PATCH 06/10] From: Ard Biesheuvel - Subject: [PATCH 2/2] Replace ARM arithmetic support routines with EDK2 - versions. - -Replace the incomplete GPL licensed ARM arithmetic support routines -with the ones from the EDK2 project. These cover long long multiplication -and long long logical shift as well. - -Also remove the special case for small dividends in DivU64x32: we can -simply let the compiler handle this, and emit calls to the support -routines where appropriate. - -Signed-off-by: Ard Biesheuvel -Signed-off-by: Nigel Croxon ---- - inc/arm/efibind.h | 9 +- - lib/Makefile | 3 +- - lib/arm/div.S | 155 +++++++++++++++++++++++++++++ - lib/arm/div64.S | 193 ------------------------------------ - lib/arm/edk2asm.h | 6 ++ - lib/arm/ldivmod.S | 61 ++++++++++++ - lib/arm/lib1funcs.S | 279 ---------------------------------------------------- - lib/arm/llsl.S | 41 ++++++++ - lib/arm/llsr.S | 41 ++++++++ - lib/arm/mullu.S | 33 +++++++ - lib/arm/uldiv.S | 267 +++++++++++++++++++++++++++++++++++++++++++++++++ - 11 files changed, 608 insertions(+), 480 deletions(-) - create mode 100644 lib/arm/div.S - delete mode 100644 lib/arm/div64.S - create mode 100644 lib/arm/edk2asm.h - create mode 100644 lib/arm/ldivmod.S - delete mode 100644 lib/arm/lib1funcs.S - create mode 100644 lib/arm/llsl.S - create mode 100644 lib/arm/llsr.S - create mode 100644 lib/arm/mullu.S - create mode 100644 lib/arm/uldiv.S - -diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h -index 798212c..cc4b5c5 100644 ---- a/inc/arm/efibind.h -+++ b/inc/arm/efibind.h -@@ -125,13 +125,8 @@ typedef uint32_t UINTN; - #define uefi_call_wrapper(func, va_num, ...) func(__VA_ARGS__) - #define EFI_FUNCTION - --extern UINT64 __DivU64x32(UINT64 Dividend, UINTN Divisor, UINTN *Remainder); -- - static inline UINT64 DivU64x32(UINT64 Dividend, UINTN Divisor, UINTN *Remainder) - { -- if (Dividend >> 32) -- return __DivU64x32(Dividend, Divisor, Remainder); -- - /* - * GCC turns a division into a multiplication and shift with precalculated - * constants if the divisor is constant and the dividend fits into a 32 bit -@@ -139,7 +134,7 @@ static inline UINT64 DivU64x32(UINT64 Dividend, UINTN Divisor, UINTN *Remainder) - * library functions. - */ - if (Remainder) -- *Remainder = (UINTN)Dividend % Divisor; -- Dividend = (UINTN)Dividend / Divisor; -+ *Remainder = Dividend % Divisor; -+ Dividend = Dividend / Divisor; - return Dividend; - } -diff --git a/lib/Makefile b/lib/Makefile -index 622730f..a9ba4e2 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -58,7 +58,8 @@ FILES += $(ARCH)/callwrap $(ARCH)/efi_stub - endif - - ifeq ($(ARCH),arm) --FILES += $(ARCH)/lib1funcs $(ARCH)/div64 -+FILES += $(ARCH)/uldiv $(ARCH)/ldivmod $(ARCH)/div $(ARCH)/llsl $(ARCH)/llsr \ -+ $(ARCH)/mullu - endif - - OBJS = $(FILES:%=%.o) -diff --git a/lib/arm/div.S b/lib/arm/div.S -new file mode 100644 -index 0000000..71158b6 ---- /dev/null -+++ b/lib/arm/div.S -@@ -0,0 +1,155 @@ -+#------------------------------------------------------------------------------ -+# -+# Copyright (c) 2011, ARM. All rights reserved.
-+# -+# This program and the accompanying materials -+# are licensed and made available under the terms and conditions of the BSD License -+# which accompanies this distribution. The full text of the license may be found at -+# http://opensource.org/licenses/bsd-license.php -+# -+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -+# -+#------------------------------------------------------------------------------ -+ -+#include "edk2asm.h" -+ -+.text -+.align 2 -+GCC_ASM_EXPORT(__aeabi_uidiv) -+GCC_ASM_EXPORT(__aeabi_uidivmod) -+GCC_ASM_EXPORT(__aeabi_idiv) -+GCC_ASM_EXPORT(__aeabi_idivmod) -+ -+# AREA Math, CODE, READONLY -+ -+# -+#UINT32 -+#EFIAPI -+#__aeabi_uidivmode ( -+# IN UINT32 Dividen -+# IN UINT32 Divisor -+# ); -+# -+ -+ASM_PFX(__aeabi_uidiv): -+ASM_PFX(__aeabi_uidivmod): -+ rsbs r12, r1, r0, LSR #4 -+ mov r2, #0 -+ bcc ASM_PFX(__arm_div4) -+ rsbs r12, r1, r0, LSR #8 -+ bcc ASM_PFX(__arm_div8) -+ mov r3, #0 -+ b ASM_PFX(__arm_div_large) -+ -+# -+#INT32 -+#EFIAPI -+#__aeabi_idivmode ( -+# IN INT32 Dividen -+# IN INT32 Divisor -+# ); -+# -+ASM_PFX(__aeabi_idiv): -+ASM_PFX(__aeabi_idivmod): -+ orrs r12, r0, r1 -+ bmi ASM_PFX(__arm_div_negative) -+ rsbs r12, r1, r0, LSR #1 -+ mov r2, #0 -+ bcc ASM_PFX(__arm_div1) -+ rsbs r12, r1, r0, LSR #4 -+ bcc ASM_PFX(__arm_div4) -+ rsbs r12, r1, r0, LSR #8 -+ bcc ASM_PFX(__arm_div8) -+ mov r3, #0 -+ b ASM_PFX(__arm_div_large) -+ASM_PFX(__arm_div8): -+ rsbs r12, r1, r0, LSR #7 -+ subcs r0, r0, r1, LSL #7 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0,LSR #6 -+ subcs r0, r0, r1, LSL #6 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #5 -+ subcs r0, r0, r1, LSL #5 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #4 -+ subcs r0, r0, r1, LSL #4 -+ adc r2, r2, r2 -+ASM_PFX(__arm_div4): -+ rsbs r12, r1, r0, LSR #3 -+ subcs r0, r0, r1, LSL #3 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #2 -+ subcs r0, r0, r1, LSL #2 -+ adcs r2, r2, r2 -+ rsbs r12, r1, r0, LSR #1 -+ subcs r0, r0, r1, LSL #1 -+ adc r2, r2, r2 -+ASM_PFX(__arm_div1): -+ subs r1, r0, r1 -+ movcc r1, r0 -+ adc r0, r2, r2 -+ bx r14 -+ASM_PFX(__arm_div_negative): -+ ands r2, r1, #0x80000000 -+ rsbmi r1, r1, #0 -+ eors r3, r2, r0, ASR #32 -+ rsbcs r0, r0, #0 -+ rsbs r12, r1, r0, LSR #4 -+ bcc label1 -+ rsbs r12, r1, r0, LSR #8 -+ bcc label2 -+ASM_PFX(__arm_div_large): -+ lsl r1, r1, #6 -+ rsbs r12, r1, r0, LSR #8 -+ orr r2, r2, #0xfc000000 -+ bcc label2 -+ lsl r1, r1, #6 -+ rsbs r12, r1, r0, LSR #8 -+ orr r2, r2, #0x3f00000 -+ bcc label2 -+ lsl r1, r1, #6 -+ rsbs r12, r1, r0, LSR #8 -+ orr r2, r2, #0xfc000 -+ orrcs r2, r2, #0x3f00 -+ lslcs r1, r1, #6 -+ rsbs r12, r1, #0 -+ bcs ASM_PFX(__aeabi_idiv0) -+label3: -+ lsrcs r1, r1, #6 -+label2: -+ rsbs r12, r1, r0, LSR #7 -+ subcs r0, r0, r1, LSL #7 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #6 -+ subcs r0, r0, r1, LSL #6 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #5 -+ subcs r0, r0, r1, LSL #5 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #4 -+ subcs r0, r0, r1, LSL #4 -+ adc r2, r2, r2 -+label1: -+ rsbs r12, r1, r0, LSR #3 -+ subcs r0, r0, r1, LSL #3 -+ adc r2, r2, r2 -+ rsbs r12, r1, r0, LSR #2 -+ subcs r0, r0, r1, LSL #2 -+ adcs r2, r2, r2 -+ bcs label3 -+ rsbs r12, r1, r0, LSR #1 -+ subcs r0, r0, r1, LSL #1 -+ adc r2, r2, r2 -+ subs r1, r0, r1 -+ movcc r1, r0 -+ adc r0, r2, r2 -+ asrs r3, r3, #31 -+ rsbmi r0, r0, #0 -+ rsbcs r1, r1, #0 -+ bx r14 -+ -+ @ What to do about division by zero? For now, just return. -+ASM_PFX(__aeabi_idiv0): -+ bx r14 -diff --git a/lib/arm/div64.S b/lib/arm/div64.S -deleted file mode 100644 -index f67ba77..0000000 ---- a/lib/arm/div64.S -+++ /dev/null -@@ -1,193 +0,0 @@ --/* -- * linux/arch/arm/lib/div64.S -- * -- * Optimized computation of 64-bit dividend / 32-bit divisor -- * -- * Author: Nicolas Pitre -- * Created: Oct 5, 2003 -- * Copyright: Monta Vista Software, Inc. -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License version 2 as -- * published by the Free Software Foundation. -- */ -- --#define xl r0 --#define xh r1 --#define yl r2 --#define yh r3 -- --#define UNWIND(x...) --#define ARM(x...) x --#define THUMB(x...) -- --#define ENTRY(__f) \ -- .align 3 ;\ -- .globl __f ;\ -- .type __f,%function ;\ --__f: --#define ENDPROC(__f) ;\ -- .size __f, . - __f -- -- --/* --UINT64 --DivU64x32 ( -- IN UINT64 Dividend, -- IN UINTN Divisor, -- OUT UINTN *Remainder OPTIONAL -- ) --// divide 64bit by 32bit and get a 64bit result --// N.B. only works for 31bit divisors!! --{ --} --*/ -- --ENTRY(__DivU64x32) -- stmfd sp!, {r4-r6, lr} -- -- mov r5, r4 @ preserve Remainder -- mov r4, r2 @ divisor in r4 -- bl __do_div64 -- -- teq r5, #0 -- strne xh, [r5] -- mov r0, yl -- mov r1, yh -- ldmfd sp!, {r4-r6, pc} --ENDPROC(__DivU64x32) -- --/* -- * __do_div64: perform a division with 64-bit dividend and 32-bit divisor. -- * -- * Note: Calling convention is totally non standard for optimal code. -- * This is meant to be used by do_div() from include/asm/div64.h only. -- * -- * Input parameters: -- * xh-xl = dividend (clobbered) -- * r4 = divisor (preserved) -- * -- * Output values: -- * yh-yl = result -- * xh = remainder -- * -- * Clobbered regs: xl, ip -- */ -- --ENTRY(__do_div64) --UNWIND(.fnstart) -- -- @ Test for easy paths first. -- subs ip, r4, #1 -- bls 9f @ divisor is 0 or 1 -- tst ip, r4 -- beq 8f @ divisor is power of 2 -- -- @ See if we need to handle upper 32-bit result. -- cmp xh, r4 -- mov yh, #0 -- blo 3f -- -- @ Align divisor with upper part of dividend. -- @ The aligned divisor is stored in yl preserving the original. -- @ The bit position is stored in ip. -- -- clz yl, r4 -- clz ip, xh -- sub yl, yl, ip -- mov ip, #1 -- mov ip, ip, lsl yl -- mov yl, r4, lsl yl -- -- @ The division loop for needed upper bit positions. -- @ Break out early if dividend reaches 0. --2: cmp xh, yl -- orrcs yh, yh, ip -- subcss xh, xh, yl -- movnes ip, ip, lsr #1 -- mov yl, yl, lsr #1 -- bne 2b -- -- @ See if we need to handle lower 32-bit result. --3: cmp xh, #0 -- mov yl, #0 -- cmpeq xl, r4 -- movlo xh, xl -- movlo pc, lr -- -- @ The division loop for lower bit positions. -- @ Here we shift remainer bits leftwards rather than moving the -- @ divisor for comparisons, considering the carry-out bit as well. -- mov ip, #0x80000000 --4: movs xl, xl, lsl #1 -- adcs xh, xh, xh -- beq 6f -- cmpcc xh, r4 --5: orrcs yl, yl, ip -- subcs xh, xh, r4 -- movs ip, ip, lsr #1 -- bne 4b -- mov pc, lr -- -- @ The top part of remainder became zero. If carry is set -- @ (the 33th bit) this is a false positive so resume the loop. -- @ Otherwise, if lower part is also null then we are done. --6: bcs 5b -- cmp xl, #0 -- moveq pc, lr -- -- @ We still have remainer bits in the low part. Bring them up. -- -- clz xh, xl @ we know xh is zero here so... -- add xh, xh, #1 -- mov xl, xl, lsl xh -- mov ip, ip, lsr xh -- -- @ Current remainder is now 1. It is worthless to compare with -- @ divisor at this point since divisor can not be smaller than 3 here. -- @ If possible, branch for another shift in the division loop. -- @ If no bit position left then we are done. -- movs ip, ip, lsr #1 -- mov xh, #1 -- bne 4b -- mov pc, lr -- --8: @ Division by a power of 2: determine what that divisor order is -- @ then simply shift values around -- -- clz ip, r4 -- rsb ip, ip, #31 -- -- mov yh, xh, lsr ip -- mov yl, xl, lsr ip -- rsb ip, ip, #32 -- ARM( orr yl, yl, xh, lsl ip ) -- THUMB( lsl xh, xh, ip ) -- THUMB( orr yl, yl, xh ) -- mov xh, xl, lsl ip -- mov xh, xh, lsr ip -- mov pc, lr -- -- @ eq -> division by 1: obvious enough... --9: moveq yl, xl -- moveq yh, xh -- moveq xh, #0 -- moveq pc, lr --UNWIND(.fnend) -- --UNWIND(.fnstart) --UNWIND(.pad #4) --UNWIND(.save {lr}) --Ldiv0_64: -- @ Division by 0: -- str lr, [sp, #-8]! -- bl __div0 -- -- @ as wrong as it could be... -- mov yl, #0 -- mov yh, #0 -- mov xh, #0 -- ldr pc, [sp], #8 -- --UNWIND(.fnend) --ENDPROC(__do_div64) -diff --git a/lib/arm/edk2asm.h b/lib/arm/edk2asm.h -new file mode 100644 -index 0000000..9515eaf ---- /dev/null -+++ b/lib/arm/edk2asm.h -@@ -0,0 +1,6 @@ -+ -+#define ASM_PFX(x) x -+#define GCC_ASM_EXPORT(x) \ -+ .globl x ; \ -+ .type x, %function -+ -diff --git a/lib/arm/ldivmod.S b/lib/arm/ldivmod.S -new file mode 100644 -index 0000000..edbf89e ---- /dev/null -+++ b/lib/arm/ldivmod.S -@@ -0,0 +1,61 @@ -+//------------------------------------------------------------------------------ -+// -+// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-+// -+// This program and the accompanying materials -+// are licensed and made available under the terms and conditions of the BSD License -+// which accompanies this distribution. The full text of the license may be found at -+// http://opensource.org/licenses/bsd-license.php -+// -+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -+// -+//------------------------------------------------------------------------------ -+ -+ -+#include "edk2asm.h" -+ -+ .text -+ .align 2 -+ GCC_ASM_EXPORT(__aeabi_ldivmod) -+ -+// -+// A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}}, -+// the quotient in {r0, r1}, and the remainder in {r2, r3}. -+// -+//__value_in_regs lldiv_t -+//EFIAPI -+//__aeabi_ldivmod ( -+// IN UINT64 Dividen -+// IN UINT64 Divisor -+// )// -+// -+ -+ASM_PFX(__aeabi_ldivmod): -+ push {r4,lr} -+ asrs r4,r1,#1 -+ eor r4,r4,r3,LSR #1 -+ bpl L_Test1 -+ rsbs r0,r0,#0 -+ rsc r1,r1,#0 -+L_Test1: -+ tst r3,r3 -+ bpl L_Test2 -+ rsbs r2,r2,#0 -+ rsc r3,r3,#0 -+L_Test2: -+ bl ASM_PFX(__aeabi_uldivmod) -+ tst r4,#0x40000000 -+ beq L_Test3 -+ rsbs r0,r0,#0 -+ rsc r1,r1,#0 -+L_Test3: -+ tst r4,#0x80000000 -+ beq L_Exit -+ rsbs r2,r2,#0 -+ rsc r3,r3,#0 -+L_Exit: -+ pop {r4,pc} -+ -+ -+ -diff --git a/lib/arm/lib1funcs.S b/lib/arm/lib1funcs.S -deleted file mode 100644 -index 6b4d4bf..0000000 ---- a/lib/arm/lib1funcs.S -+++ /dev/null -@@ -1,279 +0,0 @@ --/* -- * linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines -- * -- * Author: Nicolas Pitre -- * - contributed to gcc-3.4 on Sep 30, 2003 -- * - adapted for the Linux kernel on Oct 2, 2003 -- */ -- --/* Copyright 1995, 1996, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. -- --This file is free software; you can redistribute it and/or modify it --under the terms of the GNU General Public License as published by the --Free Software Foundation; either version 2, or (at your option) any --later version. -- --In addition to the permissions in the GNU General Public License, the --Free Software Foundation gives you unlimited permission to link the --compiled version of this file into combinations with other programs, --and to distribute those combinations without any restriction coming --from the use of this file. (The General Public License restrictions --do apply in other respects; for example, they cover modification of --the file, and distribution when not linked into a combine --executable.) -- --This file is distributed in the hope that it will be useful, but --WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --General Public License for more details. -- --You should have received a copy of the GNU General Public License --along with this program; see the file COPYING. If not, write to --the Free Software Foundation, 59 Temple Place - Suite 330, --Boston, MA 02111-1307, USA. */ -- --#define UNWIND(x...) -- --#define ENTRY(__f) \ -- .align 3 ;\ -- .globl __f ;\ -- .type __f,%function ;\ --__f: --#define ENDPROC(__f) ;\ -- .size __f, . - __f -- --.macro ARM_DIV_BODY dividend, divisor, result, curbit -- -- clz \curbit, \divisor -- clz \result, \dividend -- sub \result, \curbit, \result -- mov \curbit, #1 -- mov \divisor, \divisor, lsl \result -- mov \curbit, \curbit, lsl \result -- mov \result, #0 -- -- @ Division loop --1: cmp \dividend, \divisor -- subhs \dividend, \dividend, \divisor -- orrhs \result, \result, \curbit -- cmp \dividend, \divisor, lsr #1 -- subhs \dividend, \dividend, \divisor, lsr #1 -- orrhs \result, \result, \curbit, lsr #1 -- cmp \dividend, \divisor, lsr #2 -- subhs \dividend, \dividend, \divisor, lsr #2 -- orrhs \result, \result, \curbit, lsr #2 -- cmp \dividend, \divisor, lsr #3 -- subhs \dividend, \dividend, \divisor, lsr #3 -- orrhs \result, \result, \curbit, lsr #3 -- cmp \dividend, #0 @ Early termination? -- movnes \curbit, \curbit, lsr #4 @ No, any more bits to do? -- movne \divisor, \divisor, lsr #4 -- bne 1b -- --.endm -- -- --.macro ARM_DIV2_ORDER divisor, order -- -- clz \order, \divisor -- rsb \order, \order, #31 -- --.endm -- -- --.macro ARM_MOD_BODY dividend, divisor, order, spare -- -- clz \order, \divisor -- clz \spare, \dividend -- sub \order, \order, \spare -- mov \divisor, \divisor, lsl \order -- -- @ Perform all needed substractions to keep only the reminder. -- @ Do comparisons in batch of 4 first. -- subs \order, \order, #3 @ yes, 3 is intended here -- blt 2f -- --1: cmp \dividend, \divisor -- subhs \dividend, \dividend, \divisor -- cmp \dividend, \divisor, lsr #1 -- subhs \dividend, \dividend, \divisor, lsr #1 -- cmp \dividend, \divisor, lsr #2 -- subhs \dividend, \dividend, \divisor, lsr #2 -- cmp \dividend, \divisor, lsr #3 -- subhs \dividend, \dividend, \divisor, lsr #3 -- cmp \dividend, #1 -- mov \divisor, \divisor, lsr #4 -- subges \order, \order, #4 -- bge 1b -- -- tst \order, #3 -- teqne \dividend, #0 -- beq 5f -- -- @ Either 1, 2 or 3 comparison/substractions are left. --2: cmn \order, #2 -- blt 4f -- beq 3f -- cmp \dividend, \divisor -- subhs \dividend, \dividend, \divisor -- mov \divisor, \divisor, lsr #1 --3: cmp \dividend, \divisor -- subhs \dividend, \dividend, \divisor -- mov \divisor, \divisor, lsr #1 --4: cmp \dividend, \divisor -- subhs \dividend, \dividend, \divisor --5: --.endm -- -- --ENTRY(__aeabi_uidiv) --ENTRY(__udivsi3) -- -- subs r2, r1, #1 -- moveq pc, lr -- bcc Ldiv0 -- cmp r0, r1 -- bls 11f -- tst r1, r2 -- beq 12f -- -- ARM_DIV_BODY r0, r1, r2, r3 -- -- mov r0, r2 -- mov pc, lr -- --11: moveq r0, #1 -- movne r0, #0 -- mov pc, lr -- --12: ARM_DIV2_ORDER r1, r2 -- -- mov r0, r0, lsr r2 -- mov pc, lr -- --UNWIND(.fnend) --ENDPROC(__udivsi3) --ENDPROC(__aeabi_uidiv) -- --ENTRY(__umodsi3) --UNWIND(.fnstart) -- -- subs r2, r1, #1 @ compare divisor with 1 -- bcc Ldiv0 -- cmpne r0, r1 @ compare dividend with divisor -- moveq r0, #0 -- tsthi r1, r2 @ see if divisor is power of 2 -- andeq r0, r0, r2 -- movls pc, lr -- -- ARM_MOD_BODY r0, r1, r2, r3 -- -- mov pc, lr -- --UNWIND(.fnend) --ENDPROC(__umodsi3) -- --ENTRY(__divsi3) --ENTRY(__aeabi_idiv) --UNWIND(.fnstart) -- -- cmp r1, #0 -- eor ip, r0, r1 @ save the sign of the result. -- beq Ldiv0 -- rsbmi r1, r1, #0 @ loops below use unsigned. -- subs r2, r1, #1 @ division by 1 or -1 ? -- beq 10f -- movs r3, r0 -- rsbmi r3, r0, #0 @ positive dividend value -- cmp r3, r1 -- bls 11f -- tst r1, r2 @ divisor is power of 2 ? -- beq 12f -- -- ARM_DIV_BODY r3, r1, r0, r2 -- -- cmp ip, #0 -- rsbmi r0, r0, #0 -- mov pc, lr -- --10: teq ip, r0 @ same sign ? -- rsbmi r0, r0, #0 -- mov pc, lr -- --11: movlo r0, #0 -- moveq r0, ip, asr #31 -- orreq r0, r0, #1 -- mov pc, lr -- --12: ARM_DIV2_ORDER r1, r2 -- -- cmp ip, #0 -- mov r0, r3, lsr r2 -- rsbmi r0, r0, #0 -- mov pc, lr -- --UNWIND(.fnend) --ENDPROC(__divsi3) --ENDPROC(__aeabi_idiv) -- --ENTRY(__modsi3) --UNWIND(.fnstart) -- -- cmp r1, #0 -- beq Ldiv0 -- rsbmi r1, r1, #0 @ loops below use unsigned. -- movs ip, r0 @ preserve sign of dividend -- rsbmi r0, r0, #0 @ if negative make positive -- subs r2, r1, #1 @ compare divisor with 1 -- cmpne r0, r1 @ compare dividend with divisor -- moveq r0, #0 -- tsthi r1, r2 @ see if divisor is power of 2 -- andeq r0, r0, r2 -- bls 10f -- -- ARM_MOD_BODY r0, r1, r2, r3 -- --10: cmp ip, #0 -- rsbmi r0, r0, #0 -- mov pc, lr -- --UNWIND(.fnend) --ENDPROC(__modsi3) -- --ENTRY(__aeabi_uidivmod) --UNWIND(.fnstart) --UNWIND(.save {r0, r1, ip, lr} ) -- -- stmfd sp!, {r0, r1, ip, lr} -- bl __aeabi_uidiv -- ldmfd sp!, {r1, r2, ip, lr} -- mul r3, r0, r2 -- sub r1, r1, r3 -- mov pc, lr -- --UNWIND(.fnend) --ENDPROC(__aeabi_uidivmod) -- --ENTRY(__aeabi_idivmod) --UNWIND(.fnstart) --UNWIND(.save {r0, r1, ip, lr} ) -- stmfd sp!, {r0, r1, ip, lr} -- bl __aeabi_idiv -- ldmfd sp!, {r1, r2, ip, lr} -- mul r3, r0, r2 -- sub r1, r1, r3 -- mov pc, lr -- --UNWIND(.fnend) --ENDPROC(__aeabi_idivmod) -- --Ldiv0: --UNWIND(.fnstart) --UNWIND(.pad #4) --UNWIND(.save {lr}) -- str lr, [sp, #-8]! -- bl __div0 -- mov r0, #0 @ About as wrong as it could be. -- ldr pc, [sp], #8 --UNWIND(.fnend) --ENDPROC(Ldiv0) -diff --git a/lib/arm/llsl.S b/lib/arm/llsl.S -new file mode 100644 -index 0000000..0f5c407 ---- /dev/null -+++ b/lib/arm/llsl.S -@@ -0,0 +1,41 @@ -+#------------------------------------------------------------------------------ -+# -+# Copyright (c) 2013, ARM. All rights reserved.
-+# -+# This program and the accompanying materials -+# are licensed and made available under the terms and conditions of the BSD License -+# which accompanies this distribution. The full text of the license may be found at -+# http://opensource.org/licenses/bsd-license.php -+# -+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -+# -+#------------------------------------------------------------------------------ -+ -+#include "edk2asm.h" -+ -+.text -+.align 2 -+GCC_ASM_EXPORT(__aeabi_llsl) -+ -+# -+#VOID -+#EFIAPI -+#__aeabi_llsl ( -+# IN VOID *Destination, -+# IN VOID *Source, -+# IN UINT32 Size -+# ); -+# -+ASM_PFX(__aeabi_llsl): -+ subs r3,r2,#0x20 -+ bpl 1f -+ rsb r3,r2,#0x20 -+ lsl r1,r1,r2 -+ orr r1,r1,r0,lsr r3 -+ lsl r0,r0,r2 -+ bx lr -+1: -+ lsl r1,r0,r3 -+ mov r0,#0 -+ bx lr -diff --git a/lib/arm/llsr.S b/lib/arm/llsr.S -new file mode 100644 -index 0000000..432b27d ---- /dev/null -+++ b/lib/arm/llsr.S -@@ -0,0 +1,41 @@ -+#------------------------------------------------------------------------------ -+# -+# Copyright (c) 2013, ARM. All rights reserved.
-+# -+# This program and the accompanying materials -+# are licensed and made available under the terms and conditions of the BSD License -+# which accompanies this distribution. The full text of the license may be found at -+# http://opensource.org/licenses/bsd-license.php -+# -+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -+# -+#------------------------------------------------------------------------------ -+ -+#include "edk2asm.h" -+ -+.text -+.align 2 -+GCC_ASM_EXPORT(__aeabi_llsr) -+ -+# -+#VOID -+#EFIAPI -+#__aeabi_llsr ( -+# IN VOID *Destination, -+# IN VOID *Source, -+# IN UINT32 Size -+# ); -+# -+ASM_PFX(__aeabi_llsr): -+ subs r3,r2,#0x20 -+ bpl 1f -+ rsb r3,r2,#0x20 -+ lsr r0,r0,r2 -+ orr r0,r0,r1,lsl r3 -+ lsr r1,r1,r2 -+ bx lr -+1: -+ lsr r0,r1,r3 -+ mov r1,#0 -+ bx lr -diff --git a/lib/arm/mullu.S b/lib/arm/mullu.S -new file mode 100644 -index 0000000..39b9a80 ---- /dev/null -+++ b/lib/arm/mullu.S -@@ -0,0 +1,33 @@ -+#------------------------------------------------------------------------------ -+# -+# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-+# -+# This program and the accompanying materials -+# are licensed and made available under the terms and conditions of the BSD License -+# which accompanies this distribution. The full text of the license may be found at -+# http://opensource.org/licenses/bsd-license.php -+# -+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -+# -+#------------------------------------------------------------------------------ -+ -+#include "edk2asm.h" -+ -+.text -+GCC_ASM_EXPORT(__aeabi_lmul) -+# -+#INT64 -+#EFIAPI -+#__aeabi_lmul ( -+# IN INT64 Multiplicand -+# IN INT64 Multiplier -+# ); -+# -+ASM_PFX(__aeabi_lmul): -+ stmdb sp!, {lr} -+ mov lr, r0 -+ umull r0, ip, r2, lr -+ mla r1, r2, r1, ip -+ mla r1, r3, lr, r1 -+ ldmia sp!, {pc} -diff --git a/lib/arm/uldiv.S b/lib/arm/uldiv.S -new file mode 100644 -index 0000000..f478898 ---- /dev/null -+++ b/lib/arm/uldiv.S -@@ -0,0 +1,267 @@ -+//------------------------------------------------------------------------------ -+// -+// Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-+// -+// This program and the accompanying materials -+// are licensed and made available under the terms and conditions of the BSD License -+// which accompanies this distribution. The full text of the license may be found at -+// http://opensource.org/licenses/bsd-license.php -+// -+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -+// -+//------------------------------------------------------------------------------ -+ -+#include "edk2asm.h" -+ -+ .text -+ .align 2 -+ GCC_ASM_EXPORT(__aeabi_uldivmod) -+ -+// -+//UINT64 -+//EFIAPI -+//__aeabi_uldivmod ( -+// IN UINT64 Dividend -+// IN UINT64 Divisor -+// ) -+// -+ASM_PFX(__aeabi_uldivmod): -+ stmdb sp!, {r4, r5, r6, lr} -+ mov r4, r1 -+ mov r5, r0 -+ mov r6, #0 // 0x0 -+ orrs ip, r3, r2, lsr #31 -+ bne ASM_PFX(__aeabi_uldivmod_label1) -+ tst r2, r2 -+ beq ASM_PFX(_ll_div0) -+ movs ip, r2, lsr #15 -+ addeq r6, r6, #16 // 0x10 -+ mov ip, r2, lsl r6 -+ movs lr, ip, lsr #23 -+ moveq ip, ip, lsl #8 -+ addeq r6, r6, #8 // 0x8 -+ movs lr, ip, lsr #27 -+ moveq ip, ip, lsl #4 -+ addeq r6, r6, #4 // 0x4 -+ movs lr, ip, lsr #29 -+ moveq ip, ip, lsl #2 -+ addeq r6, r6, #2 // 0x2 -+ movs lr, ip, lsr #30 -+ moveq ip, ip, lsl #1 -+ addeq r6, r6, #1 // 0x1 -+ b ASM_PFX(_ll_udiv_small) -+ASM_PFX(__aeabi_uldivmod_label1): -+ tst r3, #-2147483648 // 0x80000000 -+ bne ASM_PFX(__aeabi_uldivmod_label2) -+ movs ip, r3, lsr #15 -+ addeq r6, r6, #16 // 0x10 -+ mov ip, r3, lsl r6 -+ movs lr, ip, lsr #23 -+ moveq ip, ip, lsl #8 -+ addeq r6, r6, #8 // 0x8 -+ movs lr, ip, lsr #27 -+ moveq ip, ip, lsl #4 -+ addeq r6, r6, #4 // 0x4 -+ movs lr, ip, lsr #29 -+ moveq ip, ip, lsl #2 -+ addeq r6, r6, #2 // 0x2 -+ movs lr, ip, lsr #30 -+ addeq r6, r6, #1 // 0x1 -+ rsb r3, r6, #32 // 0x20 -+ moveq ip, ip, lsl #1 -+ orr ip, ip, r2, lsr r3 -+ mov lr, r2, lsl r6 -+ b ASM_PFX(_ll_udiv_big) -+ASM_PFX(__aeabi_uldivmod_label2): -+ mov ip, r3 -+ mov lr, r2 -+ b ASM_PFX(_ll_udiv_ginormous) -+ -+ASM_PFX(_ll_udiv_small): -+ cmp r4, ip, lsl #1 -+ mov r3, #0 // 0x0 -+ subcs r4, r4, ip, lsl #1 -+ addcs r3, r3, #2 // 0x2 -+ cmp r4, ip -+ subcs r4, r4, ip -+ adcs r3, r3, #0 // 0x0 -+ add r2, r6, #32 // 0x20 -+ cmp r2, #32 // 0x20 -+ rsb ip, ip, #0 // 0x0 -+ bcc ASM_PFX(_ll_udiv_small_label1) -+ orrs r0, r4, r5, lsr #30 -+ moveq r4, r5 -+ moveq r5, #0 // 0x0 -+ subeq r2, r2, #32 // 0x20 -+ASM_PFX(_ll_udiv_small_label1): -+ mov r1, #0 // 0x0 -+ cmp r2, #16 // 0x10 -+ bcc ASM_PFX(_ll_udiv_small_label2) -+ movs r0, r4, lsr #14 -+ moveq r4, r4, lsl #16 -+ addeq r1, r1, #16 // 0x10 -+ASM_PFX(_ll_udiv_small_label2): -+ sub lr, r2, r1 -+ cmp lr, #8 // 0x8 -+ bcc ASM_PFX(_ll_udiv_small_label3) -+ movs r0, r4, lsr #22 -+ moveq r4, r4, lsl #8 -+ addeq r1, r1, #8 // 0x8 -+ASM_PFX(_ll_udiv_small_label3): -+ rsb r0, r1, #32 // 0x20 -+ sub r2, r2, r1 -+ orr r4, r4, r5, lsr r0 -+ mov r5, r5, lsl r1 -+ cmp r2, #1 // 0x1 -+ bcc ASM_PFX(_ll_udiv_small_label5) -+ sub r2, r2, #1 // 0x1 -+ and r0, r2, #7 // 0x7 -+ eor r0, r0, #7 // 0x7 -+ adds r0, r0, r0, lsl #1 -+ add pc, pc, r0, lsl #2 -+ nop // (mov r0,r0) -+ASM_PFX(_ll_udiv_small_label4): -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ rsbcc r4, ip, r4 -+ adcs r5, r5, r5 -+ adcs r4, ip, r4, lsl #1 -+ sub r2, r2, #8 // 0x8 -+ tst r2, r2 -+ rsbcc r4, ip, r4 -+ bpl ASM_PFX(_ll_udiv_small_label4) -+ASM_PFX(_ll_udiv_small_label5): -+ mov r2, r4, lsr r6 -+ bic r4, r4, r2, lsl r6 -+ adcs r0, r5, r5 -+ adc r1, r4, r4 -+ add r1, r1, r3, lsl r6 -+ mov r3, #0 // 0x0 -+ ldmia sp!, {r4, r5, r6, pc} -+ -+ASM_PFX(_ll_udiv_big): -+ subs r0, r5, lr -+ mov r3, #0 // 0x0 -+ sbcs r1, r4, ip -+ movcs r5, r0 -+ movcs r4, r1 -+ adcs r3, r3, #0 // 0x0 -+ subs r0, r5, lr -+ sbcs r1, r4, ip -+ movcs r5, r0 -+ movcs r4, r1 -+ adcs r3, r3, #0 // 0x0 -+ subs r0, r5, lr -+ sbcs r1, r4, ip -+ movcs r5, r0 -+ movcs r4, r1 -+ adcs r3, r3, #0 // 0x0 -+ mov r1, #0 // 0x0 -+ rsbs lr, lr, #0 // 0x0 -+ rsc ip, ip, #0 // 0x0 -+ cmp r6, #16 // 0x10 -+ bcc ASM_PFX(_ll_udiv_big_label1) -+ movs r0, r4, lsr #14 -+ moveq r4, r4, lsl #16 -+ addeq r1, r1, #16 // 0x10 -+ASM_PFX(_ll_udiv_big_label1): -+ sub r2, r6, r1 -+ cmp r2, #8 // 0x8 -+ bcc ASM_PFX(_ll_udiv_big_label2) -+ movs r0, r4, lsr #22 -+ moveq r4, r4, lsl #8 -+ addeq r1, r1, #8 // 0x8 -+ASM_PFX(_ll_udiv_big_label2): -+ rsb r0, r1, #32 // 0x20 -+ sub r2, r6, r1 -+ orr r4, r4, r5, lsr r0 -+ mov r5, r5, lsl r1 -+ cmp r2, #1 // 0x1 -+ bcc ASM_PFX(_ll_udiv_big_label4) -+ sub r2, r2, #1 // 0x1 -+ and r0, r2, #3 // 0x3 -+ rsb r0, r0, #3 // 0x3 -+ adds r0, r0, r0, lsl #1 -+ add pc, pc, r0, lsl #3 -+ nop // (mov r0,r0) -+ASM_PFX(_ll_udiv_big_label3): -+ adcs r5, r5, r5 -+ adcs r4, r4, r4 -+ adcs r0, lr, r5 -+ adcs r1, ip, r4 -+ movcs r5, r0 -+ movcs r4, r1 -+ adcs r5, r5, r5 -+ adcs r4, r4, r4 -+ adcs r0, lr, r5 -+ adcs r1, ip, r4 -+ movcs r5, r0 -+ movcs r4, r1 -+ adcs r5, r5, r5 -+ adcs r4, r4, r4 -+ adcs r0, lr, r5 -+ adcs r1, ip, r4 -+ movcs r5, r0 -+ movcs r4, r1 -+ sub r2, r2, #4 // 0x4 -+ adcs r5, r5, r5 -+ adcs r4, r4, r4 -+ adcs r0, lr, r5 -+ adcs r1, ip, r4 -+ tst r2, r2 -+ movcs r5, r0 -+ movcs r4, r1 -+ bpl ASM_PFX(_ll_udiv_big_label3) -+ASM_PFX(_ll_udiv_big_label4): -+ mov r1, #0 // 0x0 -+ mov r2, r5, lsr r6 -+ bic r5, r5, r2, lsl r6 -+ adcs r0, r5, r5 -+ adc r1, r1, #0 // 0x0 -+ movs lr, r3, lsl r6 -+ mov r3, r4, lsr r6 -+ bic r4, r4, r3, lsl r6 -+ adc r1, r1, #0 // 0x0 -+ adds r0, r0, lr -+ orr r2, r2, r4, ror r6 -+ adc r1, r1, #0 // 0x0 -+ ldmia sp!, {r4, r5, r6, pc} -+ -+ASM_PFX(_ll_udiv_ginormous): -+ subs r2, r5, lr -+ mov r1, #0 // 0x0 -+ sbcs r3, r4, ip -+ adc r0, r1, r1 -+ movcc r2, r5 -+ movcc r3, r4 -+ ldmia sp!, {r4, r5, r6, pc} -+ -+ASM_PFX(_ll_div0): -+ ldmia sp!, {r4, r5, r6, lr} -+ mov r0, #0 // 0x0 -+ mov r1, #0 // 0x0 -+ b ASM_PFX(__aeabi_ldiv0) -+ -+ASM_PFX(__aeabi_ldiv0): -+ bx r14 -+ -+ --- -2.5.0 - diff --git a/0007-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch b/0007-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch deleted file mode 100644 index 778aa69..0000000 --- a/0007-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 16409cad4cb4ccd7c914da4317740550cc00200c Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Wed, 23 Dec 2015 08:38:24 -0500 -Subject: [PATCH 07/10] From: Ard Biesheuvel - Subject: [PATCH] Add ARM .note.gnu.build-id input section to a dedicated - output section - -This fixes the builds for ARM and AARCH64, which currently fail at link -time with an error like this: - -arm-linux-gnueabi-ld: section .note.gnu.build-id loaded at - [0000000000000000,0000000000000023] overlaps section .text loaded at - [0000000000000000,00000000000064cf] - -Signed-off-by: Ard Biesheuvel -Signed-off-by: Nigel Croxon ---- - gnuefi/elf_aarch64_efi.lds | 1 + - gnuefi/elf_arm_efi.lds | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/gnuefi/elf_aarch64_efi.lds b/gnuefi/elf_aarch64_efi.lds -index 6494e59..8864757 100644 ---- a/gnuefi/elf_aarch64_efi.lds -+++ b/gnuefi/elf_aarch64_efi.lds -@@ -50,6 +50,7 @@ SECTIONS - . = ALIGN(4096); - .dynstr : { *(.dynstr) } - . = ALIGN(4096); -+ .note.gnu.build-id : { *(.note.gnu.build-id) } - /DISCARD/ : - { - *(.rel.reloc) -diff --git a/gnuefi/elf_arm_efi.lds b/gnuefi/elf_arm_efi.lds -index 63d31be..a2f1b01 100644 ---- a/gnuefi/elf_arm_efi.lds -+++ b/gnuefi/elf_arm_efi.lds -@@ -50,6 +50,7 @@ SECTIONS - . = ALIGN(4096); - .dynstr : { *(.dynstr) } - . = ALIGN(4096); -+ .note.gnu.build-id : { *(.note.gnu.build-id) } - /DISCARD/ : - { - *(.rel.reloc) --- -2.5.0 - diff --git a/0008-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch b/0008-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch deleted file mode 100644 index 7e9af51..0000000 --- a/0008-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch +++ /dev/null @@ -1,105 +0,0 @@ -From af1a3ea3c2ca8023fd51e0b7190da43e3aaa1a95 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Thu, 7 Jan 2016 09:35:42 -0500 -Subject: [PATCH 08/10] From: Ard Biesheuvel - Subject: [PATCH v2] ARM/AARCH64: define C99 types explicitly when building - against older standard - -This adds support for the C99 uintXX_t types when building for -older versions of the standard, like the other architectures -already implement. - -Signed-off-by: Ard Biesheuvel -Reviewed-off-by: Leif Lindholm -Signed-off-by: Nigel Croxon ---- - inc/aarch64/efibind.h | 33 ++++++++++++++++++++++++++++++++- - inc/arm/efibind.h | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 63 insertions(+), 1 deletion(-) - -diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h -index 693fe52..ef7148d 100644 ---- a/inc/aarch64/efibind.h -+++ b/inc/aarch64/efibind.h -@@ -1,5 +1,36 @@ -- -+/* -+ * Copright (C) 2014 - 2015 Linaro Ltd. -+ * Author: Ard Biesheuvel -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. -+ */ -+ -+#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) -+ -+// ANSI C 1999/2000 stdint.h integer width declarations -+ -+typedef unsigned long uint64_t; -+typedef long int64_t; -+typedef unsigned int uint32_t; -+typedef int int32_t; -+typedef unsigned short uint16_t; -+typedef short int16_t; -+typedef unsigned char uint8_t; -+typedef signed char int8_t; // unqualified 'char' is unsigned on ARM -+ -+#else - #include -+#endif - - // - // Basic EFI types of various widths -diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h -index cc4b5c5..8c37f64 100644 ---- a/inc/arm/efibind.h -+++ b/inc/arm/efibind.h -@@ -1,5 +1,36 @@ -+/* -+ * Copright (C) 2014 - 2015 Linaro Ltd. -+ * Author: Ard Biesheuvel -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice and this list of conditions, without modification. -+ * 2. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * Alternatively, this software may be distributed under the terms of the -+ * GNU General Public License as published by the Free Software Foundation; -+ * either version 2 of the License, or (at your option) any later version. -+ */ -+ -+#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) - -+// ANSI C 1999/2000 stdint.h integer width declarations -+ -+typedef unsigned long long uint64_t; -+typedef long long int64_t; -+typedef unsigned int uint32_t; -+typedef int int32_t; -+typedef unsigned short uint16_t; -+typedef short int16_t; -+typedef unsigned char uint8_t; -+typedef signed char int8_t; // unqualified 'char' is unsigned on ARM -+ -+#else - #include -+#endif - - /* - * This prevents GCC from emitting GOT based relocations, and use R_ARM_REL32 --- -2.5.0 - diff --git a/0009-arm-fix-linker-script-for-building-efi-binaries.patch b/0009-arm-fix-linker-script-for-building-efi-binaries.patch deleted file mode 100644 index 2ad6ce6..0000000 --- a/0009-arm-fix-linker-script-for-building-efi-binaries.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b3a63019277282415e0c06942b0aa42c4e876582 Mon Sep 17 00:00:00 2001 -From: Nigel Croxon -Date: Wed, 17 Feb 2016 15:32:23 -0500 -Subject: [PATCH 09/10] arm: fix linker script for building efi binaries - -On arm, the linker script is missing section collection for data and -bss. This causes some symbols (notably static array symbols) not to -get relocated correctly and the resulting efi binary to crash. Fix -this by correctly collecting all the data and bss sections. - -Signed-off-by: James Bottomley -Signed-off-by: Nigel Croxon ---- - gnuefi/elf_arm_efi.lds | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gnuefi/elf_arm_efi.lds b/gnuefi/elf_arm_efi.lds -index a2f1b01..2ca8fc6 100644 ---- a/gnuefi/elf_arm_efi.lds -+++ b/gnuefi/elf_arm_efi.lds -@@ -22,7 +22,7 @@ SECTIONS - *(.sdata) - *(.data) - *(.data1) -- *(.data) -+ *(.data.*) - *(.got.plt) - *(.got) - -@@ -34,6 +34,7 @@ SECTIONS - *(.scommon) - *(.dynbss) - *(.bss) -+ *(.bss.*) - *(COMMON) - . = ALIGN(16); - _bss_end = .; --- -2.5.0 - diff --git a/0010-Explicitly-place-our-build-id-notes-on-all-arches.patch b/0010-Explicitly-place-our-build-id-notes-on-all-arches.patch deleted file mode 100644 index 6433fad..0000000 --- a/0010-Explicitly-place-our-build-id-notes-on-all-arches.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 0587ab32cf5037fd759dfcec0e858a57372cb64f Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 15 Jul 2015 10:15:51 -0400 -Subject: [PATCH 10/10] Explicitly place our build-id notes on all arches. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apparently some linkers will just throw caution to the wind and decide -to stick stuff we don't explicitly mention at 0, no matter what else has -already explicitly been located there. A debian/ubuntu builder noted: - -gcc -O0 -g3 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ - -fno-merge-constants -ffreestanding -fno-stack-protector \ - -fno-stack-check --std=c11 -DCONFIG_aarch64 -D__KERNEL__ \ - -I/usr/include/efi/ -I/usr/include/efi/aarch64/ \ - -iquote/«PKGBUILDDIR»/include "-DDEBUGDIR=L\"/\"" \ - -ffreestanding -I/usr/lib/gcc/aarch64-linux-gnu/4.9/include \ - -c -o fakeesrt2.o fakeesrt2.c -ld -nostdlib --warn-common --no-undefined --fatal-warnings -shared \ - -Bsymbolic -L/usr/lib -L/usr/lib --build-id=sha1 \ - /usr/lib/crt0-efi-aarch64.o --defsym=EFI_SUBSYSTEM=0xa \ - -o fakeesrt2.so fakeesrt2.o -lefi -lgnuefi \ - /usr/lib/gcc/aarch64-linux-gnu/4.9/libgcc.a \ - -T elf_aarch64_efi.lds -ld: section .note.gnu.build-id loaded at [00000000,00000023] overlaps section .text loaded at [00000000,0000668f] - -This shouldn't be a problem if we explicitly tell it where to put them. - -Ard added a patch to do this on Arm and aarch64 targets in 16409cad4cb, -but it needs to be everywhere. - -Signed-off-by: Peter Jones ---- - gnuefi/elf_ia32_efi.lds | 2 ++ - gnuefi/elf_ia32_fbsd_efi.lds | 2 ++ - gnuefi/elf_ia64_efi.lds | 2 ++ - gnuefi/elf_x86_64_efi.lds | 2 ++ - gnuefi/elf_x86_64_fbsd_efi.lds | 2 ++ - 5 files changed, 10 insertions(+) - -diff --git a/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds -index b164094..6cc4ce1 100644 ---- a/gnuefi/elf_ia32_efi.lds -+++ b/gnuefi/elf_ia32_efi.lds -@@ -46,6 +46,8 @@ SECTIONS - *(.bss) - *(COMMON) - } -+ .note.gnu.build-id : { *(.note.gnu.build-id) } -+ - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); -diff --git a/gnuefi/elf_ia32_fbsd_efi.lds b/gnuefi/elf_ia32_fbsd_efi.lds -index 1f56cd7..77d6fad 100644 ---- a/gnuefi/elf_ia32_fbsd_efi.lds -+++ b/gnuefi/elf_ia32_fbsd_efi.lds -@@ -46,6 +46,8 @@ SECTIONS - *(.bss) - *(COMMON) - } -+ .note.gnu.build-id : { *(.note.gnu.build-id) } -+ - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); -diff --git a/gnuefi/elf_ia64_efi.lds b/gnuefi/elf_ia64_efi.lds -index a6ec717..baca962 100644 ---- a/gnuefi/elf_ia64_efi.lds -+++ b/gnuefi/elf_ia64_efi.lds -@@ -43,6 +43,8 @@ SECTIONS - *(.bss) - *(COMMON) - } -+ .note.gnu.build-id : { *(.note.gnu.build-id) } -+ - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); -diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds -index 3862d9f..942d1f3 100644 ---- a/gnuefi/elf_x86_64_efi.lds -+++ b/gnuefi/elf_x86_64_efi.lds -@@ -46,6 +46,8 @@ SECTIONS - *(COMMON) - *(.rel.local) - } -+ .note.gnu.build-id : { *(.note.gnu.build-id) } -+ - _edata = .; - _data_size = . - _etext; - . = ALIGN(4096); -diff --git a/gnuefi/elf_x86_64_fbsd_efi.lds b/gnuefi/elf_x86_64_fbsd_efi.lds -index 507fe43..6fd2031 100644 ---- a/gnuefi/elf_x86_64_fbsd_efi.lds -+++ b/gnuefi/elf_x86_64_fbsd_efi.lds -@@ -43,6 +43,8 @@ SECTIONS - *(COMMON) - *(.rel.local) - } -+ .note.gnu.build-id : { *(.note.gnu.build-id) } -+ - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); --- -2.5.0 - diff --git a/gnu-efi.spec b/gnu-efi.spec index f729135..d63fb4d 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -1,25 +1,18 @@ Summary: Development Libraries and headers for EFI Name: gnu-efi -Version: 3.0.3 +Version: 3.0.5 Release: 3%{?dist} Epoch: 1 Group: Development/System License: BSD URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} x86_64 ia64 aarch64 +ExclusiveArch: %{ix86} x86_64 aarch64 %{arm} BuildRequires: git Source: http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-%{version}.tar.bz2 -Patch0001: 0001-Add-the-missing-URI-device-path-to-the-unions.patch -Patch0002: 0002-From-Pete-Batard-pete-akeo.ie.patch -Patch0003: 0003-From-Pete-Batard-pete-akeo.ie.patch -Patch0004: 0004-From-Julian-Andres-Klode-jak-debian.org.patch -Patch0005: 0005-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch -Patch0006: 0006-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch -Patch0007: 0007-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch -Patch0008: 0008-From-Ard-Biesheuvel-ard.biesheuvel-linaro.org.patch -Patch0009: 0009-arm-fix-linker-script-for-building-efi-binaries.patch -Patch0010: 0010-Explicitly-place-our-build-id-notes-on-all-arches.patch + +Patch0001: 0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch +Patch0002: 0002-Fix-some-types-gcc-doesn-t-like.patch %define debug_package %{nil} @@ -106,6 +99,9 @@ rm -rf %{buildroot} %attr(0644,root,root) /boot/efi/EFI/%{efidir}/*.efi %changelog +* Thu Feb 02 2017 Peter Jones - 3.0.5-3 +- Update to 3.0.5 + * Tue Feb 23 2016 Peter Jones - 3.0.3-3 - Include patches from upstream that are after 3.0.3 This should fix the arm and aarch64 builds. diff --git a/sources b/sources index e163e00..9b5b3b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15a4bcbc18a9a5e8110ed955970622e6 gnu-efi-3.0.3.tar.bz2 +SHA512 (gnu-efi-3.0.5.tar.bz2) = 848ea9b0a9b900a237d04c2fe95fbaaa08d786c8abe4cbfdca9b666a5cd955ad1097668561aa90899b654a606ff822509fb23b6aeafce69bc4407e5b4547fdcf