diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6fa2a99 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/gnu-efi-3.0.9.tar.bz2 diff --git a/.gnu-efi.metadata b/.gnu-efi.metadata new file mode 100644 index 0000000..6a3e605 --- /dev/null +++ b/.gnu-efi.metadata @@ -0,0 +1 @@ +9b39e06206e63eba56d59a648a7e4f20aead6962 SOURCES/gnu-efi-3.0.9.tar.bz2 diff --git a/SOURCES/0001-Set-0-properly-in-StrnCpy.patch b/SOURCES/0001-Set-0-properly-in-StrnCpy.patch new file mode 100644 index 0000000..f90d1a5 --- /dev/null +++ b/SOURCES/0001-Set-0-properly-in-StrnCpy.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Gary Lin +Date: Tue, 9 Oct 2018 18:35:21 +0800 +Subject: [PATCH] Set '\0' properly in StrnCpy() + +The arguments to SetMem() were wrong. Besides, SetMem() should start at +"Dest + Size" since "Size" will be smaller than "Len" if they are not +equal. + +Signed-off-by: Gary Lin +Signed-off-by: Nigel Croxon +--- + lib/runtime/rtstr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/runtime/rtstr.c b/lib/runtime/rtstr.c +index 129c9f21ad5..73965cae192 100644 +--- a/lib/runtime/rtstr.c ++++ b/lib/runtime/rtstr.c +@@ -71,7 +71,7 @@ RtStrnCpy ( + { + UINTN Size = RtStrnLen(Src, Len); + if (Size != Len) +- RtSetMem(Dest + Len, '\0', (UINT8)((Len - Size) * sizeof(CHAR16))); ++ RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0'); + RtCopyMem(Dest, Src, Size * sizeof(CHAR16)); + } + diff --git a/SOURCES/0002-Fix-typeo-in-efierr.h-EFI_WARN_UNKNOWN_GLYPH-definit.patch b/SOURCES/0002-Fix-typeo-in-efierr.h-EFI_WARN_UNKNOWN_GLYPH-definit.patch new file mode 100644 index 0000000..dce5471 --- /dev/null +++ b/SOURCES/0002-Fix-typeo-in-efierr.h-EFI_WARN_UNKNOWN_GLYPH-definit.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Tue, 8 Jan 2019 11:19:25 -0500 +Subject: [PATCH] Fix typeo in efierr.h EFI_WARN_UNKNOWN_GLYPH definition. + +Signed-off-by: Nigel Croxon +Signed-off-by: manison +--- + inc/efierr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/efierr.h b/inc/efierr.h +index dfd3d3cf486..d351c1ca225 100644 +--- a/inc/efierr.h ++++ b/inc/efierr.h +@@ -58,7 +58,7 @@ Revision History + #define EFI_INVALID_LANGUAGE EFIERR(32) + #define EFI_COMPROMISED_DATA EFIERR(33) + +-#define EFI_WARN_UNKOWN_GLYPH EFIWARN(1) ++#define EFI_WARN_UNKNOWN_GLYPH EFIWARN(1) + #define EFI_WARN_DELETE_FAILURE EFIWARN(2) + #define EFI_WARN_WRITE_FAILURE EFIWARN(3) + #define EFI_WARN_BUFFER_TOO_SMALL EFIWARN(4) diff --git a/SOURCES/0003-Fixed-typeo-lib-error.c-EFI_WARN_UNKNOWN_GLYPH-defin.patch b/SOURCES/0003-Fixed-typeo-lib-error.c-EFI_WARN_UNKNOWN_GLYPH-defin.patch new file mode 100644 index 0000000..d111ee2 --- /dev/null +++ b/SOURCES/0003-Fixed-typeo-lib-error.c-EFI_WARN_UNKNOWN_GLYPH-defin.patch @@ -0,0 +1,185 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Wed, 9 Jan 2019 07:03:46 -0500 +Subject: [PATCH] * Fixed typeo lib/error.c EFI_WARN_UNKNOWN_GLYPH definition. + On couple of locations in runtime string library (rtstr.c) there are calls to + non-runtime variant of StrLen function. * Another issue is with formatting + 1394 paths. The F1394_DEVICE_PATH::Guid is formatted as %g, but 1394 GUID is + 8 byte integer, not EFI_GUID and therefore should be formatted as e.g. %016lx + (as edk2 does). * Beyond what's mentioned above, changed the format of the + harddrive path, so it's in line with edk2 format and spec (2.7 errata A, + chapter 10.6.1.6, table 102). + +Signed-off-by: Nigel Croxon +Signed-off-by: manison +--- + inc/efidevp.h | 10 +++++----- + lib/dpath.c | 26 ++++++++++++++------------ + lib/error.c | 2 +- + lib/runtime/rtstr.c | 12 ++++++------ + 4 files changed, 26 insertions(+), 24 deletions(-) + +diff --git a/inc/efidevp.h b/inc/efidevp.h +index ffaf6e28eea..fa1a235eaba 100644 +--- a/inc/efidevp.h ++++ b/inc/efidevp.h +@@ -325,11 +325,11 @@ typedef struct _VLAN_DEVICE_PATH { + #define MSG_INFINIBAND_DP 0x09 + typedef struct _INFINIBAND_DEVICE_PATH { + EFI_DEVICE_PATH_PROTOCOL Header; +- UINT32 ResourceFlags ; +- UINT64 PortGid ; +- UINT64 ServiceId ; +- UINT64 TargetPortId ; +- UINT64 DeviceId ; ++ UINT32 ResourceFlags; ++ UINT8 PortGid[16]; ++ UINT64 ServiceId; ++ UINT64 TargetPortId; ++ UINT64 DeviceId; + } INFINIBAND_DEVICE_PATH; + + #define MSG_UART_DP 0x0e +diff --git a/lib/dpath.c b/lib/dpath.c +index 7486252eecf..5e079d687bd 100644 +--- a/lib/dpath.c ++++ b/lib/dpath.c +@@ -659,7 +659,8 @@ _DevPath1394 ( + F1394_DEVICE_PATH *F1394; + + F1394 = DevPath; +- CatPrint(Str, L"1394(%g)", &F1394->Guid); ++ // Guid has format of IEEE-EUI64 ++ CatPrint(Str, L"I1394(%016lx)", F1394->Guid); + } + + +@@ -863,9 +864,9 @@ _DevPathInfiniBand ( + INFINIBAND_DEVICE_PATH *InfiniBand; + + InfiniBand = DevPath; +- CatPrint( Str , L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)" , +- InfiniBand-> ResourceFlags , InfiniBand-> PortGid , InfiniBand-> ServiceId , +- InfiniBand-> TargetPortId , InfiniBand-> DeviceId ) ; ++ CatPrint(Str, L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)", ++ InfiniBand->ResourceFlags, InfiniBand->PortGid, InfiniBand->ServiceId, ++ InfiniBand->TargetPortId, InfiniBand->DeviceId); + } + + static VOID +@@ -889,17 +890,19 @@ _DevPathUart ( + } + + if (Uart->BaudRate == 0) { +- CatPrint(Str, L"Uart(DEFAULT %c",Uart->BaudRate,Parity); ++ CatPrint(Str, L"Uart(DEFAULT,"); + } else { +- CatPrint(Str, L"Uart(%d %c",Uart->BaudRate,Parity); ++ CatPrint(Str, L"Uart(%ld,", Uart->BaudRate); + } + + if (Uart->DataBits == 0) { +- CatPrint(Str, L"D"); ++ CatPrint(Str, L"DEFAULT,"); + } else { +- CatPrint(Str, L"%d",Uart->DataBits); ++ CatPrint(Str, L"%d,", Uart->DataBits); + } + ++ CatPrint(Str, L"%c,", Parity); ++ + switch (Uart->StopBits) { + case 0 : CatPrint(Str, L"D)"); break; + case 1 : CatPrint(Str, L"1)"); break; +@@ -933,21 +936,20 @@ _DevPathHardDrive ( + Hd = DevPath; + switch (Hd->SignatureType) { + case SIGNATURE_TYPE_MBR: +- CatPrint(Str, L"HD(Part%d,Sig%08X)", ++ CatPrint(Str, L"HD(%d,MBR,0x%08x)", + Hd->PartitionNumber, + *((UINT32 *)(&(Hd->Signature[0]))) + ); + break; + case SIGNATURE_TYPE_GUID: +- CatPrint(Str, L"HD(Part%d,Sig%g)", ++ CatPrint(Str, L"HD(%d,GPT,%g)", + Hd->PartitionNumber, + (EFI_GUID *) &(Hd->Signature[0]) + ); + break; + default: +- CatPrint(Str, L"HD(Part%d,MBRType=%02x,SigType=%02x)", ++ CatPrint(Str, L"HD(%d,%d,0)", + Hd->PartitionNumber, +- Hd->MBRType, + Hd->SignatureType + ); + break; +diff --git a/lib/error.c b/lib/error.c +index 3a856a6f39d..c4d053db633 100644 +--- a/lib/error.c ++++ b/lib/error.c +@@ -56,7 +56,7 @@ struct { + { EFI_COMPROMISED_DATA, L"Compromised Data"}, + + // warnings +- { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, ++ { EFI_WARN_UNKNOWN_GLYPH, L"Warning Unknown Glyph"}, + { EFI_WARN_DELETE_FAILURE, L"Warning Delete Failure"}, + { EFI_WARN_WRITE_FAILURE, L"Warning Write Failure"}, + { EFI_WARN_BUFFER_TOO_SMALL, L"Warning Buffer Too Small"}, +diff --git a/lib/runtime/rtstr.c b/lib/runtime/rtstr.c +index 73965cae192..802e7f43309 100644 +--- a/lib/runtime/rtstr.c ++++ b/lib/runtime/rtstr.c +@@ -18,7 +18,7 @@ Revision History + #include "lib.h" + + #ifndef __GNUC__ +-#pragma RUNTIME_CODE(RtAcquireLock) ++#pragma RUNTIME_CODE(RtStrCmp) + #endif + INTN + RUNTIMEFUNCTION +@@ -76,7 +76,7 @@ RtStrnCpy ( + } + + #ifndef __GNUC__ +-#pragma RUNTIME_CODE(RtStrCpy) ++#pragma RUNTIME_CODE(RtStpCpy) + #endif + CHAR16 * + RUNTIMEFUNCTION +@@ -122,7 +122,7 @@ RtStrCat ( + IN CONST CHAR16 *Src + ) + { +- RtStrCpy(Dest+StrLen(Dest), Src); ++ RtStrCpy(Dest+RtStrLen(Dest), Src); + } + + #ifndef __GNUC__ +@@ -138,7 +138,7 @@ RtStrnCat ( + { + UINTN DestSize, Size; + +- DestSize = StrLen(Dest); ++ DestSize = RtStrLen(Dest); + Size = RtStrnLen(Src, Len); + RtCopyMem(Dest + DestSize, Src, Size * sizeof(CHAR16)); + Dest[DestSize + Size] = '\0'; +@@ -169,11 +169,11 @@ RtStrnLen ( + IN CONST CHAR16 *s1, + IN UINTN Len + ) +-// copy strings ++// string length + { + UINTN i; + for (i = 0; *s1 && i < Len; i++) +- s1++; ++ s1++; + return i; + } + diff --git a/SOURCES/0004-efilink-fix-build-with-gcc-4.8.patch b/SOURCES/0004-efilink-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000..a3ccbaf --- /dev/null +++ b/SOURCES/0004-efilink-fix-build-with-gcc-4.8.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 18 Jan 2019 22:05:37 +0100 +Subject: [PATCH] efilink: fix build with gcc 4.8 + +intptr_t is undefined without an include on stdint.h + +Fixes: + - http://autobuild.buildroot.org/results/a0ca37b5ed27af445344e3ac49dc87bb17512c50 + +Signed-off-by: Fabrice Fontaine +--- + inc/efilink.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/inc/efilink.h b/inc/efilink.h +index cc5aa2dc57b..b69a6fd5cf5 100644 +--- a/inc/efilink.h ++++ b/inc/efilink.h +@@ -1,6 +1,10 @@ + #ifndef _EFI_LINK_H + #define _EFI_LINK_H + ++#if defined(__GNUC__) ++#include ++#endif ++ + /*++ + + Copyright (c) 1998 Intel Corporation diff --git a/SOURCES/0005-Fix-for-problem-with-undeclared-intptr_t-type.patch b/SOURCES/0005-Fix-for-problem-with-undeclared-intptr_t-type.patch new file mode 100644 index 0000000..d67889e --- /dev/null +++ b/SOURCES/0005-Fix-for-problem-with-undeclared-intptr_t-type.patch @@ -0,0 +1,108 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Fri, 15 Mar 2019 11:57:51 +0100 +Subject: [PATCH] Fix for problem with undeclared intptr_t type + +When building gnu-efi with old compilers with pre C90 compilers: + +In file included from gnu-efi-3.0.9/lib/../inc/efilib.h:25:0, + from gnu-efi-3.0.9/lib/lib.h:24, + from gnu-efi-3.0.9/lib/dpath.c:25: +gnu-efi-3.0.9/lib/dpath.c: In function 'FileDevicePath': +gnu-efi-3.0.9/lib/../inc/efilink.h:145:47: error: 'intptr_t' undeclared (first use in this function) + #define EFI_FIELD_OFFSET(TYPE,Field) ((UINTN)(intptr_t)(&(((TYPE *) 0)->Field))) + +Problem introduced with commit a46a62b12b58139c31d4288384808365c4053bf2 +(Fix some types gcc doesn't like). + +Avoid this by adding intptr_t (and uintptr_t) typedefs for builds that does +not include stdint.h. + +Signed-off-by: Esben Haabendal +--- + inc/aarch64/efibind.h | 2 ++ + inc/arm/efibind.h | 2 ++ + inc/ia32/efibind.h | 2 ++ + inc/ia64/efibind.h | 2 ++ + inc/mips64el/efibind.h | 2 ++ + inc/x86_64/efibind.h | 2 ++ + 6 files changed, 12 insertions(+) + +diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h +index bdaa5238e84..3c8cf963c31 100644 +--- a/inc/aarch64/efibind.h ++++ b/inc/aarch64/efibind.h +@@ -27,6 +27,8 @@ 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 ++typedef uint64_t uintptr_t; ++typedef int64_t intptr_t; + + #else + #include +diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h +index 40a5a9cd428..7a22b9c8458 100644 +--- a/inc/arm/efibind.h ++++ b/inc/arm/efibind.h +@@ -27,6 +27,8 @@ 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 ++typedef uint32_t uintptr_t; ++typedef int32_t intptr_t; + + #else + #include +diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h +index 1b11f10a6d3..dd0138573d9 100644 +--- a/inc/ia32/efibind.h ++++ b/inc/ia32/efibind.h +@@ -75,6 +75,8 @@ Revision History + typedef unsigned char uint8_t; + typedef char int8_t; + #endif ++ typedef uint32_t uintptr_t; ++ typedef int32_t intptr_t; + #elif defined(__GNUC__) + #include + #endif +diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h +index b415461b10c..b9b2e624657 100644 +--- a/inc/ia64/efibind.h ++++ b/inc/ia64/efibind.h +@@ -62,6 +62,8 @@ Revision History + typedef unsigned char uint8_t; + typedef char int8_t; + #endif ++ typedef uint64_t uintptr_t; ++ typedef int64_t intptr_t; + #elif defined(__GNUC__) + #include + #endif +diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h +index 4adbca31d63..32241e5ad46 100644 +--- a/inc/mips64el/efibind.h ++++ b/inc/mips64el/efibind.h +@@ -29,6 +29,8 @@ 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 ++typedef uint64_t uintptr_t; ++typedef int64_t intptr_t; + + #else + #include +diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h +index 4309f9f0e17..ae40595be0b 100644 +--- a/inc/x86_64/efibind.h ++++ b/inc/x86_64/efibind.h +@@ -84,6 +84,8 @@ Revision History + typedef unsigned char uint8_t; + typedef char int8_t; + #endif ++ typedef uint64_t uintptr_t; ++ typedef int64_t intptr_t; + #elif defined(__GNUC__) + #include + #endif diff --git a/SOURCES/0006-Redefine-jmp_buf-to-comply-with-C-calling-convention.patch b/SOURCES/0006-Redefine-jmp_buf-to-comply-with-C-calling-convention.patch new file mode 100644 index 0000000..fbd8e10 --- /dev/null +++ b/SOURCES/0006-Redefine-jmp_buf-to-comply-with-C-calling-convention.patch @@ -0,0 +1,131 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Fri, 15 Mar 2019 09:32:06 -0400 +Subject: [PATCH] Redefine jmp_buf to comply with C calling convention. + +Signed-off-by: Joakim Tjernlund +Signed-off-by: Nigel Croxon +--- + apps/setjmp.c | 6 +++--- + inc/aarch64/efisetjmp_arch.h | 2 +- + inc/arm/efisetjmp_arch.h | 2 +- + inc/efisetjmp.h | 4 ++-- + inc/ia32/efisetjmp_arch.h | 2 +- + inc/ia64/efisetjmp_arch.h | 2 +- + inc/mips64el/efisetjmp_arch.h | 2 +- + inc/x86_64/efisetjmp_arch.h | 2 +- + 8 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/apps/setjmp.c b/apps/setjmp.c +index bd70c11b0ba..b20070e7c95 100644 +--- a/apps/setjmp.c ++++ b/apps/setjmp.c +@@ -12,12 +12,12 @@ efi_main( + int rc; + + InitializeLib(image_handle, systab); +- rc = setjmp(&env); ++ rc = setjmp(env); + Print(L"setjmp() = %d\n", rc); + + if (rc == 3) { + Print(L"3 worked\n"); +- longjmp(&env, 0); ++ longjmp(env, 0); + return 0; + } + +@@ -26,6 +26,6 @@ efi_main( + return 0; + } + +- longjmp(&env, 3); ++ longjmp(env, 3); + return 0; + } +diff --git a/inc/aarch64/efisetjmp_arch.h b/inc/aarch64/efisetjmp_arch.h +index abd7a0e9ad9..8dbce07821f 100644 +--- a/inc/aarch64/efisetjmp_arch.h ++++ b/inc/aarch64/efisetjmp_arch.h +@@ -28,6 +28,6 @@ typedef struct { + UINT64 D13; + UINT64 D14; + UINT64 D15; +-} ALIGN(JMPBUF_ALIGN) jmp_buf; ++} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + + #endif /* GNU_EFI_AARCH64_SETJMP_H */ +diff --git a/inc/arm/efisetjmp_arch.h b/inc/arm/efisetjmp_arch.h +index 3a09ea5fa52..17f5dc0facb 100644 +--- a/inc/arm/efisetjmp_arch.h ++++ b/inc/arm/efisetjmp_arch.h +@@ -16,6 +16,6 @@ typedef struct { + UINT32 R12; + UINT32 R13; + UINT32 R14; +-} ALIGN(JMPBUF_ALIGN) jmp_buf; ++} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + + #endif /* GNU_EFI_ARM_SETJMP_H */ +diff --git a/inc/efisetjmp.h b/inc/efisetjmp.h +index 58a93a7e64f..de69194b4f9 100644 +--- a/inc/efisetjmp.h ++++ b/inc/efisetjmp.h +@@ -4,7 +4,7 @@ + #include "eficompiler.h" + #include "efisetjmp_arch.h" + +-extern UINTN setjmp(jmp_buf *env) __attribute__((returns_twice)); +-extern VOID longjmp(jmp_buf *env, UINTN value) __attribute__((noreturn)); ++extern UINTN setjmp(jmp_buf env) __attribute__((returns_twice)); ++extern VOID longjmp(jmp_buf env, UINTN value) __attribute__((noreturn)); + + #endif /* GNU_EFI_SETJMP_H */ +diff --git a/inc/ia32/efisetjmp_arch.h b/inc/ia32/efisetjmp_arch.h +index 17184e75a2d..a5c1a81c969 100644 +--- a/inc/ia32/efisetjmp_arch.h ++++ b/inc/ia32/efisetjmp_arch.h +@@ -10,6 +10,6 @@ typedef struct { + UINT32 Ebp; + UINT32 Esp; + UINT32 Eip; +-} ALIGN(JMPBUF_ALIGN) jmp_buf; ++} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + + #endif /* GNU_EFI_IA32_SETJMP_H */ +diff --git a/inc/ia64/efisetjmp_arch.h b/inc/ia64/efisetjmp_arch.h +index 3afa04426f5..ceda4481d98 100644 +--- a/inc/ia64/efisetjmp_arch.h ++++ b/inc/ia64/efisetjmp_arch.h +@@ -42,6 +42,6 @@ typedef struct { + UINT64 Predicates; + UINT64 LoopCount; + UINT64 FPSR; +-} ALIGN(JMPBUF_ALIGN) jmp_buf; ++} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + + #endif /* GNU_EFI_IA64_SETJMP_H */ +diff --git a/inc/mips64el/efisetjmp_arch.h b/inc/mips64el/efisetjmp_arch.h +index fd17f1fc6d4..2b8f756eb75 100644 +--- a/inc/mips64el/efisetjmp_arch.h ++++ b/inc/mips64el/efisetjmp_arch.h +@@ -29,6 +29,6 @@ typedef struct { + UINT64 F30; + UINT64 F31; + #endif +-} ALIGN(JMPBUF_ALIGN) jmp_buf; ++} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + + #endif /* GNU_EFI_MIPS64EL_SETJMP_H */ +diff --git a/inc/x86_64/efisetjmp_arch.h b/inc/x86_64/efisetjmp_arch.h +index a489993c174..b1ad1fe3087 100644 +--- a/inc/x86_64/efisetjmp_arch.h ++++ b/inc/x86_64/efisetjmp_arch.h +@@ -17,6 +17,6 @@ typedef struct { + UINT64 Rip; + UINT64 MxCsr; + UINT8 XmmBuffer[160]; // XMM6 - XMM15 +-} ALIGN(JMPBUF_ALIGN) jmp_buf; ++} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + + #endif /* GNU_EFI_X86_64_SETJMP_H */ diff --git a/SOURCES/0007-Make.rules-incomplete-wrong-make-r-failure.patch b/SOURCES/0007-Make.rules-incomplete-wrong-make-r-failure.patch new file mode 100644 index 0000000..ee1b7b7 --- /dev/null +++ b/SOURCES/0007-Make.rules-incomplete-wrong-make-r-failure.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Fri, 15 Mar 2019 09:48:10 -0400 +Subject: [PATCH] Make.rules incomplete/wrong; make -r failure + +Make.rules is not complete; in particular it lacks a %.o: %.S rule. +This happens to work due to the builtin make rule to that effect. but +building with make -r, or building as a sub-make of an environment that +uses make -r (or MAKEFLAGS += -r) causes it to break. + +In general, make -r is strongly preferred, and Make.rules seems to have +been created explicitly to support this. + +To further complicate things, the rule %.S: %.c causes a completely +incomprehensible error message. This rule is wrong, it should be %.s: +%.c not %.S: %.c. + +Finally, the rule %.E: %.c is normally %.i: %.c; .i is the normal +extension for preprocessed C source. The equivalent rule for assembly is +%.s: %.S. + +Signed-off-by: H. Peter Anvin +Signed-off-by: Nigel Croxon +--- + Make.rules | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Make.rules b/Make.rules +index 5b1c2862e1b..8cb93b0a039 100644 +--- a/Make.rules ++++ b/Make.rules +@@ -51,8 +51,14 @@ + %.o: %.c + $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +-%.S: %.c ++%.s: %.c + $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -S $< -o $@ + +-%.E: %.c ++%.i: %.c ++ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@ ++ ++%.o: %.S ++ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ ++ ++%.s: %.S + $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@ diff --git a/SOURCES/0008-gnuefi-Makefile-uses-a-strange-rule-to-create-libgnu.patch b/SOURCES/0008-gnuefi-Makefile-uses-a-strange-rule-to-create-libgnu.patch new file mode 100644 index 0000000..327e62c --- /dev/null +++ b/SOURCES/0008-gnuefi-Makefile-uses-a-strange-rule-to-create-libgnu.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Tue, 2 Apr 2019 09:47:24 -0400 +Subject: [PATCH] gnuefi/Makefile uses a strange rule to create libgnuefi.a, + which only works because of a "make" builtin rule. This breaks make -r, and + it is an inefficient way to build, at least for multiple files. + +I have made a git tree which includes a patch for this problem, +and also forces -r by adding it to MAKEFLAGS: + +git://git.zytor.com/users/hpa/gnu-efi.git make-r-fixes + +Signed-off-by: H. Peter Anvin +Signed-off-by: Nigel Croxon +--- + gnuefi/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index 2a61699ac25..10d4e7addd0 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -54,7 +54,9 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a + + all: $(TARGETS) + +-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) ++libgnuefi.a: $(OBJS) ++ $(AR) $(ARFLAGS) $@ $^ ++ + + clean: + rm -f $(TARGETS) *~ *.o $(OBJS) diff --git a/SOURCES/0009-efiapi.h-fix-EventGroup-parameter-of-EFI_CREATE_EVEN.patch b/SOURCES/0009-efiapi.h-fix-EventGroup-parameter-of-EFI_CREATE_EVEN.patch new file mode 100644 index 0000000..48f8b9a --- /dev/null +++ b/SOURCES/0009-efiapi.h-fix-EventGroup-parameter-of-EFI_CREATE_EVEN.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: leo +Date: Tue, 14 May 2019 07:44:28 +0200 +Subject: [PATCH] efiapi.h: fix EventGroup parameter of EFI_CREATE_EVENT_EX + prototype + +From UEFI specifications, this parameter is a pointer, see +https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf +page 148 for reference. + +Signed-off-by: leo +--- + inc/efiapi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/efiapi.h b/inc/efiapi.h +index e7d2abd79de..bdf5de26a3f 100644 +--- a/inc/efiapi.h ++++ b/inc/efiapi.h +@@ -576,7 +576,7 @@ EFI_STATUS + IN EFI_TPL NotifyTpl, + IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, + IN const VOID *NotifyContext OPTIONAL, +- IN const EFI_GUID EventGroup OPTIONAL, ++ IN const EFI_GUID *EventGroup OPTIONAL, + OUT EFI_EVENT *Event + ); + diff --git a/SOURCES/0010-Do-not-include-efisetjmp.h-on-efi.h.patch b/SOURCES/0010-Do-not-include-efisetjmp.h-on-efi.h.patch new file mode 100644 index 0000000..a081e33 --- /dev/null +++ b/SOURCES/0010-Do-not-include-efisetjmp.h-on-efi.h.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: leo +Date: Wed, 15 May 2019 05:32:21 +0200 +Subject: [PATCH] Do not include efisetjmp.h on efi.h + +People than really want to use efisetjmp implementation can include +the header on their own. + +Signed-off-by: leo +--- + apps/setjmp.c | 1 + + inc/efi.h | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/setjmp.c b/apps/setjmp.c +index b20070e7c95..d9e0f290dd2 100644 +--- a/apps/setjmp.c ++++ b/apps/setjmp.c +@@ -1,6 +1,7 @@ + + #include + #include ++#include + + EFI_STATUS + efi_main( +diff --git a/inc/efi.h b/inc/efi.h +index 9cbc22dc370..2ddd53e0d95 100644 +--- a/inc/efi.h ++++ b/inc/efi.h +@@ -57,6 +57,5 @@ Revision History + #include "efiudp.h" + #include "efitcp.h" + #include "efipoint.h" +-#include "efisetjmp.h" + + #endif diff --git a/SOURCES/0011-Bump-revision-to-VERSION-3.0.10.patch b/SOURCES/0011-Bump-revision-to-VERSION-3.0.10.patch new file mode 100644 index 0000000..e1413ba --- /dev/null +++ b/SOURCES/0011-Bump-revision-to-VERSION-3.0.10.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Thu, 3 Oct 2019 12:05:00 -0400 +Subject: [PATCH] Bump revision to VERSION = 3.0.10 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 01d1a01369e..a15513dcbba 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ + # SUCH DAMAGE. + # + +-VERSION = 3.0.9 ++VERSION = 3.0.10 + + MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) + SRCDIR = $(dir $(MKFILE_PATH)) diff --git a/SOURCES/0012-Revert-efilink-fix-build-with-gcc-4.8.patch b/SOURCES/0012-Revert-efilink-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000..6b98d29 --- /dev/null +++ b/SOURCES/0012-Revert-efilink-fix-build-with-gcc-4.8.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Mon, 28 Oct 2019 07:45:38 -0400 +Subject: [PATCH] Revert "efilink: fix build with gcc 4.8" + +Breaks gcc builds with '-nostdinc' flag. + +The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4 +(Fix for problem with undeclared intptr_t type), which is also merged +fixes the same problem, without causing breakage. + +This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6. +--- + inc/efilink.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/inc/efilink.h b/inc/efilink.h +index b69a6fd5cf5..cc5aa2dc57b 100644 +--- a/inc/efilink.h ++++ b/inc/efilink.h +@@ -1,10 +1,6 @@ + #ifndef _EFI_LINK_H + #define _EFI_LINK_H + +-#if defined(__GNUC__) +-#include +-#endif +- + /*++ + + Copyright (c) 1998 Intel Corporation diff --git a/SOURCES/0013-Bump-revision-to-VERSION-3.0.11.patch b/SOURCES/0013-Bump-revision-to-VERSION-3.0.11.patch new file mode 100644 index 0000000..d487fbf --- /dev/null +++ b/SOURCES/0013-Bump-revision-to-VERSION-3.0.11.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Mon, 28 Oct 2019 07:48:52 -0400 +Subject: [PATCH] Bump revision to VERSION = 3.0.11 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a15513dcbba..84f07d33a48 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ + # SUCH DAMAGE. + # + +-VERSION = 3.0.10 ++VERSION = 3.0.11 + + MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) + SRCDIR = $(dir $(MKFILE_PATH)) diff --git a/SOURCES/0014-efibind-Fix-usage-of-efi-headers-from-C-code.patch b/SOURCES/0014-efibind-Fix-usage-of-efi-headers-from-C-code.patch new file mode 100644 index 0000000..de2fa86 --- /dev/null +++ b/SOURCES/0014-efibind-Fix-usage-of-efi-headers-from-C-code.patch @@ -0,0 +1,108 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 27 Nov 2019 17:03:42 -0600 +Subject: [PATCH] efibind: Fix usage of efi headers from C++ code + +* __STDC_VERSION__ is undefined when headers are called from C++ + code resulting in not using stdint.h and efibind.h + "making a guess" on what they are. extern "C" will not define + __STDC_VERSION__. +* Always leverage stdint.h on C++. +* Honestly, gnu-efi should always use stdint.h, or find a better + way to detect it. (or platforms without it need to catch up to 2007) +--- + inc/aarch64/efibind.h | 2 +- + inc/arm/efibind.h | 2 +- + inc/ia32/efibind.h | 2 +- + inc/ia64/efibind.h | 2 +- + inc/mips64el/efibind.h | 2 +- + inc/x86_64/efibind.h | 4 ++-- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h +index 3c8cf963c31..c2c546b892a 100644 +--- a/inc/aarch64/efibind.h ++++ b/inc/aarch64/efibind.h +@@ -15,7 +15,7 @@ + * either version 2 of the License, or (at your option) any later version. + */ + +-#if !defined(_MSC_VER) && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L )) ++#if !defined(_MSC_VER) && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L )) && !defined(__cplusplus) + + // ANSI C 1999/2000 stdint.h integer width declarations + +diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h +index 7a22b9c8458..012d3d2f8c9 100644 +--- a/inc/arm/efibind.h ++++ b/inc/arm/efibind.h +@@ -15,7 +15,7 @@ + * either version 2 of the License, or (at your option) any later version. + */ + +-#if !defined(_MSC_VER) && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L )) ++#if !defined(_MSC_VER) && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L )) && !defined(__cplusplus) + + // ANSI C 1999/2000 stdint.h integer width declarations + +diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h +index dd0138573d9..27459e454d1 100644 +--- a/inc/ia32/efibind.h ++++ b/inc/ia32/efibind.h +@@ -25,7 +25,7 @@ Revision History + // Basic int types of various widths + // + +-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) ++#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) && !defined(__cplusplus) + + // No ANSI C 1999/2000 stdint.h integer width declarations + +diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h +index b9b2e624657..3ace8d59190 100644 +--- a/inc/ia64/efibind.h ++++ b/inc/ia64/efibind.h +@@ -24,7 +24,7 @@ Revision History + // Basic int types of various widths + // + +-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) ++#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) && !defined(__cplusplus) + + // No ANSI C 1999/2000 stdint.h integer width declarations + +diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h +index 32241e5ad46..1f08cd346d0 100644 +--- a/inc/mips64el/efibind.h ++++ b/inc/mips64el/efibind.h +@@ -17,7 +17,7 @@ + * either version 2 of the License, or (at your option) any later version. + */ + +-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) ++#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) && !defined(__cplusplus) + + // ANSI C 1999/2000 stdint.h integer width declarations + +diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h +index ae40595be0b..31e9e119d74 100644 +--- a/inc/x86_64/efibind.h ++++ b/inc/x86_64/efibind.h +@@ -34,7 +34,7 @@ Revision History + // Basic int types of various widths + // + +-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) ++#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L ) && !defined(__cplusplus) + + // No ANSI C 1999/2000 stdint.h integer width declarations + +@@ -86,7 +86,7 @@ Revision History + #endif + typedef uint64_t uintptr_t; + typedef int64_t intptr_t; +-#elif defined(__GNUC__) ++#else + #include + #endif + diff --git a/SOURCES/0015-Fix-ARCH-on-ARMv6.patch b/SOURCES/0015-Fix-ARCH-on-ARMv6.patch new file mode 100644 index 0000000..6bbb80e --- /dev/null +++ b/SOURCES/0015-Fix-ARCH-on-ARMv6.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer +Date: Tue, 5 Nov 2019 00:09:12 -0500 +Subject: [PATCH] Fix ARCH on ARMv6. + +Extends the armv7 ARCH sed expression to work correctly on armv6. + +Signed-off-by: Ben Wolsieffer +--- + Make.defaults | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index ba743f17893..5695b2ac1ab 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy + + # Host/target identification + OS := $(shell uname -s) +-HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) +-ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) ++HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) ++ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + + # Get ARCH from the compiler if cross compiling + ifneq ($(CROSS_COMPILE),) +- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) ++ override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + endif + + # FreeBSD (and possibly others) reports amd64 instead of x86_64 diff --git a/SOURCES/0016-Re-add-back-the-original-symbol-typeo.patch b/SOURCES/0016-Re-add-back-the-original-symbol-typeo.patch new file mode 100644 index 0000000..83fb095 --- /dev/null +++ b/SOURCES/0016-Re-add-back-the-original-symbol-typeo.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Thu, 16 Jan 2020 14:35:56 -0500 +Subject: [PATCH] Re-add back the original symbol, typeo. + +Fix breaking code by restoring original typeo in efierr.h +EFI_WARN_UNKOWN_GLYPH definition. + +Fixes: commit 5d0d538c2574dfe32e87e87ff977f2830ae2990c + +Signed-off-by: Nigel Croxon +--- + inc/efierr.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/inc/efierr.h b/inc/efierr.h +index d351c1ca225..5a66e1a0676 100644 +--- a/inc/efierr.h ++++ b/inc/efierr.h +@@ -58,6 +58,7 @@ Revision History + #define EFI_INVALID_LANGUAGE EFIERR(32) + #define EFI_COMPROMISED_DATA EFIERR(33) + ++#define EFI_WARN_UNKOWN_GLYPH EFIWARN(1) + #define EFI_WARN_UNKNOWN_GLYPH EFIWARN(1) + #define EFI_WARN_DELETE_FAILURE EFIWARN(2) + #define EFI_WARN_WRITE_FAILURE EFIWARN(3) diff --git a/SOURCES/0017-Add-elf.h-for-cross-building-without-a-system-libelf.patch b/SOURCES/0017-Add-elf.h-for-cross-building-without-a-system-libelf.patch new file mode 100644 index 0000000..0533452 --- /dev/null +++ b/SOURCES/0017-Add-elf.h-for-cross-building-without-a-system-libelf.patch @@ -0,0 +1,4040 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Soop +Date: Thu, 17 Dec 2015 01:21:45 -0300 +Subject: [PATCH] Add elf.h for cross-building without a system libelf + installed. + +--- + inc/elf.h | 4023 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 4023 insertions(+) + create mode 100644 inc/elf.h + +diff --git a/inc/elf.h b/inc/elf.h +new file mode 100644 +index 00000000000..d39b8f8b440 +--- /dev/null ++++ b/inc/elf.h +@@ -0,0 +1,4023 @@ ++/* This file defines standard ELF types, structures, and macros. ++ Copyright (C) 1995-2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef _ELF_H ++#define _ELF_H 1 ++ ++/* Standard ELF types. */ ++ ++#include ++ ++/* Type for a 16-bit quantity. */ ++typedef uint16_t Elf32_Half; ++typedef uint16_t Elf64_Half; ++ ++/* Types for signed and unsigned 32-bit quantities. */ ++typedef uint32_t Elf32_Word; ++typedef int32_t Elf32_Sword; ++typedef uint32_t Elf64_Word; ++typedef int32_t Elf64_Sword; ++ ++/* Types for signed and unsigned 64-bit quantities. */ ++typedef uint64_t Elf32_Xword; ++typedef int64_t Elf32_Sxword; ++typedef uint64_t Elf64_Xword; ++typedef int64_t Elf64_Sxword; ++ ++/* Type of addresses. */ ++typedef uint32_t Elf32_Addr; ++typedef uint64_t Elf64_Addr; ++ ++/* Type of file offsets. */ ++typedef uint32_t Elf32_Off; ++typedef uint64_t Elf64_Off; ++ ++/* Type for section indices, which are 16-bit quantities. */ ++typedef uint16_t Elf32_Section; ++typedef uint16_t Elf64_Section; ++ ++/* Type for version symbol information. */ ++typedef Elf32_Half Elf32_Versym; ++typedef Elf64_Half Elf64_Versym; ++ ++ ++/* The ELF file header. This appears at the start of every ELF file. */ ++ ++#define EI_NIDENT (16) ++ ++typedef struct ++{ ++ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ ++ Elf32_Half e_type; /* Object file type */ ++ Elf32_Half e_machine; /* Architecture */ ++ Elf32_Word e_version; /* Object file version */ ++ Elf32_Addr e_entry; /* Entry point virtual address */ ++ Elf32_Off e_phoff; /* Program header table file offset */ ++ Elf32_Off e_shoff; /* Section header table file offset */ ++ Elf32_Word e_flags; /* Processor-specific flags */ ++ Elf32_Half e_ehsize; /* ELF header size in bytes */ ++ Elf32_Half e_phentsize; /* Program header table entry size */ ++ Elf32_Half e_phnum; /* Program header table entry count */ ++ Elf32_Half e_shentsize; /* Section header table entry size */ ++ Elf32_Half e_shnum; /* Section header table entry count */ ++ Elf32_Half e_shstrndx; /* Section header string table index */ ++} Elf32_Ehdr; ++ ++typedef struct ++{ ++ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */ ++ Elf64_Half e_type; /* Object file type */ ++ Elf64_Half e_machine; /* Architecture */ ++ Elf64_Word e_version; /* Object file version */ ++ Elf64_Addr e_entry; /* Entry point virtual address */ ++ Elf64_Off e_phoff; /* Program header table file offset */ ++ Elf64_Off e_shoff; /* Section header table file offset */ ++ Elf64_Word e_flags; /* Processor-specific flags */ ++ Elf64_Half e_ehsize; /* ELF header size in bytes */ ++ Elf64_Half e_phentsize; /* Program header table entry size */ ++ Elf64_Half e_phnum; /* Program header table entry count */ ++ Elf64_Half e_shentsize; /* Section header table entry size */ ++ Elf64_Half e_shnum; /* Section header table entry count */ ++ Elf64_Half e_shstrndx; /* Section header string table index */ ++} Elf64_Ehdr; ++ ++/* Fields in the e_ident array. The EI_* macros are indices into the ++ array. The macros under each EI_* macro are the values the byte ++ may have. */ ++ ++#define EI_MAG0 0 /* File identification byte 0 index */ ++#define ELFMAG0 0x7f /* Magic number byte 0 */ ++ ++#define EI_MAG1 1 /* File identification byte 1 index */ ++#define ELFMAG1 'E' /* Magic number byte 1 */ ++ ++#define EI_MAG2 2 /* File identification byte 2 index */ ++#define ELFMAG2 'L' /* Magic number byte 2 */ ++ ++#define EI_MAG3 3 /* File identification byte 3 index */ ++#define ELFMAG3 'F' /* Magic number byte 3 */ ++ ++/* Conglomeration of the identification bytes, for easy testing as a word. */ ++#define ELFMAG "\177ELF" ++#define SELFMAG 4 ++ ++#define EI_CLASS 4 /* File class byte index */ ++#define ELFCLASSNONE 0 /* Invalid class */ ++#define ELFCLASS32 1 /* 32-bit objects */ ++#define ELFCLASS64 2 /* 64-bit objects */ ++#define ELFCLASSNUM 3 ++ ++#define EI_DATA 5 /* Data encoding byte index */ ++#define ELFDATANONE 0 /* Invalid data encoding */ ++#define ELFDATA2LSB 1 /* 2's complement, little endian */ ++#define ELFDATA2MSB 2 /* 2's complement, big endian */ ++#define ELFDATANUM 3 ++ ++#define EI_VERSION 6 /* File version byte index */ ++ /* Value must be EV_CURRENT */ ++ ++#define EI_OSABI 7 /* OS ABI identification */ ++#define ELFOSABI_NONE 0 /* UNIX System V ABI */ ++#define ELFOSABI_SYSV 0 /* Alias. */ ++#define ELFOSABI_HPUX 1 /* HP-UX */ ++#define ELFOSABI_NETBSD 2 /* NetBSD. */ ++#define ELFOSABI_GNU 3 /* Object uses GNU ELF extensions. */ ++#define ELFOSABI_LINUX ELFOSABI_GNU /* Compatibility alias. */ ++#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ ++#define ELFOSABI_AIX 7 /* IBM AIX. */ ++#define ELFOSABI_IRIX 8 /* SGI Irix. */ ++#define ELFOSABI_FREEBSD 9 /* FreeBSD. */ ++#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ ++#define ELFOSABI_MODESTO 11 /* Novell Modesto. */ ++#define ELFOSABI_OPENBSD 12 /* OpenBSD. */ ++#define ELFOSABI_ARM_AEABI 64 /* ARM EABI */ ++#define ELFOSABI_ARM 97 /* ARM */ ++#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ ++ ++#define EI_ABIVERSION 8 /* ABI version */ ++ ++#define EI_PAD 9 /* Byte index of padding bytes */ ++ ++/* Legal values for e_type (object file type). */ ++ ++#define ET_NONE 0 /* No file type */ ++#define ET_REL 1 /* Relocatable file */ ++#define ET_EXEC 2 /* Executable file */ ++#define ET_DYN 3 /* Shared object file */ ++#define ET_CORE 4 /* Core file */ ++#define ET_NUM 5 /* Number of defined types */ ++#define ET_LOOS 0xfe00 /* OS-specific range start */ ++#define ET_HIOS 0xfeff /* OS-specific range end */ ++#define ET_LOPROC 0xff00 /* Processor-specific range start */ ++#define ET_HIPROC 0xffff /* Processor-specific range end */ ++ ++/* Legal values for e_machine (architecture). */ ++ ++#define EM_NONE 0 /* No machine */ ++#define EM_M32 1 /* AT&T WE 32100 */ ++#define EM_SPARC 2 /* SUN SPARC */ ++#define EM_386 3 /* Intel 80386 */ ++#define EM_68K 4 /* Motorola m68k family */ ++#define EM_88K 5 /* Motorola m88k family */ ++#define EM_IAMCU 6 /* Intel MCU */ ++#define EM_860 7 /* Intel 80860 */ ++#define EM_MIPS 8 /* MIPS R3000 big-endian */ ++#define EM_S370 9 /* IBM System/370 */ ++#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ ++ /* reserved 11-14 */ ++#define EM_PARISC 15 /* HPPA */ ++ /* reserved 16 */ ++#define EM_VPP500 17 /* Fujitsu VPP500 */ ++#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ ++#define EM_960 19 /* Intel 80960 */ ++#define EM_PPC 20 /* PowerPC */ ++#define EM_PPC64 21 /* PowerPC 64-bit */ ++#define EM_S390 22 /* IBM S390 */ ++#define EM_SPU 23 /* IBM SPU/SPC */ ++ /* reserved 24-35 */ ++#define EM_V800 36 /* NEC V800 series */ ++#define EM_FR20 37 /* Fujitsu FR20 */ ++#define EM_RH32 38 /* TRW RH-32 */ ++#define EM_RCE 39 /* Motorola RCE */ ++#define EM_ARM 40 /* ARM */ ++#define EM_FAKE_ALPHA 41 /* Digital Alpha */ ++#define EM_SH 42 /* Hitachi SH */ ++#define EM_SPARCV9 43 /* SPARC v9 64-bit */ ++#define EM_TRICORE 44 /* Siemens Tricore */ ++#define EM_ARC 45 /* Argonaut RISC Core */ ++#define EM_H8_300 46 /* Hitachi H8/300 */ ++#define EM_H8_300H 47 /* Hitachi H8/300H */ ++#define EM_H8S 48 /* Hitachi H8S */ ++#define EM_H8_500 49 /* Hitachi H8/500 */ ++#define EM_IA_64 50 /* Intel Merced */ ++#define EM_MIPS_X 51 /* Stanford MIPS-X */ ++#define EM_COLDFIRE 52 /* Motorola Coldfire */ ++#define EM_68HC12 53 /* Motorola M68HC12 */ ++#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator */ ++#define EM_PCP 55 /* Siemens PCP */ ++#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ ++#define EM_NDR1 57 /* Denso NDR1 microprocessor */ ++#define EM_STARCORE 58 /* Motorola Start*Core processor */ ++#define EM_ME16 59 /* Toyota ME16 processor */ ++#define EM_ST100 60 /* STMicroelectronic ST100 processor */ ++#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam */ ++#define EM_X86_64 62 /* AMD x86-64 architecture */ ++#define EM_PDSP 63 /* Sony DSP Processor */ ++#define EM_PDP10 64 /* Digital PDP-10 */ ++#define EM_PDP11 65 /* Digital PDP-11 */ ++#define EM_FX66 66 /* Siemens FX66 microcontroller */ ++#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ ++#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ ++#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ ++#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ ++#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ ++#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ ++#define EM_SVX 73 /* Silicon Graphics SVx */ ++#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */ ++#define EM_VAX 75 /* Digital VAX */ ++#define EM_CRIS 76 /* Axis Communications 32-bit emb.proc */ ++#define EM_JAVELIN 77 /* Infineon Technologies 32-bit emb.proc */ ++#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ ++#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ ++#define EM_MMIX 80 /* Donald Knuth's educational 64-bit proc */ ++#define EM_HUANY 81 /* Harvard University machine-independent object files */ ++#define EM_PRISM 82 /* SiTera Prism */ ++#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ ++#define EM_FR30 84 /* Fujitsu FR30 */ ++#define EM_D10V 85 /* Mitsubishi D10V */ ++#define EM_D30V 86 /* Mitsubishi D30V */ ++#define EM_V850 87 /* NEC v850 */ ++#define EM_M32R 88 /* Mitsubishi M32R */ ++#define EM_MN10300 89 /* Matsushita MN10300 */ ++#define EM_MN10200 90 /* Matsushita MN10200 */ ++#define EM_PJ 91 /* picoJava */ ++#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ ++#define EM_ARC_COMPACT 93 /* ARC International ARCompact */ ++#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ ++#define EM_VIDEOCORE 95 /* Alphamosaic VideoCore */ ++#define EM_TMM_GPP 96 /* Thompson Multimedia General Purpose Proc */ ++#define EM_NS32K 97 /* National Semi. 32000 */ ++#define EM_TPC 98 /* Tenor Network TPC */ ++#define EM_SNP1K 99 /* Trebia SNP 1000 */ ++#define EM_ST200 100 /* STMicroelectronics ST200 */ ++#define EM_IP2K 101 /* Ubicom IP2xxx */ ++#define EM_MAX 102 /* MAX processor */ ++#define EM_CR 103 /* National Semi. CompactRISC */ ++#define EM_F2MC16 104 /* Fujitsu F2MC16 */ ++#define EM_MSP430 105 /* Texas Instruments msp430 */ ++#define EM_BLACKFIN 106 /* Analog Devices Blackfin DSP */ ++#define EM_SE_C33 107 /* Seiko Epson S1C33 family */ ++#define EM_SEP 108 /* Sharp embedded microprocessor */ ++#define EM_ARCA 109 /* Arca RISC */ ++#define EM_UNICORE 110 /* PKU-Unity & MPRC Peking Uni. mc series */ ++#define EM_EXCESS 111 /* eXcess configurable cpu */ ++#define EM_DXP 112 /* Icera Semi. Deep Execution Processor */ ++#define EM_ALTERA_NIOS2 113 /* Altera Nios II */ ++#define EM_CRX 114 /* National Semi. CompactRISC CRX */ ++#define EM_XGATE 115 /* Motorola XGATE */ ++#define EM_C166 116 /* Infineon C16x/XC16x */ ++#define EM_M16C 117 /* Renesas M16C */ ++#define EM_DSPIC30F 118 /* Microchip Technology dsPIC30F */ ++#define EM_CE 119 /* Freescale Communication Engine RISC */ ++#define EM_M32C 120 /* Renesas M32C */ ++ /* reserved 121-130 */ ++#define EM_TSK3000 131 /* Altium TSK3000 */ ++#define EM_RS08 132 /* Freescale RS08 */ ++#define EM_SHARC 133 /* Analog Devices SHARC family */ ++#define EM_ECOG2 134 /* Cyan Technology eCOG2 */ ++#define EM_SCORE7 135 /* Sunplus S+core7 RISC */ ++#define EM_DSP24 136 /* New Japan Radio (NJR) 24-bit DSP */ ++#define EM_VIDEOCORE3 137 /* Broadcom VideoCore III */ ++#define EM_LATTICEMICO32 138 /* RISC for Lattice FPGA */ ++#define EM_SE_C17 139 /* Seiko Epson C17 */ ++#define EM_TI_C6000 140 /* Texas Instruments TMS320C6000 DSP */ ++#define EM_TI_C2000 141 /* Texas Instruments TMS320C2000 DSP */ ++#define EM_TI_C5500 142 /* Texas Instruments TMS320C55x DSP */ ++#define EM_TI_ARP32 143 /* Texas Instruments App. Specific RISC */ ++#define EM_TI_PRU 144 /* Texas Instruments Prog. Realtime Unit */ ++ /* reserved 145-159 */ ++#define EM_MMDSP_PLUS 160 /* STMicroelectronics 64bit VLIW DSP */ ++#define EM_CYPRESS_M8C 161 /* Cypress M8C */ ++#define EM_R32C 162 /* Renesas R32C */ ++#define EM_TRIMEDIA 163 /* NXP Semi. TriMedia */ ++#define EM_QDSP6 164 /* QUALCOMM DSP6 */ ++#define EM_8051 165 /* Intel 8051 and variants */ ++#define EM_STXP7X 166 /* STMicroelectronics STxP7x */ ++#define EM_NDS32 167 /* Andes Tech. compact code emb. RISC */ ++#define EM_ECOG1X 168 /* Cyan Technology eCOG1X */ ++#define EM_MAXQ30 169 /* Dallas Semi. MAXQ30 mc */ ++#define EM_XIMO16 170 /* New Japan Radio (NJR) 16-bit DSP */ ++#define EM_MANIK 171 /* M2000 Reconfigurable RISC */ ++#define EM_CRAYNV2 172 /* Cray NV2 vector architecture */ ++#define EM_RX 173 /* Renesas RX */ ++#define EM_METAG 174 /* Imagination Tech. META */ ++#define EM_MCST_ELBRUS 175 /* MCST Elbrus */ ++#define EM_ECOG16 176 /* Cyan Technology eCOG16 */ ++#define EM_CR16 177 /* National Semi. CompactRISC CR16 */ ++#define EM_ETPU 178 /* Freescale Extended Time Processing Unit */ ++#define EM_SLE9X 179 /* Infineon Tech. SLE9X */ ++#define EM_L10M 180 /* Intel L10M */ ++#define EM_K10M 181 /* Intel K10M */ ++ /* reserved 182 */ ++#define EM_AARCH64 183 /* ARM AARCH64 */ ++ /* reserved 184 */ ++#define EM_AVR32 185 /* Amtel 32-bit microprocessor */ ++#define EM_STM8 186 /* STMicroelectronics STM8 */ ++#define EM_TILE64 187 /* Tileta TILE64 */ ++#define EM_TILEPRO 188 /* Tilera TILEPro */ ++#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ ++#define EM_CUDA 190 /* NVIDIA CUDA */ ++#define EM_TILEGX 191 /* Tilera TILE-Gx */ ++#define EM_CLOUDSHIELD 192 /* CloudShield */ ++#define EM_COREA_1ST 193 /* KIPO-KAIST Core-A 1st gen. */ ++#define EM_COREA_2ND 194 /* KIPO-KAIST Core-A 2nd gen. */ ++#define EM_ARC_COMPACT2 195 /* Synopsys ARCompact V2 */ ++#define EM_OPEN8 196 /* Open8 RISC */ ++#define EM_RL78 197 /* Renesas RL78 */ ++#define EM_VIDEOCORE5 198 /* Broadcom VideoCore V */ ++#define EM_78KOR 199 /* Renesas 78KOR */ ++#define EM_56800EX 200 /* Freescale 56800EX DSC */ ++#define EM_BA1 201 /* Beyond BA1 */ ++#define EM_BA2 202 /* Beyond BA2 */ ++#define EM_XCORE 203 /* XMOS xCORE */ ++#define EM_MCHP_PIC 204 /* Microchip 8-bit PIC(r) */ ++ /* reserved 205-209 */ ++#define EM_KM32 210 /* KM211 KM32 */ ++#define EM_KMX32 211 /* KM211 KMX32 */ ++#define EM_EMX16 212 /* KM211 KMX16 */ ++#define EM_EMX8 213 /* KM211 KMX8 */ ++#define EM_KVARC 214 /* KM211 KVARC */ ++#define EM_CDP 215 /* Paneve CDP */ ++#define EM_COGE 216 /* Cognitive Smart Memory Processor */ ++#define EM_COOL 217 /* Bluechip CoolEngine */ ++#define EM_NORC 218 /* Nanoradio Optimized RISC */ ++#define EM_CSR_KALIMBA 219 /* CSR Kalimba */ ++#define EM_Z80 220 /* Zilog Z80 */ ++#define EM_VISIUM 221 /* Controls and Data Services VISIUMcore */ ++#define EM_FT32 222 /* FTDI Chip FT32 */ ++#define EM_MOXIE 223 /* Moxie processor */ ++#define EM_AMDGPU 224 /* AMD GPU */ ++ /* reserved 225-242 */ ++#define EM_RISCV 243 /* RISC-V */ ++ ++#define EM_BPF 247 /* Linux BPF -- in-kernel virtual machine */ ++#define EM_CSKY 252 /* C-SKY */ ++ ++#define EM_NUM 253 ++ ++/* Old spellings/synonyms. */ ++ ++#define EM_ARC_A5 EM_ARC_COMPACT ++ ++/* If it is necessary to assign new unofficial EM_* values, please ++ pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the ++ chances of collision with official or non-GNU unofficial values. */ ++ ++#define EM_ALPHA 0x9026 ++ ++/* Legal values for e_version (version). */ ++ ++#define EV_NONE 0 /* Invalid ELF version */ ++#define EV_CURRENT 1 /* Current version */ ++#define EV_NUM 2 ++ ++/* Section header. */ ++ ++typedef struct ++{ ++ Elf32_Word sh_name; /* Section name (string tbl index) */ ++ Elf32_Word sh_type; /* Section type */ ++ Elf32_Word sh_flags; /* Section flags */ ++ Elf32_Addr sh_addr; /* Section virtual addr at execution */ ++ Elf32_Off sh_offset; /* Section file offset */ ++ Elf32_Word sh_size; /* Section size in bytes */ ++ Elf32_Word sh_link; /* Link to another section */ ++ Elf32_Word sh_info; /* Additional section information */ ++ Elf32_Word sh_addralign; /* Section alignment */ ++ Elf32_Word sh_entsize; /* Entry size if section holds table */ ++} Elf32_Shdr; ++ ++typedef struct ++{ ++ Elf64_Word sh_name; /* Section name (string tbl index) */ ++ Elf64_Word sh_type; /* Section type */ ++ Elf64_Xword sh_flags; /* Section flags */ ++ Elf64_Addr sh_addr; /* Section virtual addr at execution */ ++ Elf64_Off sh_offset; /* Section file offset */ ++ Elf64_Xword sh_size; /* Section size in bytes */ ++ Elf64_Word sh_link; /* Link to another section */ ++ Elf64_Word sh_info; /* Additional section information */ ++ Elf64_Xword sh_addralign; /* Section alignment */ ++ Elf64_Xword sh_entsize; /* Entry size if section holds table */ ++} Elf64_Shdr; ++ ++/* Special section indices. */ ++ ++#define SHN_UNDEF 0 /* Undefined section */ ++#define SHN_LORESERVE 0xff00 /* Start of reserved indices */ ++#define SHN_LOPROC 0xff00 /* Start of processor-specific */ ++#define SHN_BEFORE 0xff00 /* Order section before all others ++ (Solaris). */ ++#define SHN_AFTER 0xff01 /* Order section after all others ++ (Solaris). */ ++#define SHN_HIPROC 0xff1f /* End of processor-specific */ ++#define SHN_LOOS 0xff20 /* Start of OS-specific */ ++#define SHN_HIOS 0xff3f /* End of OS-specific */ ++#define SHN_ABS 0xfff1 /* Associated symbol is absolute */ ++#define SHN_COMMON 0xfff2 /* Associated symbol is common */ ++#define SHN_XINDEX 0xffff /* Index is in extra table. */ ++#define SHN_HIRESERVE 0xffff /* End of reserved indices */ ++ ++/* Legal values for sh_type (section type). */ ++ ++#define SHT_NULL 0 /* Section header table entry unused */ ++#define SHT_PROGBITS 1 /* Program data */ ++#define SHT_SYMTAB 2 /* Symbol table */ ++#define SHT_STRTAB 3 /* String table */ ++#define SHT_RELA 4 /* Relocation entries with addends */ ++#define SHT_HASH 5 /* Symbol hash table */ ++#define SHT_DYNAMIC 6 /* Dynamic linking information */ ++#define SHT_NOTE 7 /* Notes */ ++#define SHT_NOBITS 8 /* Program space with no data (bss) */ ++#define SHT_REL 9 /* Relocation entries, no addends */ ++#define SHT_SHLIB 10 /* Reserved */ ++#define SHT_DYNSYM 11 /* Dynamic linker symbol table */ ++#define SHT_INIT_ARRAY 14 /* Array of constructors */ ++#define SHT_FINI_ARRAY 15 /* Array of destructors */ ++#define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ ++#define SHT_GROUP 17 /* Section group */ ++#define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ ++#define SHT_NUM 19 /* Number of defined types. */ ++#define SHT_LOOS 0x60000000 /* Start OS-specific. */ ++#define SHT_GNU_ATTRIBUTES 0x6ffffff5 /* Object attributes. */ ++#define SHT_GNU_HASH 0x6ffffff6 /* GNU-style hash table. */ ++#define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */ ++#define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */ ++#define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */ ++#define SHT_SUNW_move 0x6ffffffa ++#define SHT_SUNW_COMDAT 0x6ffffffb ++#define SHT_SUNW_syminfo 0x6ffffffc ++#define SHT_GNU_verdef 0x6ffffffd /* Version definition section. */ ++#define SHT_GNU_verneed 0x6ffffffe /* Version needs section. */ ++#define SHT_GNU_versym 0x6fffffff /* Version symbol table. */ ++#define SHT_HISUNW 0x6fffffff /* Sun-specific high bound. */ ++#define SHT_HIOS 0x6fffffff /* End OS-specific type */ ++#define SHT_LOPROC 0x70000000 /* Start of processor-specific */ ++#define SHT_HIPROC 0x7fffffff /* End of processor-specific */ ++#define SHT_LOUSER 0x80000000 /* Start of application-specific */ ++#define SHT_HIUSER 0x8fffffff /* End of application-specific */ ++ ++/* Legal values for sh_flags (section flags). */ ++ ++#define SHF_WRITE (1 << 0) /* Writable */ ++#define SHF_ALLOC (1 << 1) /* Occupies memory during execution */ ++#define SHF_EXECINSTR (1 << 2) /* Executable */ ++#define SHF_MERGE (1 << 4) /* Might be merged */ ++#define SHF_STRINGS (1 << 5) /* Contains nul-terminated strings */ ++#define SHF_INFO_LINK (1 << 6) /* `sh_info' contains SHT index */ ++#define SHF_LINK_ORDER (1 << 7) /* Preserve order after combining */ ++#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling ++ required */ ++#define SHF_GROUP (1 << 9) /* Section is member of a group. */ ++#define SHF_TLS (1 << 10) /* Section hold thread-local data. */ ++#define SHF_COMPRESSED (1 << 11) /* Section with compressed data. */ ++#define SHF_MASKOS 0x0ff00000 /* OS-specific. */ ++#define SHF_MASKPROC 0xf0000000 /* Processor-specific */ ++#define SHF_ORDERED (1 << 30) /* Special ordering requirement ++ (Solaris). */ ++#define SHF_EXCLUDE (1U << 31) /* Section is excluded unless ++ referenced or allocated (Solaris).*/ ++ ++/* Section compression header. Used when SHF_COMPRESSED is set. */ ++ ++typedef struct ++{ ++ Elf32_Word ch_type; /* Compression format. */ ++ Elf32_Word ch_size; /* Uncompressed data size. */ ++ Elf32_Word ch_addralign; /* Uncompressed data alignment. */ ++} Elf32_Chdr; ++ ++typedef struct ++{ ++ Elf64_Word ch_type; /* Compression format. */ ++ Elf64_Word ch_reserved; ++ Elf64_Xword ch_size; /* Uncompressed data size. */ ++ Elf64_Xword ch_addralign; /* Uncompressed data alignment. */ ++} Elf64_Chdr; ++ ++/* Legal values for ch_type (compression algorithm). */ ++#define ELFCOMPRESS_ZLIB 1 /* ZLIB/DEFLATE algorithm. */ ++#define ELFCOMPRESS_LOOS 0x60000000 /* Start of OS-specific. */ ++#define ELFCOMPRESS_HIOS 0x6fffffff /* End of OS-specific. */ ++#define ELFCOMPRESS_LOPROC 0x70000000 /* Start of processor-specific. */ ++#define ELFCOMPRESS_HIPROC 0x7fffffff /* End of processor-specific. */ ++ ++/* Section group handling. */ ++#define GRP_COMDAT 0x1 /* Mark group as COMDAT. */ ++ ++/* Symbol table entry. */ ++ ++typedef struct ++{ ++ Elf32_Word st_name; /* Symbol name (string tbl index) */ ++ Elf32_Addr st_value; /* Symbol value */ ++ Elf32_Word st_size; /* Symbol size */ ++ unsigned char st_info; /* Symbol type and binding */ ++ unsigned char st_other; /* Symbol visibility */ ++ Elf32_Section st_shndx; /* Section index */ ++} Elf32_Sym; ++ ++typedef struct ++{ ++ Elf64_Word st_name; /* Symbol name (string tbl index) */ ++ unsigned char st_info; /* Symbol type and binding */ ++ unsigned char st_other; /* Symbol visibility */ ++ Elf64_Section st_shndx; /* Section index */ ++ Elf64_Addr st_value; /* Symbol value */ ++ Elf64_Xword st_size; /* Symbol size */ ++} Elf64_Sym; ++ ++/* The syminfo section if available contains additional information about ++ every dynamic symbol. */ ++ ++typedef struct ++{ ++ Elf32_Half si_boundto; /* Direct bindings, symbol bound to */ ++ Elf32_Half si_flags; /* Per symbol flags */ ++} Elf32_Syminfo; ++ ++typedef struct ++{ ++ Elf64_Half si_boundto; /* Direct bindings, symbol bound to */ ++ Elf64_Half si_flags; /* Per symbol flags */ ++} Elf64_Syminfo; ++ ++/* Possible values for si_boundto. */ ++#define SYMINFO_BT_SELF 0xffff /* Symbol bound to self */ ++#define SYMINFO_BT_PARENT 0xfffe /* Symbol bound to parent */ ++#define SYMINFO_BT_LOWRESERVE 0xff00 /* Beginning of reserved entries */ ++ ++/* Possible bitmasks for si_flags. */ ++#define SYMINFO_FLG_DIRECT 0x0001 /* Direct bound symbol */ ++#define SYMINFO_FLG_PASSTHRU 0x0002 /* Pass-thru symbol for translator */ ++#define SYMINFO_FLG_COPY 0x0004 /* Symbol is a copy-reloc */ ++#define SYMINFO_FLG_LAZYLOAD 0x0008 /* Symbol bound to object to be lazy ++ loaded */ ++/* Syminfo version values. */ ++#define SYMINFO_NONE 0 ++#define SYMINFO_CURRENT 1 ++#define SYMINFO_NUM 2 ++ ++ ++/* How to extract and insert information held in the st_info field. */ ++ ++#define ELF32_ST_BIND(val) (((unsigned char) (val)) >> 4) ++#define ELF32_ST_TYPE(val) ((val) & 0xf) ++#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) ++ ++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field. */ ++#define ELF64_ST_BIND(val) ELF32_ST_BIND (val) ++#define ELF64_ST_TYPE(val) ELF32_ST_TYPE (val) ++#define ELF64_ST_INFO(bind, type) ELF32_ST_INFO ((bind), (type)) ++ ++/* Legal values for ST_BIND subfield of st_info (symbol binding). */ ++ ++#define STB_LOCAL 0 /* Local symbol */ ++#define STB_GLOBAL 1 /* Global symbol */ ++#define STB_WEAK 2 /* Weak symbol */ ++#define STB_NUM 3 /* Number of defined types. */ ++#define STB_LOOS 10 /* Start of OS-specific */ ++#define STB_GNU_UNIQUE 10 /* Unique symbol. */ ++#define STB_HIOS 12 /* End of OS-specific */ ++#define STB_LOPROC 13 /* Start of processor-specific */ ++#define STB_HIPROC 15 /* End of processor-specific */ ++ ++/* Legal values for ST_TYPE subfield of st_info (symbol type). */ ++ ++#define STT_NOTYPE 0 /* Symbol type is unspecified */ ++#define STT_OBJECT 1 /* Symbol is a data object */ ++#define STT_FUNC 2 /* Symbol is a code object */ ++#define STT_SECTION 3 /* Symbol associated with a section */ ++#define STT_FILE 4 /* Symbol's name is file name */ ++#define STT_COMMON 5 /* Symbol is a common data object */ ++#define STT_TLS 6 /* Symbol is thread-local data object*/ ++#define STT_NUM 7 /* Number of defined types. */ ++#define STT_LOOS 10 /* Start of OS-specific */ ++#define STT_GNU_IFUNC 10 /* Symbol is indirect code object */ ++#define STT_HIOS 12 /* End of OS-specific */ ++#define STT_LOPROC 13 /* Start of processor-specific */ ++#define STT_HIPROC 15 /* End of processor-specific */ ++ ++ ++/* Symbol table indices are found in the hash buckets and chain table ++ of a symbol hash table section. This special index value indicates ++ the end of a chain, meaning no further symbols are found in that bucket. */ ++ ++#define STN_UNDEF 0 /* End of a chain. */ ++ ++ ++/* How to extract and insert information held in the st_other field. */ ++ ++#define ELF32_ST_VISIBILITY(o) ((o) & 0x03) ++ ++/* For ELF64 the definitions are the same. */ ++#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o) ++ ++/* Symbol visibility specification encoded in the st_other field. */ ++#define STV_DEFAULT 0 /* Default symbol visibility rules */ ++#define STV_INTERNAL 1 /* Processor specific hidden class */ ++#define STV_HIDDEN 2 /* Sym unavailable in other modules */ ++#define STV_PROTECTED 3 /* Not preemptible, not exported */ ++ ++ ++/* Relocation table entry without addend (in section of type SHT_REL). */ ++ ++typedef struct ++{ ++ Elf32_Addr r_offset; /* Address */ ++ Elf32_Word r_info; /* Relocation type and symbol index */ ++} Elf32_Rel; ++ ++/* I have seen two different definitions of the Elf64_Rel and ++ Elf64_Rela structures, so we'll leave them out until Novell (or ++ whoever) gets their act together. */ ++/* The following, at least, is used on Sparc v9, MIPS, and Alpha. */ ++ ++typedef struct ++{ ++ Elf64_Addr r_offset; /* Address */ ++ Elf64_Xword r_info; /* Relocation type and symbol index */ ++} Elf64_Rel; ++ ++/* Relocation table entry with addend (in section of type SHT_RELA). */ ++ ++typedef struct ++{ ++ Elf32_Addr r_offset; /* Address */ ++ Elf32_Word r_info; /* Relocation type and symbol index */ ++ Elf32_Sword r_addend; /* Addend */ ++} Elf32_Rela; ++ ++typedef struct ++{ ++ Elf64_Addr r_offset; /* Address */ ++ Elf64_Xword r_info; /* Relocation type and symbol index */ ++ Elf64_Sxword r_addend; /* Addend */ ++} Elf64_Rela; ++ ++/* How to extract and insert information held in the r_info field. */ ++ ++#define ELF32_R_SYM(val) ((val) >> 8) ++#define ELF32_R_TYPE(val) ((val) & 0xff) ++#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff)) ++ ++#define ELF64_R_SYM(i) ((i) >> 32) ++#define ELF64_R_TYPE(i) ((i) & 0xffffffff) ++#define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type)) ++ ++/* Program segment header. */ ++ ++typedef struct ++{ ++ Elf32_Word p_type; /* Segment type */ ++ Elf32_Off p_offset; /* Segment file offset */ ++ Elf32_Addr p_vaddr; /* Segment virtual address */ ++ Elf32_Addr p_paddr; /* Segment physical address */ ++ Elf32_Word p_filesz; /* Segment size in file */ ++ Elf32_Word p_memsz; /* Segment size in memory */ ++ Elf32_Word p_flags; /* Segment flags */ ++ Elf32_Word p_align; /* Segment alignment */ ++} Elf32_Phdr; ++ ++typedef struct ++{ ++ Elf64_Word p_type; /* Segment type */ ++ Elf64_Word p_flags; /* Segment flags */ ++ Elf64_Off p_offset; /* Segment file offset */ ++ Elf64_Addr p_vaddr; /* Segment virtual address */ ++ Elf64_Addr p_paddr; /* Segment physical address */ ++ Elf64_Xword p_filesz; /* Segment size in file */ ++ Elf64_Xword p_memsz; /* Segment size in memory */ ++ Elf64_Xword p_align; /* Segment alignment */ ++} Elf64_Phdr; ++ ++/* Special value for e_phnum. This indicates that the real number of ++ program headers is too large to fit into e_phnum. Instead the real ++ value is in the field sh_info of section 0. */ ++ ++#define PN_XNUM 0xffff ++ ++/* Legal values for p_type (segment type). */ ++ ++#define PT_NULL 0 /* Program header table entry unused */ ++#define PT_LOAD 1 /* Loadable program segment */ ++#define PT_DYNAMIC 2 /* Dynamic linking information */ ++#define PT_INTERP 3 /* Program interpreter */ ++#define PT_NOTE 4 /* Auxiliary information */ ++#define PT_SHLIB 5 /* Reserved */ ++#define PT_PHDR 6 /* Entry for header table itself */ ++#define PT_TLS 7 /* Thread-local storage segment */ ++#define PT_NUM 8 /* Number of defined types */ ++#define PT_LOOS 0x60000000 /* Start of OS-specific */ ++#define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */ ++#define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */ ++#define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */ ++#define PT_LOSUNW 0x6ffffffa ++#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ ++#define PT_SUNWSTACK 0x6ffffffb /* Stack segment */ ++#define PT_HISUNW 0x6fffffff ++#define PT_HIOS 0x6fffffff /* End of OS-specific */ ++#define PT_LOPROC 0x70000000 /* Start of processor-specific */ ++#define PT_HIPROC 0x7fffffff /* End of processor-specific */ ++ ++/* Legal values for p_flags (segment flags). */ ++ ++#define PF_X (1 << 0) /* Segment is executable */ ++#define PF_W (1 << 1) /* Segment is writable */ ++#define PF_R (1 << 2) /* Segment is readable */ ++#define PF_MASKOS 0x0ff00000 /* OS-specific */ ++#define PF_MASKPROC 0xf0000000 /* Processor-specific */ ++ ++/* Legal values for note segment descriptor types for core files. */ ++ ++#define NT_PRSTATUS 1 /* Contains copy of prstatus struct */ ++#define NT_PRFPREG 2 /* Contains copy of fpregset ++ struct. */ ++#define NT_FPREGSET 2 /* Contains copy of fpregset struct */ ++#define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */ ++#define NT_PRXREG 4 /* Contains copy of prxregset struct */ ++#define NT_TASKSTRUCT 4 /* Contains copy of task structure */ ++#define NT_PLATFORM 5 /* String from sysinfo(SI_PLATFORM) */ ++#define NT_AUXV 6 /* Contains copy of auxv array */ ++#define NT_GWINDOWS 7 /* Contains copy of gwindows struct */ ++#define NT_ASRS 8 /* Contains copy of asrset struct */ ++#define NT_PSTATUS 10 /* Contains copy of pstatus struct */ ++#define NT_PSINFO 13 /* Contains copy of psinfo struct */ ++#define NT_PRCRED 14 /* Contains copy of prcred struct */ ++#define NT_UTSNAME 15 /* Contains copy of utsname struct */ ++#define NT_LWPSTATUS 16 /* Contains copy of lwpstatus struct */ ++#define NT_LWPSINFO 17 /* Contains copy of lwpinfo struct */ ++#define NT_PRFPXREG 20 /* Contains copy of fprxregset struct */ ++#define NT_SIGINFO 0x53494749 /* Contains copy of siginfo_t, ++ size might increase */ ++#define NT_FILE 0x46494c45 /* Contains information about mapped ++ files */ ++#define NT_PRXFPREG 0x46e62b7f /* Contains copy of user_fxsr_struct */ ++#define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */ ++#define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */ ++#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ ++#define NT_PPC_TAR 0x103 /* Target Address Register */ ++#define NT_PPC_PPR 0x104 /* Program Priority Register */ ++#define NT_PPC_DSCR 0x105 /* Data Stream Control Register */ ++#define NT_PPC_EBB 0x106 /* Event Based Branch Registers */ ++#define NT_PPC_PMU 0x107 /* Performance Monitor Registers */ ++#define NT_PPC_TM_CGPR 0x108 /* TM checkpointed GPR Registers */ ++#define NT_PPC_TM_CFPR 0x109 /* TM checkpointed FPR Registers */ ++#define NT_PPC_TM_CVMX 0x10a /* TM checkpointed VMX Registers */ ++#define NT_PPC_TM_CVSX 0x10b /* TM checkpointed VSX Registers */ ++#define NT_PPC_TM_SPR 0x10c /* TM Special Purpose Registers */ ++#define NT_PPC_TM_CTAR 0x10d /* TM checkpointed Target Address ++ Register */ ++#define NT_PPC_TM_CPPR 0x10e /* TM checkpointed Program Priority ++ Register */ ++#define NT_PPC_TM_CDSCR 0x10f /* TM checkpointed Data Stream Control ++ Register */ ++#define NT_PPC_PKEY 0x110 /* Memory Protection Keys ++ registers. */ ++#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ ++#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ ++#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */ ++#define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */ ++#define NT_S390_TIMER 0x301 /* s390 timer register */ ++#define NT_S390_TODCMP 0x302 /* s390 TOD clock comparator register */ ++#define NT_S390_TODPREG 0x303 /* s390 TOD programmable register */ ++#define NT_S390_CTRS 0x304 /* s390 control registers */ ++#define NT_S390_PREFIX 0x305 /* s390 prefix register */ ++#define NT_S390_LAST_BREAK 0x306 /* s390 breaking event address */ ++#define NT_S390_SYSTEM_CALL 0x307 /* s390 system call restart data */ ++#define NT_S390_TDB 0x308 /* s390 transaction diagnostic block */ ++#define NT_S390_VXRS_LOW 0x309 /* s390 vector registers 0-15 ++ upper half. */ ++#define NT_S390_VXRS_HIGH 0x30a /* s390 vector registers 16-31. */ ++#define NT_S390_GS_CB 0x30b /* s390 guarded storage registers. */ ++#define NT_S390_GS_BC 0x30c /* s390 guarded storage ++ broadcast control block. */ ++#define NT_S390_RI_CB 0x30d /* s390 runtime instrumentation. */ ++#define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */ ++#define NT_ARM_TLS 0x401 /* ARM TLS register */ ++#define NT_ARM_HW_BREAK 0x402 /* ARM hardware breakpoint registers */ ++#define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */ ++#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */ ++#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension ++ registers */ ++#define NT_ARM_PAC_MASK 0x406 /* ARM pointer authentication ++ code masks. */ ++#define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication ++ address keys. */ ++#define NT_ARM_PACG_KEYS 0x408 /* ARM pointer authentication ++ generic key. */ ++#define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note. */ ++#define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers. */ ++#define NT_MIPS_FP_MODE 0x801 /* MIPS floating-point mode. */ ++#define NT_MIPS_MSA 0x802 /* MIPS SIMD registers. */ ++ ++/* Legal values for the note segment descriptor types for object files. */ ++ ++#define NT_VERSION 1 /* Contains a version string. */ ++ ++ ++/* Dynamic section entry. */ ++ ++typedef struct ++{ ++ Elf32_Sword d_tag; /* Dynamic entry type */ ++ union ++ { ++ Elf32_Word d_val; /* Integer value */ ++ Elf32_Addr d_ptr; /* Address value */ ++ } d_un; ++} Elf32_Dyn; ++ ++typedef struct ++{ ++ Elf64_Sxword d_tag; /* Dynamic entry type */ ++ union ++ { ++ Elf64_Xword d_val; /* Integer value */ ++ Elf64_Addr d_ptr; /* Address value */ ++ } d_un; ++} Elf64_Dyn; ++ ++/* Legal values for d_tag (dynamic entry type). */ ++ ++#define DT_NULL 0 /* Marks end of dynamic section */ ++#define DT_NEEDED 1 /* Name of needed library */ ++#define DT_PLTRELSZ 2 /* Size in bytes of PLT relocs */ ++#define DT_PLTGOT 3 /* Processor defined value */ ++#define DT_HASH 4 /* Address of symbol hash table */ ++#define DT_STRTAB 5 /* Address of string table */ ++#define DT_SYMTAB 6 /* Address of symbol table */ ++#define DT_RELA 7 /* Address of Rela relocs */ ++#define DT_RELASZ 8 /* Total size of Rela relocs */ ++#define DT_RELAENT 9 /* Size of one Rela reloc */ ++#define DT_STRSZ 10 /* Size of string table */ ++#define DT_SYMENT 11 /* Size of one symbol table entry */ ++#define DT_INIT 12 /* Address of init function */ ++#define DT_FINI 13 /* Address of termination function */ ++#define DT_SONAME 14 /* Name of shared object */ ++#define DT_RPATH 15 /* Library search path (deprecated) */ ++#define DT_SYMBOLIC 16 /* Start symbol search here */ ++#define DT_REL 17 /* Address of Rel relocs */ ++#define DT_RELSZ 18 /* Total size of Rel relocs */ ++#define DT_RELENT 19 /* Size of one Rel reloc */ ++#define DT_PLTREL 20 /* Type of reloc in PLT */ ++#define DT_DEBUG 21 /* For debugging; unspecified */ ++#define DT_TEXTREL 22 /* Reloc might modify .text */ ++#define DT_JMPREL 23 /* Address of PLT relocs */ ++#define DT_BIND_NOW 24 /* Process relocations of object */ ++#define DT_INIT_ARRAY 25 /* Array with addresses of init fct */ ++#define DT_FINI_ARRAY 26 /* Array with addresses of fini fct */ ++#define DT_INIT_ARRAYSZ 27 /* Size in bytes of DT_INIT_ARRAY */ ++#define DT_FINI_ARRAYSZ 28 /* Size in bytes of DT_FINI_ARRAY */ ++#define DT_RUNPATH 29 /* Library search path */ ++#define DT_FLAGS 30 /* Flags for the object being loaded */ ++#define DT_ENCODING 32 /* Start of encoded range */ ++#define DT_PREINIT_ARRAY 32 /* Array with addresses of preinit fct*/ ++#define DT_PREINIT_ARRAYSZ 33 /* size in bytes of DT_PREINIT_ARRAY */ ++#define DT_SYMTAB_SHNDX 34 /* Address of SYMTAB_SHNDX section */ ++#define DT_NUM 35 /* Number used */ ++#define DT_LOOS 0x6000000d /* Start of OS-specific */ ++#define DT_HIOS 0x6ffff000 /* End of OS-specific */ ++#define DT_LOPROC 0x70000000 /* Start of processor-specific */ ++#define DT_HIPROC 0x7fffffff /* End of processor-specific */ ++#define DT_PROCNUM DT_MIPS_NUM /* Most used by any processor */ ++ ++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the ++ Dyn.d_un.d_val field of the Elf*_Dyn structure. This follows Sun's ++ approach. */ ++#define DT_VALRNGLO 0x6ffffd00 ++#define DT_GNU_PRELINKED 0x6ffffdf5 /* Prelinking timestamp */ ++#define DT_GNU_CONFLICTSZ 0x6ffffdf6 /* Size of conflict section */ ++#define DT_GNU_LIBLISTSZ 0x6ffffdf7 /* Size of library list */ ++#define DT_CHECKSUM 0x6ffffdf8 ++#define DT_PLTPADSZ 0x6ffffdf9 ++#define DT_MOVEENT 0x6ffffdfa ++#define DT_MOVESZ 0x6ffffdfb ++#define DT_FEATURE_1 0x6ffffdfc /* Feature selection (DTF_*). */ ++#define DT_POSFLAG_1 0x6ffffdfd /* Flags for DT_* entries, effecting ++ the following DT_* entry. */ ++#define DT_SYMINSZ 0x6ffffdfe /* Size of syminfo table (in bytes) */ ++#define DT_SYMINENT 0x6ffffdff /* Entry size of syminfo */ ++#define DT_VALRNGHI 0x6ffffdff ++#define DT_VALTAGIDX(tag) (DT_VALRNGHI - (tag)) /* Reverse order! */ ++#define DT_VALNUM 12 ++ ++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the ++ Dyn.d_un.d_ptr field of the Elf*_Dyn structure. ++ ++ If any adjustment is made to the ELF object after it has been ++ built these entries will need to be adjusted. */ ++#define DT_ADDRRNGLO 0x6ffffe00 ++#define DT_GNU_HASH 0x6ffffef5 /* GNU-style hash table. */ ++#define DT_TLSDESC_PLT 0x6ffffef6 ++#define DT_TLSDESC_GOT 0x6ffffef7 ++#define DT_GNU_CONFLICT 0x6ffffef8 /* Start of conflict section */ ++#define DT_GNU_LIBLIST 0x6ffffef9 /* Library list */ ++#define DT_CONFIG 0x6ffffefa /* Configuration information. */ ++#define DT_DEPAUDIT 0x6ffffefb /* Dependency auditing. */ ++#define DT_AUDIT 0x6ffffefc /* Object auditing. */ ++#define DT_PLTPAD 0x6ffffefd /* PLT padding. */ ++#define DT_MOVETAB 0x6ffffefe /* Move table. */ ++#define DT_SYMINFO 0x6ffffeff /* Syminfo table. */ ++#define DT_ADDRRNGHI 0x6ffffeff ++#define DT_ADDRTAGIDX(tag) (DT_ADDRRNGHI - (tag)) /* Reverse order! */ ++#define DT_ADDRNUM 11 ++ ++/* The versioning entry types. The next are defined as part of the ++ GNU extension. */ ++#define DT_VERSYM 0x6ffffff0 ++ ++#define DT_RELACOUNT 0x6ffffff9 ++#define DT_RELCOUNT 0x6ffffffa ++ ++/* These were chosen by Sun. */ ++#define DT_FLAGS_1 0x6ffffffb /* State flags, see DF_1_* below. */ ++#define DT_VERDEF 0x6ffffffc /* Address of version definition ++ table */ ++#define DT_VERDEFNUM 0x6ffffffd /* Number of version definitions */ ++#define DT_VERNEED 0x6ffffffe /* Address of table with needed ++ versions */ ++#define DT_VERNEEDNUM 0x6fffffff /* Number of needed versions */ ++#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */ ++#define DT_VERSIONTAGNUM 16 ++ ++/* Sun added these machine-independent extensions in the "processor-specific" ++ range. Be compatible. */ ++#define DT_AUXILIARY 0x7ffffffd /* Shared object to load before self */ ++#define DT_FILTER 0x7fffffff /* Shared object to get values from */ ++#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1) ++#define DT_EXTRANUM 3 ++ ++/* Values of `d_un.d_val' in the DT_FLAGS entry. */ ++#define DF_ORIGIN 0x00000001 /* Object may use DF_ORIGIN */ ++#define DF_SYMBOLIC 0x00000002 /* Symbol resolutions starts here */ ++#define DF_TEXTREL 0x00000004 /* Object contains text relocations */ ++#define DF_BIND_NOW 0x00000008 /* No lazy binding for this object */ ++#define DF_STATIC_TLS 0x00000010 /* Module uses the static TLS model */ ++ ++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1 ++ entry in the dynamic section. */ ++#define DF_1_NOW 0x00000001 /* Set RTLD_NOW for this object. */ ++#define DF_1_GLOBAL 0x00000002 /* Set RTLD_GLOBAL for this object. */ ++#define DF_1_GROUP 0x00000004 /* Set RTLD_GROUP for this object. */ ++#define DF_1_NODELETE 0x00000008 /* Set RTLD_NODELETE for this object.*/ ++#define DF_1_LOADFLTR 0x00000010 /* Trigger filtee loading at runtime.*/ ++#define DF_1_INITFIRST 0x00000020 /* Set RTLD_INITFIRST for this object*/ ++#define DF_1_NOOPEN 0x00000040 /* Set RTLD_NOOPEN for this object. */ ++#define DF_1_ORIGIN 0x00000080 /* $ORIGIN must be handled. */ ++#define DF_1_DIRECT 0x00000100 /* Direct binding enabled. */ ++#define DF_1_TRANS 0x00000200 ++#define DF_1_INTERPOSE 0x00000400 /* Object is used to interpose. */ ++#define DF_1_NODEFLIB 0x00000800 /* Ignore default lib search path. */ ++#define DF_1_NODUMP 0x00001000 /* Object can't be dldump'ed. */ ++#define DF_1_CONFALT 0x00002000 /* Configuration alternative created.*/ ++#define DF_1_ENDFILTEE 0x00004000 /* Filtee terminates filters search. */ ++#define DF_1_DISPRELDNE 0x00008000 /* Disp reloc applied at build time. */ ++#define DF_1_DISPRELPND 0x00010000 /* Disp reloc applied at run-time. */ ++#define DF_1_NODIRECT 0x00020000 /* Object has no-direct binding. */ ++#define DF_1_IGNMULDEF 0x00040000 ++#define DF_1_NOKSYMS 0x00080000 ++#define DF_1_NOHDR 0x00100000 ++#define DF_1_EDITED 0x00200000 /* Object is modified after built. */ ++#define DF_1_NORELOC 0x00400000 ++#define DF_1_SYMINTPOSE 0x00800000 /* Object has individual interposers. */ ++#define DF_1_GLOBAUDIT 0x01000000 /* Global auditing required. */ ++#define DF_1_SINGLETON 0x02000000 /* Singleton symbols are used. */ ++#define DF_1_STUB 0x04000000 ++#define DF_1_PIE 0x08000000 ++#define DF_1_KMOD 0x10000000 ++#define DF_1_WEAKFILTER 0x20000000 ++#define DF_1_NOCOMMON 0x40000000 ++ ++/* Flags for the feature selection in DT_FEATURE_1. */ ++#define DTF_1_PARINIT 0x00000001 ++#define DTF_1_CONFEXP 0x00000002 ++ ++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry. */ ++#define DF_P1_LAZYLOAD 0x00000001 /* Lazyload following object. */ ++#define DF_P1_GROUPPERM 0x00000002 /* Symbols from next object are not ++ generally available. */ ++ ++/* Version definition sections. */ ++ ++typedef struct ++{ ++ Elf32_Half vd_version; /* Version revision */ ++ Elf32_Half vd_flags; /* Version information */ ++ Elf32_Half vd_ndx; /* Version Index */ ++ Elf32_Half vd_cnt; /* Number of associated aux entries */ ++ Elf32_Word vd_hash; /* Version name hash value */ ++ Elf32_Word vd_aux; /* Offset in bytes to verdaux array */ ++ Elf32_Word vd_next; /* Offset in bytes to next verdef ++ entry */ ++} Elf32_Verdef; ++ ++typedef struct ++{ ++ Elf64_Half vd_version; /* Version revision */ ++ Elf64_Half vd_flags; /* Version information */ ++ Elf64_Half vd_ndx; /* Version Index */ ++ Elf64_Half vd_cnt; /* Number of associated aux entries */ ++ Elf64_Word vd_hash; /* Version name hash value */ ++ Elf64_Word vd_aux; /* Offset in bytes to verdaux array */ ++ Elf64_Word vd_next; /* Offset in bytes to next verdef ++ entry */ ++} Elf64_Verdef; ++ ++ ++/* Legal values for vd_version (version revision). */ ++#define VER_DEF_NONE 0 /* No version */ ++#define VER_DEF_CURRENT 1 /* Current version */ ++#define VER_DEF_NUM 2 /* Given version number */ ++ ++/* Legal values for vd_flags (version information flags). */ ++#define VER_FLG_BASE 0x1 /* Version definition of file itself */ ++#define VER_FLG_WEAK 0x2 /* Weak version identifier */ ++ ++/* Versym symbol index values. */ ++#define VER_NDX_LOCAL 0 /* Symbol is local. */ ++#define VER_NDX_GLOBAL 1 /* Symbol is global. */ ++#define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */ ++#define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */ ++ ++/* Auxialiary version information. */ ++ ++typedef struct ++{ ++ Elf32_Word vda_name; /* Version or dependency names */ ++ Elf32_Word vda_next; /* Offset in bytes to next verdaux ++ entry */ ++} Elf32_Verdaux; ++ ++typedef struct ++{ ++ Elf64_Word vda_name; /* Version or dependency names */ ++ Elf64_Word vda_next; /* Offset in bytes to next verdaux ++ entry */ ++} Elf64_Verdaux; ++ ++ ++/* Version dependency section. */ ++ ++typedef struct ++{ ++ Elf32_Half vn_version; /* Version of structure */ ++ Elf32_Half vn_cnt; /* Number of associated aux entries */ ++ Elf32_Word vn_file; /* Offset of filename for this ++ dependency */ ++ Elf32_Word vn_aux; /* Offset in bytes to vernaux array */ ++ Elf32_Word vn_next; /* Offset in bytes to next verneed ++ entry */ ++} Elf32_Verneed; ++ ++typedef struct ++{ ++ Elf64_Half vn_version; /* Version of structure */ ++ Elf64_Half vn_cnt; /* Number of associated aux entries */ ++ Elf64_Word vn_file; /* Offset of filename for this ++ dependency */ ++ Elf64_Word vn_aux; /* Offset in bytes to vernaux array */ ++ Elf64_Word vn_next; /* Offset in bytes to next verneed ++ entry */ ++} Elf64_Verneed; ++ ++ ++/* Legal values for vn_version (version revision). */ ++#define VER_NEED_NONE 0 /* No version */ ++#define VER_NEED_CURRENT 1 /* Current version */ ++#define VER_NEED_NUM 2 /* Given version number */ ++ ++/* Auxiliary needed version information. */ ++ ++typedef struct ++{ ++ Elf32_Word vna_hash; /* Hash value of dependency name */ ++ Elf32_Half vna_flags; /* Dependency specific information */ ++ Elf32_Half vna_other; /* Unused */ ++ Elf32_Word vna_name; /* Dependency name string offset */ ++ Elf32_Word vna_next; /* Offset in bytes to next vernaux ++ entry */ ++} Elf32_Vernaux; ++ ++typedef struct ++{ ++ Elf64_Word vna_hash; /* Hash value of dependency name */ ++ Elf64_Half vna_flags; /* Dependency specific information */ ++ Elf64_Half vna_other; /* Unused */ ++ Elf64_Word vna_name; /* Dependency name string offset */ ++ Elf64_Word vna_next; /* Offset in bytes to next vernaux ++ entry */ ++} Elf64_Vernaux; ++ ++ ++/* Legal values for vna_flags. */ ++#define VER_FLG_WEAK 0x2 /* Weak version identifier */ ++ ++ ++/* Auxiliary vector. */ ++ ++/* This vector is normally only used by the program interpreter. The ++ usual definition in an ABI supplement uses the name auxv_t. The ++ vector is not usually defined in a standard file, but it ++ can't hurt. We rename it to avoid conflicts. The sizes of these ++ types are an arrangement between the exec server and the program ++ interpreter, so we don't fully specify them here. */ ++ ++typedef struct ++{ ++ uint32_t a_type; /* Entry type */ ++ union ++ { ++ uint32_t a_val; /* Integer value */ ++ /* We use to have pointer elements added here. We cannot do that, ++ though, since it does not work when using 32-bit definitions ++ on 64-bit platforms and vice versa. */ ++ } a_un; ++} Elf32_auxv_t; ++ ++typedef struct ++{ ++ uint64_t a_type; /* Entry type */ ++ union ++ { ++ uint64_t a_val; /* Integer value */ ++ /* We use to have pointer elements added here. We cannot do that, ++ though, since it does not work when using 32-bit definitions ++ on 64-bit platforms and vice versa. */ ++ } a_un; ++} Elf64_auxv_t; ++ ++/* Legal values for a_type (entry type). */ ++ ++#define AT_NULL 0 /* End of vector */ ++#define AT_IGNORE 1 /* Entry should be ignored */ ++#define AT_EXECFD 2 /* File descriptor of program */ ++#define AT_PHDR 3 /* Program headers for program */ ++#define AT_PHENT 4 /* Size of program header entry */ ++#define AT_PHNUM 5 /* Number of program headers */ ++#define AT_PAGESZ 6 /* System page size */ ++#define AT_BASE 7 /* Base address of interpreter */ ++#define AT_FLAGS 8 /* Flags */ ++#define AT_ENTRY 9 /* Entry point of program */ ++#define AT_NOTELF 10 /* Program is not ELF */ ++#define AT_UID 11 /* Real uid */ ++#define AT_EUID 12 /* Effective uid */ ++#define AT_GID 13 /* Real gid */ ++#define AT_EGID 14 /* Effective gid */ ++#define AT_CLKTCK 17 /* Frequency of times() */ ++ ++/* Some more special a_type values describing the hardware. */ ++#define AT_PLATFORM 15 /* String identifying platform. */ ++#define AT_HWCAP 16 /* Machine-dependent hints about ++ processor capabilities. */ ++ ++/* This entry gives some information about the FPU initialization ++ performed by the kernel. */ ++#define AT_FPUCW 18 /* Used FPU control word. */ ++ ++/* Cache block sizes. */ ++#define AT_DCACHEBSIZE 19 /* Data cache block size. */ ++#define AT_ICACHEBSIZE 20 /* Instruction cache block size. */ ++#define AT_UCACHEBSIZE 21 /* Unified cache block size. */ ++ ++/* A special ignored value for PPC, used by the kernel to control the ++ interpretation of the AUXV. Must be > 16. */ ++#define AT_IGNOREPPC 22 /* Entry should be ignored. */ ++ ++#define AT_SECURE 23 /* Boolean, was exec setuid-like? */ ++ ++#define AT_BASE_PLATFORM 24 /* String identifying real platforms.*/ ++ ++#define AT_RANDOM 25 /* Address of 16 random bytes. */ ++ ++#define AT_HWCAP2 26 /* More machine-dependent hints about ++ processor capabilities. */ ++ ++#define AT_EXECFN 31 /* Filename of executable. */ ++ ++/* Pointer to the global system page used for system calls and other ++ nice things. */ ++#define AT_SYSINFO 32 ++#define AT_SYSINFO_EHDR 33 ++ ++/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains ++ log2 of line size; mask those to get cache size. */ ++#define AT_L1I_CACHESHAPE 34 ++#define AT_L1D_CACHESHAPE 35 ++#define AT_L2_CACHESHAPE 36 ++#define AT_L3_CACHESHAPE 37 ++ ++/* Shapes of the caches, with more room to describe them. ++ *GEOMETRY are comprised of cache line size in bytes in the bottom 16 bits ++ and the cache associativity in the next 16 bits. */ ++#define AT_L1I_CACHESIZE 40 ++#define AT_L1I_CACHEGEOMETRY 41 ++#define AT_L1D_CACHESIZE 42 ++#define AT_L1D_CACHEGEOMETRY 43 ++#define AT_L2_CACHESIZE 44 ++#define AT_L2_CACHEGEOMETRY 45 ++#define AT_L3_CACHESIZE 46 ++#define AT_L3_CACHEGEOMETRY 47 ++ ++#define AT_MINSIGSTKSZ 51 /* Stack needed for signal delivery ++ (AArch64). */ ++ ++/* Note section contents. Each entry in the note section begins with ++ a header of a fixed form. */ ++ ++typedef struct ++{ ++ Elf32_Word n_namesz; /* Length of the note's name. */ ++ Elf32_Word n_descsz; /* Length of the note's descriptor. */ ++ Elf32_Word n_type; /* Type of the note. */ ++} Elf32_Nhdr; ++ ++typedef struct ++{ ++ Elf64_Word n_namesz; /* Length of the note's name. */ ++ Elf64_Word n_descsz; /* Length of the note's descriptor. */ ++ Elf64_Word n_type; /* Type of the note. */ ++} Elf64_Nhdr; ++ ++/* Known names of notes. */ ++ ++/* Solaris entries in the note section have this name. */ ++#define ELF_NOTE_SOLARIS "SUNW Solaris" ++ ++/* Note entries for GNU systems have this name. */ ++#define ELF_NOTE_GNU "GNU" ++ ++ ++/* Defined types of notes for Solaris. */ ++ ++/* Value of descriptor (one word) is desired pagesize for the binary. */ ++#define ELF_NOTE_PAGESIZE_HINT 1 ++ ++ ++/* Defined note types for GNU systems. */ ++ ++/* ABI information. The descriptor consists of words: ++ word 0: OS descriptor ++ word 1: major version of the ABI ++ word 2: minor version of the ABI ++ word 3: subminor version of the ABI ++*/ ++#define NT_GNU_ABI_TAG 1 ++#define ELF_NOTE_ABI NT_GNU_ABI_TAG /* Old name. */ ++ ++/* Known OSes. These values can appear in word 0 of an ++ NT_GNU_ABI_TAG note section entry. */ ++#define ELF_NOTE_OS_LINUX 0 ++#define ELF_NOTE_OS_GNU 1 ++#define ELF_NOTE_OS_SOLARIS2 2 ++#define ELF_NOTE_OS_FREEBSD 3 ++ ++/* Synthetic hwcap information. The descriptor begins with two words: ++ word 0: number of entries ++ word 1: bitmask of enabled entries ++ Then follow variable-length entries, one byte followed by a ++ '\0'-terminated hwcap name string. The byte gives the bit ++ number to test if enabled, (1U << bit) & bitmask. */ ++#define NT_GNU_HWCAP 2 ++ ++/* Build ID bits as generated by ld --build-id. ++ The descriptor consists of any nonzero number of bytes. */ ++#define NT_GNU_BUILD_ID 3 ++ ++/* Version note generated by GNU gold containing a version string. */ ++#define NT_GNU_GOLD_VERSION 4 ++ ++/* Program property. */ ++#define NT_GNU_PROPERTY_TYPE_0 5 ++ ++/* Note section name of program property. */ ++#define NOTE_GNU_PROPERTY_SECTION_NAME ".note.gnu.property" ++ ++/* Values used in GNU .note.gnu.property notes (NT_GNU_PROPERTY_TYPE_0). */ ++ ++/* Stack size. */ ++#define GNU_PROPERTY_STACK_SIZE 1 ++/* No copy relocation on protected data symbol. */ ++#define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 ++ ++/* Processor-specific semantics, lo */ ++#define GNU_PROPERTY_LOPROC 0xc0000000 ++/* Processor-specific semantics, hi */ ++#define GNU_PROPERTY_HIPROC 0xdfffffff ++/* Application-specific semantics, lo */ ++#define GNU_PROPERTY_LOUSER 0xe0000000 ++/* Application-specific semantics, hi */ ++#define GNU_PROPERTY_HIUSER 0xffffffff ++ ++/* The x86 instruction sets indicated by the corresponding bits are ++ used in program. Their support in the hardware is optional. */ ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 ++/* The x86 instruction sets indicated by the corresponding bits are ++ used in program and they must be supported by the hardware. */ ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++/* X86 processor-specific features used in program. */ ++#define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 ++ ++#define GNU_PROPERTY_X86_ISA_1_486 (1U << 0) ++#define GNU_PROPERTY_X86_ISA_1_586 (1U << 1) ++#define GNU_PROPERTY_X86_ISA_1_686 (1U << 2) ++#define GNU_PROPERTY_X86_ISA_1_SSE (1U << 3) ++#define GNU_PROPERTY_X86_ISA_1_SSE2 (1U << 4) ++#define GNU_PROPERTY_X86_ISA_1_SSE3 (1U << 5) ++#define GNU_PROPERTY_X86_ISA_1_SSSE3 (1U << 6) ++#define GNU_PROPERTY_X86_ISA_1_SSE4_1 (1U << 7) ++#define GNU_PROPERTY_X86_ISA_1_SSE4_2 (1U << 8) ++#define GNU_PROPERTY_X86_ISA_1_AVX (1U << 9) ++#define GNU_PROPERTY_X86_ISA_1_AVX2 (1U << 10) ++#define GNU_PROPERTY_X86_ISA_1_AVX512F (1U << 11) ++#define GNU_PROPERTY_X86_ISA_1_AVX512CD (1U << 12) ++#define GNU_PROPERTY_X86_ISA_1_AVX512ER (1U << 13) ++#define GNU_PROPERTY_X86_ISA_1_AVX512PF (1U << 14) ++#define GNU_PROPERTY_X86_ISA_1_AVX512VL (1U << 15) ++#define GNU_PROPERTY_X86_ISA_1_AVX512DQ (1U << 16) ++#define GNU_PROPERTY_X86_ISA_1_AVX512BW (1U << 17) ++ ++/* This indicates that all executable sections are compatible with ++ IBT. */ ++#define GNU_PROPERTY_X86_FEATURE_1_IBT (1U << 0) ++/* This indicates that all executable sections are compatible with ++ SHSTK. */ ++#define GNU_PROPERTY_X86_FEATURE_1_SHSTK (1U << 1) ++ ++/* Move records. */ ++typedef struct ++{ ++ Elf32_Xword m_value; /* Symbol value. */ ++ Elf32_Word m_info; /* Size and index. */ ++ Elf32_Word m_poffset; /* Symbol offset. */ ++ Elf32_Half m_repeat; /* Repeat count. */ ++ Elf32_Half m_stride; /* Stride info. */ ++} Elf32_Move; ++ ++typedef struct ++{ ++ Elf64_Xword m_value; /* Symbol value. */ ++ Elf64_Xword m_info; /* Size and index. */ ++ Elf64_Xword m_poffset; /* Symbol offset. */ ++ Elf64_Half m_repeat; /* Repeat count. */ ++ Elf64_Half m_stride; /* Stride info. */ ++} Elf64_Move; ++ ++/* Macro to construct move records. */ ++#define ELF32_M_SYM(info) ((info) >> 8) ++#define ELF32_M_SIZE(info) ((unsigned char) (info)) ++#define ELF32_M_INFO(sym, size) (((sym) << 8) + (unsigned char) (size)) ++ ++#define ELF64_M_SYM(info) ELF32_M_SYM (info) ++#define ELF64_M_SIZE(info) ELF32_M_SIZE (info) ++#define ELF64_M_INFO(sym, size) ELF32_M_INFO (sym, size) ++ ++ ++/* Motorola 68k specific definitions. */ ++ ++/* Values for Elf32_Ehdr.e_flags. */ ++#define EF_CPU32 0x00810000 ++ ++/* m68k relocs. */ ++ ++#define R_68K_NONE 0 /* No reloc */ ++#define R_68K_32 1 /* Direct 32 bit */ ++#define R_68K_16 2 /* Direct 16 bit */ ++#define R_68K_8 3 /* Direct 8 bit */ ++#define R_68K_PC32 4 /* PC relative 32 bit */ ++#define R_68K_PC16 5 /* PC relative 16 bit */ ++#define R_68K_PC8 6 /* PC relative 8 bit */ ++#define R_68K_GOT32 7 /* 32 bit PC relative GOT entry */ ++#define R_68K_GOT16 8 /* 16 bit PC relative GOT entry */ ++#define R_68K_GOT8 9 /* 8 bit PC relative GOT entry */ ++#define R_68K_GOT32O 10 /* 32 bit GOT offset */ ++#define R_68K_GOT16O 11 /* 16 bit GOT offset */ ++#define R_68K_GOT8O 12 /* 8 bit GOT offset */ ++#define R_68K_PLT32 13 /* 32 bit PC relative PLT address */ ++#define R_68K_PLT16 14 /* 16 bit PC relative PLT address */ ++#define R_68K_PLT8 15 /* 8 bit PC relative PLT address */ ++#define R_68K_PLT32O 16 /* 32 bit PLT offset */ ++#define R_68K_PLT16O 17 /* 16 bit PLT offset */ ++#define R_68K_PLT8O 18 /* 8 bit PLT offset */ ++#define R_68K_COPY 19 /* Copy symbol at runtime */ ++#define R_68K_GLOB_DAT 20 /* Create GOT entry */ ++#define R_68K_JMP_SLOT 21 /* Create PLT entry */ ++#define R_68K_RELATIVE 22 /* Adjust by program base */ ++#define R_68K_TLS_GD32 25 /* 32 bit GOT offset for GD */ ++#define R_68K_TLS_GD16 26 /* 16 bit GOT offset for GD */ ++#define R_68K_TLS_GD8 27 /* 8 bit GOT offset for GD */ ++#define R_68K_TLS_LDM32 28 /* 32 bit GOT offset for LDM */ ++#define R_68K_TLS_LDM16 29 /* 16 bit GOT offset for LDM */ ++#define R_68K_TLS_LDM8 30 /* 8 bit GOT offset for LDM */ ++#define R_68K_TLS_LDO32 31 /* 32 bit module-relative offset */ ++#define R_68K_TLS_LDO16 32 /* 16 bit module-relative offset */ ++#define R_68K_TLS_LDO8 33 /* 8 bit module-relative offset */ ++#define R_68K_TLS_IE32 34 /* 32 bit GOT offset for IE */ ++#define R_68K_TLS_IE16 35 /* 16 bit GOT offset for IE */ ++#define R_68K_TLS_IE8 36 /* 8 bit GOT offset for IE */ ++#define R_68K_TLS_LE32 37 /* 32 bit offset relative to ++ static TLS block */ ++#define R_68K_TLS_LE16 38 /* 16 bit offset relative to ++ static TLS block */ ++#define R_68K_TLS_LE8 39 /* 8 bit offset relative to ++ static TLS block */ ++#define R_68K_TLS_DTPMOD32 40 /* 32 bit module number */ ++#define R_68K_TLS_DTPREL32 41 /* 32 bit module-relative offset */ ++#define R_68K_TLS_TPREL32 42 /* 32 bit TP-relative offset */ ++/* Keep this the last entry. */ ++#define R_68K_NUM 43 ++ ++/* Intel 80386 specific definitions. */ ++ ++/* i386 relocs. */ ++ ++#define R_386_NONE 0 /* No reloc */ ++#define R_386_32 1 /* Direct 32 bit */ ++#define R_386_PC32 2 /* PC relative 32 bit */ ++#define R_386_GOT32 3 /* 32 bit GOT entry */ ++#define R_386_PLT32 4 /* 32 bit PLT address */ ++#define R_386_COPY 5 /* Copy symbol at runtime */ ++#define R_386_GLOB_DAT 6 /* Create GOT entry */ ++#define R_386_JMP_SLOT 7 /* Create PLT entry */ ++#define R_386_RELATIVE 8 /* Adjust by program base */ ++#define R_386_GOTOFF 9 /* 32 bit offset to GOT */ ++#define R_386_GOTPC 10 /* 32 bit PC relative offset to GOT */ ++#define R_386_32PLT 11 ++#define R_386_TLS_TPOFF 14 /* Offset in static TLS block */ ++#define R_386_TLS_IE 15 /* Address of GOT entry for static TLS ++ block offset */ ++#define R_386_TLS_GOTIE 16 /* GOT entry for static TLS block ++ offset */ ++#define R_386_TLS_LE 17 /* Offset relative to static TLS ++ block */ ++#define R_386_TLS_GD 18 /* Direct 32 bit for GNU version of ++ general dynamic thread local data */ ++#define R_386_TLS_LDM 19 /* Direct 32 bit for GNU version of ++ local dynamic thread local data ++ in LE code */ ++#define R_386_16 20 ++#define R_386_PC16 21 ++#define R_386_8 22 ++#define R_386_PC8 23 ++#define R_386_TLS_GD_32 24 /* Direct 32 bit for general dynamic ++ thread local data */ ++#define R_386_TLS_GD_PUSH 25 /* Tag for pushl in GD TLS code */ ++#define R_386_TLS_GD_CALL 26 /* Relocation for call to ++ __tls_get_addr() */ ++#define R_386_TLS_GD_POP 27 /* Tag for popl in GD TLS code */ ++#define R_386_TLS_LDM_32 28 /* Direct 32 bit for local dynamic ++ thread local data in LE code */ ++#define R_386_TLS_LDM_PUSH 29 /* Tag for pushl in LDM TLS code */ ++#define R_386_TLS_LDM_CALL 30 /* Relocation for call to ++ __tls_get_addr() in LDM code */ ++#define R_386_TLS_LDM_POP 31 /* Tag for popl in LDM TLS code */ ++#define R_386_TLS_LDO_32 32 /* Offset relative to TLS block */ ++#define R_386_TLS_IE_32 33 /* GOT entry for negated static TLS ++ block offset */ ++#define R_386_TLS_LE_32 34 /* Negated offset relative to static ++ TLS block */ ++#define R_386_TLS_DTPMOD32 35 /* ID of module containing symbol */ ++#define R_386_TLS_DTPOFF32 36 /* Offset in TLS block */ ++#define R_386_TLS_TPOFF32 37 /* Negated offset in static TLS block */ ++#define R_386_SIZE32 38 /* 32-bit symbol size */ ++#define R_386_TLS_GOTDESC 39 /* GOT offset for TLS descriptor. */ ++#define R_386_TLS_DESC_CALL 40 /* Marker of call through TLS ++ descriptor for ++ relaxation. */ ++#define R_386_TLS_DESC 41 /* TLS descriptor containing ++ pointer to code and to ++ argument, returning the TLS ++ offset for the symbol. */ ++#define R_386_IRELATIVE 42 /* Adjust indirectly by program base */ ++#define R_386_GOT32X 43 /* Load from 32 bit GOT entry, ++ relaxable. */ ++/* Keep this the last entry. */ ++#define R_386_NUM 44 ++ ++/* SUN SPARC specific definitions. */ ++ ++/* Legal values for ST_TYPE subfield of st_info (symbol type). */ ++ ++#define STT_SPARC_REGISTER 13 /* Global register reserved to app. */ ++ ++/* Values for Elf64_Ehdr.e_flags. */ ++ ++#define EF_SPARCV9_MM 3 ++#define EF_SPARCV9_TSO 0 ++#define EF_SPARCV9_PSO 1 ++#define EF_SPARCV9_RMO 2 ++#define EF_SPARC_LEDATA 0x800000 /* little endian data */ ++#define EF_SPARC_EXT_MASK 0xFFFF00 ++#define EF_SPARC_32PLUS 0x000100 /* generic V8+ features */ ++#define EF_SPARC_SUN_US1 0x000200 /* Sun UltraSPARC1 extensions */ ++#define EF_SPARC_HAL_R1 0x000400 /* HAL R1 extensions */ ++#define EF_SPARC_SUN_US3 0x000800 /* Sun UltraSPARCIII extensions */ ++ ++/* SPARC relocs. */ ++ ++#define R_SPARC_NONE 0 /* No reloc */ ++#define R_SPARC_8 1 /* Direct 8 bit */ ++#define R_SPARC_16 2 /* Direct 16 bit */ ++#define R_SPARC_32 3 /* Direct 32 bit */ ++#define R_SPARC_DISP8 4 /* PC relative 8 bit */ ++#define R_SPARC_DISP16 5 /* PC relative 16 bit */ ++#define R_SPARC_DISP32 6 /* PC relative 32 bit */ ++#define R_SPARC_WDISP30 7 /* PC relative 30 bit shifted */ ++#define R_SPARC_WDISP22 8 /* PC relative 22 bit shifted */ ++#define R_SPARC_HI22 9 /* High 22 bit */ ++#define R_SPARC_22 10 /* Direct 22 bit */ ++#define R_SPARC_13 11 /* Direct 13 bit */ ++#define R_SPARC_LO10 12 /* Truncated 10 bit */ ++#define R_SPARC_GOT10 13 /* Truncated 10 bit GOT entry */ ++#define R_SPARC_GOT13 14 /* 13 bit GOT entry */ ++#define R_SPARC_GOT22 15 /* 22 bit GOT entry shifted */ ++#define R_SPARC_PC10 16 /* PC relative 10 bit truncated */ ++#define R_SPARC_PC22 17 /* PC relative 22 bit shifted */ ++#define R_SPARC_WPLT30 18 /* 30 bit PC relative PLT address */ ++#define R_SPARC_COPY 19 /* Copy symbol at runtime */ ++#define R_SPARC_GLOB_DAT 20 /* Create GOT entry */ ++#define R_SPARC_JMP_SLOT 21 /* Create PLT entry */ ++#define R_SPARC_RELATIVE 22 /* Adjust by program base */ ++#define R_SPARC_UA32 23 /* Direct 32 bit unaligned */ ++ ++/* Additional Sparc64 relocs. */ ++ ++#define R_SPARC_PLT32 24 /* Direct 32 bit ref to PLT entry */ ++#define R_SPARC_HIPLT22 25 /* High 22 bit PLT entry */ ++#define R_SPARC_LOPLT10 26 /* Truncated 10 bit PLT entry */ ++#define R_SPARC_PCPLT32 27 /* PC rel 32 bit ref to PLT entry */ ++#define R_SPARC_PCPLT22 28 /* PC rel high 22 bit PLT entry */ ++#define R_SPARC_PCPLT10 29 /* PC rel trunc 10 bit PLT entry */ ++#define R_SPARC_10 30 /* Direct 10 bit */ ++#define R_SPARC_11 31 /* Direct 11 bit */ ++#define R_SPARC_64 32 /* Direct 64 bit */ ++#define R_SPARC_OLO10 33 /* 10bit with secondary 13bit addend */ ++#define R_SPARC_HH22 34 /* Top 22 bits of direct 64 bit */ ++#define R_SPARC_HM10 35 /* High middle 10 bits of ... */ ++#define R_SPARC_LM22 36 /* Low middle 22 bits of ... */ ++#define R_SPARC_PC_HH22 37 /* Top 22 bits of pc rel 64 bit */ ++#define R_SPARC_PC_HM10 38 /* High middle 10 bit of ... */ ++#define R_SPARC_PC_LM22 39 /* Low miggle 22 bits of ... */ ++#define R_SPARC_WDISP16 40 /* PC relative 16 bit shifted */ ++#define R_SPARC_WDISP19 41 /* PC relative 19 bit shifted */ ++#define R_SPARC_GLOB_JMP 42 /* was part of v9 ABI but was removed */ ++#define R_SPARC_7 43 /* Direct 7 bit */ ++#define R_SPARC_5 44 /* Direct 5 bit */ ++#define R_SPARC_6 45 /* Direct 6 bit */ ++#define R_SPARC_DISP64 46 /* PC relative 64 bit */ ++#define R_SPARC_PLT64 47 /* Direct 64 bit ref to PLT entry */ ++#define R_SPARC_HIX22 48 /* High 22 bit complemented */ ++#define R_SPARC_LOX10 49 /* Truncated 11 bit complemented */ ++#define R_SPARC_H44 50 /* Direct high 12 of 44 bit */ ++#define R_SPARC_M44 51 /* Direct mid 22 of 44 bit */ ++#define R_SPARC_L44 52 /* Direct low 10 of 44 bit */ ++#define R_SPARC_REGISTER 53 /* Global register usage */ ++#define R_SPARC_UA64 54 /* Direct 64 bit unaligned */ ++#define R_SPARC_UA16 55 /* Direct 16 bit unaligned */ ++#define R_SPARC_TLS_GD_HI22 56 ++#define R_SPARC_TLS_GD_LO10 57 ++#define R_SPARC_TLS_GD_ADD 58 ++#define R_SPARC_TLS_GD_CALL 59 ++#define R_SPARC_TLS_LDM_HI22 60 ++#define R_SPARC_TLS_LDM_LO10 61 ++#define R_SPARC_TLS_LDM_ADD 62 ++#define R_SPARC_TLS_LDM_CALL 63 ++#define R_SPARC_TLS_LDO_HIX22 64 ++#define R_SPARC_TLS_LDO_LOX10 65 ++#define R_SPARC_TLS_LDO_ADD 66 ++#define R_SPARC_TLS_IE_HI22 67 ++#define R_SPARC_TLS_IE_LO10 68 ++#define R_SPARC_TLS_IE_LD 69 ++#define R_SPARC_TLS_IE_LDX 70 ++#define R_SPARC_TLS_IE_ADD 71 ++#define R_SPARC_TLS_LE_HIX22 72 ++#define R_SPARC_TLS_LE_LOX10 73 ++#define R_SPARC_TLS_DTPMOD32 74 ++#define R_SPARC_TLS_DTPMOD64 75 ++#define R_SPARC_TLS_DTPOFF32 76 ++#define R_SPARC_TLS_DTPOFF64 77 ++#define R_SPARC_TLS_TPOFF32 78 ++#define R_SPARC_TLS_TPOFF64 79 ++#define R_SPARC_GOTDATA_HIX22 80 ++#define R_SPARC_GOTDATA_LOX10 81 ++#define R_SPARC_GOTDATA_OP_HIX22 82 ++#define R_SPARC_GOTDATA_OP_LOX10 83 ++#define R_SPARC_GOTDATA_OP 84 ++#define R_SPARC_H34 85 ++#define R_SPARC_SIZE32 86 ++#define R_SPARC_SIZE64 87 ++#define R_SPARC_WDISP10 88 ++#define R_SPARC_JMP_IREL 248 ++#define R_SPARC_IRELATIVE 249 ++#define R_SPARC_GNU_VTINHERIT 250 ++#define R_SPARC_GNU_VTENTRY 251 ++#define R_SPARC_REV32 252 ++/* Keep this the last entry. */ ++#define R_SPARC_NUM 253 ++ ++/* For Sparc64, legal values for d_tag of Elf64_Dyn. */ ++ ++#define DT_SPARC_REGISTER 0x70000001 ++#define DT_SPARC_NUM 2 ++ ++/* MIPS R3000 specific definitions. */ ++ ++/* Legal values for e_flags field of Elf32_Ehdr. */ ++ ++#define EF_MIPS_NOREORDER 1 /* A .noreorder directive was used. */ ++#define EF_MIPS_PIC 2 /* Contains PIC code. */ ++#define EF_MIPS_CPIC 4 /* Uses PIC calling sequence. */ ++#define EF_MIPS_XGOT 8 ++#define EF_MIPS_64BIT_WHIRL 16 ++#define EF_MIPS_ABI2 32 ++#define EF_MIPS_ABI_ON32 64 ++#define EF_MIPS_FP64 512 /* Uses FP64 (12 callee-saved). */ ++#define EF_MIPS_NAN2008 1024 /* Uses IEEE 754-2008 NaN encoding. */ ++#define EF_MIPS_ARCH 0xf0000000 /* MIPS architecture level. */ ++ ++/* Legal values for MIPS architecture level. */ ++ ++#define EF_MIPS_ARCH_1 0x00000000 /* -mips1 code. */ ++#define EF_MIPS_ARCH_2 0x10000000 /* -mips2 code. */ ++#define EF_MIPS_ARCH_3 0x20000000 /* -mips3 code. */ ++#define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code. */ ++#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code. */ ++#define EF_MIPS_ARCH_32 0x50000000 /* MIPS32 code. */ ++#define EF_MIPS_ARCH_64 0x60000000 /* MIPS64 code. */ ++#define EF_MIPS_ARCH_32R2 0x70000000 /* MIPS32r2 code. */ ++#define EF_MIPS_ARCH_64R2 0x80000000 /* MIPS64r2 code. */ ++ ++/* The following are unofficial names and should not be used. */ ++ ++#define E_MIPS_ARCH_1 EF_MIPS_ARCH_1 ++#define E_MIPS_ARCH_2 EF_MIPS_ARCH_2 ++#define E_MIPS_ARCH_3 EF_MIPS_ARCH_3 ++#define E_MIPS_ARCH_4 EF_MIPS_ARCH_4 ++#define E_MIPS_ARCH_5 EF_MIPS_ARCH_5 ++#define E_MIPS_ARCH_32 EF_MIPS_ARCH_32 ++#define E_MIPS_ARCH_64 EF_MIPS_ARCH_64 ++ ++/* Special section indices. */ ++ ++#define SHN_MIPS_ACOMMON 0xff00 /* Allocated common symbols. */ ++#define SHN_MIPS_TEXT 0xff01 /* Allocated test symbols. */ ++#define SHN_MIPS_DATA 0xff02 /* Allocated data symbols. */ ++#define SHN_MIPS_SCOMMON 0xff03 /* Small common symbols. */ ++#define SHN_MIPS_SUNDEFINED 0xff04 /* Small undefined symbols. */ ++ ++/* Legal values for sh_type field of Elf32_Shdr. */ ++ ++#define SHT_MIPS_LIBLIST 0x70000000 /* Shared objects used in link. */ ++#define SHT_MIPS_MSYM 0x70000001 ++#define SHT_MIPS_CONFLICT 0x70000002 /* Conflicting symbols. */ ++#define SHT_MIPS_GPTAB 0x70000003 /* Global data area sizes. */ ++#define SHT_MIPS_UCODE 0x70000004 /* Reserved for SGI/MIPS compilers */ ++#define SHT_MIPS_DEBUG 0x70000005 /* MIPS ECOFF debugging info. */ ++#define SHT_MIPS_REGINFO 0x70000006 /* Register usage information. */ ++#define SHT_MIPS_PACKAGE 0x70000007 ++#define SHT_MIPS_PACKSYM 0x70000008 ++#define SHT_MIPS_RELD 0x70000009 ++#define SHT_MIPS_IFACE 0x7000000b ++#define SHT_MIPS_CONTENT 0x7000000c ++#define SHT_MIPS_OPTIONS 0x7000000d /* Miscellaneous options. */ ++#define SHT_MIPS_SHDR 0x70000010 ++#define SHT_MIPS_FDESC 0x70000011 ++#define SHT_MIPS_EXTSYM 0x70000012 ++#define SHT_MIPS_DENSE 0x70000013 ++#define SHT_MIPS_PDESC 0x70000014 ++#define SHT_MIPS_LOCSYM 0x70000015 ++#define SHT_MIPS_AUXSYM 0x70000016 ++#define SHT_MIPS_OPTSYM 0x70000017 ++#define SHT_MIPS_LOCSTR 0x70000018 ++#define SHT_MIPS_LINE 0x70000019 ++#define SHT_MIPS_RFDESC 0x7000001a ++#define SHT_MIPS_DELTASYM 0x7000001b ++#define SHT_MIPS_DELTAINST 0x7000001c ++#define SHT_MIPS_DELTACLASS 0x7000001d ++#define SHT_MIPS_DWARF 0x7000001e /* DWARF debugging information. */ ++#define SHT_MIPS_DELTADECL 0x7000001f ++#define SHT_MIPS_SYMBOL_LIB 0x70000020 ++#define SHT_MIPS_EVENTS 0x70000021 /* Event section. */ ++#define SHT_MIPS_TRANSLATE 0x70000022 ++#define SHT_MIPS_PIXIE 0x70000023 ++#define SHT_MIPS_XLATE 0x70000024 ++#define SHT_MIPS_XLATE_DEBUG 0x70000025 ++#define SHT_MIPS_WHIRL 0x70000026 ++#define SHT_MIPS_EH_REGION 0x70000027 ++#define SHT_MIPS_XLATE_OLD 0x70000028 ++#define SHT_MIPS_PDR_EXCEPTION 0x70000029 ++ ++/* Legal values for sh_flags field of Elf32_Shdr. */ ++ ++#define SHF_MIPS_GPREL 0x10000000 /* Must be in global data area. */ ++#define SHF_MIPS_MERGE 0x20000000 ++#define SHF_MIPS_ADDR 0x40000000 ++#define SHF_MIPS_STRINGS 0x80000000 ++#define SHF_MIPS_NOSTRIP 0x08000000 ++#define SHF_MIPS_LOCAL 0x04000000 ++#define SHF_MIPS_NAMES 0x02000000 ++#define SHF_MIPS_NODUPE 0x01000000 ++ ++ ++/* Symbol tables. */ ++ ++/* MIPS specific values for `st_other'. */ ++#define STO_MIPS_DEFAULT 0x0 ++#define STO_MIPS_INTERNAL 0x1 ++#define STO_MIPS_HIDDEN 0x2 ++#define STO_MIPS_PROTECTED 0x3 ++#define STO_MIPS_PLT 0x8 ++#define STO_MIPS_SC_ALIGN_UNUSED 0xff ++ ++/* MIPS specific values for `st_info'. */ ++#define STB_MIPS_SPLIT_COMMON 13 ++ ++/* Entries found in sections of type SHT_MIPS_GPTAB. */ ++ ++typedef union ++{ ++ struct ++ { ++ Elf32_Word gt_current_g_value; /* -G value used for compilation. */ ++ Elf32_Word gt_unused; /* Not used. */ ++ } gt_header; /* First entry in section. */ ++ struct ++ { ++ Elf32_Word gt_g_value; /* If this value were used for -G. */ ++ Elf32_Word gt_bytes; /* This many bytes would be used. */ ++ } gt_entry; /* Subsequent entries in section. */ ++} Elf32_gptab; ++ ++/* Entry found in sections of type SHT_MIPS_REGINFO. */ ++ ++typedef struct ++{ ++ Elf32_Word ri_gprmask; /* General registers used. */ ++ Elf32_Word ri_cprmask[4]; /* Coprocessor registers used. */ ++ Elf32_Sword ri_gp_value; /* $gp register value. */ ++} Elf32_RegInfo; ++ ++/* Entries found in sections of type SHT_MIPS_OPTIONS. */ ++ ++typedef struct ++{ ++ unsigned char kind; /* Determines interpretation of the ++ variable part of descriptor. */ ++ unsigned char size; /* Size of descriptor, including header. */ ++ Elf32_Section section; /* Section header index of section affected, ++ 0 for global options. */ ++ Elf32_Word info; /* Kind-specific information. */ ++} Elf_Options; ++ ++/* Values for `kind' field in Elf_Options. */ ++ ++#define ODK_NULL 0 /* Undefined. */ ++#define ODK_REGINFO 1 /* Register usage information. */ ++#define ODK_EXCEPTIONS 2 /* Exception processing options. */ ++#define ODK_PAD 3 /* Section padding options. */ ++#define ODK_HWPATCH 4 /* Hardware workarounds performed */ ++#define ODK_FILL 5 /* record the fill value used by the linker. */ ++#define ODK_TAGS 6 /* reserve space for desktop tools to write. */ ++#define ODK_HWAND 7 /* HW workarounds. 'AND' bits when merging. */ ++#define ODK_HWOR 8 /* HW workarounds. 'OR' bits when merging. */ ++ ++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries. */ ++ ++#define OEX_FPU_MIN 0x1f /* FPE's which MUST be enabled. */ ++#define OEX_FPU_MAX 0x1f00 /* FPE's which MAY be enabled. */ ++#define OEX_PAGE0 0x10000 /* page zero must be mapped. */ ++#define OEX_SMM 0x20000 /* Force sequential memory mode? */ ++#define OEX_FPDBUG 0x40000 /* Force floating point debug mode? */ ++#define OEX_PRECISEFP OEX_FPDBUG ++#define OEX_DISMISS 0x80000 /* Dismiss invalid address faults? */ ++ ++#define OEX_FPU_INVAL 0x10 ++#define OEX_FPU_DIV0 0x08 ++#define OEX_FPU_OFLO 0x04 ++#define OEX_FPU_UFLO 0x02 ++#define OEX_FPU_INEX 0x01 ++ ++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry. */ ++ ++#define OHW_R4KEOP 0x1 /* R4000 end-of-page patch. */ ++#define OHW_R8KPFETCH 0x2 /* may need R8000 prefetch patch. */ ++#define OHW_R5KEOP 0x4 /* R5000 end-of-page patch. */ ++#define OHW_R5KCVTL 0x8 /* R5000 cvt.[ds].l bug. clean=1. */ ++ ++#define OPAD_PREFIX 0x1 ++#define OPAD_POSTFIX 0x2 ++#define OPAD_SYMBOL 0x4 ++ ++/* Entry found in `.options' section. */ ++ ++typedef struct ++{ ++ Elf32_Word hwp_flags1; /* Extra flags. */ ++ Elf32_Word hwp_flags2; /* Extra flags. */ ++} Elf_Options_Hw; ++ ++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries. */ ++ ++#define OHWA0_R4KEOP_CHECKED 0x00000001 ++#define OHWA1_R4KEOP_CLEAN 0x00000002 ++ ++/* MIPS relocs. */ ++ ++#define R_MIPS_NONE 0 /* No reloc */ ++#define R_MIPS_16 1 /* Direct 16 bit */ ++#define R_MIPS_32 2 /* Direct 32 bit */ ++#define R_MIPS_REL32 3 /* PC relative 32 bit */ ++#define R_MIPS_26 4 /* Direct 26 bit shifted */ ++#define R_MIPS_HI16 5 /* High 16 bit */ ++#define R_MIPS_LO16 6 /* Low 16 bit */ ++#define R_MIPS_GPREL16 7 /* GP relative 16 bit */ ++#define R_MIPS_LITERAL 8 /* 16 bit literal entry */ ++#define R_MIPS_GOT16 9 /* 16 bit GOT entry */ ++#define R_MIPS_PC16 10 /* PC relative 16 bit */ ++#define R_MIPS_CALL16 11 /* 16 bit GOT entry for function */ ++#define R_MIPS_GPREL32 12 /* GP relative 32 bit */ ++ ++#define R_MIPS_SHIFT5 16 ++#define R_MIPS_SHIFT6 17 ++#define R_MIPS_64 18 ++#define R_MIPS_GOT_DISP 19 ++#define R_MIPS_GOT_PAGE 20 ++#define R_MIPS_GOT_OFST 21 ++#define R_MIPS_GOT_HI16 22 ++#define R_MIPS_GOT_LO16 23 ++#define R_MIPS_SUB 24 ++#define R_MIPS_INSERT_A 25 ++#define R_MIPS_INSERT_B 26 ++#define R_MIPS_DELETE 27 ++#define R_MIPS_HIGHER 28 ++#define R_MIPS_HIGHEST 29 ++#define R_MIPS_CALL_HI16 30 ++#define R_MIPS_CALL_LO16 31 ++#define R_MIPS_SCN_DISP 32 ++#define R_MIPS_REL16 33 ++#define R_MIPS_ADD_IMMEDIATE 34 ++#define R_MIPS_PJUMP 35 ++#define R_MIPS_RELGOT 36 ++#define R_MIPS_JALR 37 ++#define R_MIPS_TLS_DTPMOD32 38 /* Module number 32 bit */ ++#define R_MIPS_TLS_DTPREL32 39 /* Module-relative offset 32 bit */ ++#define R_MIPS_TLS_DTPMOD64 40 /* Module number 64 bit */ ++#define R_MIPS_TLS_DTPREL64 41 /* Module-relative offset 64 bit */ ++#define R_MIPS_TLS_GD 42 /* 16 bit GOT offset for GD */ ++#define R_MIPS_TLS_LDM 43 /* 16 bit GOT offset for LDM */ ++#define R_MIPS_TLS_DTPREL_HI16 44 /* Module-relative offset, high 16 bits */ ++#define R_MIPS_TLS_DTPREL_LO16 45 /* Module-relative offset, low 16 bits */ ++#define R_MIPS_TLS_GOTTPREL 46 /* 16 bit GOT offset for IE */ ++#define R_MIPS_TLS_TPREL32 47 /* TP-relative offset, 32 bit */ ++#define R_MIPS_TLS_TPREL64 48 /* TP-relative offset, 64 bit */ ++#define R_MIPS_TLS_TPREL_HI16 49 /* TP-relative offset, high 16 bits */ ++#define R_MIPS_TLS_TPREL_LO16 50 /* TP-relative offset, low 16 bits */ ++#define R_MIPS_GLOB_DAT 51 ++#define R_MIPS_COPY 126 ++#define R_MIPS_JUMP_SLOT 127 ++/* Keep this the last entry. */ ++#define R_MIPS_NUM 128 ++ ++/* Legal values for p_type field of Elf32_Phdr. */ ++ ++#define PT_MIPS_REGINFO 0x70000000 /* Register usage information. */ ++#define PT_MIPS_RTPROC 0x70000001 /* Runtime procedure table. */ ++#define PT_MIPS_OPTIONS 0x70000002 ++#define PT_MIPS_ABIFLAGS 0x70000003 /* FP mode requirement. */ ++ ++/* Special program header types. */ ++ ++#define PF_MIPS_LOCAL 0x10000000 ++ ++/* Legal values for d_tag field of Elf32_Dyn. */ ++ ++#define DT_MIPS_RLD_VERSION 0x70000001 /* Runtime linker interface version */ ++#define DT_MIPS_TIME_STAMP 0x70000002 /* Timestamp */ ++#define DT_MIPS_ICHECKSUM 0x70000003 /* Checksum */ ++#define DT_MIPS_IVERSION 0x70000004 /* Version string (string tbl index) */ ++#define DT_MIPS_FLAGS 0x70000005 /* Flags */ ++#define DT_MIPS_BASE_ADDRESS 0x70000006 /* Base address */ ++#define DT_MIPS_MSYM 0x70000007 ++#define DT_MIPS_CONFLICT 0x70000008 /* Address of CONFLICT section */ ++#define DT_MIPS_LIBLIST 0x70000009 /* Address of LIBLIST section */ ++#define DT_MIPS_LOCAL_GOTNO 0x7000000a /* Number of local GOT entries */ ++#define DT_MIPS_CONFLICTNO 0x7000000b /* Number of CONFLICT entries */ ++#define DT_MIPS_LIBLISTNO 0x70000010 /* Number of LIBLIST entries */ ++#define DT_MIPS_SYMTABNO 0x70000011 /* Number of DYNSYM entries */ ++#define DT_MIPS_UNREFEXTNO 0x70000012 /* First external DYNSYM */ ++#define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in DYNSYM */ ++#define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */ ++#define DT_MIPS_RLD_MAP 0x70000016 /* Address of run time loader map. */ ++#define DT_MIPS_DELTA_CLASS 0x70000017 /* Delta C++ class definition. */ ++#define DT_MIPS_DELTA_CLASS_NO 0x70000018 /* Number of entries in ++ DT_MIPS_DELTA_CLASS. */ ++#define DT_MIPS_DELTA_INSTANCE 0x70000019 /* Delta C++ class instances. */ ++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in ++ DT_MIPS_DELTA_INSTANCE. */ ++#define DT_MIPS_DELTA_RELOC 0x7000001b /* Delta relocations. */ ++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in ++ DT_MIPS_DELTA_RELOC. */ ++#define DT_MIPS_DELTA_SYM 0x7000001d /* Delta symbols that Delta ++ relocations refer to. */ ++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in ++ DT_MIPS_DELTA_SYM. */ ++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the ++ class declaration. */ ++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in ++ DT_MIPS_DELTA_CLASSSYM. */ ++#define DT_MIPS_CXX_FLAGS 0x70000022 /* Flags indicating for C++ flavor. */ ++#define DT_MIPS_PIXIE_INIT 0x70000023 ++#define DT_MIPS_SYMBOL_LIB 0x70000024 ++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025 ++#define DT_MIPS_LOCAL_GOTIDX 0x70000026 ++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027 ++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028 ++#define DT_MIPS_OPTIONS 0x70000029 /* Address of .options. */ ++#define DT_MIPS_INTERFACE 0x7000002a /* Address of .interface. */ ++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b ++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */ ++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve ++ function stored in GOT. */ ++#define DT_MIPS_PERF_SUFFIX 0x7000002e /* Default suffix of dso to be added ++ by rld on dlopen() calls. */ ++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */ ++#define DT_MIPS_GP_VALUE 0x70000030 /* GP value for aux GOTs. */ ++#define DT_MIPS_AUX_DYNAMIC 0x70000031 /* Address of aux .dynamic. */ ++/* The address of .got.plt in an executable using the new non-PIC ABI. */ ++#define DT_MIPS_PLTGOT 0x70000032 ++/* The base of the PLT in an executable using the new non-PIC ABI if that ++ PLT is writable. For a non-writable PLT, this is omitted or has a zero ++ value. */ ++#define DT_MIPS_RWPLT 0x70000034 ++/* An alternative description of the classic MIPS RLD_MAP that is usable ++ in a PIE as it stores a relative offset from the address of the tag ++ rather than an absolute address. */ ++#define DT_MIPS_RLD_MAP_REL 0x70000035 ++#define DT_MIPS_NUM 0x36 ++ ++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */ ++ ++#define RHF_NONE 0 /* No flags */ ++#define RHF_QUICKSTART (1 << 0) /* Use quickstart */ ++#define RHF_NOTPOT (1 << 1) /* Hash size not power of 2 */ ++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2) /* Ignore LD_LIBRARY_PATH */ ++#define RHF_NO_MOVE (1 << 3) ++#define RHF_SGI_ONLY (1 << 4) ++#define RHF_GUARANTEE_INIT (1 << 5) ++#define RHF_DELTA_C_PLUS_PLUS (1 << 6) ++#define RHF_GUARANTEE_START_INIT (1 << 7) ++#define RHF_PIXIE (1 << 8) ++#define RHF_DEFAULT_DELAY_LOAD (1 << 9) ++#define RHF_REQUICKSTART (1 << 10) ++#define RHF_REQUICKSTARTED (1 << 11) ++#define RHF_CORD (1 << 12) ++#define RHF_NO_UNRES_UNDEF (1 << 13) ++#define RHF_RLD_ORDER_SAFE (1 << 14) ++ ++/* Entries found in sections of type SHT_MIPS_LIBLIST. */ ++ ++typedef struct ++{ ++ Elf32_Word l_name; /* Name (string table index) */ ++ Elf32_Word l_time_stamp; /* Timestamp */ ++ Elf32_Word l_checksum; /* Checksum */ ++ Elf32_Word l_version; /* Interface version */ ++ Elf32_Word l_flags; /* Flags */ ++} Elf32_Lib; ++ ++typedef struct ++{ ++ Elf64_Word l_name; /* Name (string table index) */ ++ Elf64_Word l_time_stamp; /* Timestamp */ ++ Elf64_Word l_checksum; /* Checksum */ ++ Elf64_Word l_version; /* Interface version */ ++ Elf64_Word l_flags; /* Flags */ ++} Elf64_Lib; ++ ++ ++/* Legal values for l_flags. */ ++ ++#define LL_NONE 0 ++#define LL_EXACT_MATCH (1 << 0) /* Require exact match */ ++#define LL_IGNORE_INT_VER (1 << 1) /* Ignore interface version */ ++#define LL_REQUIRE_MINOR (1 << 2) ++#define LL_EXPORTS (1 << 3) ++#define LL_DELAY_LOAD (1 << 4) ++#define LL_DELTA (1 << 5) ++ ++/* Entries found in sections of type SHT_MIPS_CONFLICT. */ ++ ++typedef Elf32_Addr Elf32_Conflict; ++ ++typedef struct ++{ ++ /* Version of flags structure. */ ++ Elf32_Half version; ++ /* The level of the ISA: 1-5, 32, 64. */ ++ unsigned char isa_level; ++ /* The revision of ISA: 0 for MIPS V and below, 1-n otherwise. */ ++ unsigned char isa_rev; ++ /* The size of general purpose registers. */ ++ unsigned char gpr_size; ++ /* The size of co-processor 1 registers. */ ++ unsigned char cpr1_size; ++ /* The size of co-processor 2 registers. */ ++ unsigned char cpr2_size; ++ /* The floating-point ABI. */ ++ unsigned char fp_abi; ++ /* Processor-specific extension. */ ++ Elf32_Word isa_ext; ++ /* Mask of ASEs used. */ ++ Elf32_Word ases; ++ /* Mask of general flags. */ ++ Elf32_Word flags1; ++ Elf32_Word flags2; ++} Elf_MIPS_ABIFlags_v0; ++ ++/* Values for the register size bytes of an abi flags structure. */ ++ ++#define MIPS_AFL_REG_NONE 0x00 /* No registers. */ ++#define MIPS_AFL_REG_32 0x01 /* 32-bit registers. */ ++#define MIPS_AFL_REG_64 0x02 /* 64-bit registers. */ ++#define MIPS_AFL_REG_128 0x03 /* 128-bit registers. */ ++ ++/* Masks for the ases word of an ABI flags structure. */ ++ ++#define MIPS_AFL_ASE_DSP 0x00000001 /* DSP ASE. */ ++#define MIPS_AFL_ASE_DSPR2 0x00000002 /* DSP R2 ASE. */ ++#define MIPS_AFL_ASE_EVA 0x00000004 /* Enhanced VA Scheme. */ ++#define MIPS_AFL_ASE_MCU 0x00000008 /* MCU (MicroController) ASE. */ ++#define MIPS_AFL_ASE_MDMX 0x00000010 /* MDMX ASE. */ ++#define MIPS_AFL_ASE_MIPS3D 0x00000020 /* MIPS-3D ASE. */ ++#define MIPS_AFL_ASE_MT 0x00000040 /* MT ASE. */ ++#define MIPS_AFL_ASE_SMARTMIPS 0x00000080 /* SmartMIPS ASE. */ ++#define MIPS_AFL_ASE_VIRT 0x00000100 /* VZ ASE. */ ++#define MIPS_AFL_ASE_MSA 0x00000200 /* MSA ASE. */ ++#define MIPS_AFL_ASE_MIPS16 0x00000400 /* MIPS16 ASE. */ ++#define MIPS_AFL_ASE_MICROMIPS 0x00000800 /* MICROMIPS ASE. */ ++#define MIPS_AFL_ASE_XPA 0x00001000 /* XPA ASE. */ ++#define MIPS_AFL_ASE_MASK 0x00001fff /* All ASEs. */ ++ ++/* Values for the isa_ext word of an ABI flags structure. */ ++ ++#define MIPS_AFL_EXT_XLR 1 /* RMI Xlr instruction. */ ++#define MIPS_AFL_EXT_OCTEON2 2 /* Cavium Networks Octeon2. */ ++#define MIPS_AFL_EXT_OCTEONP 3 /* Cavium Networks OcteonP. */ ++#define MIPS_AFL_EXT_LOONGSON_3A 4 /* Loongson 3A. */ ++#define MIPS_AFL_EXT_OCTEON 5 /* Cavium Networks Octeon. */ ++#define MIPS_AFL_EXT_5900 6 /* MIPS R5900 instruction. */ ++#define MIPS_AFL_EXT_4650 7 /* MIPS R4650 instruction. */ ++#define MIPS_AFL_EXT_4010 8 /* LSI R4010 instruction. */ ++#define MIPS_AFL_EXT_4100 9 /* NEC VR4100 instruction. */ ++#define MIPS_AFL_EXT_3900 10 /* Toshiba R3900 instruction. */ ++#define MIPS_AFL_EXT_10000 11 /* MIPS R10000 instruction. */ ++#define MIPS_AFL_EXT_SB1 12 /* Broadcom SB-1 instruction. */ ++#define MIPS_AFL_EXT_4111 13 /* NEC VR4111/VR4181 instruction. */ ++#define MIPS_AFL_EXT_4120 14 /* NEC VR4120 instruction. */ ++#define MIPS_AFL_EXT_5400 15 /* NEC VR5400 instruction. */ ++#define MIPS_AFL_EXT_5500 16 /* NEC VR5500 instruction. */ ++#define MIPS_AFL_EXT_LOONGSON_2E 17 /* ST Microelectronics Loongson 2E. */ ++#define MIPS_AFL_EXT_LOONGSON_2F 18 /* ST Microelectronics Loongson 2F. */ ++ ++/* Masks for the flags1 word of an ABI flags structure. */ ++#define MIPS_AFL_FLAGS1_ODDSPREG 1 /* Uses odd single-precision registers. */ ++ ++/* Object attribute values. */ ++enum ++{ ++ /* Not tagged or not using any ABIs affected by the differences. */ ++ Val_GNU_MIPS_ABI_FP_ANY = 0, ++ /* Using hard-float -mdouble-float. */ ++ Val_GNU_MIPS_ABI_FP_DOUBLE = 1, ++ /* Using hard-float -msingle-float. */ ++ Val_GNU_MIPS_ABI_FP_SINGLE = 2, ++ /* Using soft-float. */ ++ Val_GNU_MIPS_ABI_FP_SOFT = 3, ++ /* Using -mips32r2 -mfp64. */ ++ Val_GNU_MIPS_ABI_FP_OLD_64 = 4, ++ /* Using -mfpxx. */ ++ Val_GNU_MIPS_ABI_FP_XX = 5, ++ /* Using -mips32r2 -mfp64. */ ++ Val_GNU_MIPS_ABI_FP_64 = 6, ++ /* Using -mips32r2 -mfp64 -mno-odd-spreg. */ ++ Val_GNU_MIPS_ABI_FP_64A = 7, ++ /* Maximum allocated FP ABI value. */ ++ Val_GNU_MIPS_ABI_FP_MAX = 7 ++}; ++ ++/* HPPA specific definitions. */ ++ ++/* Legal values for e_flags field of Elf32_Ehdr. */ ++ ++#define EF_PARISC_TRAPNIL 0x00010000 /* Trap nil pointer dereference. */ ++#define EF_PARISC_EXT 0x00020000 /* Program uses arch. extensions. */ ++#define EF_PARISC_LSB 0x00040000 /* Program expects little endian. */ ++#define EF_PARISC_WIDE 0x00080000 /* Program expects wide mode. */ ++#define EF_PARISC_NO_KABP 0x00100000 /* No kernel assisted branch ++ prediction. */ ++#define EF_PARISC_LAZYSWAP 0x00400000 /* Allow lazy swapping. */ ++#define EF_PARISC_ARCH 0x0000ffff /* Architecture version. */ ++ ++/* Defined values for `e_flags & EF_PARISC_ARCH' are: */ ++ ++#define EFA_PARISC_1_0 0x020b /* PA-RISC 1.0 big-endian. */ ++#define EFA_PARISC_1_1 0x0210 /* PA-RISC 1.1 big-endian. */ ++#define EFA_PARISC_2_0 0x0214 /* PA-RISC 2.0 big-endian. */ ++ ++/* Additional section indeces. */ ++ ++#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tenatively declared ++ symbols in ANSI C. */ ++#define SHN_PARISC_HUGE_COMMON 0xff01 /* Common blocks in huge model. */ ++ ++/* Legal values for sh_type field of Elf32_Shdr. */ ++ ++#define SHT_PARISC_EXT 0x70000000 /* Contains product specific ext. */ ++#define SHT_PARISC_UNWIND 0x70000001 /* Unwind information. */ ++#define SHT_PARISC_DOC 0x70000002 /* Debug info for optimized code. */ ++ ++/* Legal values for sh_flags field of Elf32_Shdr. */ ++ ++#define SHF_PARISC_SHORT 0x20000000 /* Section with short addressing. */ ++#define SHF_PARISC_HUGE 0x40000000 /* Section far from gp. */ ++#define SHF_PARISC_SBP 0x80000000 /* Static branch prediction code. */ ++ ++/* Legal values for ST_TYPE subfield of st_info (symbol type). */ ++ ++#define STT_PARISC_MILLICODE 13 /* Millicode function entry point. */ ++ ++#define STT_HP_OPAQUE (STT_LOOS + 0x1) ++#define STT_HP_STUB (STT_LOOS + 0x2) ++ ++/* HPPA relocs. */ ++ ++#define R_PARISC_NONE 0 /* No reloc. */ ++#define R_PARISC_DIR32 1 /* Direct 32-bit reference. */ ++#define R_PARISC_DIR21L 2 /* Left 21 bits of eff. address. */ ++#define R_PARISC_DIR17R 3 /* Right 17 bits of eff. address. */ ++#define R_PARISC_DIR17F 4 /* 17 bits of eff. address. */ ++#define R_PARISC_DIR14R 6 /* Right 14 bits of eff. address. */ ++#define R_PARISC_PCREL32 9 /* 32-bit rel. address. */ ++#define R_PARISC_PCREL21L 10 /* Left 21 bits of rel. address. */ ++#define R_PARISC_PCREL17R 11 /* Right 17 bits of rel. address. */ ++#define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ ++#define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ ++#define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ ++#define R_PARISC_DPREL14R 22 /* Right 14 bits of rel. address. */ ++#define R_PARISC_GPREL21L 26 /* GP-relative, left 21 bits. */ ++#define R_PARISC_GPREL14R 30 /* GP-relative, right 14 bits. */ ++#define R_PARISC_LTOFF21L 34 /* LT-relative, left 21 bits. */ ++#define R_PARISC_LTOFF14R 38 /* LT-relative, right 14 bits. */ ++#define R_PARISC_SECREL32 41 /* 32 bits section rel. address. */ ++#define R_PARISC_SEGBASE 48 /* No relocation, set segment base. */ ++#define R_PARISC_SEGREL32 49 /* 32 bits segment rel. address. */ ++#define R_PARISC_PLTOFF21L 50 /* PLT rel. address, left 21 bits. */ ++#define R_PARISC_PLTOFF14R 54 /* PLT rel. address, right 14 bits. */ ++#define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ ++#define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ ++#define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ ++#define R_PARISC_FPTR64 64 /* 64 bits function address. */ ++#define R_PARISC_PLABEL32 65 /* 32 bits function address. */ ++#define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ ++#define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ ++#define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ ++#define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ ++#define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ ++#define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ ++#define R_PARISC_PCREL16F 77 /* 16 bits PC-rel. address. */ ++#define R_PARISC_PCREL16WF 78 /* 16 bits PC-rel. address. */ ++#define R_PARISC_PCREL16DF 79 /* 16 bits PC-rel. address. */ ++#define R_PARISC_DIR64 80 /* 64 bits of eff. address. */ ++#define R_PARISC_DIR14WR 83 /* 14 bits of eff. address. */ ++#define R_PARISC_DIR14DR 84 /* 14 bits of eff. address. */ ++#define R_PARISC_DIR16F 85 /* 16 bits of eff. address. */ ++#define R_PARISC_DIR16WF 86 /* 16 bits of eff. address. */ ++#define R_PARISC_DIR16DF 87 /* 16 bits of eff. address. */ ++#define R_PARISC_GPREL64 88 /* 64 bits of GP-rel. address. */ ++#define R_PARISC_GPREL14WR 91 /* GP-rel. address, right 14 bits. */ ++#define R_PARISC_GPREL14DR 92 /* GP-rel. address, right 14 bits. */ ++#define R_PARISC_GPREL16F 93 /* 16 bits GP-rel. address. */ ++#define R_PARISC_GPREL16WF 94 /* 16 bits GP-rel. address. */ ++#define R_PARISC_GPREL16DF 95 /* 16 bits GP-rel. address. */ ++#define R_PARISC_LTOFF64 96 /* 64 bits LT-rel. address. */ ++#define R_PARISC_LTOFF14WR 99 /* LT-rel. address, right 14 bits. */ ++#define R_PARISC_LTOFF14DR 100 /* LT-rel. address, right 14 bits. */ ++#define R_PARISC_LTOFF16F 101 /* 16 bits LT-rel. address. */ ++#define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ ++#define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ ++#define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ ++#define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */ ++#define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */ ++#define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */ ++#define R_PARISC_PLTOFF16F 117 /* 16 bits LT-rel. address. */ ++#define R_PARISC_PLTOFF16WF 118 /* 16 bits PLT-rel. address. */ ++#define R_PARISC_PLTOFF16DF 119 /* 16 bits PLT-rel. address. */ ++#define R_PARISC_LTOFF_FPTR64 120 /* 64 bits LT-rel. function ptr. */ ++#define R_PARISC_LTOFF_FPTR14WR 123 /* LT-rel. fct. ptr., right 14 bits. */ ++#define R_PARISC_LTOFF_FPTR14DR 124 /* LT-rel. fct. ptr., right 14 bits. */ ++#define R_PARISC_LTOFF_FPTR16F 125 /* 16 bits LT-rel. function ptr. */ ++#define R_PARISC_LTOFF_FPTR16WF 126 /* 16 bits LT-rel. function ptr. */ ++#define R_PARISC_LTOFF_FPTR16DF 127 /* 16 bits LT-rel. function ptr. */ ++#define R_PARISC_LORESERVE 128 ++#define R_PARISC_COPY 128 /* Copy relocation. */ ++#define R_PARISC_IPLT 129 /* Dynamic reloc, imported PLT */ ++#define R_PARISC_EPLT 130 /* Dynamic reloc, exported PLT */ ++#define R_PARISC_TPREL32 153 /* 32 bits TP-rel. address. */ ++#define R_PARISC_TPREL21L 154 /* TP-rel. address, left 21 bits. */ ++#define R_PARISC_TPREL14R 158 /* TP-rel. address, right 14 bits. */ ++#define R_PARISC_LTOFF_TP21L 162 /* LT-TP-rel. address, left 21 bits. */ ++#define R_PARISC_LTOFF_TP14R 166 /* LT-TP-rel. address, right 14 bits.*/ ++#define R_PARISC_LTOFF_TP14F 167 /* 14 bits LT-TP-rel. address. */ ++#define R_PARISC_TPREL64 216 /* 64 bits TP-rel. address. */ ++#define R_PARISC_TPREL14WR 219 /* TP-rel. address, right 14 bits. */ ++#define R_PARISC_TPREL14DR 220 /* TP-rel. address, right 14 bits. */ ++#define R_PARISC_TPREL16F 221 /* 16 bits TP-rel. address. */ ++#define R_PARISC_TPREL16WF 222 /* 16 bits TP-rel. address. */ ++#define R_PARISC_TPREL16DF 223 /* 16 bits TP-rel. address. */ ++#define R_PARISC_LTOFF_TP64 224 /* 64 bits LT-TP-rel. address. */ ++#define R_PARISC_LTOFF_TP14WR 227 /* LT-TP-rel. address, right 14 bits.*/ ++#define R_PARISC_LTOFF_TP14DR 228 /* LT-TP-rel. address, right 14 bits.*/ ++#define R_PARISC_LTOFF_TP16F 229 /* 16 bits LT-TP-rel. address. */ ++#define R_PARISC_LTOFF_TP16WF 230 /* 16 bits LT-TP-rel. address. */ ++#define R_PARISC_LTOFF_TP16DF 231 /* 16 bits LT-TP-rel. address. */ ++#define R_PARISC_GNU_VTENTRY 232 ++#define R_PARISC_GNU_VTINHERIT 233 ++#define R_PARISC_TLS_GD21L 234 /* GD 21-bit left. */ ++#define R_PARISC_TLS_GD14R 235 /* GD 14-bit right. */ ++#define R_PARISC_TLS_GDCALL 236 /* GD call to __t_g_a. */ ++#define R_PARISC_TLS_LDM21L 237 /* LD module 21-bit left. */ ++#define R_PARISC_TLS_LDM14R 238 /* LD module 14-bit right. */ ++#define R_PARISC_TLS_LDMCALL 239 /* LD module call to __t_g_a. */ ++#define R_PARISC_TLS_LDO21L 240 /* LD offset 21-bit left. */ ++#define R_PARISC_TLS_LDO14R 241 /* LD offset 14-bit right. */ ++#define R_PARISC_TLS_DTPMOD32 242 /* DTP module 32-bit. */ ++#define R_PARISC_TLS_DTPMOD64 243 /* DTP module 64-bit. */ ++#define R_PARISC_TLS_DTPOFF32 244 /* DTP offset 32-bit. */ ++#define R_PARISC_TLS_DTPOFF64 245 /* DTP offset 32-bit. */ ++#define R_PARISC_TLS_LE21L R_PARISC_TPREL21L ++#define R_PARISC_TLS_LE14R R_PARISC_TPREL14R ++#define R_PARISC_TLS_IE21L R_PARISC_LTOFF_TP21L ++#define R_PARISC_TLS_IE14R R_PARISC_LTOFF_TP14R ++#define R_PARISC_TLS_TPREL32 R_PARISC_TPREL32 ++#define R_PARISC_TLS_TPREL64 R_PARISC_TPREL64 ++#define R_PARISC_HIRESERVE 255 ++ ++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */ ++ ++#define PT_HP_TLS (PT_LOOS + 0x0) ++#define PT_HP_CORE_NONE (PT_LOOS + 0x1) ++#define PT_HP_CORE_VERSION (PT_LOOS + 0x2) ++#define PT_HP_CORE_KERNEL (PT_LOOS + 0x3) ++#define PT_HP_CORE_COMM (PT_LOOS + 0x4) ++#define PT_HP_CORE_PROC (PT_LOOS + 0x5) ++#define PT_HP_CORE_LOADABLE (PT_LOOS + 0x6) ++#define PT_HP_CORE_STACK (PT_LOOS + 0x7) ++#define PT_HP_CORE_SHM (PT_LOOS + 0x8) ++#define PT_HP_CORE_MMF (PT_LOOS + 0x9) ++#define PT_HP_PARALLEL (PT_LOOS + 0x10) ++#define PT_HP_FASTBIND (PT_LOOS + 0x11) ++#define PT_HP_OPT_ANNOT (PT_LOOS + 0x12) ++#define PT_HP_HSL_ANNOT (PT_LOOS + 0x13) ++#define PT_HP_STACK (PT_LOOS + 0x14) ++ ++#define PT_PARISC_ARCHEXT 0x70000000 ++#define PT_PARISC_UNWIND 0x70000001 ++ ++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr. */ ++ ++#define PF_PARISC_SBP 0x08000000 ++ ++#define PF_HP_PAGE_SIZE 0x00100000 ++#define PF_HP_FAR_SHARED 0x00200000 ++#define PF_HP_NEAR_SHARED 0x00400000 ++#define PF_HP_CODE 0x01000000 ++#define PF_HP_MODIFY 0x02000000 ++#define PF_HP_LAZYSWAP 0x04000000 ++#define PF_HP_SBP 0x08000000 ++ ++ ++/* Alpha specific definitions. */ ++ ++/* Legal values for e_flags field of Elf64_Ehdr. */ ++ ++#define EF_ALPHA_32BIT 1 /* All addresses must be < 2GB. */ ++#define EF_ALPHA_CANRELAX 2 /* Relocations for relaxing exist. */ ++ ++/* Legal values for sh_type field of Elf64_Shdr. */ ++ ++/* These two are primerily concerned with ECOFF debugging info. */ ++#define SHT_ALPHA_DEBUG 0x70000001 ++#define SHT_ALPHA_REGINFO 0x70000002 ++ ++/* Legal values for sh_flags field of Elf64_Shdr. */ ++ ++#define SHF_ALPHA_GPREL 0x10000000 ++ ++/* Legal values for st_other field of Elf64_Sym. */ ++#define STO_ALPHA_NOPV 0x80 /* No PV required. */ ++#define STO_ALPHA_STD_GPLOAD 0x88 /* PV only used for initial ldgp. */ ++ ++/* Alpha relocs. */ ++ ++#define R_ALPHA_NONE 0 /* No reloc */ ++#define R_ALPHA_REFLONG 1 /* Direct 32 bit */ ++#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */ ++#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */ ++#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */ ++#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */ ++#define R_ALPHA_GPDISP 6 /* Add displacement to GP */ ++#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */ ++#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */ ++#define R_ALPHA_SREL16 9 /* PC relative 16 bit */ ++#define R_ALPHA_SREL32 10 /* PC relative 32 bit */ ++#define R_ALPHA_SREL64 11 /* PC relative 64 bit */ ++#define R_ALPHA_GPRELHIGH 17 /* GP relative 32 bit, high 16 bits */ ++#define R_ALPHA_GPRELLOW 18 /* GP relative 32 bit, low 16 bits */ ++#define R_ALPHA_GPREL16 19 /* GP relative 16 bit */ ++#define R_ALPHA_COPY 24 /* Copy symbol at runtime */ ++#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */ ++#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */ ++#define R_ALPHA_RELATIVE 27 /* Adjust by program base */ ++#define R_ALPHA_TLS_GD_HI 28 ++#define R_ALPHA_TLSGD 29 ++#define R_ALPHA_TLS_LDM 30 ++#define R_ALPHA_DTPMOD64 31 ++#define R_ALPHA_GOTDTPREL 32 ++#define R_ALPHA_DTPREL64 33 ++#define R_ALPHA_DTPRELHI 34 ++#define R_ALPHA_DTPRELLO 35 ++#define R_ALPHA_DTPREL16 36 ++#define R_ALPHA_GOTTPREL 37 ++#define R_ALPHA_TPREL64 38 ++#define R_ALPHA_TPRELHI 39 ++#define R_ALPHA_TPRELLO 40 ++#define R_ALPHA_TPREL16 41 ++/* Keep this the last entry. */ ++#define R_ALPHA_NUM 46 ++ ++/* Magic values of the LITUSE relocation addend. */ ++#define LITUSE_ALPHA_ADDR 0 ++#define LITUSE_ALPHA_BASE 1 ++#define LITUSE_ALPHA_BYTOFF 2 ++#define LITUSE_ALPHA_JSR 3 ++#define LITUSE_ALPHA_TLS_GD 4 ++#define LITUSE_ALPHA_TLS_LDM 5 ++ ++/* Legal values for d_tag of Elf64_Dyn. */ ++#define DT_ALPHA_PLTRO (DT_LOPROC + 0) ++#define DT_ALPHA_NUM 1 ++ ++/* PowerPC specific declarations */ ++ ++/* Values for Elf32/64_Ehdr.e_flags. */ ++#define EF_PPC_EMB 0x80000000 /* PowerPC embedded flag */ ++ ++/* Cygnus local bits below */ ++#define EF_PPC_RELOCATABLE 0x00010000 /* PowerPC -mrelocatable flag*/ ++#define EF_PPC_RELOCATABLE_LIB 0x00008000 /* PowerPC -mrelocatable-lib ++ flag */ ++ ++/* PowerPC relocations defined by the ABIs */ ++#define R_PPC_NONE 0 ++#define R_PPC_ADDR32 1 /* 32bit absolute address */ ++#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */ ++#define R_PPC_ADDR16 3 /* 16bit absolute address */ ++#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */ ++#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */ ++#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */ ++#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */ ++#define R_PPC_ADDR14_BRTAKEN 8 ++#define R_PPC_ADDR14_BRNTAKEN 9 ++#define R_PPC_REL24 10 /* PC relative 26 bit */ ++#define R_PPC_REL14 11 /* PC relative 16 bit */ ++#define R_PPC_REL14_BRTAKEN 12 ++#define R_PPC_REL14_BRNTAKEN 13 ++#define R_PPC_GOT16 14 ++#define R_PPC_GOT16_LO 15 ++#define R_PPC_GOT16_HI 16 ++#define R_PPC_GOT16_HA 17 ++#define R_PPC_PLTREL24 18 ++#define R_PPC_COPY 19 ++#define R_PPC_GLOB_DAT 20 ++#define R_PPC_JMP_SLOT 21 ++#define R_PPC_RELATIVE 22 ++#define R_PPC_LOCAL24PC 23 ++#define R_PPC_UADDR32 24 ++#define R_PPC_UADDR16 25 ++#define R_PPC_REL32 26 ++#define R_PPC_PLT32 27 ++#define R_PPC_PLTREL32 28 ++#define R_PPC_PLT16_LO 29 ++#define R_PPC_PLT16_HI 30 ++#define R_PPC_PLT16_HA 31 ++#define R_PPC_SDAREL16 32 ++#define R_PPC_SECTOFF 33 ++#define R_PPC_SECTOFF_LO 34 ++#define R_PPC_SECTOFF_HI 35 ++#define R_PPC_SECTOFF_HA 36 ++ ++/* PowerPC relocations defined for the TLS access ABI. */ ++#define R_PPC_TLS 67 /* none (sym+add)@tls */ ++#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */ ++#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */ ++#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */ ++#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */ ++#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */ ++#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */ ++#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */ ++#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */ ++#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */ ++#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */ ++#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */ ++#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */ ++#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */ ++#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */ ++#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */ ++#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */ ++#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */ ++#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */ ++#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */ ++#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */ ++#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */ ++#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */ ++#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */ ++#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */ ++#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */ ++#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */ ++#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */ ++#define R_PPC_TLSGD 95 /* none (sym+add)@tlsgd */ ++#define R_PPC_TLSLD 96 /* none (sym+add)@tlsld */ ++ ++/* The remaining relocs are from the Embedded ELF ABI, and are not ++ in the SVR4 ELF ABI. */ ++#define R_PPC_EMB_NADDR32 101 ++#define R_PPC_EMB_NADDR16 102 ++#define R_PPC_EMB_NADDR16_LO 103 ++#define R_PPC_EMB_NADDR16_HI 104 ++#define R_PPC_EMB_NADDR16_HA 105 ++#define R_PPC_EMB_SDAI16 106 ++#define R_PPC_EMB_SDA2I16 107 ++#define R_PPC_EMB_SDA2REL 108 ++#define R_PPC_EMB_SDA21 109 /* 16 bit offset in SDA */ ++#define R_PPC_EMB_MRKREF 110 ++#define R_PPC_EMB_RELSEC16 111 ++#define R_PPC_EMB_RELST_LO 112 ++#define R_PPC_EMB_RELST_HI 113 ++#define R_PPC_EMB_RELST_HA 114 ++#define R_PPC_EMB_BIT_FLD 115 ++#define R_PPC_EMB_RELSDA 116 /* 16 bit relative offset in SDA */ ++ ++/* Diab tool relocations. */ ++#define R_PPC_DIAB_SDA21_LO 180 /* like EMB_SDA21, but lower 16 bit */ ++#define R_PPC_DIAB_SDA21_HI 181 /* like EMB_SDA21, but high 16 bit */ ++#define R_PPC_DIAB_SDA21_HA 182 /* like EMB_SDA21, adjusted high 16 */ ++#define R_PPC_DIAB_RELSDA_LO 183 /* like EMB_RELSDA, but lower 16 bit */ ++#define R_PPC_DIAB_RELSDA_HI 184 /* like EMB_RELSDA, but high 16 bit */ ++#define R_PPC_DIAB_RELSDA_HA 185 /* like EMB_RELSDA, adjusted high 16 */ ++ ++/* GNU extension to support local ifunc. */ ++#define R_PPC_IRELATIVE 248 ++ ++/* GNU relocs used in PIC code sequences. */ ++#define R_PPC_REL16 249 /* half16 (sym+add-.) */ ++#define R_PPC_REL16_LO 250 /* half16 (sym+add-.)@l */ ++#define R_PPC_REL16_HI 251 /* half16 (sym+add-.)@h */ ++#define R_PPC_REL16_HA 252 /* half16 (sym+add-.)@ha */ ++ ++/* This is a phony reloc to handle any old fashioned TOC16 references ++ that may still be in object files. */ ++#define R_PPC_TOC16 255 ++ ++/* PowerPC specific values for the Dyn d_tag field. */ ++#define DT_PPC_GOT (DT_LOPROC + 0) ++#define DT_PPC_OPT (DT_LOPROC + 1) ++#define DT_PPC_NUM 2 ++ ++/* PowerPC specific values for the DT_PPC_OPT Dyn entry. */ ++#define PPC_OPT_TLS 1 ++ ++/* PowerPC64 relocations defined by the ABIs */ ++#define R_PPC64_NONE R_PPC_NONE ++#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address */ ++#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned */ ++#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address */ ++#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of address */ ++#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of address. */ ++#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */ ++#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned */ ++#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN ++#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN ++#define R_PPC64_REL24 R_PPC_REL24 /* PC-rel. 26 bit, word aligned */ ++#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit */ ++#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN ++#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN ++#define R_PPC64_GOT16 R_PPC_GOT16 ++#define R_PPC64_GOT16_LO R_PPC_GOT16_LO ++#define R_PPC64_GOT16_HI R_PPC_GOT16_HI ++#define R_PPC64_GOT16_HA R_PPC_GOT16_HA ++ ++#define R_PPC64_COPY R_PPC_COPY ++#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT ++#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT ++#define R_PPC64_RELATIVE R_PPC_RELATIVE ++ ++#define R_PPC64_UADDR32 R_PPC_UADDR32 ++#define R_PPC64_UADDR16 R_PPC_UADDR16 ++#define R_PPC64_REL32 R_PPC_REL32 ++#define R_PPC64_PLT32 R_PPC_PLT32 ++#define R_PPC64_PLTREL32 R_PPC_PLTREL32 ++#define R_PPC64_PLT16_LO R_PPC_PLT16_LO ++#define R_PPC64_PLT16_HI R_PPC_PLT16_HI ++#define R_PPC64_PLT16_HA R_PPC_PLT16_HA ++ ++#define R_PPC64_SECTOFF R_PPC_SECTOFF ++#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO ++#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI ++#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA ++#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2 */ ++#define R_PPC64_ADDR64 38 /* doubleword64 S + A */ ++#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */ ++#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A) */ ++#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A) */ ++#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A) */ ++#define R_PPC64_UADDR64 43 /* doubleword64 S + A */ ++#define R_PPC64_REL64 44 /* doubleword64 S + A - P */ ++#define R_PPC64_PLT64 45 /* doubleword64 L + A */ ++#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P */ ++#define R_PPC64_TOC16 47 /* half16* S + A - .TOC */ ++#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.) */ ++#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.) */ ++#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.) */ ++#define R_PPC64_TOC 51 /* doubleword64 .TOC */ ++#define R_PPC64_PLTGOT16 52 /* half16* M + A */ ++#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A) */ ++#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A) */ ++#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A) */ ++ ++#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2 */ ++#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2 */ ++#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2 */ ++#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2 */ ++#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2 */ ++#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2 */ ++#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2 */ ++#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2 */ ++#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2 */ ++#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2 */ ++#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2 */ ++ ++/* PowerPC64 relocations defined for the TLS access ABI. */ ++#define R_PPC64_TLS 67 /* none (sym+add)@tls */ ++#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */ ++#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */ ++#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */ ++#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */ ++#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */ ++#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */ ++#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */ ++#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */ ++#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */ ++#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */ ++#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */ ++#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */ ++#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */ ++#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */ ++#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */ ++#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */ ++#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */ ++#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */ ++#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */ ++#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */ ++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */ ++#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */ ++#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */ ++#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */ ++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */ ++#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */ ++#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */ ++#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */ ++#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */ ++#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */ ++#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */ ++#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */ ++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */ ++#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */ ++#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */ ++#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */ ++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */ ++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */ ++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */ ++#define R_PPC64_TLSGD 107 /* none (sym+add)@tlsgd */ ++#define R_PPC64_TLSLD 108 /* none (sym+add)@tlsld */ ++#define R_PPC64_TOCSAVE 109 /* none */ ++ ++/* Added when HA and HI relocs were changed to report overflows. */ ++#define R_PPC64_ADDR16_HIGH 110 ++#define R_PPC64_ADDR16_HIGHA 111 ++#define R_PPC64_TPREL16_HIGH 112 ++#define R_PPC64_TPREL16_HIGHA 113 ++#define R_PPC64_DTPREL16_HIGH 114 ++#define R_PPC64_DTPREL16_HIGHA 115 ++ ++/* GNU extension to support local ifunc. */ ++#define R_PPC64_JMP_IREL 247 ++#define R_PPC64_IRELATIVE 248 ++#define R_PPC64_REL16 249 /* half16 (sym+add-.) */ ++#define R_PPC64_REL16_LO 250 /* half16 (sym+add-.)@l */ ++#define R_PPC64_REL16_HI 251 /* half16 (sym+add-.)@h */ ++#define R_PPC64_REL16_HA 252 /* half16 (sym+add-.)@ha */ ++ ++/* e_flags bits specifying ABI. ++ 1 for original function descriptor using ABI, ++ 2 for revised ABI without function descriptors, ++ 0 for unspecified or not using any features affected by the differences. */ ++#define EF_PPC64_ABI 3 ++ ++/* PowerPC64 specific values for the Dyn d_tag field. */ ++#define DT_PPC64_GLINK (DT_LOPROC + 0) ++#define DT_PPC64_OPD (DT_LOPROC + 1) ++#define DT_PPC64_OPDSZ (DT_LOPROC + 2) ++#define DT_PPC64_OPT (DT_LOPROC + 3) ++#define DT_PPC64_NUM 4 ++ ++/* PowerPC64 specific bits in the DT_PPC64_OPT Dyn entry. */ ++#define PPC64_OPT_TLS 1 ++#define PPC64_OPT_MULTI_TOC 2 ++#define PPC64_OPT_LOCALENTRY 4 ++ ++/* PowerPC64 specific values for the Elf64_Sym st_other field. */ ++#define STO_PPC64_LOCAL_BIT 5 ++#define STO_PPC64_LOCAL_MASK (7 << STO_PPC64_LOCAL_BIT) ++#define PPC64_LOCAL_ENTRY_OFFSET(other) \ ++ (((1 << (((other) & STO_PPC64_LOCAL_MASK) >> STO_PPC64_LOCAL_BIT)) >> 2) << 2) ++ ++ ++/* ARM specific declarations */ ++ ++/* Processor specific flags for the ELF header e_flags field. */ ++#define EF_ARM_RELEXEC 0x01 ++#define EF_ARM_HASENTRY 0x02 ++#define EF_ARM_INTERWORK 0x04 ++#define EF_ARM_APCS_26 0x08 ++#define EF_ARM_APCS_FLOAT 0x10 ++#define EF_ARM_PIC 0x20 ++#define EF_ARM_ALIGN8 0x40 /* 8-bit structure alignment is in use */ ++#define EF_ARM_NEW_ABI 0x80 ++#define EF_ARM_OLD_ABI 0x100 ++#define EF_ARM_SOFT_FLOAT 0x200 ++#define EF_ARM_VFP_FLOAT 0x400 ++#define EF_ARM_MAVERICK_FLOAT 0x800 ++ ++#define EF_ARM_ABI_FLOAT_SOFT 0x200 /* NB conflicts with EF_ARM_SOFT_FLOAT */ ++#define EF_ARM_ABI_FLOAT_HARD 0x400 /* NB conflicts with EF_ARM_VFP_FLOAT */ ++ ++ ++/* Other constants defined in the ARM ELF spec. version B-01. */ ++/* NB. These conflict with values defined above. */ ++#define EF_ARM_SYMSARESORTED 0x04 ++#define EF_ARM_DYNSYMSUSESEGIDX 0x08 ++#define EF_ARM_MAPSYMSFIRST 0x10 ++#define EF_ARM_EABIMASK 0XFF000000 ++ ++/* Constants defined in AAELF. */ ++#define EF_ARM_BE8 0x00800000 ++#define EF_ARM_LE8 0x00400000 ++ ++#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK) ++#define EF_ARM_EABI_UNKNOWN 0x00000000 ++#define EF_ARM_EABI_VER1 0x01000000 ++#define EF_ARM_EABI_VER2 0x02000000 ++#define EF_ARM_EABI_VER3 0x03000000 ++#define EF_ARM_EABI_VER4 0x04000000 ++#define EF_ARM_EABI_VER5 0x05000000 ++ ++/* Additional symbol types for Thumb. */ ++#define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ ++#define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ ++ ++/* ARM-specific values for sh_flags */ ++#define SHF_ARM_ENTRYSECT 0x10000000 /* Section contains an entry point */ ++#define SHF_ARM_COMDEF 0x80000000 /* Section may be multiply defined ++ in the input to a link step. */ ++ ++/* ARM-specific program header flags */ ++#define PF_ARM_SB 0x10000000 /* Segment contains the location ++ addressed by the static base. */ ++#define PF_ARM_PI 0x20000000 /* Position-independent segment. */ ++#define PF_ARM_ABS 0x40000000 /* Absolute segment. */ ++ ++/* Processor specific values for the Phdr p_type field. */ ++#define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ ++ ++/* Processor specific values for the Shdr sh_type field. */ ++#define SHT_ARM_EXIDX (SHT_LOPROC + 1) /* ARM unwind section. */ ++#define SHT_ARM_PREEMPTMAP (SHT_LOPROC + 2) /* Preemption details. */ ++#define SHT_ARM_ATTRIBUTES (SHT_LOPROC + 3) /* ARM attributes section. */ ++ ++ ++/* AArch64 relocs. */ ++ ++#define R_AARCH64_NONE 0 /* No relocation. */ ++ ++/* ILP32 AArch64 relocs. */ ++#define R_AARCH64_P32_ABS32 1 /* Direct 32 bit. */ ++#define R_AARCH64_P32_COPY 180 /* Copy symbol at runtime. */ ++#define R_AARCH64_P32_GLOB_DAT 181 /* Create GOT entry. */ ++#define R_AARCH64_P32_JUMP_SLOT 182 /* Create PLT entry. */ ++#define R_AARCH64_P32_RELATIVE 183 /* Adjust by program base. */ ++#define R_AARCH64_P32_TLS_DTPMOD 184 /* Module number, 32 bit. */ ++#define R_AARCH64_P32_TLS_DTPREL 185 /* Module-relative offset, 32 bit. */ ++#define R_AARCH64_P32_TLS_TPREL 186 /* TP-relative offset, 32 bit. */ ++#define R_AARCH64_P32_TLSDESC 187 /* TLS Descriptor. */ ++#define R_AARCH64_P32_IRELATIVE 188 /* STT_GNU_IFUNC relocation. */ ++ ++/* LP64 AArch64 relocs. */ ++#define R_AARCH64_ABS64 257 /* Direct 64 bit. */ ++#define R_AARCH64_ABS32 258 /* Direct 32 bit. */ ++#define R_AARCH64_ABS16 259 /* Direct 16-bit. */ ++#define R_AARCH64_PREL64 260 /* PC-relative 64-bit. */ ++#define R_AARCH64_PREL32 261 /* PC-relative 32-bit. */ ++#define R_AARCH64_PREL16 262 /* PC-relative 16-bit. */ ++#define R_AARCH64_MOVW_UABS_G0 263 /* Dir. MOVZ imm. from bits 15:0. */ ++#define R_AARCH64_MOVW_UABS_G0_NC 264 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_UABS_G1 265 /* Dir. MOVZ imm. from bits 31:16. */ ++#define R_AARCH64_MOVW_UABS_G1_NC 266 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_UABS_G2 267 /* Dir. MOVZ imm. from bits 47:32. */ ++#define R_AARCH64_MOVW_UABS_G2_NC 268 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_UABS_G3 269 /* Dir. MOV{K,Z} imm. from 63:48. */ ++#define R_AARCH64_MOVW_SABS_G0 270 /* Dir. MOV{N,Z} imm. from 15:0. */ ++#define R_AARCH64_MOVW_SABS_G1 271 /* Dir. MOV{N,Z} imm. from 31:16. */ ++#define R_AARCH64_MOVW_SABS_G2 272 /* Dir. MOV{N,Z} imm. from 47:32. */ ++#define R_AARCH64_LD_PREL_LO19 273 /* PC-rel. LD imm. from bits 20:2. */ ++#define R_AARCH64_ADR_PREL_LO21 274 /* PC-rel. ADR imm. from bits 20:0. */ ++#define R_AARCH64_ADR_PREL_PG_HI21 275 /* Page-rel. ADRP imm. from 32:12. */ ++#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Likewise; no overflow check. */ ++#define R_AARCH64_ADD_ABS_LO12_NC 277 /* Dir. ADD imm. from bits 11:0. */ ++#define R_AARCH64_LDST8_ABS_LO12_NC 278 /* Likewise for LD/ST; no check. */ ++#define R_AARCH64_TSTBR14 279 /* PC-rel. TBZ/TBNZ imm. from 15:2. */ ++#define R_AARCH64_CONDBR19 280 /* PC-rel. cond. br. imm. from 20:2. */ ++#define R_AARCH64_JUMP26 282 /* PC-rel. B imm. from bits 27:2. */ ++#define R_AARCH64_CALL26 283 /* Likewise for CALL. */ ++#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* Dir. ADD imm. from bits 11:1. */ ++#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* Likewise for bits 11:2. */ ++#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* Likewise for bits 11:3. */ ++#define R_AARCH64_MOVW_PREL_G0 287 /* PC-rel. MOV{N,Z} imm. from 15:0. */ ++#define R_AARCH64_MOVW_PREL_G0_NC 288 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_PREL_G1 289 /* PC-rel. MOV{N,Z} imm. from 31:16. */ ++#define R_AARCH64_MOVW_PREL_G1_NC 290 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_PREL_G2 291 /* PC-rel. MOV{N,Z} imm. from 47:32. */ ++#define R_AARCH64_MOVW_PREL_G2_NC 292 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_PREL_G3 293 /* PC-rel. MOV{N,Z} imm. from 63:48. */ ++#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* Dir. ADD imm. from bits 11:4. */ ++#define R_AARCH64_MOVW_GOTOFF_G0 300 /* GOT-rel. off. MOV{N,Z} imm. 15:0. */ ++#define R_AARCH64_MOVW_GOTOFF_G0_NC 301 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_GOTOFF_G1 302 /* GOT-rel. o. MOV{N,Z} imm. 31:16. */ ++#define R_AARCH64_MOVW_GOTOFF_G1_NC 303 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_GOTOFF_G2 304 /* GOT-rel. o. MOV{N,Z} imm. 47:32. */ ++#define R_AARCH64_MOVW_GOTOFF_G2_NC 305 /* Likewise for MOVK; no check. */ ++#define R_AARCH64_MOVW_GOTOFF_G3 306 /* GOT-rel. o. MOV{N,Z} imm. 63:48. */ ++#define R_AARCH64_GOTREL64 307 /* GOT-relative 64-bit. */ ++#define R_AARCH64_GOTREL32 308 /* GOT-relative 32-bit. */ ++#define R_AARCH64_GOT_LD_PREL19 309 /* PC-rel. GOT off. load imm. 20:2. */ ++#define R_AARCH64_LD64_GOTOFF_LO15 310 /* GOT-rel. off. LD/ST imm. 14:3. */ ++#define R_AARCH64_ADR_GOT_PAGE 311 /* P-page-rel. GOT off. ADRP 32:12. */ ++#define R_AARCH64_LD64_GOT_LO12_NC 312 /* Dir. GOT off. LD/ST imm. 11:3. */ ++#define R_AARCH64_LD64_GOTPAGE_LO15 313 /* GOT-page-rel. GOT off. LD/ST 14:3 */ ++#define R_AARCH64_TLSGD_ADR_PREL21 512 /* PC-relative ADR imm. 20:0. */ ++#define R_AARCH64_TLSGD_ADR_PAGE21 513 /* page-rel. ADRP imm. 32:12. */ ++#define R_AARCH64_TLSGD_ADD_LO12_NC 514 /* direct ADD imm. from 11:0. */ ++#define R_AARCH64_TLSGD_MOVW_G1 515 /* GOT-rel. MOV{N,Z} 31:16. */ ++#define R_AARCH64_TLSGD_MOVW_G0_NC 516 /* GOT-rel. MOVK imm. 15:0. */ ++#define R_AARCH64_TLSLD_ADR_PREL21 517 /* Like 512; local dynamic model. */ ++#define R_AARCH64_TLSLD_ADR_PAGE21 518 /* Like 513; local dynamic model. */ ++#define R_AARCH64_TLSLD_ADD_LO12_NC 519 /* Like 514; local dynamic model. */ ++#define R_AARCH64_TLSLD_MOVW_G1 520 /* Like 515; local dynamic model. */ ++#define R_AARCH64_TLSLD_MOVW_G0_NC 521 /* Like 516; local dynamic model. */ ++#define R_AARCH64_TLSLD_LD_PREL19 522 /* TLS PC-rel. load imm. 20:2. */ ++#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* TLS DTP-rel. MOV{N,Z} 47:32. */ ++#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* TLS DTP-rel. MOV{N,Z} 31:16. */ ++#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* Likewise; MOVK; no check. */ ++#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* TLS DTP-rel. MOV{N,Z} 15:0. */ ++#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* Likewise; MOVK; no check. */ ++#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTP-rel. ADD imm. from 23:12. */ ++#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTP-rel. ADD imm. from 11:0. */ ++#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* Likewise; no ovfl. check. */ ++#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTP-rel. LD/ST imm. 11:0. */ ++#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* Likewise; no check. */ ++#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTP-rel. LD/ST imm. 11:1. */ ++#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* Likewise; no check. */ ++#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTP-rel. LD/ST imm. 11:2. */ ++#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* Likewise; no check. */ ++#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTP-rel. LD/ST imm. 11:3. */ ++#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* Likewise; no check. */ ++#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* GOT-rel. MOV{N,Z} 31:16. */ ++#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* GOT-rel. MOVK 15:0. */ ++#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* Page-rel. ADRP 32:12. */ ++#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* Direct LD off. 11:3. */ ++#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* PC-rel. load imm. 20:2. */ ++#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TLS TP-rel. MOV{N,Z} 47:32. */ ++#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TLS TP-rel. MOV{N,Z} 31:16. */ ++#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* Likewise; MOVK; no check. */ ++#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TLS TP-rel. MOV{N,Z} 15:0. */ ++#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* Likewise; MOVK; no check. */ ++#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TP-rel. ADD imm. 23:12. */ ++#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TP-rel. ADD imm. 11:0. */ ++#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* Likewise; no ovfl. check. */ ++#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TP-rel. LD/ST off. 11:0. */ ++#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* Likewise; no ovfl. check. */ ++#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TP-rel. LD/ST off. 11:1. */ ++#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* Likewise; no check. */ ++#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TP-rel. LD/ST off. 11:2. */ ++#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* Likewise; no check. */ ++#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TP-rel. LD/ST off. 11:3. */ ++#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* Likewise; no check. */ ++#define R_AARCH64_TLSDESC_LD_PREL19 560 /* PC-rel. load immediate 20:2. */ ++#define R_AARCH64_TLSDESC_ADR_PREL21 561 /* PC-rel. ADR immediate 20:0. */ ++#define R_AARCH64_TLSDESC_ADR_PAGE21 562 /* Page-rel. ADRP imm. 32:12. */ ++#define R_AARCH64_TLSDESC_LD64_LO12 563 /* Direct LD off. from 11:3. */ ++#define R_AARCH64_TLSDESC_ADD_LO12 564 /* Direct ADD imm. from 11:0. */ ++#define R_AARCH64_TLSDESC_OFF_G1 565 /* GOT-rel. MOV{N,Z} imm. 31:16. */ ++#define R_AARCH64_TLSDESC_OFF_G0_NC 566 /* GOT-rel. MOVK imm. 15:0; no ck. */ ++#define R_AARCH64_TLSDESC_LDR 567 /* Relax LDR. */ ++#define R_AARCH64_TLSDESC_ADD 568 /* Relax ADD. */ ++#define R_AARCH64_TLSDESC_CALL 569 /* Relax BLR. */ ++#define R_AARCH64_TLSLE_LDST128_TPREL_LO12 570 /* TP-rel. LD/ST off. 11:4. */ ++#define R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC 571 /* Likewise; no check. */ ++#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12 572 /* DTP-rel. LD/ST imm. 11:4. */ ++#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 573 /* Likewise; no check. */ ++#define R_AARCH64_COPY 1024 /* Copy symbol at runtime. */ ++#define R_AARCH64_GLOB_DAT 1025 /* Create GOT entry. */ ++#define R_AARCH64_JUMP_SLOT 1026 /* Create PLT entry. */ ++#define R_AARCH64_RELATIVE 1027 /* Adjust by program base. */ ++#define R_AARCH64_TLS_DTPMOD 1028 /* Module number, 64 bit. */ ++#define R_AARCH64_TLS_DTPREL 1029 /* Module-relative offset, 64 bit. */ ++#define R_AARCH64_TLS_TPREL 1030 /* TP-relative offset, 64 bit. */ ++#define R_AARCH64_TLSDESC 1031 /* TLS Descriptor. */ ++#define R_AARCH64_IRELATIVE 1032 /* STT_GNU_IFUNC relocation. */ ++ ++/* AArch64 specific values for the Dyn d_tag field. */ ++#define DT_AARCH64_VARIANT_PCS (DT_LOPROC + 5) ++#define DT_AARCH64_NUM 6 ++ ++/* AArch64 specific values for the st_other field. */ ++#define STO_AARCH64_VARIANT_PCS 0x80 ++ ++/* ARM relocs. */ ++ ++#define R_ARM_NONE 0 /* No reloc */ ++#define R_ARM_PC24 1 /* Deprecated PC relative 26 ++ bit branch. */ ++#define R_ARM_ABS32 2 /* Direct 32 bit */ ++#define R_ARM_REL32 3 /* PC relative 32 bit */ ++#define R_ARM_PC13 4 ++#define R_ARM_ABS16 5 /* Direct 16 bit */ ++#define R_ARM_ABS12 6 /* Direct 12 bit */ ++#define R_ARM_THM_ABS5 7 /* Direct & 0x7C (LDR, STR). */ ++#define R_ARM_ABS8 8 /* Direct 8 bit */ ++#define R_ARM_SBREL32 9 ++#define R_ARM_THM_PC22 10 /* PC relative 24 bit (Thumb32 BL). */ ++#define R_ARM_THM_PC8 11 /* PC relative & 0x3FC ++ (Thumb16 LDR, ADD, ADR). */ ++#define R_ARM_AMP_VCALL9 12 ++#define R_ARM_SWI24 13 /* Obsolete static relocation. */ ++#define R_ARM_TLS_DESC 13 /* Dynamic relocation. */ ++#define R_ARM_THM_SWI8 14 /* Reserved. */ ++#define R_ARM_XPC25 15 /* Reserved. */ ++#define R_ARM_THM_XPC22 16 /* Reserved. */ ++#define R_ARM_TLS_DTPMOD32 17 /* ID of module containing symbol */ ++#define R_ARM_TLS_DTPOFF32 18 /* Offset in TLS block */ ++#define R_ARM_TLS_TPOFF32 19 /* Offset in static TLS block */ ++#define R_ARM_COPY 20 /* Copy symbol at runtime */ ++#define R_ARM_GLOB_DAT 21 /* Create GOT entry */ ++#define R_ARM_JUMP_SLOT 22 /* Create PLT entry */ ++#define R_ARM_RELATIVE 23 /* Adjust by program base */ ++#define R_ARM_GOTOFF 24 /* 32 bit offset to GOT */ ++#define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */ ++#define R_ARM_GOT32 26 /* 32 bit GOT entry */ ++#define R_ARM_PLT32 27 /* Deprecated, 32 bit PLT address. */ ++#define R_ARM_CALL 28 /* PC relative 24 bit (BL, BLX). */ ++#define R_ARM_JUMP24 29 /* PC relative 24 bit ++ (B, BL). */ ++#define R_ARM_THM_JUMP24 30 /* PC relative 24 bit (Thumb32 B.W). */ ++#define R_ARM_BASE_ABS 31 /* Adjust by program base. */ ++#define R_ARM_ALU_PCREL_7_0 32 /* Obsolete. */ ++#define R_ARM_ALU_PCREL_15_8 33 /* Obsolete. */ ++#define R_ARM_ALU_PCREL_23_15 34 /* Obsolete. */ ++#define R_ARM_LDR_SBREL_11_0 35 /* Deprecated, prog. base relative. */ ++#define R_ARM_ALU_SBREL_19_12 36 /* Deprecated, prog. base relative. */ ++#define R_ARM_ALU_SBREL_27_20 37 /* Deprecated, prog. base relative. */ ++#define R_ARM_TARGET1 38 ++#define R_ARM_SBREL31 39 /* Program base relative. */ ++#define R_ARM_V4BX 40 ++#define R_ARM_TARGET2 41 ++#define R_ARM_PREL31 42 /* 32 bit PC relative. */ ++#define R_ARM_MOVW_ABS_NC 43 /* Direct 16-bit (MOVW). */ ++#define R_ARM_MOVT_ABS 44 /* Direct high 16-bit (MOVT). */ ++#define R_ARM_MOVW_PREL_NC 45 /* PC relative 16-bit (MOVW). */ ++#define R_ARM_MOVT_PREL 46 /* PC relative (MOVT). */ ++#define R_ARM_THM_MOVW_ABS_NC 47 /* Direct 16 bit (Thumb32 MOVW). */ ++#define R_ARM_THM_MOVT_ABS 48 /* Direct high 16 bit ++ (Thumb32 MOVT). */ ++#define R_ARM_THM_MOVW_PREL_NC 49 /* PC relative 16 bit ++ (Thumb32 MOVW). */ ++#define R_ARM_THM_MOVT_PREL 50 /* PC relative high 16 bit ++ (Thumb32 MOVT). */ ++#define R_ARM_THM_JUMP19 51 /* PC relative 20 bit ++ (Thumb32 B.W). */ ++#define R_ARM_THM_JUMP6 52 /* PC relative X & 0x7E ++ (Thumb16 CBZ, CBNZ). */ ++#define R_ARM_THM_ALU_PREL_11_0 53 /* PC relative 12 bit ++ (Thumb32 ADR.W). */ ++#define R_ARM_THM_PC12 54 /* PC relative 12 bit ++ (Thumb32 LDR{D,SB,H,SH}). */ ++#define R_ARM_ABS32_NOI 55 /* Direct 32-bit. */ ++#define R_ARM_REL32_NOI 56 /* PC relative 32-bit. */ ++#define R_ARM_ALU_PC_G0_NC 57 /* PC relative (ADD, SUB). */ ++#define R_ARM_ALU_PC_G0 58 /* PC relative (ADD, SUB). */ ++#define R_ARM_ALU_PC_G1_NC 59 /* PC relative (ADD, SUB). */ ++#define R_ARM_ALU_PC_G1 60 /* PC relative (ADD, SUB). */ ++#define R_ARM_ALU_PC_G2 61 /* PC relative (ADD, SUB). */ ++#define R_ARM_LDR_PC_G1 62 /* PC relative (LDR,STR,LDRB,STRB). */ ++#define R_ARM_LDR_PC_G2 63 /* PC relative (LDR,STR,LDRB,STRB). */ ++#define R_ARM_LDRS_PC_G0 64 /* PC relative (STR{D,H}, ++ LDR{D,SB,H,SH}). */ ++#define R_ARM_LDRS_PC_G1 65 /* PC relative (STR{D,H}, ++ LDR{D,SB,H,SH}). */ ++#define R_ARM_LDRS_PC_G2 66 /* PC relative (STR{D,H}, ++ LDR{D,SB,H,SH}). */ ++#define R_ARM_LDC_PC_G0 67 /* PC relative (LDC, STC). */ ++#define R_ARM_LDC_PC_G1 68 /* PC relative (LDC, STC). */ ++#define R_ARM_LDC_PC_G2 69 /* PC relative (LDC, STC). */ ++#define R_ARM_ALU_SB_G0_NC 70 /* Program base relative (ADD,SUB). */ ++#define R_ARM_ALU_SB_G0 71 /* Program base relative (ADD,SUB). */ ++#define R_ARM_ALU_SB_G1_NC 72 /* Program base relative (ADD,SUB). */ ++#define R_ARM_ALU_SB_G1 73 /* Program base relative (ADD,SUB). */ ++#define R_ARM_ALU_SB_G2 74 /* Program base relative (ADD,SUB). */ ++#define R_ARM_LDR_SB_G0 75 /* Program base relative (LDR, ++ STR, LDRB, STRB). */ ++#define R_ARM_LDR_SB_G1 76 /* Program base relative ++ (LDR, STR, LDRB, STRB). */ ++#define R_ARM_LDR_SB_G2 77 /* Program base relative ++ (LDR, STR, LDRB, STRB). */ ++#define R_ARM_LDRS_SB_G0 78 /* Program base relative ++ (LDR, STR, LDRB, STRB). */ ++#define R_ARM_LDRS_SB_G1 79 /* Program base relative ++ (LDR, STR, LDRB, STRB). */ ++#define R_ARM_LDRS_SB_G2 80 /* Program base relative ++ (LDR, STR, LDRB, STRB). */ ++#define R_ARM_LDC_SB_G0 81 /* Program base relative (LDC,STC). */ ++#define R_ARM_LDC_SB_G1 82 /* Program base relative (LDC,STC). */ ++#define R_ARM_LDC_SB_G2 83 /* Program base relative (LDC,STC). */ ++#define R_ARM_MOVW_BREL_NC 84 /* Program base relative 16 ++ bit (MOVW). */ ++#define R_ARM_MOVT_BREL 85 /* Program base relative high ++ 16 bit (MOVT). */ ++#define R_ARM_MOVW_BREL 86 /* Program base relative 16 ++ bit (MOVW). */ ++#define R_ARM_THM_MOVW_BREL_NC 87 /* Program base relative 16 ++ bit (Thumb32 MOVW). */ ++#define R_ARM_THM_MOVT_BREL 88 /* Program base relative high ++ 16 bit (Thumb32 MOVT). */ ++#define R_ARM_THM_MOVW_BREL 89 /* Program base relative 16 ++ bit (Thumb32 MOVW). */ ++#define R_ARM_TLS_GOTDESC 90 ++#define R_ARM_TLS_CALL 91 ++#define R_ARM_TLS_DESCSEQ 92 /* TLS relaxation. */ ++#define R_ARM_THM_TLS_CALL 93 ++#define R_ARM_PLT32_ABS 94 ++#define R_ARM_GOT_ABS 95 /* GOT entry. */ ++#define R_ARM_GOT_PREL 96 /* PC relative GOT entry. */ ++#define R_ARM_GOT_BREL12 97 /* GOT entry relative to GOT ++ origin (LDR). */ ++#define R_ARM_GOTOFF12 98 /* 12 bit, GOT entry relative ++ to GOT origin (LDR, STR). */ ++#define R_ARM_GOTRELAX 99 ++#define R_ARM_GNU_VTENTRY 100 ++#define R_ARM_GNU_VTINHERIT 101 ++#define R_ARM_THM_PC11 102 /* PC relative & 0xFFE (Thumb16 B). */ ++#define R_ARM_THM_PC9 103 /* PC relative & 0x1FE ++ (Thumb16 B/B). */ ++#define R_ARM_TLS_GD32 104 /* PC-rel 32 bit for global dynamic ++ thread local data */ ++#define R_ARM_TLS_LDM32 105 /* PC-rel 32 bit for local dynamic ++ thread local data */ ++#define R_ARM_TLS_LDO32 106 /* 32 bit offset relative to TLS ++ block */ ++#define R_ARM_TLS_IE32 107 /* PC-rel 32 bit for GOT entry of ++ static TLS block offset */ ++#define R_ARM_TLS_LE32 108 /* 32 bit offset relative to static ++ TLS block */ ++#define R_ARM_TLS_LDO12 109 /* 12 bit relative to TLS ++ block (LDR, STR). */ ++#define R_ARM_TLS_LE12 110 /* 12 bit relative to static ++ TLS block (LDR, STR). */ ++#define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative ++ to GOT origin (LDR). */ ++#define R_ARM_ME_TOO 128 /* Obsolete. */ ++#define R_ARM_THM_TLS_DESCSEQ 129 ++#define R_ARM_THM_TLS_DESCSEQ16 129 ++#define R_ARM_THM_TLS_DESCSEQ32 130 ++#define R_ARM_THM_GOT_BREL12 131 /* GOT entry relative to GOT ++ origin, 12 bit (Thumb32 LDR). */ ++#define R_ARM_IRELATIVE 160 ++#define R_ARM_RXPC25 249 ++#define R_ARM_RSBREL32 250 ++#define R_ARM_THM_RPC22 251 ++#define R_ARM_RREL32 252 ++#define R_ARM_RABS22 253 ++#define R_ARM_RPC24 254 ++#define R_ARM_RBASE 255 ++/* Keep this the last entry. */ ++#define R_ARM_NUM 256 ++ ++/* C-SKY */ ++#define R_CKCORE_NONE 0 /* no reloc */ ++#define R_CKCORE_ADDR32 1 /* direct 32 bit (S + A) */ ++#define R_CKCORE_PCRELIMM8BY4 2 /* disp ((S + A - P) >> 2) & 0xff */ ++#define R_CKCORE_PCRELIMM11BY2 3 /* disp ((S + A - P) >> 1) & 0x7ff */ ++#define R_CKCORE_PCREL32 5 /* 32-bit rel (S + A - P) */ ++#define R_CKCORE_PCRELJSR_IMM11BY2 6 /* disp ((S + A - P) >>1) & 0x7ff */ ++#define R_CKCORE_RELATIVE 9 /* 32 bit adjust program base(B + A)*/ ++#define R_CKCORE_COPY 10 /* 32 bit adjust by program base */ ++#define R_CKCORE_GLOB_DAT 11 /* off between got and sym (S) */ ++#define R_CKCORE_JUMP_SLOT 12 /* PLT entry (S) */ ++#define R_CKCORE_GOTOFF 13 /* offset to GOT (S + A - GOT) */ ++#define R_CKCORE_GOTPC 14 /* PC offset to GOT (GOT + A - P) */ ++#define R_CKCORE_GOT32 15 /* 32 bit GOT entry (G) */ ++#define R_CKCORE_PLT32 16 /* 32 bit PLT entry (G) */ ++#define R_CKCORE_ADDRGOT 17 /* GOT entry in GLOB_DAT (GOT + G) */ ++#define R_CKCORE_ADDRPLT 18 /* PLT entry in GLOB_DAT (GOT + G) */ ++#define R_CKCORE_PCREL_IMM26BY2 19 /* ((S + A - P) >> 1) & 0x3ffffff */ ++#define R_CKCORE_PCREL_IMM16BY2 20 /* disp ((S + A - P) >> 1) & 0xffff */ ++#define R_CKCORE_PCREL_IMM16BY4 21 /* disp ((S + A - P) >> 2) & 0xffff */ ++#define R_CKCORE_PCREL_IMM10BY2 22 /* disp ((S + A - P) >> 1) & 0x3ff */ ++#define R_CKCORE_PCREL_IMM10BY4 23 /* disp ((S + A - P) >> 2) & 0x3ff */ ++#define R_CKCORE_ADDR_HI16 24 /* high & low 16 bit ADDR */ ++ /* ((S + A) >> 16) & 0xffff */ ++#define R_CKCORE_ADDR_LO16 25 /* (S + A) & 0xffff */ ++#define R_CKCORE_GOTPC_HI16 26 /* high & low 16 bit GOTPC */ ++ /* ((GOT + A - P) >> 16) & 0xffff */ ++#define R_CKCORE_GOTPC_LO16 27 /* (GOT + A - P) & 0xffff */ ++#define R_CKCORE_GOTOFF_HI16 28 /* high & low 16 bit GOTOFF */ ++ /* ((S + A - GOT) >> 16) & 0xffff */ ++#define R_CKCORE_GOTOFF_LO16 29 /* (S + A - GOT) & 0xffff */ ++#define R_CKCORE_GOT12 30 /* 12 bit disp GOT entry (G) */ ++#define R_CKCORE_GOT_HI16 31 /* high & low 16 bit GOT */ ++ /* (G >> 16) & 0xffff */ ++#define R_CKCORE_GOT_LO16 32 /* (G & 0xffff) */ ++#define R_CKCORE_PLT12 33 /* 12 bit disp PLT entry (G) */ ++#define R_CKCORE_PLT_HI16 34 /* high & low 16 bit PLT */ ++ /* (G >> 16) & 0xffff */ ++#define R_CKCORE_PLT_LO16 35 /* G & 0xffff */ ++#define R_CKCORE_ADDRGOT_HI16 36 /* high & low 16 bit ADDRGOT */ ++ /* (GOT + G * 4) & 0xffff */ ++#define R_CKCORE_ADDRGOT_LO16 37 /* (GOT + G * 4) & 0xffff */ ++#define R_CKCORE_ADDRPLT_HI16 38 /* high & low 16 bit ADDRPLT */ ++ /* ((GOT + G * 4) >> 16) & 0xFFFF */ ++#define R_CKCORE_ADDRPLT_LO16 39 /* (GOT+G*4) & 0xffff */ ++#define R_CKCORE_PCREL_JSR_IMM26BY2 40 /* disp ((S+A-P) >>1) & x3ffffff */ ++#define R_CKCORE_TOFFSET_LO16 41 /* (S+A-BTEXT) & 0xffff */ ++#define R_CKCORE_DOFFSET_LO16 42 /* (S+A-BTEXT) & 0xffff */ ++#define R_CKCORE_PCREL_IMM18BY2 43 /* disp ((S+A-P) >>1) & 0x3ffff */ ++#define R_CKCORE_DOFFSET_IMM18 44 /* disp (S+A-BDATA) & 0x3ffff */ ++#define R_CKCORE_DOFFSET_IMM18BY2 45 /* disp ((S+A-BDATA)>>1) & 0x3ffff */ ++#define R_CKCORE_DOFFSET_IMM18BY4 46 /* disp ((S+A-BDATA)>>2) & 0x3ffff */ ++#define R_CKCORE_GOT_IMM18BY4 48 /* disp (G >> 2) */ ++#define R_CKCORE_PLT_IMM18BY4 49 /* disp (G >> 2) */ ++#define R_CKCORE_PCREL_IMM7BY4 50 /* disp ((S+A-P) >>2) & 0x7f */ ++#define R_CKCORE_TLS_LE32 51 /* 32 bit offset to TLS block */ ++#define R_CKCORE_TLS_IE32 52 ++#define R_CKCORE_TLS_GD32 53 ++#define R_CKCORE_TLS_LDM32 54 ++#define R_CKCORE_TLS_LDO32 55 ++#define R_CKCORE_TLS_DTPMOD32 56 ++#define R_CKCORE_TLS_DTPOFF32 57 ++#define R_CKCORE_TLS_TPOFF32 58 ++ ++/* C-SKY elf header definition. */ ++#define EF_CSKY_ABIMASK 0XF0000000 ++#define EF_CSKY_OTHER 0X0FFF0000 ++#define EF_CSKY_PROCESSOR 0X0000FFFF ++ ++#define EF_CSKY_ABIV1 0X10000000 ++#define EF_CSKY_ABIV2 0X20000000 ++ ++/* C-SKY attributes section. */ ++#define SHT_CSKY_ATTRIBUTES (SHT_LOPROC + 1) ++ ++/* IA-64 specific declarations. */ ++ ++/* Processor specific flags for the Ehdr e_flags field. */ ++#define EF_IA_64_MASKOS 0x0000000f /* os-specific flags */ ++#define EF_IA_64_ABI64 0x00000010 /* 64-bit ABI */ ++#define EF_IA_64_ARCH 0xff000000 /* arch. version mask */ ++ ++/* Processor specific values for the Phdr p_type field. */ ++#define PT_IA_64_ARCHEXT (PT_LOPROC + 0) /* arch extension bits */ ++#define PT_IA_64_UNWIND (PT_LOPROC + 1) /* ia64 unwind bits */ ++#define PT_IA_64_HP_OPT_ANOT (PT_LOOS + 0x12) ++#define PT_IA_64_HP_HSL_ANOT (PT_LOOS + 0x13) ++#define PT_IA_64_HP_STACK (PT_LOOS + 0x14) ++ ++/* Processor specific flags for the Phdr p_flags field. */ ++#define PF_IA_64_NORECOV 0x80000000 /* spec insns w/o recovery */ ++ ++/* Processor specific values for the Shdr sh_type field. */ ++#define SHT_IA_64_EXT (SHT_LOPROC + 0) /* extension bits */ ++#define SHT_IA_64_UNWIND (SHT_LOPROC + 1) /* unwind bits */ ++ ++/* Processor specific flags for the Shdr sh_flags field. */ ++#define SHF_IA_64_SHORT 0x10000000 /* section near gp */ ++#define SHF_IA_64_NORECOV 0x20000000 /* spec insns w/o recovery */ ++ ++/* Processor specific values for the Dyn d_tag field. */ ++#define DT_IA_64_PLT_RESERVE (DT_LOPROC + 0) ++#define DT_IA_64_NUM 1 ++ ++/* IA-64 relocations. */ ++#define R_IA64_NONE 0x00 /* none */ ++#define R_IA64_IMM14 0x21 /* symbol + addend, add imm14 */ ++#define R_IA64_IMM22 0x22 /* symbol + addend, add imm22 */ ++#define R_IA64_IMM64 0x23 /* symbol + addend, mov imm64 */ ++#define R_IA64_DIR32MSB 0x24 /* symbol + addend, data4 MSB */ ++#define R_IA64_DIR32LSB 0x25 /* symbol + addend, data4 LSB */ ++#define R_IA64_DIR64MSB 0x26 /* symbol + addend, data8 MSB */ ++#define R_IA64_DIR64LSB 0x27 /* symbol + addend, data8 LSB */ ++#define R_IA64_GPREL22 0x2a /* @gprel(sym + add), add imm22 */ ++#define R_IA64_GPREL64I 0x2b /* @gprel(sym + add), mov imm64 */ ++#define R_IA64_GPREL32MSB 0x2c /* @gprel(sym + add), data4 MSB */ ++#define R_IA64_GPREL32LSB 0x2d /* @gprel(sym + add), data4 LSB */ ++#define R_IA64_GPREL64MSB 0x2e /* @gprel(sym + add), data8 MSB */ ++#define R_IA64_GPREL64LSB 0x2f /* @gprel(sym + add), data8 LSB */ ++#define R_IA64_LTOFF22 0x32 /* @ltoff(sym + add), add imm22 */ ++#define R_IA64_LTOFF64I 0x33 /* @ltoff(sym + add), mov imm64 */ ++#define R_IA64_PLTOFF22 0x3a /* @pltoff(sym + add), add imm22 */ ++#define R_IA64_PLTOFF64I 0x3b /* @pltoff(sym + add), mov imm64 */ ++#define R_IA64_PLTOFF64MSB 0x3e /* @pltoff(sym + add), data8 MSB */ ++#define R_IA64_PLTOFF64LSB 0x3f /* @pltoff(sym + add), data8 LSB */ ++#define R_IA64_FPTR64I 0x43 /* @fptr(sym + add), mov imm64 */ ++#define R_IA64_FPTR32MSB 0x44 /* @fptr(sym + add), data4 MSB */ ++#define R_IA64_FPTR32LSB 0x45 /* @fptr(sym + add), data4 LSB */ ++#define R_IA64_FPTR64MSB 0x46 /* @fptr(sym + add), data8 MSB */ ++#define R_IA64_FPTR64LSB 0x47 /* @fptr(sym + add), data8 LSB */ ++#define R_IA64_PCREL60B 0x48 /* @pcrel(sym + add), brl */ ++#define R_IA64_PCREL21B 0x49 /* @pcrel(sym + add), ptb, call */ ++#define R_IA64_PCREL21M 0x4a /* @pcrel(sym + add), chk.s */ ++#define R_IA64_PCREL21F 0x4b /* @pcrel(sym + add), fchkf */ ++#define R_IA64_PCREL32MSB 0x4c /* @pcrel(sym + add), data4 MSB */ ++#define R_IA64_PCREL32LSB 0x4d /* @pcrel(sym + add), data4 LSB */ ++#define R_IA64_PCREL64MSB 0x4e /* @pcrel(sym + add), data8 MSB */ ++#define R_IA64_PCREL64LSB 0x4f /* @pcrel(sym + add), data8 LSB */ ++#define R_IA64_LTOFF_FPTR22 0x52 /* @ltoff(@fptr(s+a)), imm22 */ ++#define R_IA64_LTOFF_FPTR64I 0x53 /* @ltoff(@fptr(s+a)), imm64 */ ++#define R_IA64_LTOFF_FPTR32MSB 0x54 /* @ltoff(@fptr(s+a)), data4 MSB */ ++#define R_IA64_LTOFF_FPTR32LSB 0x55 /* @ltoff(@fptr(s+a)), data4 LSB */ ++#define R_IA64_LTOFF_FPTR64MSB 0x56 /* @ltoff(@fptr(s+a)), data8 MSB */ ++#define R_IA64_LTOFF_FPTR64LSB 0x57 /* @ltoff(@fptr(s+a)), data8 LSB */ ++#define R_IA64_SEGREL32MSB 0x5c /* @segrel(sym + add), data4 MSB */ ++#define R_IA64_SEGREL32LSB 0x5d /* @segrel(sym + add), data4 LSB */ ++#define R_IA64_SEGREL64MSB 0x5e /* @segrel(sym + add), data8 MSB */ ++#define R_IA64_SEGREL64LSB 0x5f /* @segrel(sym + add), data8 LSB */ ++#define R_IA64_SECREL32MSB 0x64 /* @secrel(sym + add), data4 MSB */ ++#define R_IA64_SECREL32LSB 0x65 /* @secrel(sym + add), data4 LSB */ ++#define R_IA64_SECREL64MSB 0x66 /* @secrel(sym + add), data8 MSB */ ++#define R_IA64_SECREL64LSB 0x67 /* @secrel(sym + add), data8 LSB */ ++#define R_IA64_REL32MSB 0x6c /* data 4 + REL */ ++#define R_IA64_REL32LSB 0x6d /* data 4 + REL */ ++#define R_IA64_REL64MSB 0x6e /* data 8 + REL */ ++#define R_IA64_REL64LSB 0x6f /* data 8 + REL */ ++#define R_IA64_LTV32MSB 0x74 /* symbol + addend, data4 MSB */ ++#define R_IA64_LTV32LSB 0x75 /* symbol + addend, data4 LSB */ ++#define R_IA64_LTV64MSB 0x76 /* symbol + addend, data8 MSB */ ++#define R_IA64_LTV64LSB 0x77 /* symbol + addend, data8 LSB */ ++#define R_IA64_PCREL21BI 0x79 /* @pcrel(sym + add), 21bit inst */ ++#define R_IA64_PCREL22 0x7a /* @pcrel(sym + add), 22bit inst */ ++#define R_IA64_PCREL64I 0x7b /* @pcrel(sym + add), 64bit inst */ ++#define R_IA64_IPLTMSB 0x80 /* dynamic reloc, imported PLT, MSB */ ++#define R_IA64_IPLTLSB 0x81 /* dynamic reloc, imported PLT, LSB */ ++#define R_IA64_COPY 0x84 /* copy relocation */ ++#define R_IA64_SUB 0x85 /* Addend and symbol difference */ ++#define R_IA64_LTOFF22X 0x86 /* LTOFF22, relaxable. */ ++#define R_IA64_LDXMOV 0x87 /* Use of LTOFF22X. */ ++#define R_IA64_TPREL14 0x91 /* @tprel(sym + add), imm14 */ ++#define R_IA64_TPREL22 0x92 /* @tprel(sym + add), imm22 */ ++#define R_IA64_TPREL64I 0x93 /* @tprel(sym + add), imm64 */ ++#define R_IA64_TPREL64MSB 0x96 /* @tprel(sym + add), data8 MSB */ ++#define R_IA64_TPREL64LSB 0x97 /* @tprel(sym + add), data8 LSB */ ++#define R_IA64_LTOFF_TPREL22 0x9a /* @ltoff(@tprel(s+a)), imm2 */ ++#define R_IA64_DTPMOD64MSB 0xa6 /* @dtpmod(sym + add), data8 MSB */ ++#define R_IA64_DTPMOD64LSB 0xa7 /* @dtpmod(sym + add), data8 LSB */ ++#define R_IA64_LTOFF_DTPMOD22 0xaa /* @ltoff(@dtpmod(sym + add)), imm22 */ ++#define R_IA64_DTPREL14 0xb1 /* @dtprel(sym + add), imm14 */ ++#define R_IA64_DTPREL22 0xb2 /* @dtprel(sym + add), imm22 */ ++#define R_IA64_DTPREL64I 0xb3 /* @dtprel(sym + add), imm64 */ ++#define R_IA64_DTPREL32MSB 0xb4 /* @dtprel(sym + add), data4 MSB */ ++#define R_IA64_DTPREL32LSB 0xb5 /* @dtprel(sym + add), data4 LSB */ ++#define R_IA64_DTPREL64MSB 0xb6 /* @dtprel(sym + add), data8 MSB */ ++#define R_IA64_DTPREL64LSB 0xb7 /* @dtprel(sym + add), data8 LSB */ ++#define R_IA64_LTOFF_DTPREL22 0xba /* @ltoff(@dtprel(s+a)), imm22 */ ++ ++/* SH specific declarations */ ++ ++/* Processor specific flags for the ELF header e_flags field. */ ++#define EF_SH_MACH_MASK 0x1f ++#define EF_SH_UNKNOWN 0x0 ++#define EF_SH1 0x1 ++#define EF_SH2 0x2 ++#define EF_SH3 0x3 ++#define EF_SH_DSP 0x4 ++#define EF_SH3_DSP 0x5 ++#define EF_SH4AL_DSP 0x6 ++#define EF_SH3E 0x8 ++#define EF_SH4 0x9 ++#define EF_SH2E 0xb ++#define EF_SH4A 0xc ++#define EF_SH2A 0xd ++#define EF_SH4_NOFPU 0x10 ++#define EF_SH4A_NOFPU 0x11 ++#define EF_SH4_NOMMU_NOFPU 0x12 ++#define EF_SH2A_NOFPU 0x13 ++#define EF_SH3_NOMMU 0x14 ++#define EF_SH2A_SH4_NOFPU 0x15 ++#define EF_SH2A_SH3_NOFPU 0x16 ++#define EF_SH2A_SH4 0x17 ++#define EF_SH2A_SH3E 0x18 ++ ++/* SH relocs. */ ++#define R_SH_NONE 0 ++#define R_SH_DIR32 1 ++#define R_SH_REL32 2 ++#define R_SH_DIR8WPN 3 ++#define R_SH_IND12W 4 ++#define R_SH_DIR8WPL 5 ++#define R_SH_DIR8WPZ 6 ++#define R_SH_DIR8BP 7 ++#define R_SH_DIR8W 8 ++#define R_SH_DIR8L 9 ++#define R_SH_SWITCH16 25 ++#define R_SH_SWITCH32 26 ++#define R_SH_USES 27 ++#define R_SH_COUNT 28 ++#define R_SH_ALIGN 29 ++#define R_SH_CODE 30 ++#define R_SH_DATA 31 ++#define R_SH_LABEL 32 ++#define R_SH_SWITCH8 33 ++#define R_SH_GNU_VTINHERIT 34 ++#define R_SH_GNU_VTENTRY 35 ++#define R_SH_TLS_GD_32 144 ++#define R_SH_TLS_LD_32 145 ++#define R_SH_TLS_LDO_32 146 ++#define R_SH_TLS_IE_32 147 ++#define R_SH_TLS_LE_32 148 ++#define R_SH_TLS_DTPMOD32 149 ++#define R_SH_TLS_DTPOFF32 150 ++#define R_SH_TLS_TPOFF32 151 ++#define R_SH_GOT32 160 ++#define R_SH_PLT32 161 ++#define R_SH_COPY 162 ++#define R_SH_GLOB_DAT 163 ++#define R_SH_JMP_SLOT 164 ++#define R_SH_RELATIVE 165 ++#define R_SH_GOTOFF 166 ++#define R_SH_GOTPC 167 ++/* Keep this the last entry. */ ++#define R_SH_NUM 256 ++ ++/* S/390 specific definitions. */ ++ ++/* Valid values for the e_flags field. */ ++ ++#define EF_S390_HIGH_GPRS 0x00000001 /* High GPRs kernel facility needed. */ ++ ++/* Additional s390 relocs */ ++ ++#define R_390_NONE 0 /* No reloc. */ ++#define R_390_8 1 /* Direct 8 bit. */ ++#define R_390_12 2 /* Direct 12 bit. */ ++#define R_390_16 3 /* Direct 16 bit. */ ++#define R_390_32 4 /* Direct 32 bit. */ ++#define R_390_PC32 5 /* PC relative 32 bit. */ ++#define R_390_GOT12 6 /* 12 bit GOT offset. */ ++#define R_390_GOT32 7 /* 32 bit GOT offset. */ ++#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */ ++#define R_390_COPY 9 /* Copy symbol at runtime. */ ++#define R_390_GLOB_DAT 10 /* Create GOT entry. */ ++#define R_390_JMP_SLOT 11 /* Create PLT entry. */ ++#define R_390_RELATIVE 12 /* Adjust by program base. */ ++#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */ ++#define R_390_GOTPC 14 /* 32 bit PC relative offset to GOT. */ ++#define R_390_GOT16 15 /* 16 bit GOT offset. */ ++#define R_390_PC16 16 /* PC relative 16 bit. */ ++#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */ ++#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */ ++#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */ ++#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */ ++#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */ ++#define R_390_64 22 /* Direct 64 bit. */ ++#define R_390_PC64 23 /* PC relative 64 bit. */ ++#define R_390_GOT64 24 /* 64 bit GOT offset. */ ++#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */ ++#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */ ++#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */ ++#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */ ++#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */ ++#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */ ++#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */ ++#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */ ++#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */ ++#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */ ++#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */ ++#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */ ++#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */ ++#define R_390_TLS_GDCALL 38 /* Tag for function call in general ++ dynamic TLS code. */ ++#define R_390_TLS_LDCALL 39 /* Tag for function call in local ++ dynamic TLS code. */ ++#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic ++ thread local data. */ ++#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic ++ thread local data. */ ++#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS ++ block offset. */ ++#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS ++ block offset. */ ++#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS ++ block offset. */ ++#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic ++ thread local data in LE code. */ ++#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic ++ thread local data in LE code. */ ++#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for ++ negated static TLS block offset. */ ++#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for ++ negated static TLS block offset. */ ++#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for ++ negated static TLS block offset. */ ++#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to ++ static TLS block. */ ++#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to ++ static TLS block. */ ++#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS ++ block. */ ++#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS ++ block. */ ++#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */ ++#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */ ++#define R_390_TLS_TPOFF 56 /* Negated offset in static TLS ++ block. */ ++#define R_390_20 57 /* Direct 20 bit. */ ++#define R_390_GOT20 58 /* 20 bit GOT offset. */ ++#define R_390_GOTPLT20 59 /* 20 bit offset to jump slot. */ ++#define R_390_TLS_GOTIE20 60 /* 20 bit GOT offset for static TLS ++ block offset. */ ++#define R_390_IRELATIVE 61 /* STT_GNU_IFUNC relocation. */ ++/* Keep this the last entry. */ ++#define R_390_NUM 62 ++ ++ ++/* CRIS relocations. */ ++#define R_CRIS_NONE 0 ++#define R_CRIS_8 1 ++#define R_CRIS_16 2 ++#define R_CRIS_32 3 ++#define R_CRIS_8_PCREL 4 ++#define R_CRIS_16_PCREL 5 ++#define R_CRIS_32_PCREL 6 ++#define R_CRIS_GNU_VTINHERIT 7 ++#define R_CRIS_GNU_VTENTRY 8 ++#define R_CRIS_COPY 9 ++#define R_CRIS_GLOB_DAT 10 ++#define R_CRIS_JUMP_SLOT 11 ++#define R_CRIS_RELATIVE 12 ++#define R_CRIS_16_GOT 13 ++#define R_CRIS_32_GOT 14 ++#define R_CRIS_16_GOTPLT 15 ++#define R_CRIS_32_GOTPLT 16 ++#define R_CRIS_32_GOTREL 17 ++#define R_CRIS_32_PLT_GOTREL 18 ++#define R_CRIS_32_PLT_PCREL 19 ++ ++#define R_CRIS_NUM 20 ++ ++ ++/* AMD x86-64 relocations. */ ++#define R_X86_64_NONE 0 /* No reloc */ ++#define R_X86_64_64 1 /* Direct 64 bit */ ++#define R_X86_64_PC32 2 /* PC relative 32 bit signed */ ++#define R_X86_64_GOT32 3 /* 32 bit GOT entry */ ++#define R_X86_64_PLT32 4 /* 32 bit PLT address */ ++#define R_X86_64_COPY 5 /* Copy symbol at runtime */ ++#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */ ++#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */ ++#define R_X86_64_RELATIVE 8 /* Adjust by program base */ ++#define R_X86_64_GOTPCREL 9 /* 32 bit signed PC relative ++ offset to GOT */ ++#define R_X86_64_32 10 /* Direct 32 bit zero extended */ ++#define R_X86_64_32S 11 /* Direct 32 bit sign extended */ ++#define R_X86_64_16 12 /* Direct 16 bit zero extended */ ++#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */ ++#define R_X86_64_8 14 /* Direct 8 bit sign extended */ ++#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */ ++#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ ++#define R_X86_64_DTPOFF64 17 /* Offset in module's TLS block */ ++#define R_X86_64_TPOFF64 18 /* Offset in initial TLS block */ ++#define R_X86_64_TLSGD 19 /* 32 bit signed PC relative offset ++ to two GOT entries for GD symbol */ ++#define R_X86_64_TLSLD 20 /* 32 bit signed PC relative offset ++ to two GOT entries for LD symbol */ ++#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ ++#define R_X86_64_GOTTPOFF 22 /* 32 bit signed PC relative offset ++ to GOT entry for IE symbol */ ++#define R_X86_64_TPOFF32 23 /* Offset in initial TLS block */ ++#define R_X86_64_PC64 24 /* PC relative 64 bit */ ++#define R_X86_64_GOTOFF64 25 /* 64 bit offset to GOT */ ++#define R_X86_64_GOTPC32 26 /* 32 bit signed pc relative ++ offset to GOT */ ++#define R_X86_64_GOT64 27 /* 64-bit GOT entry offset */ ++#define R_X86_64_GOTPCREL64 28 /* 64-bit PC relative offset ++ to GOT entry */ ++#define R_X86_64_GOTPC64 29 /* 64-bit PC relative offset to GOT */ ++#define R_X86_64_GOTPLT64 30 /* like GOT64, says PLT entry needed */ ++#define R_X86_64_PLTOFF64 31 /* 64-bit GOT relative offset ++ to PLT entry */ ++#define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */ ++#define R_X86_64_SIZE64 33 /* Size of symbol plus 64-bit addend */ ++#define R_X86_64_GOTPC32_TLSDESC 34 /* GOT offset for TLS descriptor. */ ++#define R_X86_64_TLSDESC_CALL 35 /* Marker for call through TLS ++ descriptor. */ ++#define R_X86_64_TLSDESC 36 /* TLS descriptor. */ ++#define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */ ++#define R_X86_64_RELATIVE64 38 /* 64-bit adjust by program base */ ++ /* 39 Reserved was R_X86_64_PC32_BND */ ++ /* 40 Reserved was R_X86_64_PLT32_BND */ ++#define R_X86_64_GOTPCRELX 41 /* Load from 32 bit signed pc relative ++ offset to GOT entry without REX ++ prefix, relaxable. */ ++#define R_X86_64_REX_GOTPCRELX 42 /* Load from 32 bit signed pc relative ++ offset to GOT entry with REX prefix, ++ relaxable. */ ++#define R_X86_64_NUM 43 ++ ++/* x86-64 sh_type values. */ ++#define SHT_X86_64_UNWIND 0x70000001 /* Unwind information. */ ++ ++ ++/* AM33 relocations. */ ++#define R_MN10300_NONE 0 /* No reloc. */ ++#define R_MN10300_32 1 /* Direct 32 bit. */ ++#define R_MN10300_16 2 /* Direct 16 bit. */ ++#define R_MN10300_8 3 /* Direct 8 bit. */ ++#define R_MN10300_PCREL32 4 /* PC-relative 32-bit. */ ++#define R_MN10300_PCREL16 5 /* PC-relative 16-bit signed. */ ++#define R_MN10300_PCREL8 6 /* PC-relative 8-bit signed. */ ++#define R_MN10300_GNU_VTINHERIT 7 /* Ancient C++ vtable garbage... */ ++#define R_MN10300_GNU_VTENTRY 8 /* ... collection annotation. */ ++#define R_MN10300_24 9 /* Direct 24 bit. */ ++#define R_MN10300_GOTPC32 10 /* 32-bit PCrel offset to GOT. */ ++#define R_MN10300_GOTPC16 11 /* 16-bit PCrel offset to GOT. */ ++#define R_MN10300_GOTOFF32 12 /* 32-bit offset from GOT. */ ++#define R_MN10300_GOTOFF24 13 /* 24-bit offset from GOT. */ ++#define R_MN10300_GOTOFF16 14 /* 16-bit offset from GOT. */ ++#define R_MN10300_PLT32 15 /* 32-bit PCrel to PLT entry. */ ++#define R_MN10300_PLT16 16 /* 16-bit PCrel to PLT entry. */ ++#define R_MN10300_GOT32 17 /* 32-bit offset to GOT entry. */ ++#define R_MN10300_GOT24 18 /* 24-bit offset to GOT entry. */ ++#define R_MN10300_GOT16 19 /* 16-bit offset to GOT entry. */ ++#define R_MN10300_COPY 20 /* Copy symbol at runtime. */ ++#define R_MN10300_GLOB_DAT 21 /* Create GOT entry. */ ++#define R_MN10300_JMP_SLOT 22 /* Create PLT entry. */ ++#define R_MN10300_RELATIVE 23 /* Adjust by program base. */ ++#define R_MN10300_TLS_GD 24 /* 32-bit offset for global dynamic. */ ++#define R_MN10300_TLS_LD 25 /* 32-bit offset for local dynamic. */ ++#define R_MN10300_TLS_LDO 26 /* Module-relative offset. */ ++#define R_MN10300_TLS_GOTIE 27 /* GOT offset for static TLS block ++ offset. */ ++#define R_MN10300_TLS_IE 28 /* GOT address for static TLS block ++ offset. */ ++#define R_MN10300_TLS_LE 29 /* Offset relative to static TLS ++ block. */ ++#define R_MN10300_TLS_DTPMOD 30 /* ID of module containing symbol. */ ++#define R_MN10300_TLS_DTPOFF 31 /* Offset in module TLS block. */ ++#define R_MN10300_TLS_TPOFF 32 /* Offset in static TLS block. */ ++#define R_MN10300_SYM_DIFF 33 /* Adjustment for next reloc as needed ++ by linker relaxation. */ ++#define R_MN10300_ALIGN 34 /* Alignment requirement for linker ++ relaxation. */ ++#define R_MN10300_NUM 35 ++ ++ ++/* M32R relocs. */ ++#define R_M32R_NONE 0 /* No reloc. */ ++#define R_M32R_16 1 /* Direct 16 bit. */ ++#define R_M32R_32 2 /* Direct 32 bit. */ ++#define R_M32R_24 3 /* Direct 24 bit. */ ++#define R_M32R_10_PCREL 4 /* PC relative 10 bit shifted. */ ++#define R_M32R_18_PCREL 5 /* PC relative 18 bit shifted. */ ++#define R_M32R_26_PCREL 6 /* PC relative 26 bit shifted. */ ++#define R_M32R_HI16_ULO 7 /* High 16 bit with unsigned low. */ ++#define R_M32R_HI16_SLO 8 /* High 16 bit with signed low. */ ++#define R_M32R_LO16 9 /* Low 16 bit. */ ++#define R_M32R_SDA16 10 /* 16 bit offset in SDA. */ ++#define R_M32R_GNU_VTINHERIT 11 ++#define R_M32R_GNU_VTENTRY 12 ++/* M32R relocs use SHT_RELA. */ ++#define R_M32R_16_RELA 33 /* Direct 16 bit. */ ++#define R_M32R_32_RELA 34 /* Direct 32 bit. */ ++#define R_M32R_24_RELA 35 /* Direct 24 bit. */ ++#define R_M32R_10_PCREL_RELA 36 /* PC relative 10 bit shifted. */ ++#define R_M32R_18_PCREL_RELA 37 /* PC relative 18 bit shifted. */ ++#define R_M32R_26_PCREL_RELA 38 /* PC relative 26 bit shifted. */ ++#define R_M32R_HI16_ULO_RELA 39 /* High 16 bit with unsigned low */ ++#define R_M32R_HI16_SLO_RELA 40 /* High 16 bit with signed low */ ++#define R_M32R_LO16_RELA 41 /* Low 16 bit */ ++#define R_M32R_SDA16_RELA 42 /* 16 bit offset in SDA */ ++#define R_M32R_RELA_GNU_VTINHERIT 43 ++#define R_M32R_RELA_GNU_VTENTRY 44 ++#define R_M32R_REL32 45 /* PC relative 32 bit. */ ++ ++#define R_M32R_GOT24 48 /* 24 bit GOT entry */ ++#define R_M32R_26_PLTREL 49 /* 26 bit PC relative to PLT shifted */ ++#define R_M32R_COPY 50 /* Copy symbol at runtime */ ++#define R_M32R_GLOB_DAT 51 /* Create GOT entry */ ++#define R_M32R_JMP_SLOT 52 /* Create PLT entry */ ++#define R_M32R_RELATIVE 53 /* Adjust by program base */ ++#define R_M32R_GOTOFF 54 /* 24 bit offset to GOT */ ++#define R_M32R_GOTPC24 55 /* 24 bit PC relative offset to GOT */ ++#define R_M32R_GOT16_HI_ULO 56 /* High 16 bit GOT entry with unsigned ++ low */ ++#define R_M32R_GOT16_HI_SLO 57 /* High 16 bit GOT entry with signed ++ low */ ++#define R_M32R_GOT16_LO 58 /* Low 16 bit GOT entry */ ++#define R_M32R_GOTPC_HI_ULO 59 /* High 16 bit PC relative offset to ++ GOT with unsigned low */ ++#define R_M32R_GOTPC_HI_SLO 60 /* High 16 bit PC relative offset to ++ GOT with signed low */ ++#define R_M32R_GOTPC_LO 61 /* Low 16 bit PC relative offset to ++ GOT */ ++#define R_M32R_GOTOFF_HI_ULO 62 /* High 16 bit offset to GOT ++ with unsigned low */ ++#define R_M32R_GOTOFF_HI_SLO 63 /* High 16 bit offset to GOT ++ with signed low */ ++#define R_M32R_GOTOFF_LO 64 /* Low 16 bit offset to GOT */ ++#define R_M32R_NUM 256 /* Keep this the last entry. */ ++ ++/* MicroBlaze relocations */ ++#define R_MICROBLAZE_NONE 0 /* No reloc. */ ++#define R_MICROBLAZE_32 1 /* Direct 32 bit. */ ++#define R_MICROBLAZE_32_PCREL 2 /* PC relative 32 bit. */ ++#define R_MICROBLAZE_64_PCREL 3 /* PC relative 64 bit. */ ++#define R_MICROBLAZE_32_PCREL_LO 4 /* Low 16 bits of PCREL32. */ ++#define R_MICROBLAZE_64 5 /* Direct 64 bit. */ ++#define R_MICROBLAZE_32_LO 6 /* Low 16 bit. */ ++#define R_MICROBLAZE_SRO32 7 /* Read-only small data area. */ ++#define R_MICROBLAZE_SRW32 8 /* Read-write small data area. */ ++#define R_MICROBLAZE_64_NONE 9 /* No reloc. */ ++#define R_MICROBLAZE_32_SYM_OP_SYM 10 /* Symbol Op Symbol relocation. */ ++#define R_MICROBLAZE_GNU_VTINHERIT 11 /* GNU C++ vtable hierarchy. */ ++#define R_MICROBLAZE_GNU_VTENTRY 12 /* GNU C++ vtable member usage. */ ++#define R_MICROBLAZE_GOTPC_64 13 /* PC-relative GOT offset. */ ++#define R_MICROBLAZE_GOT_64 14 /* GOT entry offset. */ ++#define R_MICROBLAZE_PLT_64 15 /* PLT offset (PC-relative). */ ++#define R_MICROBLAZE_REL 16 /* Adjust by program base. */ ++#define R_MICROBLAZE_JUMP_SLOT 17 /* Create PLT entry. */ ++#define R_MICROBLAZE_GLOB_DAT 18 /* Create GOT entry. */ ++#define R_MICROBLAZE_GOTOFF_64 19 /* 64 bit offset to GOT. */ ++#define R_MICROBLAZE_GOTOFF_32 20 /* 32 bit offset to GOT. */ ++#define R_MICROBLAZE_COPY 21 /* Runtime copy. */ ++#define R_MICROBLAZE_TLS 22 /* TLS Reloc. */ ++#define R_MICROBLAZE_TLSGD 23 /* TLS General Dynamic. */ ++#define R_MICROBLAZE_TLSLD 24 /* TLS Local Dynamic. */ ++#define R_MICROBLAZE_TLSDTPMOD32 25 /* TLS Module ID. */ ++#define R_MICROBLAZE_TLSDTPREL32 26 /* TLS Offset Within TLS Block. */ ++#define R_MICROBLAZE_TLSDTPREL64 27 /* TLS Offset Within TLS Block. */ ++#define R_MICROBLAZE_TLSGOTTPREL32 28 /* TLS Offset From Thread Pointer. */ ++#define R_MICROBLAZE_TLSTPREL32 29 /* TLS Offset From Thread Pointer. */ ++ ++/* Legal values for d_tag (dynamic entry type). */ ++#define DT_NIOS2_GP 0x70000002 /* Address of _gp. */ ++ ++/* Nios II relocations. */ ++#define R_NIOS2_NONE 0 /* No reloc. */ ++#define R_NIOS2_S16 1 /* Direct signed 16 bit. */ ++#define R_NIOS2_U16 2 /* Direct unsigned 16 bit. */ ++#define R_NIOS2_PCREL16 3 /* PC relative 16 bit. */ ++#define R_NIOS2_CALL26 4 /* Direct call. */ ++#define R_NIOS2_IMM5 5 /* 5 bit constant expression. */ ++#define R_NIOS2_CACHE_OPX 6 /* 5 bit expression, shift 22. */ ++#define R_NIOS2_IMM6 7 /* 6 bit constant expression. */ ++#define R_NIOS2_IMM8 8 /* 8 bit constant expression. */ ++#define R_NIOS2_HI16 9 /* High 16 bit. */ ++#define R_NIOS2_LO16 10 /* Low 16 bit. */ ++#define R_NIOS2_HIADJ16 11 /* High 16 bit, adjusted. */ ++#define R_NIOS2_BFD_RELOC_32 12 /* 32 bit symbol value + addend. */ ++#define R_NIOS2_BFD_RELOC_16 13 /* 16 bit symbol value + addend. */ ++#define R_NIOS2_BFD_RELOC_8 14 /* 8 bit symbol value + addend. */ ++#define R_NIOS2_GPREL 15 /* 16 bit GP pointer offset. */ ++#define R_NIOS2_GNU_VTINHERIT 16 /* GNU C++ vtable hierarchy. */ ++#define R_NIOS2_GNU_VTENTRY 17 /* GNU C++ vtable member usage. */ ++#define R_NIOS2_UJMP 18 /* Unconditional branch. */ ++#define R_NIOS2_CJMP 19 /* Conditional branch. */ ++#define R_NIOS2_CALLR 20 /* Indirect call through register. */ ++#define R_NIOS2_ALIGN 21 /* Alignment requirement for ++ linker relaxation. */ ++#define R_NIOS2_GOT16 22 /* 16 bit GOT entry. */ ++#define R_NIOS2_CALL16 23 /* 16 bit GOT entry for function. */ ++#define R_NIOS2_GOTOFF_LO 24 /* %lo of offset to GOT pointer. */ ++#define R_NIOS2_GOTOFF_HA 25 /* %hiadj of offset to GOT pointer. */ ++#define R_NIOS2_PCREL_LO 26 /* %lo of PC relative offset. */ ++#define R_NIOS2_PCREL_HA 27 /* %hiadj of PC relative offset. */ ++#define R_NIOS2_TLS_GD16 28 /* 16 bit GOT offset for TLS GD. */ ++#define R_NIOS2_TLS_LDM16 29 /* 16 bit GOT offset for TLS LDM. */ ++#define R_NIOS2_TLS_LDO16 30 /* 16 bit module relative offset. */ ++#define R_NIOS2_TLS_IE16 31 /* 16 bit GOT offset for TLS IE. */ ++#define R_NIOS2_TLS_LE16 32 /* 16 bit LE TP-relative offset. */ ++#define R_NIOS2_TLS_DTPMOD 33 /* Module number. */ ++#define R_NIOS2_TLS_DTPREL 34 /* Module-relative offset. */ ++#define R_NIOS2_TLS_TPREL 35 /* TP-relative offset. */ ++#define R_NIOS2_COPY 36 /* Copy symbol at runtime. */ ++#define R_NIOS2_GLOB_DAT 37 /* Create GOT entry. */ ++#define R_NIOS2_JUMP_SLOT 38 /* Create PLT entry. */ ++#define R_NIOS2_RELATIVE 39 /* Adjust by program base. */ ++#define R_NIOS2_GOTOFF 40 /* 16 bit offset to GOT pointer. */ ++#define R_NIOS2_CALL26_NOAT 41 /* Direct call in .noat section. */ ++#define R_NIOS2_GOT_LO 42 /* %lo() of GOT entry. */ ++#define R_NIOS2_GOT_HA 43 /* %hiadj() of GOT entry. */ ++#define R_NIOS2_CALL_LO 44 /* %lo() of function GOT entry. */ ++#define R_NIOS2_CALL_HA 45 /* %hiadj() of function GOT entry. */ ++ ++/* TILEPro relocations. */ ++#define R_TILEPRO_NONE 0 /* No reloc */ ++#define R_TILEPRO_32 1 /* Direct 32 bit */ ++#define R_TILEPRO_16 2 /* Direct 16 bit */ ++#define R_TILEPRO_8 3 /* Direct 8 bit */ ++#define R_TILEPRO_32_PCREL 4 /* PC relative 32 bit */ ++#define R_TILEPRO_16_PCREL 5 /* PC relative 16 bit */ ++#define R_TILEPRO_8_PCREL 6 /* PC relative 8 bit */ ++#define R_TILEPRO_LO16 7 /* Low 16 bit */ ++#define R_TILEPRO_HI16 8 /* High 16 bit */ ++#define R_TILEPRO_HA16 9 /* High 16 bit, adjusted */ ++#define R_TILEPRO_COPY 10 /* Copy relocation */ ++#define R_TILEPRO_GLOB_DAT 11 /* Create GOT entry */ ++#define R_TILEPRO_JMP_SLOT 12 /* Create PLT entry */ ++#define R_TILEPRO_RELATIVE 13 /* Adjust by program base */ ++#define R_TILEPRO_BROFF_X1 14 /* X1 pipe branch offset */ ++#define R_TILEPRO_JOFFLONG_X1 15 /* X1 pipe jump offset */ ++#define R_TILEPRO_JOFFLONG_X1_PLT 16 /* X1 pipe jump offset to PLT */ ++#define R_TILEPRO_IMM8_X0 17 /* X0 pipe 8-bit */ ++#define R_TILEPRO_IMM8_Y0 18 /* Y0 pipe 8-bit */ ++#define R_TILEPRO_IMM8_X1 19 /* X1 pipe 8-bit */ ++#define R_TILEPRO_IMM8_Y1 20 /* Y1 pipe 8-bit */ ++#define R_TILEPRO_MT_IMM15_X1 21 /* X1 pipe mtspr */ ++#define R_TILEPRO_MF_IMM15_X1 22 /* X1 pipe mfspr */ ++#define R_TILEPRO_IMM16_X0 23 /* X0 pipe 16-bit */ ++#define R_TILEPRO_IMM16_X1 24 /* X1 pipe 16-bit */ ++#define R_TILEPRO_IMM16_X0_LO 25 /* X0 pipe low 16-bit */ ++#define R_TILEPRO_IMM16_X1_LO 26 /* X1 pipe low 16-bit */ ++#define R_TILEPRO_IMM16_X0_HI 27 /* X0 pipe high 16-bit */ ++#define R_TILEPRO_IMM16_X1_HI 28 /* X1 pipe high 16-bit */ ++#define R_TILEPRO_IMM16_X0_HA 29 /* X0 pipe high 16-bit, adjusted */ ++#define R_TILEPRO_IMM16_X1_HA 30 /* X1 pipe high 16-bit, adjusted */ ++#define R_TILEPRO_IMM16_X0_PCREL 31 /* X0 pipe PC relative 16 bit */ ++#define R_TILEPRO_IMM16_X1_PCREL 32 /* X1 pipe PC relative 16 bit */ ++#define R_TILEPRO_IMM16_X0_LO_PCREL 33 /* X0 pipe PC relative low 16 bit */ ++#define R_TILEPRO_IMM16_X1_LO_PCREL 34 /* X1 pipe PC relative low 16 bit */ ++#define R_TILEPRO_IMM16_X0_HI_PCREL 35 /* X0 pipe PC relative high 16 bit */ ++#define R_TILEPRO_IMM16_X1_HI_PCREL 36 /* X1 pipe PC relative high 16 bit */ ++#define R_TILEPRO_IMM16_X0_HA_PCREL 37 /* X0 pipe PC relative ha() 16 bit */ ++#define R_TILEPRO_IMM16_X1_HA_PCREL 38 /* X1 pipe PC relative ha() 16 bit */ ++#define R_TILEPRO_IMM16_X0_GOT 39 /* X0 pipe 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X1_GOT 40 /* X1 pipe 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X0_GOT_LO 41 /* X0 pipe low 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X1_GOT_LO 42 /* X1 pipe low 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X0_GOT_HI 43 /* X0 pipe high 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X1_GOT_HI 44 /* X1 pipe high 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X0_GOT_HA 45 /* X0 pipe ha() 16-bit GOT offset */ ++#define R_TILEPRO_IMM16_X1_GOT_HA 46 /* X1 pipe ha() 16-bit GOT offset */ ++#define R_TILEPRO_MMSTART_X0 47 /* X0 pipe mm "start" */ ++#define R_TILEPRO_MMEND_X0 48 /* X0 pipe mm "end" */ ++#define R_TILEPRO_MMSTART_X1 49 /* X1 pipe mm "start" */ ++#define R_TILEPRO_MMEND_X1 50 /* X1 pipe mm "end" */ ++#define R_TILEPRO_SHAMT_X0 51 /* X0 pipe shift amount */ ++#define R_TILEPRO_SHAMT_X1 52 /* X1 pipe shift amount */ ++#define R_TILEPRO_SHAMT_Y0 53 /* Y0 pipe shift amount */ ++#define R_TILEPRO_SHAMT_Y1 54 /* Y1 pipe shift amount */ ++#define R_TILEPRO_DEST_IMM8_X1 55 /* X1 pipe destination 8-bit */ ++/* Relocs 56-59 are currently not defined. */ ++#define R_TILEPRO_TLS_GD_CALL 60 /* "jal" for TLS GD */ ++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61 /* X0 pipe "addi" for TLS GD */ ++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62 /* X1 pipe "addi" for TLS GD */ ++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63 /* Y0 pipe "addi" for TLS GD */ ++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64 /* Y1 pipe "addi" for TLS GD */ ++#define R_TILEPRO_TLS_IE_LOAD 65 /* "lw_tls" for TLS IE */ ++#define R_TILEPRO_IMM16_X0_TLS_GD 66 /* X0 pipe 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X1_TLS_GD 67 /* X1 pipe 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68 /* X0 pipe low 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69 /* X1 pipe low 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70 /* X0 pipe high 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71 /* X1 pipe high 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72 /* X0 pipe ha() 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73 /* X1 pipe ha() 16-bit TLS GD offset */ ++#define R_TILEPRO_IMM16_X0_TLS_IE 74 /* X0 pipe 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_IE 75 /* X1 pipe 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76 /* X0 pipe low 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77 /* X1 pipe low 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78 /* X0 pipe high 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79 /* X1 pipe high 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80 /* X0 pipe ha() 16-bit TLS IE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81 /* X1 pipe ha() 16-bit TLS IE offset */ ++#define R_TILEPRO_TLS_DTPMOD32 82 /* ID of module containing symbol */ ++#define R_TILEPRO_TLS_DTPOFF32 83 /* Offset in TLS block */ ++#define R_TILEPRO_TLS_TPOFF32 84 /* Offset in static TLS block */ ++#define R_TILEPRO_IMM16_X0_TLS_LE 85 /* X0 pipe 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_LE 86 /* X1 pipe 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87 /* X0 pipe low 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88 /* X1 pipe low 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89 /* X0 pipe high 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90 /* X1 pipe high 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91 /* X0 pipe ha() 16-bit TLS LE offset */ ++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92 /* X1 pipe ha() 16-bit TLS LE offset */ ++ ++#define R_TILEPRO_GNU_VTINHERIT 128 /* GNU C++ vtable hierarchy */ ++#define R_TILEPRO_GNU_VTENTRY 129 /* GNU C++ vtable member usage */ ++ ++#define R_TILEPRO_NUM 130 ++ ++ ++/* TILE-Gx relocations. */ ++#define R_TILEGX_NONE 0 /* No reloc */ ++#define R_TILEGX_64 1 /* Direct 64 bit */ ++#define R_TILEGX_32 2 /* Direct 32 bit */ ++#define R_TILEGX_16 3 /* Direct 16 bit */ ++#define R_TILEGX_8 4 /* Direct 8 bit */ ++#define R_TILEGX_64_PCREL 5 /* PC relative 64 bit */ ++#define R_TILEGX_32_PCREL 6 /* PC relative 32 bit */ ++#define R_TILEGX_16_PCREL 7 /* PC relative 16 bit */ ++#define R_TILEGX_8_PCREL 8 /* PC relative 8 bit */ ++#define R_TILEGX_HW0 9 /* hword 0 16-bit */ ++#define R_TILEGX_HW1 10 /* hword 1 16-bit */ ++#define R_TILEGX_HW2 11 /* hword 2 16-bit */ ++#define R_TILEGX_HW3 12 /* hword 3 16-bit */ ++#define R_TILEGX_HW0_LAST 13 /* last hword 0 16-bit */ ++#define R_TILEGX_HW1_LAST 14 /* last hword 1 16-bit */ ++#define R_TILEGX_HW2_LAST 15 /* last hword 2 16-bit */ ++#define R_TILEGX_COPY 16 /* Copy relocation */ ++#define R_TILEGX_GLOB_DAT 17 /* Create GOT entry */ ++#define R_TILEGX_JMP_SLOT 18 /* Create PLT entry */ ++#define R_TILEGX_RELATIVE 19 /* Adjust by program base */ ++#define R_TILEGX_BROFF_X1 20 /* X1 pipe branch offset */ ++#define R_TILEGX_JUMPOFF_X1 21 /* X1 pipe jump offset */ ++#define R_TILEGX_JUMPOFF_X1_PLT 22 /* X1 pipe jump offset to PLT */ ++#define R_TILEGX_IMM8_X0 23 /* X0 pipe 8-bit */ ++#define R_TILEGX_IMM8_Y0 24 /* Y0 pipe 8-bit */ ++#define R_TILEGX_IMM8_X1 25 /* X1 pipe 8-bit */ ++#define R_TILEGX_IMM8_Y1 26 /* Y1 pipe 8-bit */ ++#define R_TILEGX_DEST_IMM8_X1 27 /* X1 pipe destination 8-bit */ ++#define R_TILEGX_MT_IMM14_X1 28 /* X1 pipe mtspr */ ++#define R_TILEGX_MF_IMM14_X1 29 /* X1 pipe mfspr */ ++#define R_TILEGX_MMSTART_X0 30 /* X0 pipe mm "start" */ ++#define R_TILEGX_MMEND_X0 31 /* X0 pipe mm "end" */ ++#define R_TILEGX_SHAMT_X0 32 /* X0 pipe shift amount */ ++#define R_TILEGX_SHAMT_X1 33 /* X1 pipe shift amount */ ++#define R_TILEGX_SHAMT_Y0 34 /* Y0 pipe shift amount */ ++#define R_TILEGX_SHAMT_Y1 35 /* Y1 pipe shift amount */ ++#define R_TILEGX_IMM16_X0_HW0 36 /* X0 pipe hword 0 */ ++#define R_TILEGX_IMM16_X1_HW0 37 /* X1 pipe hword 0 */ ++#define R_TILEGX_IMM16_X0_HW1 38 /* X0 pipe hword 1 */ ++#define R_TILEGX_IMM16_X1_HW1 39 /* X1 pipe hword 1 */ ++#define R_TILEGX_IMM16_X0_HW2 40 /* X0 pipe hword 2 */ ++#define R_TILEGX_IMM16_X1_HW2 41 /* X1 pipe hword 2 */ ++#define R_TILEGX_IMM16_X0_HW3 42 /* X0 pipe hword 3 */ ++#define R_TILEGX_IMM16_X1_HW3 43 /* X1 pipe hword 3 */ ++#define R_TILEGX_IMM16_X0_HW0_LAST 44 /* X0 pipe last hword 0 */ ++#define R_TILEGX_IMM16_X1_HW0_LAST 45 /* X1 pipe last hword 0 */ ++#define R_TILEGX_IMM16_X0_HW1_LAST 46 /* X0 pipe last hword 1 */ ++#define R_TILEGX_IMM16_X1_HW1_LAST 47 /* X1 pipe last hword 1 */ ++#define R_TILEGX_IMM16_X0_HW2_LAST 48 /* X0 pipe last hword 2 */ ++#define R_TILEGX_IMM16_X1_HW2_LAST 49 /* X1 pipe last hword 2 */ ++#define R_TILEGX_IMM16_X0_HW0_PCREL 50 /* X0 pipe PC relative hword 0 */ ++#define R_TILEGX_IMM16_X1_HW0_PCREL 51 /* X1 pipe PC relative hword 0 */ ++#define R_TILEGX_IMM16_X0_HW1_PCREL 52 /* X0 pipe PC relative hword 1 */ ++#define R_TILEGX_IMM16_X1_HW1_PCREL 53 /* X1 pipe PC relative hword 1 */ ++#define R_TILEGX_IMM16_X0_HW2_PCREL 54 /* X0 pipe PC relative hword 2 */ ++#define R_TILEGX_IMM16_X1_HW2_PCREL 55 /* X1 pipe PC relative hword 2 */ ++#define R_TILEGX_IMM16_X0_HW3_PCREL 56 /* X0 pipe PC relative hword 3 */ ++#define R_TILEGX_IMM16_X1_HW3_PCREL 57 /* X1 pipe PC relative hword 3 */ ++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */ ++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */ ++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */ ++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */ ++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */ ++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */ ++#define R_TILEGX_IMM16_X0_HW0_GOT 64 /* X0 pipe hword 0 GOT offset */ ++#define R_TILEGX_IMM16_X1_HW0_GOT 65 /* X1 pipe hword 0 GOT offset */ ++#define R_TILEGX_IMM16_X0_HW0_PLT_PCREL 66 /* X0 pipe PC-rel PLT hword 0 */ ++#define R_TILEGX_IMM16_X1_HW0_PLT_PCREL 67 /* X1 pipe PC-rel PLT hword 0 */ ++#define R_TILEGX_IMM16_X0_HW1_PLT_PCREL 68 /* X0 pipe PC-rel PLT hword 1 */ ++#define R_TILEGX_IMM16_X1_HW1_PLT_PCREL 69 /* X1 pipe PC-rel PLT hword 1 */ ++#define R_TILEGX_IMM16_X0_HW2_PLT_PCREL 70 /* X0 pipe PC-rel PLT hword 2 */ ++#define R_TILEGX_IMM16_X1_HW2_PLT_PCREL 71 /* X1 pipe PC-rel PLT hword 2 */ ++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */ ++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */ ++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */ ++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */ ++#define R_TILEGX_IMM16_X0_HW3_PLT_PCREL 76 /* X0 pipe PC-rel PLT hword 3 */ ++#define R_TILEGX_IMM16_X1_HW3_PLT_PCREL 77 /* X1 pipe PC-rel PLT hword 3 */ ++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78 /* X0 pipe hword 0 TLS GD offset */ ++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79 /* X1 pipe hword 0 TLS GD offset */ ++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80 /* X0 pipe hword 0 TLS LE offset */ ++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81 /* X1 pipe hword 0 TLS LE offset */ ++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */ ++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */ ++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */ ++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */ ++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */ ++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */ ++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */ ++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */ ++/* Relocs 90-91 are currently not defined. */ ++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92 /* X0 pipe hword 0 TLS IE offset */ ++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93 /* X1 pipe hword 0 TLS IE offset */ ++#define R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL 94 /* X0 pipe PC-rel PLT last hword 0 */ ++#define R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL 95 /* X1 pipe PC-rel PLT last hword 0 */ ++#define R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL 96 /* X0 pipe PC-rel PLT last hword 1 */ ++#define R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL 97 /* X1 pipe PC-rel PLT last hword 1 */ ++#define R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL 98 /* X0 pipe PC-rel PLT last hword 2 */ ++#define R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL 99 /* X1 pipe PC-rel PLT last hword 2 */ ++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */ ++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */ ++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */ ++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */ ++/* Relocs 104-105 are currently not defined. */ ++#define R_TILEGX_TLS_DTPMOD64 106 /* 64-bit ID of symbol's module */ ++#define R_TILEGX_TLS_DTPOFF64 107 /* 64-bit offset in TLS block */ ++#define R_TILEGX_TLS_TPOFF64 108 /* 64-bit offset in static TLS block */ ++#define R_TILEGX_TLS_DTPMOD32 109 /* 32-bit ID of symbol's module */ ++#define R_TILEGX_TLS_DTPOFF32 110 /* 32-bit offset in TLS block */ ++#define R_TILEGX_TLS_TPOFF32 111 /* 32-bit offset in static TLS block */ ++#define R_TILEGX_TLS_GD_CALL 112 /* "jal" for TLS GD */ ++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113 /* X0 pipe "addi" for TLS GD */ ++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114 /* X1 pipe "addi" for TLS GD */ ++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115 /* Y0 pipe "addi" for TLS GD */ ++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116 /* Y1 pipe "addi" for TLS GD */ ++#define R_TILEGX_TLS_IE_LOAD 117 /* "ld_tls" for TLS IE */ ++#define R_TILEGX_IMM8_X0_TLS_ADD 118 /* X0 pipe "addi" for TLS GD/IE */ ++#define R_TILEGX_IMM8_X1_TLS_ADD 119 /* X1 pipe "addi" for TLS GD/IE */ ++#define R_TILEGX_IMM8_Y0_TLS_ADD 120 /* Y0 pipe "addi" for TLS GD/IE */ ++#define R_TILEGX_IMM8_Y1_TLS_ADD 121 /* Y1 pipe "addi" for TLS GD/IE */ ++ ++#define R_TILEGX_GNU_VTINHERIT 128 /* GNU C++ vtable hierarchy */ ++#define R_TILEGX_GNU_VTENTRY 129 /* GNU C++ vtable member usage */ ++ ++#define R_TILEGX_NUM 130 ++ ++/* RISC-V ELF Flags */ ++#define EF_RISCV_RVC 0x0001 ++#define EF_RISCV_FLOAT_ABI 0x0006 ++#define EF_RISCV_FLOAT_ABI_SOFT 0x0000 ++#define EF_RISCV_FLOAT_ABI_SINGLE 0x0002 ++#define EF_RISCV_FLOAT_ABI_DOUBLE 0x0004 ++#define EF_RISCV_FLOAT_ABI_QUAD 0x0006 ++ ++/* RISC-V relocations. */ ++#define R_RISCV_NONE 0 ++#define R_RISCV_32 1 ++#define R_RISCV_64 2 ++#define R_RISCV_RELATIVE 3 ++#define R_RISCV_COPY 4 ++#define R_RISCV_JUMP_SLOT 5 ++#define R_RISCV_TLS_DTPMOD32 6 ++#define R_RISCV_TLS_DTPMOD64 7 ++#define R_RISCV_TLS_DTPREL32 8 ++#define R_RISCV_TLS_DTPREL64 9 ++#define R_RISCV_TLS_TPREL32 10 ++#define R_RISCV_TLS_TPREL64 11 ++#define R_RISCV_BRANCH 16 ++#define R_RISCV_JAL 17 ++#define R_RISCV_CALL 18 ++#define R_RISCV_CALL_PLT 19 ++#define R_RISCV_GOT_HI20 20 ++#define R_RISCV_TLS_GOT_HI20 21 ++#define R_RISCV_TLS_GD_HI20 22 ++#define R_RISCV_PCREL_HI20 23 ++#define R_RISCV_PCREL_LO12_I 24 ++#define R_RISCV_PCREL_LO12_S 25 ++#define R_RISCV_HI20 26 ++#define R_RISCV_LO12_I 27 ++#define R_RISCV_LO12_S 28 ++#define R_RISCV_TPREL_HI20 29 ++#define R_RISCV_TPREL_LO12_I 30 ++#define R_RISCV_TPREL_LO12_S 31 ++#define R_RISCV_TPREL_ADD 32 ++#define R_RISCV_ADD8 33 ++#define R_RISCV_ADD16 34 ++#define R_RISCV_ADD32 35 ++#define R_RISCV_ADD64 36 ++#define R_RISCV_SUB8 37 ++#define R_RISCV_SUB16 38 ++#define R_RISCV_SUB32 39 ++#define R_RISCV_SUB64 40 ++#define R_RISCV_GNU_VTINHERIT 41 ++#define R_RISCV_GNU_VTENTRY 42 ++#define R_RISCV_ALIGN 43 ++#define R_RISCV_RVC_BRANCH 44 ++#define R_RISCV_RVC_JUMP 45 ++#define R_RISCV_RVC_LUI 46 ++#define R_RISCV_GPREL_I 47 ++#define R_RISCV_GPREL_S 48 ++#define R_RISCV_TPREL_I 49 ++#define R_RISCV_TPREL_S 50 ++#define R_RISCV_RELAX 51 ++#define R_RISCV_SUB6 52 ++#define R_RISCV_SET6 53 ++#define R_RISCV_SET8 54 ++#define R_RISCV_SET16 55 ++#define R_RISCV_SET32 56 ++#define R_RISCV_32_PCREL 57 ++ ++#define R_RISCV_NUM 58 ++ ++/* BPF specific declarations. */ ++ ++#define R_BPF_NONE 0 /* No reloc */ ++#define R_BPF_64_64 1 ++#define R_BPF_64_32 10 ++ ++/* Imagination Meta specific relocations. */ ++ ++#define R_METAG_HIADDR16 0 ++#define R_METAG_LOADDR16 1 ++#define R_METAG_ADDR32 2 /* 32bit absolute address */ ++#define R_METAG_NONE 3 /* No reloc */ ++#define R_METAG_RELBRANCH 4 ++#define R_METAG_GETSETOFF 5 ++ ++/* Backward compatability */ ++#define R_METAG_REG32OP1 6 ++#define R_METAG_REG32OP2 7 ++#define R_METAG_REG32OP3 8 ++#define R_METAG_REG16OP1 9 ++#define R_METAG_REG16OP2 10 ++#define R_METAG_REG16OP3 11 ++#define R_METAG_REG32OP4 12 ++ ++#define R_METAG_HIOG 13 ++#define R_METAG_LOOG 14 ++ ++#define R_METAG_REL8 15 ++#define R_METAG_REL16 16 ++ ++/* GNU */ ++#define R_METAG_GNU_VTINHERIT 30 ++#define R_METAG_GNU_VTENTRY 31 ++ ++/* PIC relocations */ ++#define R_METAG_HI16_GOTOFF 32 ++#define R_METAG_LO16_GOTOFF 33 ++#define R_METAG_GETSET_GOTOFF 34 ++#define R_METAG_GETSET_GOT 35 ++#define R_METAG_HI16_GOTPC 36 ++#define R_METAG_LO16_GOTPC 37 ++#define R_METAG_HI16_PLT 38 ++#define R_METAG_LO16_PLT 39 ++#define R_METAG_RELBRANCH_PLT 40 ++#define R_METAG_GOTOFF 41 ++#define R_METAG_PLT 42 ++#define R_METAG_COPY 43 ++#define R_METAG_JMP_SLOT 44 ++#define R_METAG_RELATIVE 45 ++#define R_METAG_GLOB_DAT 46 ++ ++/* TLS relocations */ ++#define R_METAG_TLS_GD 47 ++#define R_METAG_TLS_LDM 48 ++#define R_METAG_TLS_LDO_HI16 49 ++#define R_METAG_TLS_LDO_LO16 50 ++#define R_METAG_TLS_LDO 51 ++#define R_METAG_TLS_IE 52 ++#define R_METAG_TLS_IENONPIC 53 ++#define R_METAG_TLS_IENONPIC_HI16 54 ++#define R_METAG_TLS_IENONPIC_LO16 55 ++#define R_METAG_TLS_TPOFF 56 ++#define R_METAG_TLS_DTPMOD 57 ++#define R_METAG_TLS_DTPOFF 58 ++#define R_METAG_TLS_LE 59 ++#define R_METAG_TLS_LE_HI16 60 ++#define R_METAG_TLS_LE_LO16 61 ++ ++/* NDS32 relocations. */ ++#define R_NDS32_NONE 0 ++#define R_NDS32_32_RELA 20 ++#define R_NDS32_COPY 39 ++#define R_NDS32_GLOB_DAT 40 ++#define R_NDS32_JMP_SLOT 41 ++#define R_NDS32_RELATIVE 42 ++#define R_NDS32_TLS_TPOFF 102 ++#define R_NDS32_TLS_DESC 119 ++ ++#endif /* elf.h */ diff --git a/SOURCES/0018-make-parameter-to-compile-apps-add-example-output-di.patch b/SOURCES/0018-make-parameter-to-compile-apps-add-example-output-di.patch new file mode 100644 index 0000000..515b208 --- /dev/null +++ b/SOURCES/0018-make-parameter-to-compile-apps-add-example-output-di.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: sgerwk +Date: Thu, 2 May 2019 12:57:16 +0200 +Subject: [PATCH] make parameter to compile apps + add example output directory + +--- + README.gnuefi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/README.gnuefi b/README.gnuefi +index 512698c28b4..a65e5f9042a 100644 +--- a/README.gnuefi ++++ b/README.gnuefi +@@ -108,10 +108,10 @@ the make command line (e.g., "make ARCH=ia64"). + ** Building + + To build the sample EFI applications provided in subdirectory "apps", +-simply invoke "make" in the toplevel directory (the directory ++simply invoke "make apps" in the toplevel directory (the directory + containing this README file). This should build lib/libefi.a and + gnuefi/libgnuefi.a first and then all the EFI applications such as a +-apps/t6.efi. ++x86_64/apps/t6.efi. + + + ** Running diff --git a/SOURCES/0019-Support-for-building-on-macOS-systems.patch b/SOURCES/0019-Support-for-building-on-macOS-systems.patch new file mode 100644 index 0000000..3909d7e --- /dev/null +++ b/SOURCES/0019-Support-for-building-on-macOS-systems.patch @@ -0,0 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rick Mark +Date: Fri, 27 Oct 2017 14:05:39 -0700 +Subject: [PATCH] Support for building on macOS systems + +--- + Make.defaults | 12 ++++++++++-- + lib/x86_64/setjmp.S | 15 +++++++++++---- + 2 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 5695b2ac1ab..5d34ff47157 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -65,7 +65,7 @@ OS := $(shell uname -s) + HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + +-# Get ARCH from the compiler if cross compiling ++# Get ARCH from the compiler if cross compiling + ifneq ($(CROSS_COMPILE),) + override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + endif +@@ -165,7 +165,10 @@ ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE))) + CFLAGS += -fpic + endif + +-ifeq (FreeBSD, $(findstring FreeBSD, $(OS))) ++IS_FREEBSD = $(findstring FreeBSD, $(OS)) ++IS_DARWIN = $(findstring Darwin, $(OS)) ++ ++ifneq "$(or $(IS_FREEBSD), $(IS_DARWIN))" "" + CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ + -fshort-wchar -fno-strict-aliasing \ + -ffreestanding -fno-stack-protector +@@ -177,7 +180,12 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ + $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,) + endif + ++ifeq "$(IS_DARWIN)" "" ++ARFLAGS += -U ++else + ARFLAGS := rDv ++endif ++ + ASFLAGS += $(ARCH3264) + LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \ + --build-id=sha1 +diff --git a/lib/x86_64/setjmp.S b/lib/x86_64/setjmp.S +index e870aef703a..e3e51959719 100644 +--- a/lib/x86_64/setjmp.S ++++ b/lib/x86_64/setjmp.S +@@ -1,10 +1,14 @@ + .text + .globl setjmp +-#ifndef __MINGW32__ ++ ++#ifndef __APPLE__ ++# ifndef __MINGW32__ + .type setjmp, @function +-#else ++# else + .def setjmp; .scl 2; .type 32; .endef ++# endif + #endif ++ + setjmp: + pop %rsi + movq %rbx,0x00(%rdi) +@@ -20,11 +24,14 @@ setjmp: + ret + + .globl longjmp +-#ifndef __MINGW32__ ++#ifndef __APPLE__ ++# ifndef __MINGW32__ + .type longjmp, @function +-#else ++# else + .def longjmp; .scl 2; .type 32; .endef ++# endif + #endif ++ + longjmp: + movl %esi, %eax + movq 0x00(%rdi), %rbx diff --git a/SOURCES/0020-Make-apps-link-against-the-local-gnuefi-and-crt-obje.patch b/SOURCES/0020-Make-apps-link-against-the-local-gnuefi-and-crt-obje.patch new file mode 100644 index 0000000..98c3d17 --- /dev/null +++ b/SOURCES/0020-Make-apps-link-against-the-local-gnuefi-and-crt-obje.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Soop +Date: Wed, 16 Dec 2015 22:33:33 -0300 +Subject: [PATCH] Make apps link against the local gnuefi and crt objects + +--- + apps/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/apps/Makefile b/apps/Makefile +index 4e1b69a38c8..310c6fdb5fc 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -45,14 +45,14 @@ TOPDIR = $(SRCDIR)/.. + CDIR=$(TOPDIR)/.. + LINUX_HEADERS = /usr/src/sys/build + CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include +-CRTOBJS = ../gnuefi/crt0-efi-$(ARCH).o ++CRTOBJS = $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o + + LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_efi.lds + ifneq (,$(findstring FreeBSD,$(OS))) + LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_fbsd_efi.lds + endif + +-LDFLAGS += -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS) ++LDFLAGS += -shared -Bsymbolic -L$(TOPDIR)/$(ARCH)/lib -L$(TOPDIR)/$(ARCH)/gnuefi $(CRTOBJS) + + LOADLIBES += -lefi -lgnuefi + LOADLIBES += $(LIBGCC) diff --git a/SOURCES/0021-Add-.travis.yml.patch b/SOURCES/0021-Add-.travis.yml.patch new file mode 100644 index 0000000..cf38161 --- /dev/null +++ b/SOURCES/0021-Add-.travis.yml.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 11 Apr 2018 16:49:36 -0400 +Subject: [PATCH] Add .travis.yml + +Signed-off-by: Peter Jones +--- + .travis.yml | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + create mode 100644 .travis.yml + +diff --git a/.travis.yml b/.travis.yml +new file mode 100644 +index 00000000000..eb9be1e46f2 +--- /dev/null ++++ b/.travis.yml +@@ -0,0 +1,17 @@ ++language: c ++cache: ccache ++branches: ++ except: ++ - travis ++ ++matrix: ++ include: ++ - os: linux ++ dist: trusty ++ services: docker ++ ++before_install: ++ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull vathpela/efi-ci-rawhide:v0 ; fi ++ ++script: ++ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run vathpela/efi-ci-rawhide:v0 /bin/sh -c "cd /root/ && ./build.sh --branch \"$TRAVIS_BRANCH\" --commit \"$TRAVIS_COMMIT\" --commit-range \"$TRAVIS_COMMIT_RANGE\" --event-type \"$TRAVIS_EVENT_TYPE\" --pull-request \"$TRAVIS_PULL_REQUEST\" --pr-branch \"$TRAVIS_PULL_REQUEST_BRANCH\" --pr-sha \"$TRAVIS_PULL_REQUEST_SHA\" --remote \"$TRAVIS_PULL_REQUEST_SLUG\" --repo \"$TRAVIS_REPO_SLUG\" --test-subject gnu-efi" ; fi diff --git a/SOURCES/0022-Use-EFI-canonical-names-everywhere-the-compiler-does.patch b/SOURCES/0022-Use-EFI-canonical-names-everywhere-the-compiler-does.patch new file mode 100644 index 0000000..efecf53 --- /dev/null +++ b/SOURCES/0022-Use-EFI-canonical-names-everywhere-the-compiler-does.patch @@ -0,0 +1,482 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 1 May 2018 14:12:01 -0400 +Subject: [PATCH] Use EFI canonical names everywhere the compiler doesn't care. + +Always use x64/X64 and aa64/AA64 unless the toolchain cares about +"x86_64" or whatnot. + +Note that we still have mips64el as an arch name, which is not actually +defined in the UEFI specs. + +Signed-off-by: Peter Jones +--- + Make.defaults | 39 +++++++++++++++------- + README.gnuefi | 6 ++-- + apps/Makefile | 6 ++-- + gnuefi/Makefile | 6 ++-- + gnuefi/{crt0-efi-aarch64.S => crt0-efi-aa64.S} | 2 +- + gnuefi/{crt0-efi-x86_64.S => crt0-efi-x64.S} | 2 +- + gnuefi/{elf_aarch64_efi.lds => elf_aa64_efi.lds} | 0 + gnuefi/{elf_x86_64_efi.lds => elf_x64_efi.lds} | 2 +- + ...lf_x86_64_fbsd_efi.lds => elf_x64_fbsd_efi.lds} | 2 +- + gnuefi/{reloc_aarch64.c => reloc_aa64.c} | 2 +- + gnuefi/{reloc_x86_64.c => reloc_x64.c} | 2 +- + inc/{aarch64 => aa64}/efibind.h | 3 ++ + inc/{aarch64 => aa64}/efilibplat.h | 0 + inc/{aarch64 => aa64}/efisetjmp_arch.h | 6 ++-- + inc/efiapi.h | 5 ++- + inc/efidebug.h | 2 +- + inc/{x86_64 => x64}/efibind.h | 4 +-- + inc/{x86_64 => x64}/efilibplat.h | 0 + inc/{x86_64 => x64}/efisetjmp_arch.h | 6 ++-- + inc/{x86_64 => x64}/pe.h | 0 + lib/Makefile | 4 +-- + lib/{aarch64 => aa64}/efi_stub.S | 0 + lib/{aarch64 => aa64}/initplat.c | 0 + lib/{aarch64 => aa64}/math.c | 0 + lib/{aarch64 => aa64}/setjmp.S | 0 + lib/{x86_64 => x64}/callwrap.c | 0 + lib/{x86_64 => x64}/efi_stub.S | 0 + lib/{x86_64 => x64}/initplat.c | 0 + lib/{x86_64 => x64}/math.c | 0 + lib/{x86_64 => x64}/setjmp.S | 0 + 30 files changed, 60 insertions(+), 39 deletions(-) + rename gnuefi/{crt0-efi-aarch64.S => crt0-efi-aa64.S} (98%) + rename gnuefi/{crt0-efi-x86_64.S => crt0-efi-x64.S} (97%) + rename gnuefi/{elf_aarch64_efi.lds => elf_aa64_efi.lds} (100%) + rename gnuefi/{elf_x86_64_efi.lds => elf_x64_efi.lds} (93%) + rename gnuefi/{elf_x86_64_fbsd_efi.lds => elf_x64_fbsd_efi.lds} (93%) + rename gnuefi/{reloc_aarch64.c => reloc_aa64.c} (97%) + rename gnuefi/{reloc_x86_64.c => reloc_x64.c} (97%) + rename inc/{aarch64 => aa64}/efibind.h (98%) + rename inc/{aarch64 => aa64}/efilibplat.h (100%) + rename inc/{aarch64 => aa64}/efisetjmp_arch.h (78%) + rename inc/{x86_64 => x64}/efibind.h (99%) + rename inc/{x86_64 => x64}/efilibplat.h (100%) + rename inc/{x86_64 => x64}/efisetjmp_arch.h (72%) + rename inc/{x86_64 => x64}/pe.h (100%) + rename lib/{aarch64 => aa64}/efi_stub.S (100%) + rename lib/{aarch64 => aa64}/initplat.c (100%) + rename lib/{aarch64 => aa64}/math.c (100%) + rename lib/{aarch64 => aa64}/setjmp.S (100%) + rename lib/{x86_64 => x64}/callwrap.c (100%) + rename lib/{x86_64 => x64}/efi_stub.S (100%) + rename lib/{x86_64 => x64}/initplat.c (100%) + rename lib/{x86_64 => x64}/math.c (100%) + rename lib/{x86_64 => x64}/setjmp.S (100%) + +diff --git a/Make.defaults b/Make.defaults +index 5d34ff47157..585f3a00aa5 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -62,17 +62,32 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy + + # Host/target identification + OS := $(shell uname -s) +-HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) +-ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) ++HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x64, -e s,x86_64,x64, \ ++ -e s,aarch64,aa64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) ++ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x64, -e s,x86_64,x64, \ ++ -e s,aarch64,aa64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) ++BFD_ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x86_64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) + + # Get ARCH from the compiler if cross compiling + ifneq ($(CROSS_COMPILE),) +- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) +-endif +- +-# FreeBSD (and possibly others) reports amd64 instead of x86_64 +-ifeq ($(ARCH),amd64) +- override ARCH := x86_64 ++ override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d- | sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x64, -e s,x86_64,x64, \ ++ -e s,aarch64,aa64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) + endif + + # +@@ -95,12 +110,12 @@ endif + + ifeq ($(ARCH),ia32) + CFLAGS += -mno-mmx -mno-sse +- ifeq ($(HOSTARCH),x86_64) ++ ifeq ($(HOSTARCH),x64) + ARCH3264 = -m32 + endif + endif + +-ifeq ($(ARCH),x86_64) ++ifeq ($(ARCH),x64) + GCCVERSION := $(shell $(CC) -dumpversion | cut -f1 -d.) + GCCMINOR := $(shell $(CC) -dumpversion | cut -f2 -d.) + USING_CLANG := $(shell $(CC) -v 2>&1 | grep -q 'clang version' && echo clang) +@@ -122,7 +137,7 @@ ifeq ($(ARCH),x86_64) + endif + endif + +-ifneq (,$(filter $(ARCH),ia32 x86_64)) ++ifneq (,$(filter $(ARCH),ia32 x64)) + # Disable AVX, if the compiler supports that. + CC_CAN_DISABLE_AVX=$(shell $(CC) -Werror -c -o /dev/null -xc -mno-avx - /dev/null 2>&1 && echo 1) + ifeq ($(CC_CAN_DISABLE_AVX), 1) +@@ -139,7 +154,7 @@ endif + # Set HAVE_EFI_OBJCOPY if objcopy understands --target efi-[app|bsdrv|rtdrv], + # otherwise we need to compose the PE/COFF header using the assembler + # +-ifneq ($(ARCH),aarch64) ++ifneq ($(ARCH),aa64) + ifneq ($(ARCH),arm) + ifneq ($(ARCH),mips64el) + export HAVE_EFI_OBJCOPY=y +diff --git a/README.gnuefi b/README.gnuefi +index a65e5f9042a..dd714de116d 100644 +--- a/README.gnuefi ++++ b/README.gnuefi +@@ -100,7 +100,7 @@ the appropriate compiler, assembler, linker, ar, and ranlib binaries, + respectively. + + If you're working in a cross-development environment, be sure to set +-macro ARCH to the desired target architecture ("ia32" for x86, "x86_64" for ++macro ARCH to the desired target architecture ("ia32" for x86, "x64" for + x86_64 and "ia64" for IA-64). For convenience, this can also be done from + the make command line (e.g., "make ARCH=ia64"). + +@@ -225,7 +225,7 @@ environment addresses each of these issues. + In order to satisfy the COFF constraint of page-sized and page-aligned + sections, the GNU EFI build environment uses the special linker script + in gnuefi/elf_$(ARCH)_efi.lds where $(ARCH) is the target architecture +-("ia32" for x86, "x86_64" for x86_64 and "ia64" for IA-64). ++("ia32" for x86, "x64" for x86_64 and "ia64" for IA-64). + This script is set up to create only eight COFF section, each page aligned + and page sized.These eight sections are used to group together the much + greater number of sections that are typically present in ELF object files. +@@ -319,7 +319,7 @@ environment is to: + + The self-relocator is of course architecture dependent. The x86 + version can be found in gnuefi/reloc_ia32.c, the x86_64 version +-can be found in gnuefi/reloc_x86_64.c and the IA-64 version can be ++can be found in gnuefi/reloc_x64.c and the IA-64 version can be + found in gnuefi/reloc_ia64.S. + + The self-relocator operates as follows: the startup code invokes it +diff --git a/apps/Makefile b/apps/Makefile +index 310c6fdb5fc..a95620cba2d 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -68,9 +68,9 @@ TARGET_RTDRIVERS = + + ifneq ($(HAVE_EFI_OBJCOPY),) + +-FORMAT := --target efi-app-$(ARCH) +-$(TARGET_BSDRIVERS): FORMAT=--target efi-bsdrv-$(ARCH) +-$(TARGET_RTDRIVERS): FORMAT=--target efi-rtdrv-$(ARCH) ++FORMAT := --target efi-app-$(BFD_ARCH) ++$(TARGET_BSDRIVERS): FORMAT=--target efi-bsdrv-$(BFD_ARCH) ++$(TARGET_RTDRIVERS): FORMAT=--target efi-rtdrv-$(BFD_ARCH) + + else + +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index 10d4e7addd0..df67ee83911 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -47,8 +47,8 @@ FILES = reloc_$(ARCH) + + OBJS = $(FILES:%=%.o) + +-# on aarch64, avoid jump tables before all relocations have been processed +-reloc_aarch64.o: CFLAGS += -fno-jump-tables ++# on aa64, avoid jump tables before all relocations have been processed ++reloc_aa64.o: CFLAGS += -fno-jump-tables + + TARGETS = crt0-efi-$(ARCH).o libgnuefi.a + +@@ -65,7 +65,7 @@ install: + mkdir -p $(INSTALLROOT)$(LIBDIR) + $(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)$(LIBDIR) + ifneq (,$(findstring FreeBSD,$(OS))) +- ifeq ($(ARCH),x86_64) ++ ifeq ($(ARCH),x64) + $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR) + else + $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR) +diff --git a/gnuefi/crt0-efi-aarch64.S b/gnuefi/crt0-efi-aa64.S +similarity index 98% +rename from gnuefi/crt0-efi-aarch64.S +rename to gnuefi/crt0-efi-aa64.S +index c300d89bdfd..d6e610b8c79 100644 +--- a/gnuefi/crt0-efi-aarch64.S ++++ b/gnuefi/crt0-efi-aa64.S +@@ -1,5 +1,5 @@ + /* +- * crt0-efi-aarch64.S - PE/COFF header for AArch64 EFI applications ++ * crt0-efi-aa64.S - PE/COFF header for AArch64 EFI applications + * + * Copright (C) 2014 Linaro Ltd. + * +diff --git a/gnuefi/crt0-efi-x86_64.S b/gnuefi/crt0-efi-x64.S +similarity index 97% +rename from gnuefi/crt0-efi-x86_64.S +rename to gnuefi/crt0-efi-x64.S +index 6839150a72e..6533af7461f 100644 +--- a/gnuefi/crt0-efi-x86_64.S ++++ b/gnuefi/crt0-efi-x64.S +@@ -1,4 +1,4 @@ +-/* crt0-efi-x86_64.S - x86_64 EFI startup code. ++/* crt0-efi-x64.S - x86_64 EFI startup code. + Copyright (C) 1999 Hewlett-Packard Co. + Contributed by David Mosberger . + Copyright (C) 2005 Intel Co. +diff --git a/gnuefi/elf_aarch64_efi.lds b/gnuefi/elf_aa64_efi.lds +similarity index 100% +rename from gnuefi/elf_aarch64_efi.lds +rename to gnuefi/elf_aa64_efi.lds +diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x64_efi.lds +similarity index 93% +rename from gnuefi/elf_x86_64_efi.lds +rename to gnuefi/elf_x64_efi.lds +index 7be59023510..c7a105898c8 100644 +--- a/gnuefi/elf_x86_64_efi.lds ++++ b/gnuefi/elf_x64_efi.lds +@@ -1,4 +1,4 @@ +-/* Same as elf_x86_64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */ ++/* Same as elf_x64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */ + OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) +diff --git a/gnuefi/elf_x86_64_fbsd_efi.lds b/gnuefi/elf_x64_fbsd_efi.lds +similarity index 93% +rename from gnuefi/elf_x86_64_fbsd_efi.lds +rename to gnuefi/elf_x64_fbsd_efi.lds +index fe1f3342cae..705719bf68b 100644 +--- a/gnuefi/elf_x86_64_fbsd_efi.lds ++++ b/gnuefi/elf_x64_fbsd_efi.lds +@@ -1,4 +1,4 @@ +-/* Same as elf_x86_64_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */ ++/* Same as elf_x64_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */ + OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) +diff --git a/gnuefi/reloc_aarch64.c b/gnuefi/reloc_aa64.c +similarity index 97% +rename from gnuefi/reloc_aarch64.c +rename to gnuefi/reloc_aa64.c +index 086727961c2..f2ac52b1269 100644 +--- a/gnuefi/reloc_aarch64.c ++++ b/gnuefi/reloc_aa64.c +@@ -1,4 +1,4 @@ +-/* reloc_aarch64.c - position independent x86 ELF shared object relocator ++/* reloc_aa64.c - position independent ARM Aarch64 ELF shared object relocator + Copyright (C) 2014 Linaro Ltd. + Copyright (C) 1999 Hewlett-Packard Co. + Contributed by David Mosberger . +diff --git a/gnuefi/reloc_x86_64.c b/gnuefi/reloc_x64.c +similarity index 97% +rename from gnuefi/reloc_x86_64.c +rename to gnuefi/reloc_x64.c +index 04b75b29fda..09493227a7b 100644 +--- a/gnuefi/reloc_x86_64.c ++++ b/gnuefi/reloc_x64.c +@@ -1,4 +1,4 @@ +-/* reloc_x86_64.c - position independent x86_64 ELF shared object relocator ++/* reloc_x64.c - position independent x86_64 ELF shared object relocator + Copyright (C) 1999 Hewlett-Packard Co. + Contributed by David Mosberger . + Copyright (C) 2005 Intel Co. +diff --git a/inc/aarch64/efibind.h b/inc/aa64/efibind.h +similarity index 98% +rename from inc/aarch64/efibind.h +rename to inc/aa64/efibind.h +index c2c546b892a..c4eafa0d8a8 100644 +--- a/inc/aarch64/efibind.h ++++ b/inc/aa64/efibind.h +@@ -15,6 +15,8 @@ + * either version 2 of the License, or (at your option) any later version. + */ + ++#ifndef GNU_EFI_AA64_EFI_BIND_H ++#define GNU_EFI_AA64_EFI_BIND_H + #if !defined(_MSC_VER) && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L )) && !defined(__cplusplus) + + // ANSI C 1999/2000 stdint.h integer width declarations +@@ -156,3 +158,4 @@ typedef uint64_t UINTN; + + #define uefi_call_wrapper(func, va_num, ...) func(__VA_ARGS__) + #define EFI_FUNCTION ++#endif /* GNU_EFI_AA64_EFI_BIND_H */ +diff --git a/inc/aarch64/efilibplat.h b/inc/aa64/efilibplat.h +similarity index 100% +rename from inc/aarch64/efilibplat.h +rename to inc/aa64/efilibplat.h +diff --git a/inc/aarch64/efisetjmp_arch.h b/inc/aa64/efisetjmp_arch.h +similarity index 78% +rename from inc/aarch64/efisetjmp_arch.h +rename to inc/aa64/efisetjmp_arch.h +index 8dbce07821f..8ec3eeb9a47 100644 +--- a/inc/aarch64/efisetjmp_arch.h ++++ b/inc/aa64/efisetjmp_arch.h +@@ -1,5 +1,5 @@ +-#ifndef GNU_EFI_AARCH64_SETJMP_H +-#define GNU_EFI_AARCH64_SETJMP_H ++#ifndef GNU_EFI_AA64_SETJMP_H ++#define GNU_EFI_AA64_SETJMP_H + + #define JMPBUF_ALIGN 8 + +@@ -30,4 +30,4 @@ typedef struct { + UINT64 D15; + } ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + +-#endif /* GNU_EFI_AARCH64_SETJMP_H */ ++#endif /* GNU_EFI_AA64_SETJMP_H */ +diff --git a/inc/efiapi.h b/inc/efiapi.h +index bdf5de26a3f..2f6ff582252 100644 +--- a/inc/efiapi.h ++++ b/inc/efiapi.h +@@ -338,8 +338,11 @@ EFI_STATUS + #define EFI_IMAGE_MACHINE_ARMTHUMB_MIXED 0x01C2 + #endif + ++#if !defined(EFI_IMAGE_MACHINE_AA64) ++#define EFI_IMAGE_MACHINE_AA64 0xAA64 ++#endif + #if !defined(EFI_IMAGE_MACHINE_AARCH64) +-#define EFI_IMAGE_MACHINE_AARCH64 0xAA64 ++#define EFI_IMAGE_MACHINE_AARCH64 EFI_IMAGE_MACHINE_AA64 + #endif + + // Image Entry prototype +diff --git a/inc/efidebug.h b/inc/efidebug.h +index 8e54dcda842..3649edf26d1 100644 +--- a/inc/efidebug.h ++++ b/inc/efidebug.h +@@ -533,7 +533,7 @@ typedef enum { + IsaIpf = EFI_IMAGE_MACHINE_IA64, + IsaEbc = EFI_IMAGE_MACHINE_EBC, + IsaArm = EFI_IMAGE_MACHINE_ARMTHUMB_MIXED, +-// IsaArm64 = EFI_IMAGE_MACHINE_AARCH64 ++// IsaArm64 = EFI_IMAGE_MACHINE_AA64 + } EFI_INSTRUCTION_SET_ARCHITECTURE; + + // +diff --git a/inc/x86_64/efibind.h b/inc/x64/efibind.h +similarity index 99% +rename from inc/x86_64/efibind.h +rename to inc/x64/efibind.h +index 31e9e119d74..2750ab9be7d 100644 +--- a/inc/x86_64/efibind.h ++++ b/inc/x64/efibind.h +@@ -16,8 +16,8 @@ Abstract: + Revision History + + --*/ +-#ifndef X86_64_EFI_BIND +-#define X86_64_EFI_BIND ++#ifndef X64_EFI_BIND ++#define X64_EFI_BIND + #ifndef __GNUC__ + #pragma pack() + #endif +diff --git a/inc/x86_64/efilibplat.h b/inc/x64/efilibplat.h +similarity index 100% +rename from inc/x86_64/efilibplat.h +rename to inc/x64/efilibplat.h +diff --git a/inc/x86_64/efisetjmp_arch.h b/inc/x64/efisetjmp_arch.h +similarity index 72% +rename from inc/x86_64/efisetjmp_arch.h +rename to inc/x64/efisetjmp_arch.h +index b1ad1fe3087..cc8fd350517 100644 +--- a/inc/x86_64/efisetjmp_arch.h ++++ b/inc/x64/efisetjmp_arch.h +@@ -1,5 +1,5 @@ +-#ifndef GNU_EFI_X86_64_SETJMP_H +-#define GNU_EFI_X86_64_SETJMP_H ++#ifndef GNU_EFI_X64_SETJMP_H ++#define GNU_EFI_X64_SETJMP_H + + #define JMPBUF_ALIGN 8 + +@@ -19,4 +19,4 @@ typedef struct { + UINT8 XmmBuffer[160]; // XMM6 - XMM15 + } ALIGN(JMPBUF_ALIGN) jmp_buf[1]; + +-#endif /* GNU_EFI_X86_64_SETJMP_H */ ++#endif /* GNU_EFI_X64_SETJMP_H */ +diff --git a/inc/x86_64/pe.h b/inc/x64/pe.h +similarity index 100% +rename from inc/x86_64/pe.h +rename to inc/x64/pe.h +diff --git a/lib/Makefile b/lib/Makefile +index 0e6410dac55..8bf94000e33 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -53,7 +53,7 @@ ifeq ($(ARCH),ia64) + FILES += $(ARCH)/salpal $(ARCH)/palproc + endif + +-ifeq ($(ARCH),x86_64) ++ifeq ($(ARCH),x64) + FILES += $(ARCH)/callwrap $(ARCH)/efi_stub + endif + +@@ -64,7 +64,7 @@ endif + + OBJS = $(FILES:%=%.o) + +-SUBDIRS = ia32 x86_64 ia64 aarch64 arm mips64el runtime ++SUBDIRS = ia32 x64 ia64 aa64 arm mips64el runtime + + LIBDIRINSTALL = $(INSTALLROOT)$(LIBDIR) + +diff --git a/lib/aarch64/efi_stub.S b/lib/aa64/efi_stub.S +similarity index 100% +rename from lib/aarch64/efi_stub.S +rename to lib/aa64/efi_stub.S +diff --git a/lib/aarch64/initplat.c b/lib/aa64/initplat.c +similarity index 100% +rename from lib/aarch64/initplat.c +rename to lib/aa64/initplat.c +diff --git a/lib/aarch64/math.c b/lib/aa64/math.c +similarity index 100% +rename from lib/aarch64/math.c +rename to lib/aa64/math.c +diff --git a/lib/aarch64/setjmp.S b/lib/aa64/setjmp.S +similarity index 100% +rename from lib/aarch64/setjmp.S +rename to lib/aa64/setjmp.S +diff --git a/lib/x86_64/callwrap.c b/lib/x64/callwrap.c +similarity index 100% +rename from lib/x86_64/callwrap.c +rename to lib/x64/callwrap.c +diff --git a/lib/x86_64/efi_stub.S b/lib/x64/efi_stub.S +similarity index 100% +rename from lib/x86_64/efi_stub.S +rename to lib/x64/efi_stub.S +diff --git a/lib/x86_64/initplat.c b/lib/x64/initplat.c +similarity index 100% +rename from lib/x86_64/initplat.c +rename to lib/x64/initplat.c +diff --git a/lib/x86_64/math.c b/lib/x64/math.c +similarity index 100% +rename from lib/x86_64/math.c +rename to lib/x64/math.c +diff --git a/lib/x86_64/setjmp.S b/lib/x64/setjmp.S +similarity index 100% +rename from lib/x86_64/setjmp.S +rename to lib/x64/setjmp.S diff --git a/SOURCES/0023-Fix-a-minor-coverity-complaint-in-some-apps.patch b/SOURCES/0023-Fix-a-minor-coverity-complaint-in-some-apps.patch new file mode 100644 index 0000000..0ef0000 --- /dev/null +++ b/SOURCES/0023-Fix-a-minor-coverity-complaint-in-some-apps.patch @@ -0,0 +1,56 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 11 Jun 2018 13:41:05 -0400 +Subject: [PATCH] Fix a minor coverity complaint in some apps + +Coverity added a new kind of check, and it noticed some minor errors +with some types in two of the apps here, both of the same form: + +1. gnu-efi-3.0.6/apps/lfbgrid.c:91: overflow_before_widen: Potentially +overflowing expression "info->VerticalResolution * +info->PixelsPerScanLine" with type "unsigned int" (32 bits, unsigned) is +evaluated using 32-bit arithmetic, and then used in a context that +expects an expression of type "UINTN" (64 bits, unsigned). + +1. gnu-efi-3.0.6/apps/bltgrid.c:67: overflow_before_widen: Potentially +overflowing expression "info->VerticalResolution * +info->HorizontalResolution" with type "unsigned int" (32 bits, unsigned) +is evaluated using 32-bit arithmetic, and then used in a context that +expects an expression of type "UINTN" (64 bits, unsigned). + +This resolves both issues. + +Signed-off-by: Peter Jones +--- + apps/bltgrid.c | 3 ++- + apps/lfbgrid.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/apps/bltgrid.c b/apps/bltgrid.c +index 2adde6a3211..a0eb8c779e4 100644 +--- a/apps/bltgrid.c ++++ b/apps/bltgrid.c +@@ -64,7 +64,8 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop) + if (CompareMem(info, gop->Mode->Info, sizeof (*info))) + continue; + +- NumPixels = info->VerticalResolution * info->HorizontalResolution; ++ NumPixels = (UINTN)info->VerticalResolution ++ * (UINTN)info->HorizontalResolution; + BufferSize = NumPixels * sizeof(UINT32); + + PixelBuffer = AllocatePool(BufferSize); +diff --git a/apps/lfbgrid.c b/apps/lfbgrid.c +index 53a255afbb9..ac50f4eafa9 100644 +--- a/apps/lfbgrid.c ++++ b/apps/lfbgrid.c +@@ -88,7 +88,8 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop) + if (CompareMem(info, gop->Mode->Info, sizeof (*info))) + continue; + +- NumPixels = info->VerticalResolution * info->PixelsPerScanLine; ++ NumPixels = (UINTN)info->VerticalResolution ++ * (UINTN)info->PixelsPerScanLine; + BufferSize = NumPixels * sizeof(UINT32); + if (BufferSize == gop->Mode->FrameBufferSize) { + CopySize = BufferSize; diff --git a/SOURCES/0024-Add-stuff-that-s-got-weird-characters-to-.gitattribu.patch b/SOURCES/0024-Add-stuff-that-s-got-weird-characters-to-.gitattribu.patch new file mode 100644 index 0000000..816618d --- /dev/null +++ b/SOURCES/0024-Add-stuff-that-s-got-weird-characters-to-.gitattribu.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 25 Oct 2019 15:45:38 -0400 +Subject: [PATCH] Add stuff that's got weird characters to .gitattributes + +Some of these files will be removed in a later patch, but they need to +stay in .gitattributes until after the next release, because they make +patch application break in weird ways. + +Signed-off-by: Peter Jones +--- + .gitattributes | 7 +++++++ + 1 file changed, 7 insertions(+) + create mode 100644 .gitattributes + +diff --git a/.gitattributes b/.gitattributes +new file mode 100644 +index 00000000000..b9c1467125b +--- /dev/null ++++ b/.gitattributes +@@ -0,0 +1,7 @@ ++inc/inc.mak binary ++inc/make.inf binary ++inc/makefile.hdr binary ++inc/protocol/efidbg.h binary ++inc/protocol/ia64/eficontext.h binary ++inc/protocol/make.inf binary ++inc/protocol/makefile.hdr binary diff --git a/SOURCES/0025-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch b/SOURCES/0025-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch new file mode 100644 index 0000000..3925f38 --- /dev/null +++ b/SOURCES/0025-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch @@ -0,0 +1,148 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 19 Jul 2018 13:12:44 -0400 +Subject: [PATCH] Get rid of some unused junk that has the BSD 4-clause + license. + +We don't need any of this, and its license is not GPL compatible. + +Signed-off-by: Peter Jones +--- + inc/Makefile | 4 ---- + inc/protocol/efidbg.h | Bin 6634 -> 0 bytes + inc/protocol/ia64/eficontext.h | Bin 5111 -> 0 bytes + inc/protocol/makefile.hdr | Bin 640 -> 0 bytes + 4 files changed, 4 deletions(-) + delete mode 100644 inc/protocol/efidbg.h + delete mode 100644 inc/protocol/ia64/eficontext.h + delete mode 100644 inc/protocol/makefile.hdr + +diff --git a/inc/Makefile b/inc/Makefile +index 273d30307ae..dd36bb0103d 100644 +--- a/inc/Makefile ++++ b/inc/Makefile +@@ -19,9 +19,5 @@ install: + $(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi + $(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol + $(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH) +-ifeq ($(ARCH),ia64) +- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64 +- $(INSTALL) -m 644 $(SRCDIR)/protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64 +-endif + + include $(SRCDIR)/../Make.rules +diff --git a/inc/protocol/efidbg.h b/inc/protocol/efidbg.h +deleted file mode 100644 +index 1f95a70bb42f7b2669fa362f80bc50fe2663aaa8..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 6634 +zcmcIpS##P*7k!3b(KUIPgaR95AZGH^NDWpEMvNr9RDD&9j2cH3j3`NXnNgUoeT~`2`6qVL>-Fla)oeEDo3V=J5)$D$2;JBZ +zR!7vzmrJI4L@bn%3?HPY+Uc7mJwJ*=|8_&-%w2hG6G`T;SQKo+xl}E;{>lxX*&+z< +zqdI%^A>DX` +zI-(MwQb8=b}hyB|lC;iRyGFv`7bAF;7S0V6^biIsb=JlGpJ2YC2$Y_%VvN7&24o1{dWSRuY7#N#P!4yw#`h785fh00W`o{eC!y)t^-yZO?6{DtTUjn +zvFWgpabY+RbIdwS5(Kv2lbHi{AuR12K)i2^4Ch9v92m}+)D57IvkA8xLz|Ac#U@i& +zZYwnMPB(0A#ElD~A2ApK#Y|j^vBT_hJ{leH7I<6E_7&8~;Qf(Ew82^3u!QE2SH+u# +z2*Souo!Jwi8T2Bq1wz5Cn>xZm{sGw*e@!8W?@Z?xd?;-8@r~dhJ=)X~7i6|MARK$z +zw;jWoI)V*NQ&&;9g>`9Y!v4ZWCgowkrnaaP(fu4W-DmZU~oxp)yftSLXulNclK*&#^cK#zwVhl;T_xT2VYs +z$yqiQ!;vu*V@;4vCIMX;w)jL)+%jO|kWxm~b;Y3>bp!1XBhQl8QXwPUNGvl3jO&+x +zf#E7vB#(-)jkJ0IVNbR5H2T@7KCV`)ANshziqc;j-<9~{0yoACML+uJZ3Xp^ru4%EoXMp?R1(mRK&m-&L~UldzGdd +zx~3R~r>#nIO@c7yo(H~+zHCW!+llm{d*9u77Wg~qQAq%I1Oac!xdgoo{6(P4b^P@W +zaR>7mxMtgovmMy-&xs2fdVasW?#6B(r1}0Hb{wpe9u-o2(9z7Iibi}MEHB*XTcM$E +znj^u-X|%04(&9+0+}ox6QmGstGs^*gX^x%D2EnrWgT0c)FK_2u7c@|36YiXsa*m=y +zbrfGRqqFC^bTJncX1`)Xg&bY@cNEPp2h1(0DVe)j(emxPDzUeWA)|EpFmbbz*|nym +zB6EOE-7qa3MAh{?wvvyG28ddedGdC1hec;hQ#2M^Yz^>;rbo3lP}UtC9c{S-Eh>!g +zqI!Ice=rIt%-*aO5@yjjmGYafqdPd&8tvAAH+q7%8~n7-JMB|V=dI2U +z!pMib@@QsHCu+2UJsndsN9=#q@2vTh!PW6ji1ci?7A`$|VBO{uZ>#$$-TPqR=2J(t +zB(l0{X?55SSe|hN)$SORh9(pl&zzfyDDqRiG!4D_u~vM?oT!h4^@)9~R=|_R2kOYg +z(;OojDRmIxy2>hq>>Jw=7eqUbxOQ00evV>!PvZhCri4C~R8kq(4tJ(@^&{T-#9%dQ +zv&7HIv(jDrbEaWF?Q`u^^KY8FT;5_K`14lpDJj`Zs(!(4>b3_Ad)qKJZ^8|m*qT=5Z=!B47<#nKA +zCVRk+BUmK_`Bsra{0_S~Dx{riI?%t!N?MajUD7{KMw-r|`&PhJ1d3b5SX1>np*zP6 +z{e!&{#2so=wB`r2KS-HP^m$vH>8-};S?8?LJ`q}jx6V!)t#12spZB`mrrtcjY>L$k +zbGA)v*BKfJ>zV-RNtpEHExMnb(7n}FUp~`a(c5)TwRD@*qBlWoEYEY5{5!-W#jF8K +zuze6tsWSJ9BQv=~9u>tNc~z!N`d)opFR7#Kysa`(m=9W7lP0uXBsYJnRBHXrVj)A@ +z|0iW&k|!R|Wp-ckKELMEm4z+UPdl~4!9VL1nEoey%9ho6-S4Hg%pLDyjy;5QCG#e6 +z9AJ)}vgEp28(LU^6~lW=MulAoU17bOF1q)eQw5$vMG{M)(!k#{|IoOfa?4TMhHNQX +zqJeJfOz_@kFo4$THrm~0r_tA%tp;zmc)Qo_oqX2ymuMizRqF!F9PP3~2Cl|D@YNG4 +z)aX~-pr}Eud9GWuwz+QOOtE?0RreD`6S}TQ0gJRTPB{L+K@EF>Rr+dI3ZJGfk$;#&%M +zhF+;8JGWepY=3d1SIM?*x%htC2pP4XZP(sSZ$*G9Gg*+S8vgU#yd3Ow-}nng5C21> +z%X3f0(J$FtsqNZ)m~)HpW}(gN_tz-+6~Om0aY2ecAL1_z`w +zr>I_(d>WNK;oUr;R);b!qzk&=JGVhq*Dmm13Hy9rSf1ID2RE5WXi$`QocZp*I43Hd +aHI!CssuET24>&yb7wouJI-_E>R3zCjqB3lkF#L;{**c9>ATBRx1x5MH-C_2yimdYXAG3 +zTlll6);_IUO1myqr_MR|UMPI|@%)TF(zvYN>iqe8OFt(c$hf_|9gul-btNx4MJraA +zQdeaiwRu@w$gs6qkzCVIEgDh3h_t&Pulgd*o3_s54X>c6NNLju$_r}BO`QlCiSr_= +z-zY2Vbu*yXy!}pPE&ne!t%O;ZX`bbY+;%`wEvORpI&WK%QdO5Pd5SOX_o&4m0ie~Y +ze9enzO3EV5dFMvL@WQod|0xIZk8we#6dNkD9k--RF@MvvP}WA^%-~U6z6bzsosuX- +zRFrL=hykYL4XvP=aSq!{ou}MjOtOmdwWyE$GW&e6?~y?}K2V)*;NSm=5@!g|J9TN9 +zY}TS^Wdc~sB@$F(LQU(a6?Go1nnNOF2ASA#?vF$cFNmuqN?%0X<_#z6fWq4#VI0gv +z)NW8zTn$_`a8%mclv(?VT<+M(6k)Gw6}?GA4h0Y;e-`EIN~F(%fsZneoQ0gL&d3&m +zlhr20W;=9B#fw;#6)G!!qh9s13p)aN+i*hMPO&3Jw3a&haL}m2 +zz?C_*_1Q?om +zA-T?j6JlEE4Jf>~C0c(ec~g3@{qa4JtdZk7;gh5^b;23%H^qh)%`HE4#tYZ-X}$pW +zpo3$96DJtEmh)gwE(kQRHQ8V7SxCXX<+>Wd06ft<>abkL8o742AM{Qf-yVl7?C@<2 +z7s1jUP%yX04u7$~*>J=1p9XM7N(6Rb|GvOPOrVMNVBOgP{ro=+LXO4@-+o}?-c$kw +zi%}3d;Ucu@&hsYH`oQ+TI%7NdLaxWjn9?G!2iPUFm;k35#^Ex)j~0Q$7IwxX@4mm7 +zbIL!^z4r)@;Dd$boZkt_N_gT#dHxdvvmY`Y1A4r-5l7-@JB6Wdu{i;%X3Ux1PsP3{ +zqVPyB&FnkZxwB_un^}2`^ymck2Z?3*4p`oC;<(BlE$of@!Ty-X;<~R#6%EgkUUH^n +zO}+vL)H}a;0V*SKwp9d-U@^Ymrr^-!m*;2v?;m+qq#~oGJ$1Mq>~G=neu+4Oc_Dgn +zUUP}HmzO9r>(k9O_i-Yc2K^}hN<<}}neAI8@c811J0RS<>~G_FxU}4GISJhn0{hRk +zX5Iu@L*p!ur+(JV8~L{N+uTD-@8JwXGY`sae`dK$Zhlz=?+jBj4>?+bsXag7nL2(m +zD_nAwFCJt$@#f}@25(}I7I&wJ=B;Ml0^FRt85CP%)OG;8Ax<$p|EBZh)LOU)c9^Hr +zfqAIU`Q8-98*1=E>o+JK;U0!6={`f9&s?Ccy+ls-m_z9OaXIkQMf}y`{*FqLCmQLUxrm0DIs2VpXgf1?)SMcfn +z?kE^vPRFJ)9xCH&W&Bwg-zei>l<}|1_*NMkS870IXs8qom7}4OG*p&`O4Cqz8Y)pk +zWooKSO_iysGBs7ErpnY*nVKq7Q)OzZOih*PP-QyYF+ItBX8z0k_o@5Yupheahd%d1 +zH~r8r{m`%d&}~0tTxnv4CZ-W!XcQP435G_4p%GzdR2Ui=hDL{}(P3(Im>M0XMu(}< +zVQO@k8XcxahpEwFYIF=WI)+C&PO7S^w33-@2VK +AYXATM + +diff --git a/inc/protocol/makefile.hdr b/inc/protocol/makefile.hdr +deleted file mode 100644 +index 118d6ba3a08df254b3cf4eeecce923bdac063f3a..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 640 +zcmb7>PiurQ5XJ9;-(l){&_fschtfTGDC(BbMHlrbNYtpIF_CDO_1iaTcS}n_FyxS7 +z=J)3DVj3IM*g)3N5!A)daKub80cp^14lo7avAciQ;APi8Z33Xn7M#@>w_xPP` +z$(j6XH&XOUSam6HE?r*?v!rb|fm69~x7$4fAU+WWzL0}ZtEu2>)-+55MSc;4#}quU +zoonGjZW`K#?WDn5fub~fIUI@rC2mf6#Xf41lZNJl6qBd~)5QtPZMT+Vq{Y=-3Nfu` +zPYPvt9M_Y|ZC$qCoX+3|?ZL90V-oven#PH1f#-pR@WZ{el+YI&MgiLE*MiQ| +Date: Fri, 25 Oct 2019 15:37:17 -0400 +Subject: [PATCH] Get rid of unused make-like files from yore. + +These files are all edk2-like makefile snippets, and we don't use any of +them for anything. They've also got DOS line endings and things like +that. + +This patch just gets rid of them. + +Signed-off-by: Peter Jones +--- + inc/inc.mak | Bin 727 -> 0 bytes + inc/make.inf | Bin 398 -> 0 bytes + inc/makefile.hdr | Bin 1501 -> 0 bytes + inc/protocol/make.inf | Bin 113 -> 0 bytes + 4 files changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 inc/inc.mak + delete mode 100644 inc/make.inf + delete mode 100644 inc/makefile.hdr + delete mode 100644 inc/protocol/make.inf + +diff --git a/inc/inc.mak b/inc/inc.mak +deleted file mode 100644 +index 992996becdfebbd03d3dfb9b4c64fd543ed3c5ff..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 727 +zcmajdy$S*`3fe6jGed +z`}^T|xvHI7t;=SkaNVT9`d9b>+h=n~6CE2x69b*YB%0X1L!oHmycr(_aU>L=*pw-v +zp;LTHD43KmRKbuJm}=;YqD~nNLo7gF3`0`?H|6b12G^HKFMm2V3E!EZ-vYI_GodDG +SbPXXzwu@rOPN#Ver1$`XL5I}< + +diff --git a/inc/make.inf b/inc/make.inf +deleted file mode 100644 +index f173196f08cc36175a53b58d17e24d4bc6fbab1f..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 398 +zcmbV|%?biB4216seFtIh9#ni8@z9@C14~=dR(yQBg~}9fh92@U37O8SmbE{%+;Xg9 +zDc{v{Xhoin&u^;}l8pg0N2Wd|_7lAlAc+9^46v~QN?Hn{Wsb-aC;3grf}D%ff~ErD +pI5$h9jyF&|u_4)J@h~ePIkwl|wNj2+f)BQr{Qx*pX`BE6 + +diff --git a/inc/makefile.hdr b/inc/makefile.hdr +deleted file mode 100644 +index 46ef3876908366b17c77bc3275afcc554fced58b..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 1501 +zcmbu8QES355XavO{SLS4L;Emco5+0dVYGFGNfp~iLDKeW!)j7u9s2E;sN2gxycrru +zx!>JC|0L%+J=f_$R*M~&kHeN1wU7uKl&E=!B~+q8c!X#U$vlHNVwue_Z0ZjDB7mpy_!WT34jTxSZk3T1N*dO6T!$s$I*J!5 +zOrY=o`~mLI_1l(26E-z`URc?7EU`()CIt?MR$1_r_PhFDZ0a +zoN3!{4{Qov-(M`}VVtJ(W#GYN0v_Wp&)%KgXlvM(%!Mp(KH5`Ki!|PdmJgqO;1d&Ov=wM0dvFB6P +Date: Fri, 23 Aug 2019 16:23:21 -0400 +Subject: [PATCH] Make ELF constructors and destructors work. + +This makes setup and teardown functions defined with +__attribute__((__constructor__) and __attribute__((__destructor__)) work +in normal circumstances in EFI binaries. + +A couple of notes: +- it implements both the old-style .ctors/.dtors methods and the newer + style .init_array/.fini_array ELF constructor and destructor arrays, + processed in the order: + .init_array[] + .ctors[] + efi_main() + .dtors[] + .fini_array[] +- Destructors will only be called if efi_main() exits using "return"; + any call to Exit() will still longjmp() past them. +- InitializeLib() has already been called before constructors run, so + they don't need to call it (and neither does anything else.) For + compatibility, it has been altered so calling it more than once is + safe. +- No attempt is made to handle any constructor or destructor with a + prototype other than "void func(void);", but note that InitializeLib + has been called, so LibImageHandle, ST, BS, and RT are set. +- The init_array/ctor/dtor/fini_array lists aren't the using the GNU + "CONSTRUCTOR" output section command, so they don't start with a size. +- The lists are individually sorted during the link stage via + SORT_BY_NAME() in the linker script. +- The default (empty) init_array/ctor/dtor/fini_array lists are padded + out to 8-byte alignment with ".p2align 3, 0", and each list always has + at least one ".long 0" at the end of it (even if it's completely + empty). As a result, they can have NULLs that need to be skipped. + The sections they're in are mergeable, so the NULLs don't have to be + exclusively at the end. +- The ia64 and mips64el arches have not been tested. + +Signed-off-by: Peter Jones +--- + apps/Makefile | 5 ++- + apps/ctors_fns.c | 26 +++++++++++++ + apps/ctors_test.c | 20 ++++++++++ + gnuefi/crt0-efi-aa64.S | 2 +- + gnuefi/crt0-efi-arm.S | 2 +- + gnuefi/crt0-efi-ia32.S | 8 ++-- + gnuefi/crt0-efi-ia64.S | 2 +- + gnuefi/crt0-efi-mips64el.S | 4 +- + gnuefi/crt0-efi-x64.S | 2 +- + gnuefi/elf_aa64_efi.lds | 21 +++++++++++ + gnuefi/elf_arm_efi.lds | 20 ++++++++++ + gnuefi/elf_ia32_efi.lds | 21 +++++++++++ + gnuefi/elf_ia32_fbsd_efi.lds | 21 +++++++++++ + gnuefi/elf_ia64_efi.lds | 21 +++++++++++ + gnuefi/elf_mips64el_efi.lds | 20 ++++++++++ + gnuefi/elf_x64_efi.lds | 22 +++++++++++ + gnuefi/elf_x64_fbsd_efi.lds | 21 +++++++++++ + lib/Makefile | 6 +-- + lib/ctors.S | 43 ++++++++++++++++++++++ + lib/entry.c | 67 ++++++++++++++++++++++++++++++++++ + lib/init.c | 87 +++++++++++++++++++++----------------------- + 21 files changed, 381 insertions(+), 60 deletions(-) + create mode 100644 apps/ctors_fns.c + create mode 100644 apps/ctors_test.c + create mode 100644 lib/ctors.S + create mode 100644 lib/entry.c + +diff --git a/apps/Makefile b/apps/Makefile +index a95620cba2d..28088370da7 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -62,7 +62,8 @@ TARGET_APPS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi \ + printenv.efi t7.efi t8.efi tcc.efi modelist.efi \ + route80h.efi drv0_use.efi AllocPages.efi exit.efi \ + FreePages.efi setjmp.efi debughook.efi debughook.efi.debug \ +- bltgrid.efi lfbgrid.efi setdbg.efi unsetdbg.efi ++ bltgrid.efi lfbgrid.efi setdbg.efi unsetdbg.efi \ ++ ctors_test.efi + TARGET_BSDRIVERS = drv0.efi + TARGET_RTDRIVERS = + +@@ -87,6 +88,8 @@ TARGETS = $(TARGET_APPS) $(TARGET_BSDRIVERS) $(TARGET_RTDRIVERS) + + all: $(TARGETS) + ++ctors_test.so : ctors_fns.o ctors_test.o ++ + clean: + rm -f $(TARGETS) *~ *.o *.so + +diff --git a/apps/ctors_fns.c b/apps/ctors_fns.c +new file mode 100644 +index 00000000000..624190462ea +--- /dev/null ++++ b/apps/ctors_fns.c +@@ -0,0 +1,26 @@ ++/* ++ * ctors.c ++ * Copyright 2019 Peter Jones ++ * ++ */ ++ ++#include ++#include ++ ++int constructed_value = 0; ++ ++static void __attribute__((__constructor__)) ctor(void) ++{ ++ Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value); ++ constructed_value = 1; ++ Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value); ++} ++ ++static void __attribute__((__destructor__)) dtor(void) ++{ ++ Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value); ++ constructed_value = 0; ++ Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value); ++} ++ ++// vim:fenc=utf-8:tw=75:noet +diff --git a/apps/ctors_test.c b/apps/ctors_test.c +new file mode 100644 +index 00000000000..7e48da8ef35 +--- /dev/null ++++ b/apps/ctors_test.c +@@ -0,0 +1,20 @@ ++/* ++ * ctors_test.c ++ * Copyright 2019 Peter Jones ++ * ++ */ ++ ++#include ++#include ++ ++extern int constructed_value; ++ ++EFI_STATUS ++efi_main (EFI_HANDLE image EFI_UNUSED, EFI_SYSTEM_TABLE *systab EFI_UNUSED) ++{ ++ Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value); ++ ++ return EFI_SUCCESS; ++} ++ ++// vim:fenc=utf-8:tw=75:noet +diff --git a/gnuefi/crt0-efi-aa64.S b/gnuefi/crt0-efi-aa64.S +index d6e610b8c79..a9302588b71 100644 +--- a/gnuefi/crt0-efi-aa64.S ++++ b/gnuefi/crt0-efi-aa64.S +@@ -124,7 +124,7 @@ _start: + cbnz x0, 0f + + ldp x0, x1, [sp, #16] +- bl efi_main ++ bl _entry + + 0: ldp x29, x30, [sp], #32 + ret +diff --git a/gnuefi/crt0-efi-arm.S b/gnuefi/crt0-efi-arm.S +index c5bb6d482da..04e75e9481a 100644 +--- a/gnuefi/crt0-efi-arm.S ++++ b/gnuefi/crt0-efi-arm.S +@@ -136,7 +136,7 @@ _start: + bne 0f + + ldmfd sp, {r0-r1} +- bl efi_main ++ bl _entry + + 0: add sp, sp, #12 + ldr pc, [sp], #4 +diff --git a/gnuefi/crt0-efi-ia32.S b/gnuefi/crt0-efi-ia32.S +index f9d5191ecb5..8e8e372f551 100644 +--- a/gnuefi/crt0-efi-ia32.S ++++ b/gnuefi/crt0-efi-ia32.S +@@ -56,13 +56,13 @@ _start: + call _relocate + popl %ebx + popl %ebx +- testl %eax,%eax +- jne .exit ++ testl %eax,%eax ++ jne .exit + +- call efi_main # call app with "image" and "systab" argument ++ call _entry # call app with "image" and "systab" argument + + .exit: leave +- ret ++ ret + + // hand-craft a dummy .reloc section so EFI knows it's a relocatable executable: + +diff --git a/gnuefi/crt0-efi-ia64.S b/gnuefi/crt0-efi-ia64.S +index 40c3c837a1c..dacb4c4c658 100644 +--- a/gnuefi/crt0-efi-ia64.S ++++ b/gnuefi/crt0-efi-ia64.S +@@ -56,7 +56,7 @@ _start: + + mov out0=in0 // image handle + mov out1=in1 // systab +- br.call.sptk.few rp=efi_main ++ br.call.sptk.few rp=_entry + .Lret2: + .exit: + mov ar.pfs=loc0 +diff --git a/gnuefi/crt0-efi-mips64el.S b/gnuefi/crt0-efi-mips64el.S +index 6a62aca98b4..5ad2503ca79 100644 +--- a/gnuefi/crt0-efi-mips64el.S ++++ b/gnuefi/crt0-efi-mips64el.S +@@ -172,8 +172,8 @@ _pc: + + // a0: ImageHandle + ld $a0, 16($sp) +- // call efi_main +- dla $t9, efi_main ++ // call _start ++ dla $t9, _entry + jalr $t9 + // a1: SystemTable + ld $a1, 24($sp) +diff --git a/gnuefi/crt0-efi-x64.S b/gnuefi/crt0-efi-x64.S +index 6533af7461f..3fe361b7ffd 100644 +--- a/gnuefi/crt0-efi-x64.S ++++ b/gnuefi/crt0-efi-x64.S +@@ -56,7 +56,7 @@ _start: + popq %rdi + popq %rsi + +- call efi_main ++ call _entry + addq $8, %rsp + + .exit: +diff --git a/gnuefi/elf_aa64_efi.lds b/gnuefi/elf_aa64_efi.lds +index 836d98255d8..161f5fc5641 100644 +--- a/gnuefi/elf_aa64_efi.lds ++++ b/gnuefi/elf_aa64_efi.lds +@@ -26,6 +26,26 @@ SECTIONS + *(.got.plt) + *(.got) + ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + . = ALIGN(16); +@@ -36,6 +56,7 @@ SECTIONS + *(.bss) + *(COMMON) + . = ALIGN(16); ++ + _bss_end = .; + } + +diff --git a/gnuefi/elf_arm_efi.lds b/gnuefi/elf_arm_efi.lds +index 665bbdbf065..f93f39bc384 100644 +--- a/gnuefi/elf_arm_efi.lds ++++ b/gnuefi/elf_arm_efi.lds +@@ -26,6 +26,26 @@ SECTIONS + *(.got.plt) + *(.got) + ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + . = ALIGN(16); +diff --git a/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds +index f27fe5fc6e6..4b7e3f1df39 100644 +--- a/gnuefi/elf_ia32_efi.lds ++++ b/gnuefi/elf_ia32_efi.lds +@@ -40,6 +40,27 @@ SECTIONS + *(.sdata) + *(.got.plt) + *(.got) ++ ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + *(.sbss) +diff --git a/gnuefi/elf_ia32_fbsd_efi.lds b/gnuefi/elf_ia32_fbsd_efi.lds +index cd309e24f7f..9e9baec2aca 100644 +--- a/gnuefi/elf_ia32_fbsd_efi.lds ++++ b/gnuefi/elf_ia32_fbsd_efi.lds +@@ -40,6 +40,27 @@ SECTIONS + *(.sdata) + *(.got.plt) + *(.got) ++ ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + *(.sbss) +diff --git a/gnuefi/elf_ia64_efi.lds b/gnuefi/elf_ia64_efi.lds +index 190792a0c94..2cda0dd97c7 100644 +--- a/gnuefi/elf_ia64_efi.lds ++++ b/gnuefi/elf_ia64_efi.lds +@@ -39,6 +39,27 @@ SECTIONS + *(.data*) + *(.gnu.linkonce.d*) + *(.plabel) /* data whose relocs we want to ignore */ ++ ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + *(.dynbss) +diff --git a/gnuefi/elf_mips64el_efi.lds b/gnuefi/elf_mips64el_efi.lds +index 4d1a077d8f8..0e68084d103 100644 +--- a/gnuefi/elf_mips64el_efi.lds ++++ b/gnuefi/elf_mips64el_efi.lds +@@ -27,6 +27,26 @@ SECTIONS + HIDDEN (_gp = ALIGN (16) + 0x7ff0); + *(.got) + ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + . = ALIGN(16); +diff --git a/gnuefi/elf_x64_efi.lds b/gnuefi/elf_x64_efi.lds +index c7a105898c8..cb2e3dc00aa 100644 +--- a/gnuefi/elf_x64_efi.lds ++++ b/gnuefi/elf_x64_efi.lds +@@ -30,6 +30,7 @@ SECTIONS + { + *(.reloc) + } ++ + . = ALIGN(4096); + .data : + { +@@ -39,6 +40,27 @@ SECTIONS + *(.got) + *(.data*) + *(.sdata) ++ ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + *(.sbss) +diff --git a/gnuefi/elf_x64_fbsd_efi.lds b/gnuefi/elf_x64_fbsd_efi.lds +index 705719bf68b..192aa065d8c 100644 +--- a/gnuefi/elf_x64_fbsd_efi.lds ++++ b/gnuefi/elf_x64_fbsd_efi.lds +@@ -36,6 +36,27 @@ SECTIONS + *(.got) + *(.data*) + *(.sdata) ++ ++ /* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ . = ALIGN(16); ++ _init_array = .; ++ *(SORT_BY_NAME(.init_array)) ++ _init_array_end = .; ++ __CTOR_LIST__ = .; ++ *(SORT_BY_NAME(.ctors)) ++ __CTOR_END__ = .; ++ __DTOR_LIST__ = .; ++ *(SORT_BY_NAME(.dtors)) ++ __DTOR_END__ = .; ++ _fini_array = .; ++ *(SORT_BY_NAME(.fini_array)) ++ _fini_array_end = .; ++ + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + *(.sbss) +diff --git a/lib/Makefile b/lib/Makefile +index 8bf94000e33..e7eafc01f1e 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -43,8 +43,8 @@ include $(SRCDIR)/../Make.defaults + TOPDIR = $(SRCDIR)/.. + + CDIR = $(TOPDIR)/.. +-FILES = boxdraw smbios console crc data debug dpath \ +- error event exit guid hand hw init lock \ ++FILES = boxdraw smbios console crc data debug dpath \ ++ entry error event exit guid hand hw init lock \ + misc print sread str cmdline \ + runtime/rtlock runtime/efirtlib runtime/rtstr runtime/vm runtime/rtdata \ + $(ARCH)/initplat $(ARCH)/math $(ARCH)/setjmp +@@ -62,7 +62,7 @@ FILES += $(ARCH)/uldiv $(ARCH)/ldivmod $(ARCH)/div $(ARCH)/llsl $(ARCH)/llsr \ + $(ARCH)/mullu + endif + +-OBJS = $(FILES:%=%.o) ++OBJS = $(FILES:%=%.o) ctors.o + + SUBDIRS = ia32 x64 ia64 aa64 arm mips64el runtime + +diff --git a/lib/ctors.S b/lib/ctors.S +new file mode 100644 +index 00000000000..522d31b90d2 +--- /dev/null ++++ b/lib/ctors.S +@@ -0,0 +1,43 @@ ++/* ++ * Try to define the minimal empty init/ctor/dtor/fini_arrays so building with ++ * older or out-of-tree linker scripts will still work. ++ */ ++/* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++ .section .init_array, "aM", @init_array ++ .p2align 3, 0 ++ .globl _init_array ++_init_array: ++ .p2align 3, 0 ++ .globl _init_array_end ++_init_array_end: ++ .long 0 ++ .section .ctors, "aM", @init_array ++ .p2align 3, 0 ++ .globl __CTOR_LIST__ ++__CTOR_LIST__: ++ .p2align 3, 0 ++ .globl __CTOR_END__ ++__CTOR_END__: ++ .long 0 ++ .section .dtors, "aM", @fini_array ++ .p2align 3, 0 ++ .globl __DTOR_LIST__ ++__DTOR_LIST__: ++ .p2align 3, 0 ++ .globl __DTOR_END__ ++__DTOR_END__: ++ .long 0 ++ .section .fini_array, "aM", @fini_array ++ .p2align 3, 0 ++ .globl _fini_array ++_fini_array: ++ .p2align 3, 0 ++ .globl _fini_array_end ++_fini_array_end: ++ .long 0 ++ +diff --git a/lib/entry.c b/lib/entry.c +new file mode 100644 +index 00000000000..d8526084602 +--- /dev/null ++++ b/lib/entry.c +@@ -0,0 +1,67 @@ ++/* ++ * ctors.c ++ * Copyright 2019 Peter Jones ++ * ++ */ ++ ++#include ++#include ++ ++/* ++ * Note that these aren't the using the GNU "CONSTRUCTOR" output section ++ * command, so they don't start with a size. Because of p2align and the ++ * end/END definitions, and the fact that they're mergeable, they can also ++ * have NULLs which aren't guaranteed to be at the end. ++ */ ++extern UINTN _init_array, _init_array_end; ++extern UINTN __CTOR_LIST__, __CTOR_END__; ++extern UINTN _fini_array, _fini_array_end; ++extern UINTN __DTOR_LIST__, __DTOR_END__; ++ ++typedef void (*funcp)(void); ++ ++static void ctors(void) ++{ ++ for (funcp *location = (void *)&_init_array; location < (funcp *)&_init_array_end; location++) { ++ funcp func = *location; ++ if (location != NULL) ++ func(); ++ } ++ ++ for (funcp *location = (void *)&__CTOR_LIST__; location < (funcp *)&__CTOR_END__; location++) { ++ funcp func = *location; ++ if (location != NULL) ++ func(); ++ } ++} ++ ++static void dtors(void) ++{ ++ for (funcp *location = (void *)&__DTOR_LIST__; location < (funcp *)&__DTOR_END__; location++) { ++ funcp func = *location; ++ if (location != NULL) ++ func(); ++ } ++ ++ for (funcp *location = (void *)&_fini_array; location < (funcp *)&_fini_array_end; location++) { ++ funcp func = *location; ++ if (location != NULL) ++ func(); ++ } ++} ++ ++extern EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *systab); ++ ++EFI_STATUS _entry(EFI_HANDLE image, EFI_SYSTEM_TABLE *systab) ++{ ++ EFI_STATUS status; ++ InitializeLib(image, systab); ++ ++ ctors(); ++ status = efi_main(image, systab); ++ dtors(); ++ ++ return status; ++} ++ ++// vim:fenc=utf-8:tw=75:noet +diff --git a/lib/init.c b/lib/init.c +index 4f238c0a2cc..726e493919a 100644 +--- a/lib/init.c ++++ b/lib/init.c +@@ -46,57 +46,52 @@ Returns: + EFI_STATUS Status; + CHAR8 *LangCode; + +- if (!LibInitialized) { +- LibInitialized = TRUE; +- LibFwInstance = FALSE; +- LibImageHandle = ImageHandle; +- +- +- // +- // Set up global pointer to the system table, boot services table, +- // and runtime services table +- // +- +- ST = SystemTable; +- BS = SystemTable->BootServices; +- RT = SystemTable->RuntimeServices; +-// ASSERT (CheckCrc(0, &ST->Hdr)); +-// ASSERT (CheckCrc(0, &BS->Hdr)); +-// ASSERT (CheckCrc(0, &RT->Hdr)); +- +- +- // +- // Initialize pool allocation type +- // +- +- if (ImageHandle) { +- Status = uefi_call_wrapper( +- BS->HandleProtocol, +- 3, +- ImageHandle, +- &LoadedImageProtocol, +- (VOID*)&LoadedImage +- ); +- +- if (!EFI_ERROR(Status)) { +- PoolAllocationType = LoadedImage->ImageDataType; +- } +- EFIDebugVariable (); +- } +- +- // +- // Initialize Guid table +- // +- +- InitializeGuid(); +- +- InitializeLibPlatform(ImageHandle,SystemTable); ++ if (LibInitialized) ++ return; ++ ++ LibInitialized = TRUE; ++ LibFwInstance = FALSE; ++ LibImageHandle = ImageHandle; ++ ++ // ++ // Set up global pointer to the system table, boot services table, ++ // and runtime services table ++ // ++ ++ ST = SystemTable; ++ BS = SystemTable->BootServices; ++ RT = SystemTable->RuntimeServices; ++ // ASSERT (CheckCrc(0, &ST->Hdr)); ++ // ASSERT (CheckCrc(0, &BS->Hdr)); ++ // ASSERT (CheckCrc(0, &RT->Hdr)); ++ ++ // ++ // Initialize pool allocation type ++ // ++ ++ if (ImageHandle) { ++ Status = uefi_call_wrapper( ++ BS->HandleProtocol, ++ 3, ++ ImageHandle, ++ &LoadedImageProtocol, ++ (VOID*)&LoadedImage ++ ); ++ ++ if (!EFI_ERROR(Status)) { ++ PoolAllocationType = LoadedImage->ImageDataType; ++ } ++ EFIDebugVariable (); + } + + // +- // ++ // Initialize Guid table + // + ++ InitializeGuid(); ++ ++ InitializeLibPlatform(ImageHandle,SystemTable); ++ + if (ImageHandle && UnicodeInterface == &LibStubUnicodeInterface) { + LangCode = LibGetVariable (VarLanguage, &EfiGlobalVariable); + InitializeUnicodeSupport (LangCode); diff --git a/SOURCES/0028-Remove-the-accidental-lib-Makefile.orig.patch b/SOURCES/0028-Remove-the-accidental-lib-Makefile.orig.patch new file mode 100644 index 0000000..4fbd451 --- /dev/null +++ b/SOURCES/0028-Remove-the-accidental-lib-Makefile.orig.patch @@ -0,0 +1,108 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 14 Nov 2019 10:08:08 -0500 +Subject: [PATCH] Remove the accidental lib/Makefile.orig + +Signed-off-by: Peter Jones +--- + lib/Makefile.orig | 91 ------------------------------------------------------- + 1 file changed, 91 deletions(-) + delete mode 100644 lib/Makefile.orig + +diff --git a/lib/Makefile.orig b/lib/Makefile.orig +deleted file mode 100644 +index 65aa8ca5df2..00000000000 +--- a/lib/Makefile.orig ++++ /dev/null +@@ -1,91 +0,0 @@ +-# +-# Copyright (C) 1999-2001 Hewlett-Packard Co. +-# Contributed by David Mosberger +-# Contributed by Stephane Eranian +-# +-# All rights reserved. +-# +-# Redistribution and use in source and binary forms, with or without +-# modification, are permitted provided that the following conditions +-# are met: +-# +-# * Redistributions of source code must retain the above copyright +-# notice, this list of conditions and the following disclaimer. +-# * Redistributions in binary form must reproduce the above +-# copyright notice, this list of conditions and the following +-# disclaimer in the documentation and/or other materials +-# provided with the distribution. +-# * Neither the name of Hewlett-Packard Co. nor the names of its +-# contributors may be used to endorse or promote products derived +-# from this software without specific prior written permission. +-# +-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +-# BE LIABLE FOR ANYDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +-# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-# SUCH DAMAGE. +-# +- +-SRCDIR = . +- +-VPATH = $(SRCDIR) +- +-include $(SRCDIR)/../Make.defaults +- +-TOPDIR = $(SRCDIR)/.. +- +-CDIR = $(TOPDIR)/.. +-FILES = boxdraw smbios console crc data debug dpath \ +- error event guid hand hw init lock \ +- misc print sread str cmdline \ +- runtime/rtlock runtime/efirtlib runtime/rtstr runtime/vm runtime/rtdata \ +- $(ARCH)/initplat $(ARCH)/math +- +-ifeq ($(ARCH),ia64) +-FILES += $(ARCH)/salpal $(ARCH)/palproc +-endif +- +-ifeq ($(ARCH),x86_64) +-FILES += $(ARCH)/callwrap $(ARCH)/efi_stub +-endif +- +-ifeq ($(ARCH),arm) +-FILES += $(ARCH)/lib1funcs $(ARCH)/div64 +-endif +- +-OBJS = $(FILES:%=%.o) +- +-SUBDIRS = ia32 x86_64 ia64 aarch64 arm runtime +- +-LIBDIRINSTALL = $(INSTALLROOT)$(LIBDIR) +- +-all: libsubdirs libefi.a +- +-.PHONY: libsubdirs +-libsubdirs: +- for sdir in $(SUBDIRS); do mkdir -p $$sdir; done +- +-libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) +- +-clean: +- rm -f libefi.a *~ $(OBJS) */*.o +- +-$(LIBDIRINSTALL): +- mkdir -p $@ +- +-$(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL) +- $(INSTALL) -m 644 $< $(dir $@) +- +-install: $(LIBDIRINSTALL)/libefi.a +- +-include $(SRCDIR)/../Make.rules +- +-.PHONY: libsubdirs diff --git a/SOURCES/0029-gitignore-add-our-build-directories.patch b/SOURCES/0029-gitignore-add-our-build-directories.patch new file mode 100644 index 0000000..e9e3771 --- /dev/null +++ b/SOURCES/0029-gitignore-add-our-build-directories.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 13 Nov 2019 13:38:20 -0500 +Subject: [PATCH] gitignore: add our build directories. + +Signed-off-by: Peter Jones +--- + .gitignore | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/.gitignore b/.gitignore +index 970b638e0c0..014f7d02f46 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -4,3 +4,9 @@ + *.a + *.tar.* + *.tar ++aa64 ++arm ++ia32 ++ia64 ++mips64el ++x64 diff --git a/SOURCES/0030-make-Fix-shell-exit-status-handling.patch b/SOURCES/0030-make-Fix-shell-exit-status-handling.patch new file mode 100644 index 0000000..236eebf --- /dev/null +++ b/SOURCES/0030-make-Fix-shell-exit-status-handling.patch @@ -0,0 +1,50 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 14 Nov 2019 09:54:39 -0500 +Subject: [PATCH] make: Fix shell exit status handling. + +Right now whenever we have shell commands with loops, errors in the +middle are accidentally ignored, and make continues to process commands. + +This adds "set -e" to all of those, so they'll propagate back up. + +Signed-off-by: Peter Jones +--- + Makefile | 4 ++-- + lib/Makefile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 84f07d33a48..a461a5c3483 100644 +--- a/Makefile ++++ b/Makefile +@@ -81,14 +81,14 @@ $(SUBDIRS): + + clean: + rm -f *~ +- @for d in $(SUBDIRS); do \ ++ @set -e ; for d in $(SUBDIRS); do \ + if [ -d $(OBJDIR)/$$d ]; then \ + $(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d clean; \ + fi; \ + done + + install: +- @for d in $(SUBDIRS); do \ ++ @set -e ; for d in $(SUBDIRS); do \ + mkdir -p $(OBJDIR)/$$d; \ + $(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d install; done + +diff --git a/lib/Makefile b/lib/Makefile +index e7eafc01f1e..6fd472ad1ac 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -72,7 +72,7 @@ all: libsubdirs libefi.a + + .PHONY: libsubdirs + libsubdirs: +- for sdir in $(SUBDIRS); do mkdir -p $$sdir; done ++ @set -e ; for sdir in $(SUBDIRS); do mkdir -p $$sdir; done + + libefi.a: $(OBJS) + $(AR) $(ARFLAGS) $@ $^ diff --git a/SOURCES/0031-make-Make-make-clean-use-and-rm-v-everywhere.patch b/SOURCES/0031-make-Make-make-clean-use-and-rm-v-everywhere.patch new file mode 100644 index 0000000..2742d93 --- /dev/null +++ b/SOURCES/0031-make-Make-make-clean-use-and-rm-v-everywhere.patch @@ -0,0 +1,94 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 14 Nov 2019 09:55:07 -0500 +Subject: [PATCH] make: Make "make clean" use @ and rm -v everywhere + +This makes our "make clean" commands show what they've /removed/, rather +than what the shell code that will be run is. + +It also consolidates our list of arches into an ARCHES variable defined +in Make.defaults + +Signed-off-by: Peter Jones +--- + Make.defaults | 2 ++ + Makefile | 2 +- + apps/Makefile | 2 +- + gnuefi/Makefile | 2 +- + lib/Makefile | 4 ++-- + 5 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 585f3a00aa5..b8a3e07b681 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -36,6 +36,8 @@ + + TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) + ++ARCHES=aa64 arm ia32 ia64 mips64el x64 ++ + # + # Variables below overridable from command-line: + # make VARNAME=value ... +diff --git a/Makefile b/Makefile +index a461a5c3483..eecce6d9736 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,7 +80,7 @@ $(SUBDIRS): + $(MAKE) -C $(OBJDIR)/$@ -f $(SRCDIR)/$@/Makefile SRCDIR=$(SRCDIR)/$@ ARCH=$(ARCH) + + clean: +- rm -f *~ ++ @rm -vrf *~ $(foreach x,$(ARCHES),$(x)/) + @set -e ; for d in $(SUBDIRS); do \ + if [ -d $(OBJDIR)/$$d ]; then \ + $(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d clean; \ +diff --git a/apps/Makefile b/apps/Makefile +index 28088370da7..04cf251cb2f 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -91,7 +91,7 @@ all: $(TARGETS) + ctors_test.so : ctors_fns.o ctors_test.o + + clean: +- rm -f $(TARGETS) *~ *.o *.so ++ @rm -vf $(TARGETS) *~ *.o *.so + + .PHONY: install + +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index df67ee83911..09b40cc421e 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -59,7 +59,7 @@ libgnuefi.a: $(OBJS) + + + clean: +- rm -f $(TARGETS) *~ *.o $(OBJS) ++ @rm -vf $(TARGETS) *~ *.o $(OBJS) + + install: + mkdir -p $(INSTALLROOT)$(LIBDIR) +diff --git a/lib/Makefile b/lib/Makefile +index 6fd472ad1ac..4a7619aaacf 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -64,7 +64,7 @@ endif + + OBJS = $(FILES:%=%.o) ctors.o + +-SUBDIRS = ia32 x64 ia64 aa64 arm mips64el runtime ++SUBDIRS = $(ARCHES) runtime + + LIBDIRINSTALL = $(INSTALLROOT)$(LIBDIR) + +@@ -78,7 +78,7 @@ libefi.a: $(OBJS) + $(AR) $(ARFLAGS) $@ $^ + + clean: +- rm -f libefi.a *~ $(OBJS) */*.o ++ @rm -vf libefi.a *~ $(OBJS) */*.o + + $(LIBDIRINSTALL): + mkdir -p $@ diff --git a/SOURCES/0032-Make-our-dummy-.reloc-sections-not-depend-on-section.patch b/SOURCES/0032-Make-our-dummy-.reloc-sections-not-depend-on-section.patch new file mode 100644 index 0000000..d7f7072 --- /dev/null +++ b/SOURCES/0032-Make-our-dummy-.reloc-sections-not-depend-on-section.patch @@ -0,0 +1,79 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 30 Sep 2019 14:29:45 -0400 +Subject: [PATCH] Make our dummy .reloc sections not depend on section order. + +Currently on x64 we manually build a dummy .reloc table entry by using a +symbol in .text and subtracting its address from another symbol that's +inside the .reloc section. On ia32 we just use its location. In either +case, if the linker puts either section in a location we're not +expecting, the .reloc table winds up having invalid values, and the PE +loader will fail to load the binary. + +This changes it to be two symbols that are both in .text, making the +result unrelated to the section order or location. + +It's not clear to me that these .reloc entries are actually necessary at +all, but I'm going to leave them in place for now, in case they are. + +Signed-off-by: Peter Jones +--- + gnuefi/crt0-efi-ia32.S | 17 +++++++++-------- + gnuefi/crt0-efi-x64.S | 16 ++++++++-------- + 2 files changed, 17 insertions(+), 16 deletions(-) + +diff --git a/gnuefi/crt0-efi-ia32.S b/gnuefi/crt0-efi-ia32.S +index 8e8e372f551..031a592ab35 100644 +--- a/gnuefi/crt0-efi-ia32.S ++++ b/gnuefi/crt0-efi-ia32.S +@@ -64,13 +64,14 @@ _start: + .exit: leave + ret + +- // hand-craft a dummy .reloc section so EFI knows it's a relocatable executable: +- +- .data +-dummy: .long 0 ++ // hand-craft a dummy .reloc section so EFI knows it's a relocatable executable: ++ .data ++.dummy0: ++.dummy1: ++ .long 0 + + #define IMAGE_REL_ABSOLUTE 0 +- .section .reloc +- .long dummy // Page RVA +- .long 10 // Block Size (2*4+2) +- .word (IMAGE_REL_ABSOLUTE<<12) + 0 // reloc for dummy ++ .section .reloc, "a" ++ .long .dummy1-.dummy0 // Page RVA ++ .long 10 // Block Size (2*4+2) ++ .word (IMAGE_REL_ABSOLUTE<<12) + 0 // reloc for dummy +diff --git a/gnuefi/crt0-efi-x64.S b/gnuefi/crt0-efi-x64.S +index 3fe361b7ffd..5c86cde12e8 100644 +--- a/gnuefi/crt0-efi-x64.S ++++ b/gnuefi/crt0-efi-x64.S +@@ -62,15 +62,15 @@ _start: + .exit: + ret + +- // hand-craft a dummy .reloc section so EFI knows it's a relocatable executable: +- +- .data +-dummy: .long 0 ++ // hand-craft a dummy .reloc section so EFI knows it's a relocatable executable: ++ .data ++.dummy0: ++.dummy1: ++ .long 0 + + #define IMAGE_REL_ABSOLUTE 0 +- .section .reloc, "a" +-label1: +- .long dummy-label1 // Page RVA +- .long 10 // Block Size (2*4+2) ++ .section .reloc, "a" ++ .long .dummy1-.dummy0 // Page RVA ++ .long 10 // Block Size (2*4+2) + .word (IMAGE_REL_ABSOLUTE<<12) + 0 // reloc for dummy + diff --git a/SOURCES/0033-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch b/SOURCES/0033-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch new file mode 100644 index 0000000..8768787 --- /dev/null +++ b/SOURCES/0033-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch @@ -0,0 +1,204 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 27 Aug 2019 13:44:15 -0400 +Subject: [PATCH] Make CHAR8 and similar be defined the same way edk2 does it. + +Signed-off-by: Peter Jones +--- + inc/aa64/efibind.h | 7 +++++++ + inc/arm/efibind.h | 7 +++++++ + inc/efidef.h | 7 +++---- + inc/ia32/efibind.h | 7 +++++++ + inc/ia64/efibind.h | 11 +++++++++-- + inc/mips64el/efibind.h | 7 +++++++ + inc/x64/efibind.h | 4 ++++ + 7 files changed, 44 insertions(+), 6 deletions(-) + +diff --git a/inc/aa64/efibind.h b/inc/aa64/efibind.h +index c4eafa0d8a8..00c7cead486 100644 +--- a/inc/aa64/efibind.h ++++ b/inc/aa64/efibind.h +@@ -43,6 +43,9 @@ typedef int64_t intptr_t; + #ifndef __WCHAR_TYPE__ + # define __WCHAR_TYPE__ short + #endif ++#ifndef __CHAR16_TYPE__ ++# define __CHAR16_TYPE__ unsigned short ++#endif + + typedef uint64_t UINT64; + typedef int64_t INT64; +@@ -51,9 +54,13 @@ typedef uint32_t UINT32; + typedef int32_t INT32; + + typedef uint16_t UINT16; ++typedef __CHAR16_TYPE__ CHAR16; + typedef int16_t INT16; ++ + typedef uint8_t UINT8; ++typedef char CHAR8; + typedef int8_t INT8; ++ + typedef __WCHAR_TYPE__ WCHAR; + + #undef VOID +diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h +index 012d3d2f8c9..42de542257c 100644 +--- a/inc/arm/efibind.h ++++ b/inc/arm/efibind.h +@@ -49,6 +49,9 @@ typedef int32_t intptr_t; + #ifndef __WCHAR_TYPE__ + # define __WCHAR_TYPE__ short + #endif ++#ifndef __CHAR16_TYPE__ ++# define __CHAR16_TYPE__ unsigned short ++#endif + + typedef uint64_t UINT64; + typedef int64_t INT64; +@@ -57,9 +60,13 @@ typedef uint32_t UINT32; + typedef int32_t INT32; + + typedef uint16_t UINT16; ++typedef __CHAR16_TYPE__ CHAR16; + typedef int16_t INT16; ++ + typedef uint8_t UINT8; ++typedef char CHAR8; + typedef int8_t INT8; ++ + typedef __WCHAR_TYPE__ WCHAR; + + #undef VOID +diff --git a/inc/efidef.h b/inc/efidef.h +index 8b70051f43a..a552c7d91c3 100644 +--- a/inc/efidef.h ++++ b/inc/efidef.h +@@ -20,9 +20,8 @@ Revision History + + --*/ + +-typedef UINT16 CHAR16; +-typedef UINT8 CHAR8; +-typedef UINT8 BOOLEAN; ++typedef unsigned char BOOLEAN; ++ + #ifndef CONST + #define CONST const + #endif +@@ -194,7 +193,7 @@ typedef struct { + // International Language + // + +-typedef UINT8 ISO_639_2; ++typedef CHAR8 ISO_639_2; + #define ISO_639_2_ENTRY_SIZE 3 + + // +diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h +index 27459e454d1..b0b0d76151f 100644 +--- a/inc/ia32/efibind.h ++++ b/inc/ia32/efibind.h +@@ -88,6 +88,9 @@ Revision History + #ifndef __WCHAR_TYPE__ + # define __WCHAR_TYPE__ short + #endif ++#ifndef __CHAR16_TYPE__ ++# define __CHAR16_TYPE__ unsigned short ++#endif + + typedef uint64_t UINT64; + typedef int64_t INT64; +@@ -98,9 +101,13 @@ typedef int64_t INT64; + #endif + + typedef uint16_t UINT16; ++typedef __CHAR16_TYPE__ CHAR16; + typedef int16_t INT16; ++ + typedef uint8_t UINT8; ++typedef char CHAR8; + typedef int8_t INT8; ++ + typedef __WCHAR_TYPE__ WCHAR; + + #undef VOID +diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h +index 3ace8d59190..ebe8cac3e94 100644 +--- a/inc/ia64/efibind.h ++++ b/inc/ia64/efibind.h +@@ -74,19 +74,26 @@ Revision History + #ifndef __WCHAR_TYPE__ + # define __WCHAR_TYPE__ short + #endif +- ++#ifndef __CHAR16_TYPE__ ++# define __CHAR16_TYPE__ unsigned short ++#endif + + typedef uint64_t UINT64; + typedef int64_t INT64; ++ + typedef uint32_t UINT32; + typedef int32_t INT32; ++ + typedef uint16_t UINT16; ++typedef __CHAR16_TYPE__ CHAR16; + typedef int16_t INT16; ++ + typedef uint8_t UINT8; ++typedef char CHAR8; + typedef int8_t INT8; ++ + typedef __WCHAR_TYPE__ WCHAR; + +- + #undef VOID + #define VOID void + +diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h +index 1f08cd346d0..e26c51904ee 100644 +--- a/inc/mips64el/efibind.h ++++ b/inc/mips64el/efibind.h +@@ -43,6 +43,9 @@ typedef int64_t intptr_t; + #ifndef __WCHAR_TYPE__ + # define __WCHAR_TYPE__ short + #endif ++#ifndef __CHAR16_TYPE__ ++# define __CHAR16_TYPE__ unsigned short ++#endif + + typedef uint64_t UINT64; + typedef int64_t INT64; +@@ -51,9 +54,13 @@ typedef uint32_t UINT32; + typedef int32_t INT32; + + typedef uint16_t UINT16; ++typedef __CHAR16_TYPE__ CHAR16; + typedef int16_t INT16; ++ + typedef uint8_t UINT8; ++typedef char CHAR8; + typedef int8_t INT8; ++ + typedef __WCHAR_TYPE__ WCHAR; + + #undef VOID +diff --git a/inc/x64/efibind.h b/inc/x64/efibind.h +index 2750ab9be7d..e7feed9dbe4 100644 +--- a/inc/x64/efibind.h ++++ b/inc/x64/efibind.h +@@ -107,9 +107,13 @@ typedef int64_t INT64; + #endif + + typedef uint16_t UINT16; ++typedef __CHAR16_TYPE__ CHAR16; + typedef int16_t INT16; ++ + typedef uint8_t UINT8; ++typedef char CHAR8; + typedef int8_t INT8; ++ + typedef __WCHAR_TYPE__ WCHAR; + + #undef VOID diff --git a/SOURCES/0034-Make-make-TOPDIR-actually-work-and-get-rid-of-unused.patch b/SOURCES/0034-Make-make-TOPDIR-actually-work-and-get-rid-of-unused.patch new file mode 100644 index 0000000..f5d3c8f --- /dev/null +++ b/SOURCES/0034-Make-make-TOPDIR-actually-work-and-get-rid-of-unused.patch @@ -0,0 +1,101 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 25 Oct 2019 15:36:18 -0400 +Subject: [PATCH] Make: make TOPDIR actually work and get rid of unused CDIR + +Signed-off-by: Peter Jones +--- + Make.defaults | 2 +- + apps/Makefile | 6 ++---- + gnuefi/Makefile | 6 ++---- + inc/Makefile | 5 +---- + lib/Makefile | 2 +- + 5 files changed, 7 insertions(+), 14 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index b8a3e07b681..696028dd6c2 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -34,7 +34,7 @@ + # SUCH DAMAGE. + # + +-TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) ++TOPDIR ?= $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) + + ARCHES=aa64 arm ia32 ia64 mips64el x64 + +diff --git a/apps/Makefile b/apps/Makefile +index 04cf251cb2f..3b96f153a23 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -37,12 +37,10 @@ + SRCDIR = . + + VPATH = $(SRCDIR) +- +-include $(SRCDIR)/../Make.defaults +- + TOPDIR = $(SRCDIR)/.. + +-CDIR=$(TOPDIR)/.. ++include $(SRCDIR)/../Make.defaults ++ + LINUX_HEADERS = /usr/src/sys/build + CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include + CRTOBJS = $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index 09b40cc421e..bea629b0b29 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -37,12 +37,10 @@ + SRCDIR = . + + VPATH = $(SRCDIR) +- +-include $(SRCDIR)/../Make.defaults +- + TOPDIR = $(SRCDIR)/.. + +-CDIR=$(TOPDIR)/.. ++include $(SRCDIR)/../Make.defaults ++ + FILES = reloc_$(ARCH) + + OBJS = $(FILES:%=%.o) +diff --git a/inc/Makefile b/inc/Makefile +index dd36bb0103d..13022fd6ae1 100644 +--- a/inc/Makefile ++++ b/inc/Makefile +@@ -1,12 +1,9 @@ + SRCDIR = . + + VPATH = $(SRCDIR) +- +-include $(SRCDIR)/../Make.defaults +- + TOPDIR = $(SRCDIR)/.. + +-CDIR=$(TOPDIR)/.. ++include $(SRCDIR)/../Make.defaults + + all: + +diff --git a/lib/Makefile b/lib/Makefile +index 4a7619aaacf..6dca2cf1398 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -37,12 +37,12 @@ + SRCDIR = . + + VPATH = $(SRCDIR) ++TOPDIR = $(SRCDIR)/.. + + include $(SRCDIR)/../Make.defaults + + TOPDIR = $(SRCDIR)/.. + +-CDIR = $(TOPDIR)/.. + FILES = boxdraw smbios console crc data debug dpath \ + entry error event exit guid hand hw init lock \ + misc print sread str cmdline \ diff --git a/SOURCES/0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch b/SOURCES/0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch new file mode 100644 index 0000000..37096a8 --- /dev/null +++ b/SOURCES/0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 25 Oct 2019 15:39:35 -0400 +Subject: [PATCH] Make: make "make DESTDIR=../foo install" work right. + +This makes the normal DESTDIR= variable work on the command line, and +makes relative paths always relative to the top-level directory. + +Signed-off-by: Peter Jones +--- + Make.defaults | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/Make.defaults b/Make.defaults +index 696028dd6c2..157559d20ee 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -47,7 +47,19 @@ ARCHES=aa64 arm ia32 ia64 mips64el x64 + # Where to install the package. GNU-EFI will create and access + # lib and include under the root + # +-INSTALLROOT := / ++DESTDIR ?= / ++ifeq ($(origin INSTALLROOT),undefined) ++INSTALLROOT = $(DESTDIR) ++endif ++ ++empty := ++space := $(empty) $(empty) ++stripped = $(subst $(space),/,$(strip $(subst /,$(space),$(1)))) ++unstripped = $(subst $(space),/,$(subst /,$(space),$(1))) ++is_absolute = $(subst $(call stripped,$(1)),$(empty),$(call unstripped,$(1))) ++ ++override INSTALLROOT:=$(if $(call is_absolute,$(INSTALLROOT)),,$(TOPDIR)/)$(INSTALLROOT) ++ + PREFIX := /usr/local + LIBDIR := $(PREFIX)/lib + INSTALL := install diff --git a/SOURCES/0036-Install-our-libraries-in-LIBDIR-gnuefi-ARCH.patch b/SOURCES/0036-Install-our-libraries-in-LIBDIR-gnuefi-ARCH.patch new file mode 100644 index 0000000..75705ec --- /dev/null +++ b/SOURCES/0036-Install-our-libraries-in-LIBDIR-gnuefi-ARCH.patch @@ -0,0 +1,134 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 25 Oct 2019 15:41:16 -0400 +Subject: [PATCH] Install our libraries in $(LIBDIR)/gnuefi/$(ARCH) + +This makes it possible to install all the output on the same machine for +cross-builds. This also adds "install_compat", which uses the previous +paths. + +Signed-off-by: Peter Jones +--- + Make.defaults | 1 + + Makefile | 4 ++-- + apps/Makefile | 2 +- + gnuefi/Makefile | 22 ++++++++++++++++++---- + inc/Makefile | 3 +++ + lib/Makefile | 5 ++++- + 6 files changed, 29 insertions(+), 8 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 157559d20ee..7231e9bced2 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -72,6 +72,7 @@ LD := $(prefix)$(CROSS_COMPILE)ld + AR := $(prefix)$(CROSS_COMPILE)ar + RANLIB := $(prefix)$(CROSS_COMPILE)ranlib + OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy ++SYMLINK := ln -vfs + + + # Host/target identification +diff --git a/Makefile b/Makefile +index eecce6d9736..962ac72b664 100644 +--- a/Makefile ++++ b/Makefile +@@ -87,10 +87,10 @@ clean: + fi; \ + done + +-install: ++install install_compat: + @set -e ; for d in $(SUBDIRS); do \ + mkdir -p $(OBJDIR)/$$d; \ +- $(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d install; done ++ $(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d $@ ; done + + .PHONY: $(SUBDIRS) clean depend + +diff --git a/apps/Makefile b/apps/Makefile +index 3b96f153a23..8ab83d58a3c 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -91,6 +91,6 @@ ctors_test.so : ctors_fns.o ctors_test.o + clean: + @rm -vf $(TARGETS) *~ *.o *.so + +-.PHONY: install ++.PHONY: install install_compat + + include $(SRCDIR)/../Make.rules +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index bea629b0b29..7652669a7cc 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -60,16 +60,30 @@ clean: + @rm -vf $(TARGETS) *~ *.o $(OBJS) + + install: ++ mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ $(INSTALL) -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/ $(TARGETS) ++ifneq (,$(findstring FreeBSD,$(OS))) ++ ifeq ($(ARCH),x64) ++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ else ++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ endif ++else ++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++endif ++ ++install_compat: install + mkdir -p $(INSTALLROOT)$(LIBDIR) +- $(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)$(LIBDIR) ++ $(SYMLINK) gnuefi/$(ARCH)/libgnuefi.a $(INSTALLROOT)$(LIBDIR)/libgnuefi.a ++ $(SYMLINK) gnuefi/$(ARCH)/crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o + ifneq (,$(findstring FreeBSD,$(OS))) + ifeq ($(ARCH),x64) +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR) ++ $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_fbsd_efi.lds + else +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR) ++ $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds + endif + else +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR) ++ $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds + endif + + include $(SRCDIR)/../Make.rules +diff --git a/inc/Makefile b/inc/Makefile +index 13022fd6ae1..445d340f0fa 100644 +--- a/inc/Makefile ++++ b/inc/Makefile +@@ -17,4 +17,7 @@ install: + $(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol + $(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH) + ++install_compat: install ++ @if [ ! -h $(DEST)/$(BFD_ARCH) ]; then $(SYMLINK) $(ARCH) $(INSTALLROOT)$(PREFIX)/include/efi/$(BFD_ARCH) ; fi ++ + include $(SRCDIR)/../Make.rules +diff --git a/lib/Makefile b/lib/Makefile +index 6dca2cf1398..f0d7b9b08e6 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -66,7 +66,7 @@ OBJS = $(FILES:%=%.o) ctors.o + + SUBDIRS = $(ARCHES) runtime + +-LIBDIRINSTALL = $(INSTALLROOT)$(LIBDIR) ++LIBDIRINSTALL ?= $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) + + all: libsubdirs libefi.a + +@@ -88,6 +88,9 @@ $(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL) + + install: $(LIBDIRINSTALL)/libefi.a + ++install_compat: install ++ $(SYMLINK) gnuefi/$(ARCH)/libefi.a $(INSTALLROOT)$(LIBDIR)/libefi.a ++ + include $(SRCDIR)/../Make.rules + + .PHONY: libsubdirs diff --git a/SOURCES/0037-Install-all-headers-for-all-arches.patch b/SOURCES/0037-Install-all-headers-for-all-arches.patch new file mode 100644 index 0000000..d1b2299 --- /dev/null +++ b/SOURCES/0037-Install-all-headers-for-all-arches.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 25 Oct 2019 15:42:10 -0400 +Subject: [PATCH] Install all headers for all arches. + +This further enables cross-builds by installing all the arches headers. + +Signed-off-by: Peter Jones +--- + inc/Makefile | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/inc/Makefile b/inc/Makefile +index 445d340f0fa..e8123fd3115 100644 +--- a/inc/Makefile ++++ b/inc/Makefile +@@ -9,15 +9,18 @@ all: + + clean: + ++SOURCE=$(realpath $(SRCDIR)) ++DEST=$(INSTALLROOT)$(PREFIX)/include/efi ++INCLUDEDIRS=$(sort $(shell find $(SOURCE) -type d)) ++ + install: +- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi +- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol +- mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH) +- $(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi +- $(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol +- $(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH) ++ @$(foreach d,$(INCLUDEDIRS), \ ++ $(INSTALL) -v -m 755 -d $(subst $(SOURCE),$(DEST),$(d)); \ ++ $(INSTALL) -v -m 644 -t $(subst $(SOURCE),$(DEST),$(d)) $(wildcard $(d)/*.h); \ ++ ) + + install_compat: install +- @if [ ! -h $(DEST)/$(BFD_ARCH) ]; then $(SYMLINK) $(ARCH) $(INSTALLROOT)$(PREFIX)/include/efi/$(BFD_ARCH) ; fi ++ @if [ ! -h $(DEST)/x86_64 ]; then $(SYMLINK) x64/ $(DEST)/x86_64 ; fi ++ @if [ ! -h $(DEST)/aarch64 ]; then $(SYMLINK) aa64/ $(DEST)/aarch64 ; fi + + include $(SRCDIR)/../Make.rules diff --git a/SOURCES/0038-Rename-our-installed-.o-and-linker-scripts.patch b/SOURCES/0038-Rename-our-installed-.o-and-linker-scripts.patch new file mode 100644 index 0000000..f59ff1d --- /dev/null +++ b/SOURCES/0038-Rename-our-installed-.o-and-linker-scripts.patch @@ -0,0 +1,63 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 13 Nov 2019 15:24:27 -0500 +Subject: [PATCH] Rename our installed .o and linker scripts. + +Since crt0 and our linker scripts are now in a subdirectory, there's no +need to make them named differently in the installed machine. This +renames them to crt0.o and efi.lds . + +Signed-off-by: Peter Jones +--- + gnuefi/Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index 7652669a7cc..86760f55578 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -55,35 +55,35 @@ all: $(TARGETS) + libgnuefi.a: $(OBJS) + $(AR) $(ARFLAGS) $@ $^ + +- + clean: + @rm -vf $(TARGETS) *~ *.o $(OBJS) + + install: +- mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) +- $(INSTALL) -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/ $(TARGETS) ++ @mkdir -p $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 -t $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) libgnuefi.a ++ @$(INSTALL) -v -m 644 crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/crt0.o + ifneq (,$(findstring FreeBSD,$(OS))) + ifeq ($(ARCH),x64) +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) + else +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/efi.lds + endif + else +- $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH) ++ @$(INSTALL) -v -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/gnuefi/$(ARCH)/efi.lds + endif + + install_compat: install + mkdir -p $(INSTALLROOT)$(LIBDIR) + $(SYMLINK) gnuefi/$(ARCH)/libgnuefi.a $(INSTALLROOT)$(LIBDIR)/libgnuefi.a +- $(SYMLINK) gnuefi/$(ARCH)/crt0-efi-$(ARCH).o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o ++ $(SYMLINK) gnuefi/$(ARCH)/crt0.o $(INSTALLROOT)$(LIBDIR)/crt0-efi-$(BFD_ARCH).o + ifneq (,$(findstring FreeBSD,$(OS))) + ifeq ($(ARCH),x64) + $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_fbsd_efi.lds + else +- $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds ++ $(SYMLINK) gnuefi/$(ARCH)/efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds + endif + else +- $(SYMLINK) gnuefi/$(ARCH)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds ++ $(SYMLINK) gnuefi/$(ARCH)/efi.lds $(INSTALLROOT)$(LIBDIR)/elf_$(BFD_ARCH)_efi.lds + endif + + include $(SRCDIR)/../Make.rules diff --git a/SOURCES/0039-Supply-makefile-templates.patch b/SOURCES/0039-Supply-makefile-templates.patch new file mode 100644 index 0000000..9043e9c --- /dev/null +++ b/SOURCES/0039-Supply-makefile-templates.patch @@ -0,0 +1,614 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 13 Nov 2019 15:24:41 -0500 +Subject: [PATCH] Supply makefile templates. + +This supplies template makefiles for applications consuming gnu-efi to +use as: + +include efi.mk + +Signed-off-by: Peter Jones +--- + Make.defaults | 6 +- + inc/.gitignore | 2 + + inc/Makefile | 25 ++++++++- + inc/aa64.mk | 21 +++++++ + inc/arm.mk | 21 +++++++ + inc/efi.mk.3.in | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + inc/efi.mk.in | 126 +++++++++++++++++++++++++++++++++++++++++ + inc/ia32.mk | 30 ++++++++++ + inc/ia64.mk | 19 +++++++ + inc/mips64el.mk | 22 ++++++++ + inc/x64.mk | 31 ++++++++++ + 11 files changed, 470 insertions(+), 4 deletions(-) + create mode 100644 inc/.gitignore + create mode 100644 inc/aa64.mk + create mode 100644 inc/arm.mk + create mode 100644 inc/efi.mk.3.in + create mode 100644 inc/efi.mk.in + create mode 100644 inc/ia32.mk + create mode 100644 inc/ia64.mk + create mode 100644 inc/mips64el.mk + create mode 100644 inc/x64.mk + +diff --git a/Make.defaults b/Make.defaults +index 7231e9bced2..01269660ab8 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -82,12 +82,14 @@ HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed \ + -e s,amd64,x64, -e s,x86_64,x64, \ + -e s,aarch64,aa64, \ + -e 's,armv[[:digit:]].*,arm,' \ ++ -e 's,mips64.*,mips64el,g' \ + ) + ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed \ + -e s,i[3456789]86,ia32, \ + -e s,amd64,x64, -e s,x86_64,x64, \ + -e s,aarch64,aa64, \ + -e 's,armv[[:digit:]].*,arm,' \ ++ -e 's,mips64.*,mips64el,g' \ + ) + BFD_ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed \ + -e s,i[3456789]86,ia32, \ +@@ -102,6 +104,7 @@ ifneq ($(CROSS_COMPILE),) + -e s,amd64,x64, -e s,x86_64,x64, \ + -e s,aarch64,aa64, \ + -e 's,armv[[:digit:]].*,arm,' \ ++ -e 's,mips64.*,mips64el,g' \ + ) + endif + +@@ -161,7 +164,8 @@ ifneq (,$(filter $(ARCH),ia32 x64)) + endif + + ifeq ($(ARCH),mips64el) +- CFLAGS += -march=mips64r2 ++ CFLAGS += -march=mips64r2 -EL ++ LDFLAGS += -EL + ARCH3264 = -mabi=64 + endif + +diff --git a/inc/.gitignore b/inc/.gitignore +new file mode 100644 +index 00000000000..91716c91aab +--- /dev/null ++++ b/inc/.gitignore +@@ -0,0 +1,2 @@ ++efi.mk ++efi.mk.3 +diff --git a/inc/Makefile b/inc/Makefile +index e8123fd3115..c7f1406f026 100644 +--- a/inc/Makefile ++++ b/inc/Makefile +@@ -5,19 +5,38 @@ TOPDIR = $(SRCDIR)/.. + + include $(SRCDIR)/../Make.defaults + ++# deliberately not putting efi.mk and efi.mk.3 in all, because PREFIX is often ++# not passed before "make install". + all: + + clean: ++ @rm -vf efi.mk ++ ++efi.mk efi.mk.3 : % : %.in ++ sed \ ++ -e 's,@@CC@@,$(CC),g' \ ++ -e 's,@@PREFIX@@,$(PREFIX),g' \ ++ -e 's,@@INCDIR@@,$(PREFIX)/include/efi,g' \ ++ -e 's,@@GNUEFIDIR@@,$(LIBDIR)/gnuefi/$$(EFI_ARCH),g' \ ++ -e 's,@@LIBEFIDIR@@,$(LIBDIR)/gnuefi/$$(EFI_ARCH),g' \ ++ $^ > $@ + + SOURCE=$(realpath $(SRCDIR)) +-DEST=$(INSTALLROOT)$(PREFIX)/include/efi ++DESTINCDIR=$(INSTALLROOT)$(PREFIX)/include ++DEST=$(DESTINCDIR)/efi + INCLUDEDIRS=$(sort $(shell find $(SOURCE) -type d)) ++MANDIR ?= $(PREFIX)/share/man + +-install: ++install: efi.mk efi.mk.3 + @$(foreach d,$(INCLUDEDIRS), \ + $(INSTALL) -v -m 755 -d $(subst $(SOURCE),$(DEST),$(d)); \ +- $(INSTALL) -v -m 644 -t $(subst $(SOURCE),$(DEST),$(d)) $(wildcard $(d)/*.h); \ ++ $(INSTALL) -v -m 644 -t $(subst $(SOURCE),$(DEST),$(d)) $(wildcard $(d)/*.h $(d)/*.mk); \ + ) ++ @$(INSTALL) -v -m 644 -t $(DESTINCDIR) efi.mk ++ @$(INSTALL) -v -m 755 -d $(INSTALLROOT)$(MANDIR)/man3 ++ @$(INSTALL) -v -m 644 -t $(INSTALLROOT)$(MANDIR)/man3 efi.mk.3 ++ ++.PHONY: install + + install_compat: install + @if [ ! -h $(DEST)/x86_64 ]; then $(SYMLINK) x64/ $(DEST)/x86_64 ; fi +diff --git a/inc/aa64.mk b/inc/aa64.mk +new file mode 100644 +index 00000000000..406915ef742 +--- /dev/null ++++ b/inc/aa64.mk +@@ -0,0 +1,21 @@ ++# ++# efi-aa64.mk ++# Peter Jones, 2019-11-13 14:27 ++# ++ifeq ($(EFI_ARCH),aa64) ++ ++EFI_ARCH_3264 := ++EFI_ARCH_SUBSYSTEM := 0xa ++ ++EFI_ARCH_CFLAGS := -mstrict-align -DPAGE_SIZE=4096 -DPAGE_SHIFT=12 ++EFI_ARCH_LDFLAGS := --defsym=EFI_SUBSYSTEM=$(EFI_ARCH_SUBSYSTEM) ++EFI_ARCH_FORMAT := -O binary ++EFI_ARCH_SUFFIX := aa64 ++EFI_ARCH_SUFFIX_UPPER := AA64 ++EFI_ARCH_TIMESTAMP_LOCATION := 72 ++EFI_ARCH_HAVE_OBJCOPY := y ++ ++export EFI_ARCH_CCLDFLAGS EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 EFI_ARCH_HAVE_OBJCOPY ++endif +diff --git a/inc/arm.mk b/inc/arm.mk +new file mode 100644 +index 00000000000..b47c9c7c61e +--- /dev/null ++++ b/inc/arm.mk +@@ -0,0 +1,21 @@ ++# ++# efi-arm.mk ++# Peter Jones, 2019-11-13 14:27 ++# ++ifeq ($(EFI_ARCH),arm) ++ ++EFI_ARCH_3264 := ++EFI_ARCH_SUBSYSTEM := 0xa ++ ++EFI_ARCH_CFLAGS := -mno-unaligned-access -DPAGE_SIZE=4096 -DPAGE_SHIFT=12 ++EFI_ARCH_LDFLAGS := --defsym=EFI_SUBSYSTEM=$(EFI_ARCH_SUBSYSTEM) ++EFI_ARCH_FORMAT := -O binary ++EFI_ARCH_SUFFIX := arm ++EFI_ARCH_SUFFIX_UPPER := ARM ++EFI_ARCH_TIMESTAMP_LOCATION := 72 ++EFI_ARCH_HAVE_OBJCOPY := y ++ ++export EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 EFI_ARCH_HAVE_OBJCOPY ++endif +diff --git a/inc/efi.mk.3.in b/inc/efi.mk.3.in +new file mode 100644 +index 00000000000..c0bf3f123ed +--- /dev/null ++++ b/inc/efi.mk.3.in +@@ -0,0 +1,171 @@ ++.TH efi.mk 3 "Thu Nov 21 2019" ++.SH NAME ++efi.mk ++.SH SYNOPSIS ++.nf ++.B include efi.mk ++.SH DESCRIPTION ++.ad l ++.nh ++The \fBgnu-efi\fR library provides a set of makefiles which produce \fBEFI\fR ++binaries on the supported platforms, as well as a number of make variables ++which can be set to control how each step gets built. These can be set in your ++makefile or on the command line, but are normally set to reasonable defaults. ++Usually you'll just want to use the \fI+=\fR operator, as shown in the ++.BR EXAMPLES ++section below, rather than fully replacing these. ++.SS make variables ++.RS 4 ++.TP ++.B \fBEFI_ARCH_CFLAGS\fR ++Architecture specific \fBgcc\fR command line options for building a \fI.efi.o\fR ++.TP ++.B \fBEFI_ARCH_LDFLAGS\fR ++Architecture specific \fBld\fR command line options for building the \fI.efi.so\fR ++.TP ++.B \fBEFI_ARCH_FORMAT\fR ++Architecture specific \fBobjcopy\fR arguments for building the final \fI.efi\fR binary ++.TP ++.B \fBCROSS_COMPILE\fR ++Compiler prefix for cross-compilation. For example, "\fIaarch64-linux-gnu-\fR". ++.TP ++.B \fBEFI_CC\fR ++\p The C compiler. Defaults to either \fI$(CROSS_COMPILE)gcc\fR or \fI$(CROSS_COMPILE)clang\fR, ++depending on what \fI$(CC)\fR was set to when \fBgnu-efi\fR was built. ++.TP ++.B \fBEFI_HOSTCC\fR ++Defaults to whatever \fI$(CC)\fR was set to when \fBgnu-efi\fR was built. ++.TP ++.B \fBEFI_HOSTARCH\fR ++One of \fIaa64\fR, \fIarm\fR, \fIia32\fR, \fIia64\fR, \fIx64\fR, or ++\fImips64el\fR, representing the \fBEFI\fR architecture name of the host machine ++during the build. ++.TP ++.B \fBEFI_ARCH\fR ++One of \fIaa64\fR, \fIarm\fR, \fIia32\fR, \fIia64\fR, \fIx64\fR, or ++\fImips64el\fR, representing the \fBEFI\fR architecture name of the target. ++.TP ++.B \fBEFI_BFDARCH\fR ++The architecture name for the BFD target for objcopy. ++.TP ++.B \fBEFI_ARCH_3264\fR ++Usually empty; if you're cross compiling, this will default to e.g. \fI-m64\fR if ++you're building for an \fIx64\fR target on an \fIi686\fR host. ++.TP ++.B \fBEFI_CC_INCLUDES\fR ++The list of default include path for the compiler, as a \fBgcc\fR command line ++argument. Defaults to the output of \fI$(EFI_CC) $(EFI_ARCH_3264) ++-print-file-name=include\fR, for example ++\fI/usr/lib/gcc/x86_64-redhat-linux/9/include\fR. Note that there is no ++\fI-I\fR prefix on these. ++.TP ++.B \fBEFI_INCLUDES\fR ++The \fBgnu-efi\fR include paths. Note that there is no \fI-I\fR prefix on these. ++.TP ++.B \fBEFI_CPPFLAGS\fR ++Flags passed to \fBgcc\fR regardless of the build target. ++.TP ++.B \fBEFI_CFLAGS\fR ++Flags passed to \fBgcc\fR for building any binary target. Defaults to ++\fI$(EFI_CPPFLAGS) $(EFI_ARCH_CFLAGS)\fR. ++.TP ++.B \fBEFI_LDSCRIPT\fR ++The linker script passed to \fBld -T\fR for linking \fI.efi.so\fR build targets. ++Defaults to \fI@@PREFIX@@/lib/gnuefi/$(EFI_ARCH)/efi.lds\fR. ++.TP ++.B \fBEFI_LIBGCC\fR ++The path to \fBlibgcc\fR. Defaults to the result of ++\fI$(EFI_CC) $(EFI_ARCH_3264) -print-libgcc-file-name\fR ++.TP ++.B \fBEFI_LDFLAGS\fR ++Other command line to pass to \fBld\fR ++.ul ++before ++object names. Defaults to ++\fI-nostdlib --warn-common --no-undefined --fatal-warnings \ ++--build-id=sha1 -shared -Bsymbolic -L@@PREFIX@@/lib/gnuefi/$(EFI_ARCH) \ ++@@PREFIX@@/lib/gnuefi/$(EFI_ARCH)/crt0.o\fR ++.TP ++.B \fBEFI_CCLDFLAGS\fR ++Normally derived from \fI$(EFI_LDFLAGS)\fR. ++.TP ++.B \fBEFI_LDLIBS\fR ++Libraries to pass to \fBld\fR ++.ul ++after ++target object names. Defaults ++to \fI-lefi -lgnuefi $(EFI_LIBGCC) -T $(EFI_LDSCRIPT)\fR ++.TP ++.B \fBEFI_CCLDLIBS\fR ++Derived from \fI$(EFI_LDLIBS)\fR. ++.TP ++.B \fBEFI_ARFLAGS\fR ++Flags to pass to ar to make a \fI.efi.a\fR target. Defaults to "\fIrDv\fR". ++.TP ++.B \fBEFI_ASFLAGS\fR ++Flags to pass to gcc to make a \fI.efi.o\fR object from a \fI.S\fR file. ++.TP ++.B \fBEFI_OBJCOPY_FLAGS\fR ++Flags to pass to objcopy to make a \fI.efi\fR binary target. Defaults to ++\fI--file-alignment 512 --section-alignment 4096 -D\fR ++.TP ++.B \fBEFI_BIN_SECTIONS\fR ++Names of sections to go into \fI.efi\fR binary targets. If you have special ++sections, add them here. ++.TP ++.B \fBEFI_DEBUG_SECTIONS\fR ++Names of sections to go into \fI.efi.debug\fR targets. If you have special ++debug sections, add them here. ++.RE ++.TP ++In addition, there are several make rules defined, which those variables affect ++as appropriate: ++.RS 4 ++.TP ++.B \fB%.efi : %.efi.so\fB ++Build a \fI.efi\fR binary ++.TP ++.B \fB%.efi.debug : %efi.so\fR ++Build debuginfo ++.TP ++.B \fB%.efi.so :\fR ++Build the intermediate \fI.efi.so\fR to be linked as a \fI.efi\fR binary. Add ++\fI.o\fR files as dependencies to a concrete \fI.efi.so\fR rule in order to ++define targets. ++.TP ++.B \fB%.efi.a :\fR ++Build an intermediate archive file for linking into a \fI.efi.so\fR ++.TP ++.B \fB%.efi.o : %.c\fR ++Build an object file from a \fI.c\fR file ++.TP ++.B \fB%.efi.o : %.S\fR ++Build an object file from a \fI.S\fR file ++.TP ++.B \fBefi_clean :\fR ++Remove all files in the current working directory with the suffixes ++\fI.efi\fR, \fI.efi.a\fR, \fI.efi.debug\fR, \fI.efi.o\fR, or \fI.efi.so\fR. ++.SH EXAMPLES ++This is a simple makefile used to build an \fBEFI\fR binary named \fIfoo.efi\fR from source files \fIfoo.c\fR and \fIbar.c\fR. It includes the special section \fI.weird\fR in the final binary, and the name of that is defined within the \fI.c\fR source files using the macro \fIWEIRD_SECTION_NAME\fR: ++.RS 4 ++\p include efi.mk ++.br ++\p all : foo.efi ++.br ++\p %.efi.o : | EFI_CFLAGS+=-DWEIRD_SECTION_NAME=\\".weird\\" ++.br ++\p foo.efi : | EFI_BIN_SECTIONS+=.weird ++.br ++foo.efi.so : foo.efi.o bar.efi.o ++.br ++\p clean : efi_clean ++.RE ++\p The following example shows how to cross-compile a binary for another architecture (in this case, \fIARM Aarch64\fR, which \fBEFI\fR calls \fIaa64\fR). This assumes that you have the \fIcrt0.o\fR, \fIefi.lds\fR, \fIlibgnuefi.a\fR, and \fIlibefi.a\fR files for \fIAarch64\fR installed in \fI@@PREFIX@@/lib/gnuefi/aa64/\fR\. ++.RS 4 ++\p $ make CROSS_COMPILE=aarch64-linux-gnu- EFI_ARCH=aa64 foo.efi ++.RE ++.fi ++.SH AUTHORS ++.nf ++Peter Jones ++.fi +diff --git a/inc/efi.mk.in b/inc/efi.mk.in +new file mode 100644 +index 00000000000..3de783a5a05 +--- /dev/null ++++ b/inc/efi.mk.in +@@ -0,0 +1,126 @@ ++# ++# efi.mk ++# Peter Jones, 2019-11-13 14:11 ++# ++ ++_efi_comma=, ++_efi_empty= ++_efi_space=$(_efi_empty) $(_efi_empty) ++ ++CROSS_COMPILE ?= ++OBJCOPY ?= $(CROSS_COMPILE)objcopy ++LD ?= $(CROSS_COMPILE)ld ++ ++EFI_OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.*\((.*)\|version\) //g' | cut -f1-2 -d.` \>= 2.24) ++ ++EFI_CC ?= $(CROSS_COMPILE)@@CC@@ ++EFI_HOSTCC ?= @@CC@@ ++ ++EFI_HOSTARCH ?= $(shell $(EFI_HOSTCC) -dumpmachine | cut -f1 -d- | \ ++ sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x64, \ ++ -e s,x86_64,x64, \ ++ -e s,aarch64,aa64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) ++EFI_ARCH ?= $(shell $(EFI_CC) -dumpmachine | cut -f1 -d- | \ ++ sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x64, \ ++ -e s,x86_64,x64, \ ++ -e s,aarch64,aa64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) ++EFI_BFDARCH ?= $(shell $(EFI_CC) -dumpmachine | cut -f1 -d- | \ ++ sed \ ++ -e s,i[3456789]86,ia32, \ ++ -e s,amd64,x86_64, \ ++ -e 's,armv[[:digit:]].*,arm,' \ ++ ) ++ ++include efi/$(EFI_ARCH).mk ++ ++GNUEFI_LIB_PATHS := $(sort @@LIBEFIDIR@@ @@GNUEFIDIR@@) ++GNUEFI_LDFLAGS := -nostdlib --warn-common --no-undefined --fatal-warnings \ ++ --build-id=sha1 -shared -Bsymbolic --exclude-libs ALL \ ++ $(foreach x,$(GNUEFI_LIB_PATHS),-L$(x)) @@GNUEFIDIR@@/crt0.o ++ ++ifeq ($(origin EFI_CC_INCLUDES),undefined) ++EFI_CC_INCLUDES := $(foreach x,$(shell $(EFI_CC) $(EFI_ARCH_3264) -print-file-name=include),-I$(x)) ++endif ++EFI_INCLUDES ?= -I@@INCDIR@@ -I@@INCDIR@@/$(EFI_ARCH) -I@@INCDIR@@/protocol ++EFI_CPPFLAGS ?= -ffreestanding -nostdlib -fpic \ ++ $(EFI_INCLUDES) $(EFI_CC_INCLUDES) \ ++ -DCONFIG_$(EFI_ARCH) -DCONFIG_ARCH=$(EFI_ARCH) \ ++ -Wno-error=pragmas -fvisibility=hidden \ ++ -fshort-wchar -fno-strict-aliasing -fno-stack-protector \ ++ $(if $(findstring gcc,$(EFI_CC)),-fno-merge-all-constants,) \ ++ $(EFI_ARCH_CPPFLAGS) ++EFI_CFLAGS ?= $(EFI_CPPFLAGS) $(EFI_ARCH_CFLAGS) ++ifeq ($(origin EFI_LDLIBS),undefined) ++EFI_LDLIBS := -lefi -lgnuefi ++endif ++ifeq ($(origin EFI_LDFLAGS),undefined) ++EFI_LDFLAGS := $(GNUEFI_LDFLAGS) $(EFI_ARCH_LDFLAGS) ++endif ++EFI_CCLDLIBS ?= $(foreach x,$(EFI_LDLIBS),$(x)) ++EFI_CCLDFLAGS ?= $(foreach x,$(EFI_LDFLAGS),-Wl$(_efi_comma)$(x)) ++EFI_ARFLAGS ?= rDv ++EFI_ASFLAGS ?= $(EFI_ARCH_3264) ++EFI_LIBGCC ?= $(shell $(EFI_CC) $(EFI_ARCH_3264) -print-libgcc-file-name) ++EFI_LDSCRIPT ?= @@GNUEFIDIR@@/efi.lds ++_EFI_CCLDLIBS = $(subst $(_efi_space),$(_efi_comma),-Wl --start-group $(foreach x,$(EFI_CCLDLIBS),$(x)) --end-group) ++ ++EFI_BIN_SECTIONS ?= .text .sdata .data .dynamic .dynsym \ ++ .rel .rel.* .rela .rela.* .reloc \ ++ .eh_frame .note.gnu.build-id .ctf \ ++ $(EFI_ARCH_BIN_SECTIONS) ++ ++EFI_DEBUG_SECTIONS ?= .debug* .eh_frame .note.gnu.build-id .ctf \ ++ $(EFI_ARCH_DEBUG_SECTIONS) ++EFI_OBJCOPY_FLAGS ?= --file-alignment 512 --section-alignment 4096 -D ++ ++%.efi : %.efi.so ++ifneq ($(EFI_OBJCOPY_GTE224),1) ++ $(error objcopy >= 2.24 is required) ++endif ++ $(OBJCOPY) $(EFI_OBJCOPY_FLAGS) \ ++ $(foreach x,$(EFI_BIN_SECTIONS),-j $(x)) \ ++ $(EFI_ARCH_FORMAT) $*.efi.so $@ ++ ++%.efi.debug : %.efi.so ++ifneq ($(EFI_OBJCOPY_GTE224),1) ++ $(error objcopy >= 2.24 is required) ++endif ++ $(OBJCOPY) $(EFI_OBJCOPY_FLAGS) \ ++ $(foreach x,$(EFI_DEBUG_SECTIONS),-j $(x)) \ ++ $(EFI_ARCH_FORMAT) $*.efi.so $@ ++ ++%.efi.a : ++ $(AR) $(EFI_ARFLAGS) $@ $^ ++ ++%.efi.so : ++ $(EFI_CC) $(EFI_CFLAGS) $(EFI_CCLDFLAGS) -o $@ $^ $(_EFI_CCLDLIBS) $(EFI_LIBGCC) -T $(EFI_LDSCRIPT) ++ ++%.efi.o : %.c ++ $(EFI_CC) $(EFI_CFLAGS) -c -o $@ $< ++ ++%.efi.o : %.S ++ $(EFI_CC) $(EFI_CFLAGS) -c -o $@ $< ++ ++efi_clean :: ++ @rm -vf *.efi.{a,debug,o,so} *.efi ++ ++.PHONY: efi_clean ++ ++export EFI_ARCH ++export EFI_ARCH_CCLDFLAGS EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_CLANG_BUGS EFI_ARCH_CAN_DISABLE_AVX ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 ++export EFI_ARFLAGS EFI_ASFLAGS EFI_BFDARCH EFI_CC EFI_CFLAGS EFI_CPPFLAGS ++export EFI_LDFLAGS EFI_LDSCRIPT EFI_HOSTARCH EFI_HOSTCC EFI_INCLUDES ++export EFI_LIBGCC EFI_LIBS ++ ++# vim:ft=make +diff --git a/inc/ia32.mk b/inc/ia32.mk +new file mode 100644 +index 00000000000..d961db70031 +--- /dev/null ++++ b/inc/ia32.mk +@@ -0,0 +1,30 @@ ++# ++# efi-ia32.mk ++# Peter Jones, 2019-11-13 14:27 ++# ++ifeq ($(EFI_ARCH),ia32) ++ ++ifeq ($(EFI_HOSTARCH),x64) ++EFI_ARCH_3264 := -m32 ++else ++EFI_ARCH_3264 := ++endif ++EFI_ARCH_CAN_DISABLE_AVX := $(shell $(EFI_CC) -Werror -c -o /dev/null -xc -mno-avx - /dev/null 2>&1 && echo -mno-avx) ++EFI_ARCH_CLANG_BUGS := $(if $(findstring gcc,$(EFI_CC)),-maccumulate-outgoing-args,) ++ ++EFI_ARCH_CFLAGS := -mno-mmx -mno-sse \ ++ $(EFI_ARCH_3264) \ ++ $(EFI_ARCH_CAN_DISABLE_AVX) \ ++ $(EFI_ARCH_CLANG_BUGS) \ ++ -DPAGE_SIZE=4096 -DPAGE_SHIFT=12 ++EFI_ARCH_LDFLAGS := ++EFI_ARCH_FORMAT := --target efi-app-$(EFI_BFDARCH) ++EFI_ARCH_SUFFIX := ia32 ++EFI_ARCH_SUFFIX_UPPER := IA32 ++EFI_ARCH_TIMESTAMP_LOCATION := 136 ++ ++export EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 ++export EFI_ARCH_CLANG_BUGS EFI_ARCH_CAN_DISABLE_AVX ++endif +diff --git a/inc/ia64.mk b/inc/ia64.mk +new file mode 100644 +index 00000000000..29b3f1c4f8e +--- /dev/null ++++ b/inc/ia64.mk +@@ -0,0 +1,19 @@ ++# ++# efi-ia64.mk ++# Peter Jones, 2019-11-13 14:27 ++# ++ifeq ($(EFI_ARCH),ia64) ++ ++EFI_ARCH_CFLAGS := -mfixed-range=f32-f127 -m64 \ ++ -DPAGE_SIZE=4096 -DPAGE_SHIFT=12 ++EFI_ARCH_LDFLAGS := ++EFI_ARCH_SUFFIX := ia64 ++EFI_ARCH_SUFFIX_UPPER := IA64 ++# XXX I have no idea if this is right ++EFI_ARCH_TIMESTAMP_LOCATION := 136 ++ ++export EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 ++export EFI_ARCH_CLANG_BUGS EFI_ARCH_CAN_DISABLE_AVX ++endif +diff --git a/inc/mips64el.mk b/inc/mips64el.mk +new file mode 100644 +index 00000000000..257180955b6 +--- /dev/null ++++ b/inc/mips64el.mk +@@ -0,0 +1,22 @@ ++# ++# efi-mips64el.mk ++# Peter Jones, 2019-11-13 14:27 ++# ++ifeq ($(EFI_ARCH),mips64el) ++ ++EFI_ARCH_3264 := -mabi=64 ++ ++EFI_ARCH_CFLAGS := -march=mips64r2 -EL $(EFI_ARCH_3264) \ ++ -DPAGE_SIZE=4096 -DPAGE_SHIFT=12 ++EFI_ARCH_LDFLAGS := -EL ++EFI_ARCH_FORMAT := --target efi-app-$(EFI_BFDARCH) ++EFI_ARCH_SUFFIX := mips64el ++EFI_ARCH_SUFFIX_UPPER := MIPS64EL ++# XXX I have no idea if this is right ++EFI_ARCH_TIMESTAMP_LOCATION := 136 ++EFI_ARCH_HAVE_OBJCOPY := y ++ ++export EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 EFI_ARCH_HAVE_OBJCOPY ++endif +diff --git a/inc/x64.mk b/inc/x64.mk +new file mode 100644 +index 00000000000..bc1093988b3 +--- /dev/null ++++ b/inc/x64.mk +@@ -0,0 +1,31 @@ ++# ++# efi-x64.mk ++# Peter Jones, 2019-11-13 14:27 ++# ++ifeq ($(EFI_ARCH),x64) ++ ++ifeq ($(EFI_HOSTARCH),ia32) ++EFI_ARCH_3264 := -m64 ++else ++EFI_ARCH_3264 := ++endif ++EFI_ARCH_CAN_DISABLE_AVX := $(shell $(EFI_CC) -Werror -c -o /dev/null -xc -mno-avx - /dev/null 2>&1 && echo -mno-avx) ++EFI_ARCH_CLANG_BUGS := $(if $(findstring gcc,$(EFI_CC)),-maccumulate-outgoing-args,) ++ ++EFI_ARCH_CFLAGS := -mno-mmx -mno-sse -mno-red-zone \ ++ $(EFI_ARCH_3264) \ ++ $(EFI_ARCH_CAN_DISABLE_AVX) \ ++ $(EFI_ARCH_CLANG_BUGS) \ ++ -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI \ ++ -DPAGE_SIZE=4096 -DPAGE_SHIFT=12 ++EFI_ARCH_LDFLAGS := ++EFI_ARCH_FORMAT := --target efi-app-$(EFI_BFDARCH) ++EFI_ARCH_SUFFIX := x64 ++EFI_ARCH_SUFFIX_UPPER := X64 ++EFI_ARCH_TIMESTAMP_LOCATION := 136 ++ ++export EFI_ARCH_CFLAGS EFI_ARCH_CPPFLAGS EFI_ARCH_LDFLAGS ++export EFI_ARCH_FORMAT EFI_ARCH_SUBSYSTEM EFI_ARCH_SUFFIX EFI_ARCH_SUFFIX_UPPER ++export EFI_ARCH_TIMESTAMP_LOCATION EFI_ARCH_3264 ++export EFI_ARCH_CLANG_BUGS EFI_ARCH_CAN_DISABLE_AVX ++endif diff --git a/SOURCES/0040-Semi-asciibetize-_Print-s-formatters.patch b/SOURCES/0040-Semi-asciibetize-_Print-s-formatters.patch new file mode 100644 index 0000000..9624b75 --- /dev/null +++ b/SOURCES/0040-Semi-asciibetize-_Print-s-formatters.patch @@ -0,0 +1,226 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 18 Nov 2019 13:05:15 -0500 +Subject: [PATCH] Semi-asciibetize _Print()'s formatters. + +This is ascii order but with upper and lower case letters mixed, so +things like 'X' and 'x' that use fallthrough still stay together. + +Signed-off-by: Peter Jones +--- + lib/print.c | 148 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 73 insertions(+), 75 deletions(-) + +diff --git a/lib/print.c b/lib/print.c +index 35e43c03db5..0b823481347 100644 +--- a/lib/print.c ++++ b/lib/print.c +@@ -1067,26 +1067,26 @@ Returns: + Item.Item.pw = Item.Scratch; + break; + +- case '0': +- Item.Pad = '0'; +- break; +- +- case '-': +- Item.PadBefore = FALSE; +- break; +- + case ',': + Item.Comma = TRUE; + break; + +- case '.': +- Item.WidthParse = &Item.FieldWidth; ++ case '-': ++ Item.PadBefore = FALSE; + break; + + case '*': + *Item.WidthParse = va_arg(ps->args, UINTN); + break; + ++ case '.': ++ Item.WidthParse = &Item.FieldWidth; ++ break; ++ ++ case '0': ++ Item.Pad = '0'; ++ break; ++ + case '1': + case '2': + case '3': +@@ -1112,62 +1112,12 @@ Returns: + } + break; + +- case 's': +- Item.Item.pw = va_arg(ps->args, CHAR16 *); +- if (!Item.Item.pw) { +- Item.Item.pw = L"(null)"; +- } +- break; +- + case 'c': + Item.Scratch[0] = (CHAR16) va_arg(ps->args, UINTN); + Item.Scratch[1] = 0; + Item.Item.pw = Item.Scratch; + break; + +- case 'l': +- Item.Long = TRUE; +- break; +- +- case 'X': +- Item.Width = Item.Long ? 16 : 8; +- Item.Pad = '0'; +-#if __GNUC__ >= 7 +- __attribute__ ((fallthrough)); +-#endif +- case 'x': +- ValueToHex ( +- Item.Scratch, +- Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32) +- ); +- Item.Item.pw = Item.Scratch; +- +- break; +- +- +- case 'g': +- GuidToString (Item.Scratch, va_arg(ps->args, EFI_GUID *)); +- Item.Item.pw = Item.Scratch; +- break; +- +- case 'u': +- ValueToString ( +- Item.Scratch, +- Item.Comma, +- Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32) +- ); +- Item.Item.pw = Item.Scratch; +- break; +- +- case 'd': +- ValueToString ( +- Item.Scratch, +- Item.Comma, +- Item.Long ? va_arg(ps->args, INT64) : va_arg(ps->args, INT32) +- ); +- Item.Item.pw = Item.Scratch; +- break; +- + case 'D': + { + EFI_DEVICE_PATH *dp = va_arg(ps->args, EFI_DEVICE_PATH *); +@@ -1180,6 +1130,23 @@ Returns: + break; + } + ++ case 'd': ++ ValueToString ( ++ Item.Scratch, ++ Item.Comma, ++ Item.Long ? va_arg(ps->args, INT64) : va_arg(ps->args, INT32) ++ ); ++ Item.Item.pw = Item.Scratch; ++ break; ++ ++ case 'E': ++ Attr = ps->AttrError; ++ break; ++ ++ case 'e': ++ PSETATTR(ps, ps->AttrError); ++ break; ++ + case 'f': + FloatToString ( + Item.Scratch, +@@ -1189,38 +1156,69 @@ Returns: + Item.Item.pw = Item.Scratch; + break; + +- case 't': +- TimeToString (Item.Scratch, va_arg(ps->args, EFI_TIME *)); ++ case 'g': ++ GuidToString (Item.Scratch, va_arg(ps->args, EFI_GUID *)); + Item.Item.pw = Item.Scratch; + break; + +- case 'r': +- StatusToString (Item.Scratch, va_arg(ps->args, EFI_STATUS)); +- Item.Item.pw = Item.Scratch; +- break; +- +- case 'n': +- PSETATTR(ps, ps->AttrNorm); ++ case 'H': ++ Attr = ps->AttrHighlight; + break; + + case 'h': + PSETATTR(ps, ps->AttrHighlight); + break; + +- case 'e': +- PSETATTR(ps, ps->AttrError); ++ case 'l': ++ Item.Long = TRUE; + break; + + case 'N': + Attr = ps->AttrNorm; + break; + +- case 'H': +- Attr = ps->AttrHighlight; ++ case 'n': ++ PSETATTR(ps, ps->AttrNorm); + break; + +- case 'E': +- Attr = ps->AttrError; ++ case 'r': ++ StatusToString (Item.Scratch, va_arg(ps->args, EFI_STATUS)); ++ Item.Item.pw = Item.Scratch; ++ break; ++ ++ case 's': ++ Item.Item.pw = va_arg(ps->args, CHAR16 *); ++ if (!Item.Item.pw) { ++ Item.Item.pw = L"(null)"; ++ } ++ break; ++ ++ case 't': ++ TimeToString (Item.Scratch, va_arg(ps->args, EFI_TIME *)); ++ Item.Item.pw = Item.Scratch; ++ break; ++ ++ case 'u': ++ ValueToString ( ++ Item.Scratch, ++ Item.Comma, ++ Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32) ++ ); ++ Item.Item.pw = Item.Scratch; ++ break; ++ ++ case 'X': ++ Item.Width = Item.Long ? 16 : 8; ++ Item.Pad = '0'; ++#if __GNUC__ >= 7 ++ __attribute__ ((fallthrough)); ++#endif ++ case 'x': ++ ValueToHex ( ++ Item.Scratch, ++ Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32) ++ ); ++ Item.Item.pw = Item.Scratch; + break; + + default: diff --git a/SOURCES/0041-Implement-Print-L-p-ptr.patch b/SOURCES/0041-Implement-Print-L-p-ptr.patch new file mode 100644 index 0000000..d6ff3eb --- /dev/null +++ b/SOURCES/0041-Implement-Print-L-p-ptr.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 18 Nov 2019 13:06:23 -0500 +Subject: [PATCH] Implement Print(L"%p", ptr); + +Signed-off-by: Peter Jones +--- + lib/print.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/lib/print.c b/lib/print.c +index 0b823481347..8fdba6ee166 100644 +--- a/lib/print.c ++++ b/lib/print.c +@@ -1181,6 +1181,20 @@ Returns: + PSETATTR(ps, ps->AttrNorm); + break; + ++ case 'p': ++ Item.Width = sizeof(void *) == (8 ? 16 : 8) + 2; ++ Item.Pad = '0'; ++ Item.Scratch[0] = ' '; ++ Item.Scratch[1] = ' '; ++ ValueToHex ( ++ Item.Scratch+2, ++ Item.Long ? va_arg(ps->args, UINT64) : va_arg(ps->args, UINT32) ++ ); ++ Item.Scratch[0] = '0'; ++ Item.Scratch[1] = 'x'; ++ Item.Item.pw = Item.Scratch; ++ break; ++ + case 'r': + StatusToString (Item.Scratch, va_arg(ps->args, EFI_STATUS)); + Item.Item.pw = Item.Scratch; diff --git a/SOURCES/0042-Switch-to-fPIE.patch b/SOURCES/0042-Switch-to-fPIE.patch new file mode 100644 index 0000000..f1444a7 --- /dev/null +++ b/SOURCES/0042-Switch-to-fPIE.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 19 Nov 2019 13:23:14 -0500 +Subject: [PATCH] Switch to -fPIE + +Signed-off-by: Peter Jones +--- + Make.defaults | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 01269660ab8..15af35e6e26 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -193,10 +193,10 @@ endif + INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \ + -I$(TOPDIR)/inc/protocol + +-# Only enable -fpic for non MinGW compilers (unneeded on MinGW) ++# Only enable -fPIE for non MinGW compilers (unneeded on MinGW) + GCCMACHINE := $(shell $(CC) -dumpmachine) + ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE))) +- CFLAGS += -fpic ++ CFLAGS += -fPIE + endif + + IS_FREEBSD = $(findstring FreeBSD, $(OS)) diff --git a/SOURCES/0043-lfbgrid-Make-pointer-size-testing-not-arch-name-depe.patch b/SOURCES/0043-lfbgrid-Make-pointer-size-testing-not-arch-name-depe.patch new file mode 100644 index 0000000..985213f --- /dev/null +++ b/SOURCES/0043-lfbgrid-Make-pointer-size-testing-not-arch-name-depe.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 14 Jan 2020 10:13:30 -0500 +Subject: [PATCH] lfbgrid: Make pointer size testing not arch name dependent. + +Signed-off-by: Peter Jones +--- + apps/lfbgrid.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/apps/lfbgrid.c b/apps/lfbgrid.c +index ac50f4eafa9..e9fef957d94 100644 +--- a/apps/lfbgrid.c ++++ b/apps/lfbgrid.c +@@ -51,9 +51,9 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop) + UINTN NumPixels; + UINT32 *PixelBuffer; + UINT32 CopySize, BufferSize; +-#if defined(__x86_64__) || defined(__aarch64__) ++#if __SIZEOF_POINTER__ == 8 + UINT64 FrameBufferAddr; +-#elif defined(__i386__) || defined(__arm__) ++#elif __SIZEOF_POINTER__ == 4 + UINT32 FrameBufferAddr; + #else + #error YOUR ARCH HERE +@@ -115,9 +115,9 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop) + Print(L"No linear framebuffer on this device.\n"); + return; + } +-#if defined(__x86_64__) || defined(__aarch64__) ++#if __SIZEOF_POINTER__ == 8 + FrameBufferAddr = (UINT64)gop->Mode->FrameBufferBase; +-#elif defined(__i386__) || defined(__arm__) ++#elif __SIZEOF_POINTER__ == 4 + FrameBufferAddr = (UINT32)(UINT64)gop->Mode->FrameBufferBase; + #else + #error YOUR ARCH HERE diff --git a/SOURCES/0044-Fix-the-arch-subdirs-in-.gitignore.patch b/SOURCES/0044-Fix-the-arch-subdirs-in-.gitignore.patch new file mode 100644 index 0000000..483b6ec --- /dev/null +++ b/SOURCES/0044-Fix-the-arch-subdirs-in-.gitignore.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 15 Jan 2020 13:07:49 -0500 +Subject: [PATCH] Fix the arch subdirs in .gitignore. + +Currently they'll exclude e.g. inc/x64/ by accident; this makes it only +apply to the top level. + +Also adds vim temp files to the ignore list. + +Signed-off-by: Peter Jones +--- + .gitignore | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 014f7d02f46..3e96a65bb43 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,12 +1,13 @@ ++.*.sw? + *.efi + *.efi.debug + *.o + *.a + *.tar.* + *.tar +-aa64 +-arm +-ia32 +-ia64 +-mips64el +-x64 ++/aa64/ ++/arm/ ++/ia32/ ++/ia64/ ++/mips64el/ ++/x64/ diff --git a/SOURCES/0045-Use-CFLAGS-with-gcc-print-libgcc-file-name-to-get-th.patch b/SOURCES/0045-Use-CFLAGS-with-gcc-print-libgcc-file-name-to-get-th.patch new file mode 100644 index 0000000..3935e2e --- /dev/null +++ b/SOURCES/0045-Use-CFLAGS-with-gcc-print-libgcc-file-name-to-get-th.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 15 Jan 2020 13:10:11 -0500 +Subject: [PATCH] Use CFLAGS with "gcc -print-libgcc-file-name" to get the + right one. + +This makes us use CFLAGS when trying to find libgcc, so we don't get the +one with the wrong endian or float ABI. + +Signed-off-by: Peter Jones +--- + Make.defaults | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 15af35e6e26..de88bcd0231 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -181,10 +181,6 @@ endif + endif + endif + +-ifneq ($(ARCH),arm) +-export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name) +-endif +- + ifeq ($(ARCH),arm) + CFLAGS += -marm + endif +@@ -223,3 +219,7 @@ endif + ASFLAGS += $(ARCH3264) + LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \ + --build-id=sha1 ++ ++ifneq ($(ARCH),arm) ++export LIBGCC=$(shell $(CC) $(CFLAGS) $(ARCH3264) -print-libgcc-file-name) ++endif diff --git a/SOURCES/0046-CFLAGS-add-Wno-pointer-sign.patch b/SOURCES/0046-CFLAGS-add-Wno-pointer-sign.patch new file mode 100644 index 0000000..a74b95b --- /dev/null +++ b/SOURCES/0046-CFLAGS-add-Wno-pointer-sign.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 21 Jan 2020 15:05:19 -0500 +Subject: [PATCH] CFLAGS: add -Wno-pointer-sign + +Signed-off-by: Peter Jones +--- + Make.defaults | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.defaults b/Make.defaults +index de88bcd0231..cc8beec4600 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -203,7 +203,7 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ + -fshort-wchar -fno-strict-aliasing \ + -ffreestanding -fno-stack-protector + else +-CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ ++CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign -Werror \ + -fshort-wchar -fno-strict-aliasing \ + -ffreestanding -fno-stack-protector -fno-stack-check \ + -fno-stack-check \ diff --git a/SOURCES/gnu-efi.patches b/SOURCES/gnu-efi.patches new file mode 100644 index 0000000..ac379c0 --- /dev/null +++ b/SOURCES/gnu-efi.patches @@ -0,0 +1,46 @@ +Patch0001: 0001-Set-0-properly-in-StrnCpy.patch +Patch0002: 0002-Fix-typeo-in-efierr.h-EFI_WARN_UNKNOWN_GLYPH-definit.patch +Patch0003: 0003-Fixed-typeo-lib-error.c-EFI_WARN_UNKNOWN_GLYPH-defin.patch +Patch0004: 0004-efilink-fix-build-with-gcc-4.8.patch +Patch0005: 0005-Fix-for-problem-with-undeclared-intptr_t-type.patch +Patch0006: 0006-Redefine-jmp_buf-to-comply-with-C-calling-convention.patch +Patch0007: 0007-Make.rules-incomplete-wrong-make-r-failure.patch +Patch0008: 0008-gnuefi-Makefile-uses-a-strange-rule-to-create-libgnu.patch +Patch0009: 0009-efiapi.h-fix-EventGroup-parameter-of-EFI_CREATE_EVEN.patch +Patch0010: 0010-Do-not-include-efisetjmp.h-on-efi.h.patch +Patch0011: 0011-Bump-revision-to-VERSION-3.0.10.patch +Patch0012: 0012-Revert-efilink-fix-build-with-gcc-4.8.patch +Patch0013: 0013-Bump-revision-to-VERSION-3.0.11.patch +Patch0014: 0014-efibind-Fix-usage-of-efi-headers-from-C-code.patch +Patch0015: 0015-Fix-ARCH-on-ARMv6.patch +Patch0016: 0016-Re-add-back-the-original-symbol-typeo.patch +Patch0017: 0017-Add-elf.h-for-cross-building-without-a-system-libelf.patch +Patch0018: 0018-make-parameter-to-compile-apps-add-example-output-di.patch +Patch0019: 0019-Support-for-building-on-macOS-systems.patch +Patch0020: 0020-Make-apps-link-against-the-local-gnuefi-and-crt-obje.patch +Patch0021: 0021-Add-.travis.yml.patch +Patch0022: 0022-Use-EFI-canonical-names-everywhere-the-compiler-does.patch +Patch0023: 0023-Fix-a-minor-coverity-complaint-in-some-apps.patch +Patch0024: 0024-Add-stuff-that-s-got-weird-characters-to-.gitattribu.patch +Patch0025: 0025-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch +Patch0026: 0026-Get-rid-of-unused-make-like-files-from-yore.patch +Patch0027: 0027-Make-ELF-constructors-and-destructors-work.patch +Patch0028: 0028-Remove-the-accidental-lib-Makefile.orig.patch +Patch0029: 0029-gitignore-add-our-build-directories.patch +Patch0030: 0030-make-Fix-shell-exit-status-handling.patch +Patch0031: 0031-make-Make-make-clean-use-and-rm-v-everywhere.patch +Patch0032: 0032-Make-our-dummy-.reloc-sections-not-depend-on-section.patch +Patch0033: 0033-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch +Patch0034: 0034-Make-make-TOPDIR-actually-work-and-get-rid-of-unused.patch +Patch0035: 0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch +Patch0036: 0036-Install-our-libraries-in-LIBDIR-gnuefi-ARCH.patch +Patch0037: 0037-Install-all-headers-for-all-arches.patch +Patch0038: 0038-Rename-our-installed-.o-and-linker-scripts.patch +Patch0039: 0039-Supply-makefile-templates.patch +Patch0040: 0040-Semi-asciibetize-_Print-s-formatters.patch +Patch0041: 0041-Implement-Print-L-p-ptr.patch +Patch0042: 0042-Switch-to-fPIE.patch +Patch0043: 0043-lfbgrid-Make-pointer-size-testing-not-arch-name-depe.patch +Patch0044: 0044-Fix-the-arch-subdirs-in-.gitignore.patch +Patch0045: 0045-Use-CFLAGS-with-gcc-print-libgcc-file-name-to-get-th.patch +Patch0046: 0046-CFLAGS-add-Wno-pointer-sign.patch diff --git a/SPECS/gnu-efi.spec b/SPECS/gnu-efi.spec new file mode 100644 index 0000000..0546d3a --- /dev/null +++ b/SPECS/gnu-efi.spec @@ -0,0 +1,505 @@ +Name: gnu-efi +Epoch: 1 +Version: 3.0.11 +%global tarball_version 3.0.9 +Release: 8%{?dist}%{?buildid} +Summary: Development Libraries and headers for EFI +License: BSD +URL: https://sourceforge.net/projects/gnu-efi/ + +Source0: https://sourceforge.net/projects/gnu-efi/files/gnu-efi-%{tarball_version}.tar.bz2 +Source1: gnu-efi.patches +%include %{SOURCE1} + +ExclusiveArch: %{efi} +BuildRequires: binutils +BuildRequires: efi-srpm-macros >= 3-2 +BuildRequires: gcc +BuildRequires: git-core +# We're explicitly *not* requiring glibc-headers, because it gets us +# cross-arch dependency problems in "fedpkg mockbuild" from x86_64. +# BuildRequires: glibc-headers +%ifarch x86_64 +# So... in some build environments, glibc32 provides some headers. In +# others, glibc-devel.i686 does. They have no non-file provides in common. +#BuildRequires: glibc32 +#BuildRequires: glibc-devel(x86-32) +BuildRequires: /usr/include/gnu/stubs-32.h +%endif +BuildRequires: make + +# dammit, rpmlint, shut up. +%define lib %{nil}lib%{nil} + +%define debug_package %{nil} + +# brp-strip-static-archive will senselessly /add/ timestamps and uid/gid +# data to our .a and make them not multilib clean if we don't have this. +# +# We used to redefine strip, like so: +# %% global __strip "%%{__strip} -p" +# And had this note: +# Note that if we don't have the shell quotes there, -p becomes $2 on its +# invocation, and so it completely ignores it. +# +# Also note that if we try to use -D as we should (so it doesn't add +# uid/gid), strip(1) from binutils-2.25.1-22.base.el7.x86_64 throws a +# syntax error. +# +# But someone helpfully re-wrote %%__brp_strip_static_archive and that +# doesn't work any more. +# +# True story. +# +%undefine __brp_strip_static_archive +%global __brp_strip_static_archive find '%{buildroot}' -name '*.a' -print -exec %{__strip} -gDp {} \\; + +%description +This package contains development headers and libraries for developing +applications that run under EFI (Extensible Firmware Interface). + +%package devel +Summary: Development Libraries and headers for EFI +Obsoletes: gnu-efi < 1:3.0.2-1 +Requires: gnu-efi = %{epoch}:%{version}-%{release} +BuildArch: noarch +# temporarily, put this backwards +Requires: gnu-efi-compat = %{epoch}:%{version}-%{release} + +%description devel +This package contains development headers and libraries for developing +applications that run under EFI (Extensible Firmware Interface). + +%package compat +Summary: Development Libraries and headers for EFI +# temporarily, put this backwards +# Requires: gnu-efi-devel = %%{epoch}:%%{version}-%%{release} + +%description compat +This package provides compatibility for building software utilizing gnu-efi +which expects the directory layout from older versions of Fedora. + +%package utils +Summary: Utilities for EFI systems + +%description utils +This package contains utilities for debugging and developing EFI systems. + +%prep +%setup -q -n gnu-efi-%{tarball_version} +git init +git config user.email "gnu-efi-owner@fedoraproject.org" +git config user.name "Fedora Ninjas" +git config sendemail.to "gnu-efi-owner@fedoraproject.org" +git add . +git commit -a -q -m "%{version} baseline." +git am %{patches} compat.lst + +%files +%dir %{_prefix}/lib/gnuefi/ +%{_prefix}/lib/gnuefi/*/ +%exclude %{_prefix}/lib*/gnuefi/crt0-efi-* +%exclude %{_prefix}/lib*/gnuefi/elf_* + +%files devel +%doc README.* +%{_mandir}/man3/* +%{_includedir}/efi +%{_includedir}/*.mk +%exclude %{_includedir}/efi/x86_64 +%exclude %{_includedir}/efi/aarch64 + +%files compat -f compat.lst + +%files utils +%dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/ +%attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/*.efi +%if %{efi_has_alt_arch} + %dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/ + %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/*.efi +%endif + +%changelog +* Mon Aug 09 2021 Mohan Boddu +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Peter Jones - 3.0.11-4 +- Fix a mistake building -compat + +* Tue Jan 28 2020 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 24 2020 Peter Jones - 3.0.11-2 +- Make a compat subpackage to provide the old paths to our libraries, linker + script, and includes. + +* Wed Jan 22 2020 Peter Jones - 3.0.11-1 +- Update to 3.0.11 (via patches generated from git) +- Plus newer upstream fixes (also via patches generated from git) +- Fix shell exit failures in make +- Fix .reloc section generation +- Fix CHAR8 definition +- Fix "make DESTDIR=..." +- Change the installed .a/.o layout +- Provide makefiles for consumers to use. +- Make the -devel noarch since it's just headers. +- Add a bunch of compatibility symlinks for the 3.0.8 filesystem layout + These will go away once we've migrated everything using them in fedora + to use the newer make system... + +* Thu Dec 26 2019 Peter Robinson 3.0.9-4 +- Upstream patch for efibind.h +- Latest ELF constructors/destructors patch +- Minor spec cleanups + +* Mon Aug 26 2019 Peter Jones - 3.0.9-3 +- Fix some minor rpmlint complaints +- Pull recent patches from upstream +- Add support for ELF constructors and destructors +- Fix a minor licensing problem + +* Thu Jul 25 2019 Fedora Release Engineering - 1:3.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 20 2019 Peter Jones - 3.0.9-1 +- Update to gnu-efi 3.0.9 + +* Thu Jan 31 2019 Fedora Release Engineering - 1:3.0.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 04 2018 Peter Jones - 3.0.8-4 +- Rebuild for new efi-rpm-macros, now that it has settled down a bit. + +* Tue May 01 2018 Peter Jones - 3.0.8-3 +- Use efi-rpm-macros instead of defining all the efi directory and arch + stuff ourselves. + +* Mon Apr 30 2018 Peter Jones - 3.0.8-2 +- Fix permissions on /boot/efi/... + +* Tue Mar 20 2018 Peter Jones - 3.0.8-1 +- Update to 3.0.8 (from git). + +* Tue Mar 13 2018 Peter Jones - 3.0.7-1 +- Update to 3.0.7 (from git) and add some pending patches we need. + +* Wed Feb 07 2018 Fedora Release Engineering - 1:3.0.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 24 2017 Peter Jones - 3.0.5-11 +- Don't make .reloc sections on Aarch64 binaries. + +* Wed Aug 02 2017 Fedora Release Engineering - 1:3.0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:3.0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jun 13 2017 Peter Jones - 3.0.5-8 +- Update this to try to get determanistic builds. + +* Mon Mar 20 2017 Peter Jones - 3.0.5-7 +- Also build the ia32 bits in a separate 32-bit package for other consumers. + +* Mon Mar 13 2017 Peter Jones - 3.0.5-6 +- Include ia32 bits in the x86_64 packages instead of making a separate + 32-bit package + +* Tue Feb 28 2017 Peter Jones - 3.0.5-5 +- Fix some bugs from the 3.0.5 release... + +* Fri Feb 10 2017 Fedora Release Engineering - 1:3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* 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. + +* Tue Feb 23 2016 Peter Jones - 3.0.3-2 +- We still need build-id patches in some places. + +* Mon Feb 22 2016 Peter Jones - 3.0.3-1 +- Rebase to 3.0.3 + +* Wed Feb 03 2016 Fedora Release Engineering - 1:3.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 29 2016 Dan Horák - 1:3.0.2-3 +- use safer method to evaluate %%efidir + +* Wed Jun 17 2015 Fedora Release Engineering - 1:3.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 13 2015 Peter Jones - 3.0.2-1 +- Update to 3.0.2 +- Fix base package requirement on subpackages +- Add setjmp, because this is my life. + +* Tue Mar 10 2015 Peter Jones - 3.0.1-1 +- Update to 3.0.1 +- New versioning scheme! + +* Thu Nov 20 2014 Peter Jones - 3.0w-2 +- Use patches upstream is going to take for the build fixes +- Add some new protocol definitons. + +* Fri Aug 22 2014 Kyle McMartin - 3.0w-0.1 +- New upstream version 3.0w +- Add pjones' build fixes patch from that other distro. +- Enable AArch64 + +* Sat Aug 16 2014 Fedora Release Engineering - 3.0u-0.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.0u-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Sep 24 2013 Peter Jones - 3.0u-0.1 +- Update to 3.0u +- Split out subpackages so -devel can be multilib +- Fix path in apps subpackage to vary by distro. + +* Sat Aug 03 2013 Fedora Release Engineering - 3.0t-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 07 2013 Peter Jones - 3.0t-0.1 +- Update to 3.0t +- Don't allow use of mmx or sse registers. + +* Thu May 16 2013 Peter Jones - 3.0s-2 +- Update to 3.0s + Related: rhbz#963359 + +* Thu Feb 14 2013 Fedora Release Engineering - 3.0q-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 27 2012 Matthew Garrett - 3.0q-1 +- Update to current upstream +- License change - GPLv2+ to BSD + +* Thu Jul 19 2012 Fedora Release Engineering - 3.0e-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 25 2012 Peter Jones - 3.0e-17 +- Align .reloc section as well to make secureboot work (mfleming) + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0e-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Aug 11 2011 Peter Jones - 3.0e-15 +- Correctly pad the stack when doing uefi calls + Related: rhbz#677468 +- Add ability to write UEFI callbacks and drivers +- Add test harness for ABI Calling Conventions + +* Thu Jun 16 2011 Peter Jones - 3.0e-14 +- Handle uninitialized GOP driver gracefully. + +* Wed Feb 09 2011 Fedora Release Engineering - 3.0e-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Sep 10 2010 Peter Jones - 3.0e-12 +- Add "modelist.efi" test utility in apps/ + +* Mon Jul 26 2010 Peter Jones - 3.0e-11 +- Add PciIo headers. + +* Fri Jul 23 2010 Peter Jones - 3.0e-10 +- Add UEFI 2.x boot services. + +* Tue Aug 11 2009 Peter Jones - 3.0e-9 +- Change ExclusiveArch to reflect arch changes in repos. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.0e-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Apr 03 2009 Peter Jones - 3.0e-7 +- Use nickc's workaround for #492183 + +* Tue Mar 31 2009 Peter Jones - 3.0e-6.1 +- Make a test package for nickc. + +* Thu Mar 12 2009 Chris Lumens 3.0e-6 +- Add IA64 back into the list of build arches (#489544). + +* Mon Mar 02 2009 Peter Jones - 3.0e-5 +- Switch to i586 from i386. + +* Tue Feb 24 2009 Fedora Release Engineering - 3.0e-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 13 2009 Peter Jones - 3.0e-3 +- Pad sections out in the provided linker scripts to make sure they all of + some content. + +* Fri Oct 03 2008 Peter Jones - 3.0e-2 +- Fix install paths on x86_64. + +* Thu Oct 02 2008 Peter Jones - 3.0e-1 +- Update to 3.0e +- Fix relocation bug in 3.0e + +* Tue Jul 29 2008 Tom "spot" Callaway - 3.0d-6 +- fix license tag + +* Mon Jul 28 2008 Peter Jones - 3.0d-5 +- Remove ia64 palproc code since its license isn't usable. +- Remove ia64 from ExclusiveArch since it can't build... + +* Thu Mar 27 2008 Peter Jones - 3.0d-4 +- Fix uefi_call_wrapper(x, 10, ...) . +- Add efi_main wrappers and EFI_CALL() macro so drivers are possible. + +* Mon Feb 18 2008 Fedora Release Engineering - 3.0d-3 +- Autorebuild for GCC 4.3 + +* Fri Jan 11 2008 Peter Jones - 3.0d-2 +- Get rid of a bogus #ifdef . + +* Wed Dec 19 2007 Peter Jones - 3.0d-1 +- Update to 3.0d + +* Tue Jun 12 2007 Chris Lumens - 3.0c-2 +- Fixes for package review (#225846). + +* Wed Jul 12 2006 Jesse Keating - 3.0c-1.1 +- rebuild + +* Thu Apr 27 2006 Chris Lumens 3.0c-1 +- Upgrade to gnu-efi-3.0c. +- Enable build on i386. + +* Tue Feb 07 2006 Jesse Keating - 3.0a-7.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Mar 3 2005 Jeremy Katz - 3.0a-7 +- rebuild with gcc 4 + +* Tue Sep 21 2004 Jeremy Katz - 3.0a-6 +- add fix from Jesse Barnes for newer binutils (#129197) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Apr 21 2004 Jeremy Katz - 3.0a-4 +- actually add the patch + +* Tue Apr 20 2004 Bill Nottingham 3.0a-3 +- add patch to coalesce some relocations (#120080, ) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Oct 4 2002 Jeremy Katz +- rebuild in new environment + +* Sun Jul 8 2001 Bill Nottingham +- update to 3.0 + +* Tue Jun 5 2001 Bill Nottingham +- add fix for invocations from the boot manager menu (#42222) + +* Tue May 22 2001 Bill Nottingham +- add bugfix for efibootmgr () + +* Mon May 21 2001 Bill Nottingham +- update to 2.5 +- add in efibootmgr from Dell () + +* Thu May 3 2001 Bill Nottingham +- fix booting of kernels with extra arguments (#37711) + +* Wed Apr 25 2001 Bill Nottingham +- take out Stephane's initrd patch + +* Fri Apr 20 2001 Bill Nottingham +- fix the verbosity patch to not break passing arguments to images + +* Wed Apr 18 2001 Bill Nottingham +- update to 2.0, build elilo, obsolete eli + +* Tue Dec 5 2000 Bill Nottingham +- update to 1.1 + +* Thu Oct 26 2000 Bill Nottingham +- add patch for new toolchain, update to 1.0 + +* Thu Aug 17 2000 Bill Nottingham +- update to 0.9