Module Name: src
Committed By: jmcneill
Date: Thu Aug 16 18:24:36 UTC 2018
Modified Files:
src/sys/external/bsd/gnu-efi/dist/inc: eficompiler.h
src/sys/external/bsd/gnu-efi/dist/inc/aarch64: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/arm: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/ia32: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/ia64: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/mips64el: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/x86_64: efisetjmp_arch.h
Log Message:
Rename ALIGN macro to EFI_ALIGN
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h Thu Aug 16 18:24:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: eficompiler.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: eficompiler.h,v 1.2 2018/08/16 18:24:35 jmcneill Exp $ */
/*++
@@ -21,9 +21,9 @@ Abstract:
#endif
#ifdef _MSC_EXTENSIONS
-#define ALIGN(x) __declspec(align(x))
+#define EFI_ALIGN(x) __declspec(align(x))
#else
-#define ALIGN(x) __attribute__((__aligned__(x)))
+#define EFI_ALIGN(x) __attribute__((__aligned__(x)))
#endif
/* Also add a catch-all on __attribute__() for MS compilers */
Index: src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_AARCH64_SETJMP_H
#define GNU_EFI_AARCH64_SETJMP_H
@@ -30,6 +30,6 @@ typedef struct {
UINT64 D13;
UINT64 D14;
UINT64 D15;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_AARCH64_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_ARM_SETJMP_H
#define GNU_EFI_ARM_SETJMP_H
@@ -18,6 +18,6 @@ typedef struct {
UINT32 R12;
UINT32 R13;
UINT32 R14;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_ARM_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_IA32_SETJMP_H
#define GNU_EFI_IA32_SETJMP_H
@@ -12,6 +12,6 @@ typedef struct {
UINT32 Ebp;
UINT32 Esp;
UINT32 Eip;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_IA32_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_IA64_SETJMP_H
#define GNU_EFI_IA64_SETJMP_H
@@ -44,6 +44,6 @@ typedef struct {
UINT64 Predicates;
UINT64 LoopCount;
UINT64 FPSR;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_IA64_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_MIPS64EL_SETJMP_H
#define GNU_EFI_MIPS64EL_SETJMP_H
@@ -31,6 +31,6 @@ typedef struct {
UINT64 F30;
UINT64 F31;
#endif
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_MIPS64EL_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_X86_64_SETJMP_H
#define GNU_EFI_X86_64_SETJMP_H
@@ -19,6 +19,6 @@ typedef struct {
UINT64 Rip;
UINT64 MxCsr;
UINT8 XmmBuffer[160]; // XMM6 - XMM15
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_X86_64_SETJMP_H */
