mirrors/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ALIGN to EFI_ALIGN

Browse Source 
Avoid conflict with other libraries

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
This commit is contained in:
Callum Farmer 2023-08-12 12:43:40 +01:00 committed by Nigel Croxon
parent 2c47753ad3
commit 593e13f670
9 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/aarch64/efisetjmp_arch.h
View File

@ -29,6 +29,6 @@ typedef struct {
UINT64 D13; UINT64 D13;
UINT64 D14; UINT64 D14;
UINT64 D15; UINT64 D15;
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_AARCH64_SETJMP_H */ #endif /* GNU_EFI_AARCH64_SETJMP_H */

2
inc/arm/efisetjmp_arch.h
View File

@ -16,6 +16,6 @@ typedef struct {
UINT32 R12; UINT32 R12;
UINT32 R13; UINT32 R13;
UINT32 R14; UINT32 R14;
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_ARM_SETJMP_H */ #endif /* GNU_EFI_ARM_SETJMP_H */

8
inc/eficompiler.h
View File

@ -39,9 +39,13 @@ Abstract:
#endif #endif
#ifdef _MSC_EXTENSIONS #ifdef _MSC_EXTENSIONS
#define ALIGN(x) __declspec(align(x)) #define EFI_ALIGN(x) __declspec(align(x))
#else #else
#define ALIGN(x) __attribute__((__aligned__(x))) #define EFI_ALIGN(x) __attribute__((__aligned__(x)))
#endif
#ifndef ALIGN
#define ALIGN(x) EFI_ALIGN(x)
#endif #endif
/* Also add a catch-all on __attribute__() for MS compilers */ /* Also add a catch-all on __attribute__() for MS compilers */

2
inc/ia32/efisetjmp_arch.h
View File

@ -10,6 +10,6 @@ typedef struct {
UINT32 Ebp; UINT32 Ebp;
UINT32 Esp; UINT32 Esp;
UINT32 Eip; UINT32 Eip;
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_IA32_SETJMP_H */ #endif /* GNU_EFI_IA32_SETJMP_H */

2
inc/ia64/efisetjmp_arch.h
View File

@ -42,6 +42,6 @@ typedef struct {
UINT64 Predicates; UINT64 Predicates;
UINT64 LoopCount; UINT64 LoopCount;
UINT64 FPSR; UINT64 FPSR;
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_IA64_SETJMP_H */ #endif /* GNU_EFI_IA64_SETJMP_H */

2
inc/loongarch64/efisetjmp_arch.h
View File

@ -18,6 +18,6 @@ typedef struct {
UINT64 S6; UINT64 S6;
UINT64 S7; UINT64 S7;
UINT64 S8; UINT64 S8;
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_LOONGARCH64_SETJMP_H */ #endif /* GNU_EFI_LOONGARCH64_SETJMP_H */

2
inc/mips64el/efisetjmp_arch.h
View File

@ -29,6 +29,6 @@ typedef struct {
UINT64 F30; UINT64 F30;
UINT64 F31; UINT64 F31;
#endif #endif
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_MIPS64EL_SETJMP_H */ #endif /* GNU_EFI_MIPS64EL_SETJMP_H */

2
inc/riscv64/efisetjmp_arch.h
View File

@ -35,6 +35,6 @@ typedef struct {
UINT64 fs9; UINT64 fs9;
UINT64 fs10; UINT64 fs10;
UINT64 fs11; UINT64 fs11;
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_RISCV64_SETJMP_H */ #endif /* GNU_EFI_RISCV64_SETJMP_H */

2
inc/x86_64/efisetjmp_arch.h
View File

@ -17,6 +17,6 @@ typedef struct {
UINT64 Rip; UINT64 Rip;
UINT64 MxCsr; UINT64 MxCsr;
UINT8 XmmBuffer[160]; // XMM6 - XMM15 UINT8 XmmBuffer[160]; // XMM6 - XMM15
} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; } EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
#endif /* GNU_EFI_X86_64_SETJMP_H */ #endif /* GNU_EFI_X86_64_SETJMP_H */