diff options
Diffstat (limited to 'gnu-efi')
| -rwxr-xr-x | gnu-efi/Make.defaults | 7 | ||||
| -rw-r--r-- | gnu-efi/inc/efiapi.h | 8 | ||||
| -rw-r--r-- | gnu-efi/inc/efilib.h | 6 | ||||
| -rw-r--r-- | gnu-efi/lib/misc.c | 6 | ||||
| -rw-r--r-- | gnu-efi/lib/str.c | 2 |
5 files changed, 19 insertions, 10 deletions
diff --git a/gnu-efi/Make.defaults b/gnu-efi/Make.defaults index fd1d123d..5ce8f7cb 100755 --- a/gnu-efi/Make.defaults +++ b/gnu-efi/Make.defaults @@ -124,10 +124,10 @@ ifeq ($(ARCH),x86_64) || ( [ $(GCCVERSION) -eq "4" ] \ && [ $(GCCMINOR) -ge "7" ] ) ) \ && echo 1) - ifeq ($(GCCNEWENOUGH),1) - CPPFLAGS += -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG -maccumulate-outgoing-args --std=c11 - else ifeq ($(USING_CLANG),clang) + ifeq ($(USING_CLANG),clang) CPPFLAGS += -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG --std=c11 + else ifeq ($(GCCNEWENOUGH),1) + CPPFLAGS += -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG -maccumulate-outgoing-args --std=c11 endif CFLAGS += -mno-red-zone @@ -193,6 +193,7 @@ CFLAGS += $(ARCH3264) $(OPTIMIZATIONS) \ -fshort-wchar -fno-strict-aliasing \ -ffreestanding -fno-stack-protector \ -fno-stack-check -nostdinc \ + $(CFLAGS_LTO) $(CFLAGS_GCOV) \ -isystem $(TOPDIR)/../include/system \ -isystem $(shell $(CC) $(ARCH3264) -print-file-name=include) \ $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,) diff --git a/gnu-efi/inc/efiapi.h b/gnu-efi/inc/efiapi.h index bdf5de26..96e9e4a0 100644 --- a/gnu-efi/inc/efiapi.h +++ b/gnu-efi/inc/efiapi.h @@ -229,6 +229,7 @@ VOID #define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x00000010 #define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x00000020 #define EFI_VARIABLE_APPEND_WRITE 0x00000040 +#define EFI_VARIABLE_ENHANCED_AUTHENTICATED_ACCESS 0x00000080 // Variable size limitation #define EFI_MAXIMUM_VARIABLE_SIZE 1024 @@ -751,6 +752,8 @@ typedef struct _EFI_TABLE_HEADER { // #define EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552 +#define EFI_1_10_RUNTIME_SERVICES_REVISION ((1<<16) | (10)) +#define EFI_2_00_RUNTIME_SERVICES_REVISION ((2<<16) | (0)) #define EFI_RUNTIME_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) typedef struct { @@ -798,6 +801,8 @@ typedef struct { // #define EFI_BOOT_SERVICES_SIGNATURE 0x56524553544f4f42 +#define EFI_1_10_BOOT_SERVICES_REVISION ((1<<16) | (10)) +#define EFI_2_00_BOOT_SERVICES_REVISION ((2<<16) | (0)) #define EFI_BOOT_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) typedef struct _EFI_BOOT_SERVICES { @@ -938,6 +943,9 @@ typedef struct _EFI_CONFIGURATION_TABLE { #define EFI_SYSTEM_TABLE_SIGNATURE 0x5453595320494249 +#define EFI_1_02_SYSTEM_TABLE_REVISION ((1<<16) | (02)) +#define EFI_1_10_SYSTEM_TABLE_REVISION ((1<<16) | (10)) +#define EFI_2_00_SYSTEM_TABLE_REVISION ((2<<16) | (0)) #define EFI_SYSTEM_TABLE_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) typedef struct _EFI_SYSTEM_TABLE { diff --git a/gnu-efi/inc/efilib.h b/gnu-efi/inc/efilib.h index 91b51184..af470191 100644 --- a/gnu-efi/inc/efilib.h +++ b/gnu-efi/inc/efilib.h @@ -272,17 +272,17 @@ ZeroMem ( IN UINTN Size ); -VOID +VOID EFIAPI SetMem ( IN VOID *Buffer, IN UINTN Size, IN UINT8 Value ); -VOID +VOID EFIAPI CopyMem ( IN VOID *Dest, - IN CONST VOID *Src, + IN VOID *Src, IN UINTN len ); diff --git a/gnu-efi/lib/misc.c b/gnu-efi/lib/misc.c index 47331d07..c9a4b0ba 100644 --- a/gnu-efi/lib/misc.c +++ b/gnu-efi/lib/misc.c @@ -98,7 +98,7 @@ ZeroMem ( RtZeroMem (Buffer, Size); } -VOID +VOID EFIAPI SetMem ( IN VOID *Buffer, IN UINTN Size, @@ -108,10 +108,10 @@ SetMem ( RtSetMem (Buffer, Size, Value); } -VOID +VOID EFIAPI CopyMem ( IN VOID *Dest, - IN CONST VOID *Src, + IN VOID *Src, IN UINTN len ) { diff --git a/gnu-efi/lib/str.c b/gnu-efi/lib/str.c index cf5c7246..b78bf862 100644 --- a/gnu-efi/lib/str.c +++ b/gnu-efi/lib/str.c @@ -211,7 +211,7 @@ StrDuplicate ( Size = StrSize(Src); Dest = AllocatePool (Size); if (Dest) { - CopyMem (Dest, Src, Size); + CopyMem (Dest, (void *)Src, Size); } return Dest; } |