Don't use the ALIGN macro in the setjmp headers

In this code tree, ALIGN(x) means __attribute__((__aligned__(x))), but
in other headers ALIGN(x, y) means to round a value to have the right
bits clear.

In general library headers shouldn't be exporting or requiring
convenience macros, so this change makes those headers use the attribute
rather than the macro.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2023-06-30 13:37:06 -04:00
parent 39d4b348e0
commit 328951d3dc
6 changed files with 6 additions and 6 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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