Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F98728283
D11636.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D11636.diff
View Options
Index: head/sys/amd64/include/efi.h
===================================================================
--- head/sys/amd64/include/efi.h
+++ head/sys/amd64/include/efi.h
@@ -36,8 +36,14 @@
* XXX: from gcc 6.2 manual:
* Note, the ms_abi attribute for Microsoft Windows 64-bit targets
* currently requires the -maccumulate-outgoing-args option.
+ *
+ * Avoid EFIABI_ATTR declarations for compilers that don't support it.
+ * GCC support began in version 4.4.
*/
+#if defined(__clang__) || defined(__GNUC__) && \
+ (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
#define EFIABI_ATTR __attribute__((ms_abi))
+#endif
#ifdef _KERNEL
struct uuid;
Index: head/sys/sys/efi.h
===================================================================
--- head/sys/sys/efi.h
+++ head/sys/sys/efi.h
@@ -122,6 +122,9 @@
uint32_t __res;
};
+#ifdef _KERNEL
+
+#ifdef EFIABI_ATTR
struct efi_rt {
struct efi_tblhdr rt_hdr;
efi_status (*rt_gettime)(struct efi_tm *, struct efi_tmcap *)
@@ -144,6 +147,7 @@
efi_status (*rt_reset)(enum efi_reset, efi_status, u_long,
efi_char *) EFIABI_ATTR;
};
+#endif
struct efi_systbl {
struct efi_tblhdr st_hdr;
@@ -163,7 +167,6 @@
uint64_t st_cfgtbl;
};
-#ifdef _KERNEL
extern vm_paddr_t efi_systbl_phys;
#endif /* _KERNEL */
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Oct 5, 12:33 PM (21 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13642222
Default Alt Text
D11636.diff (1 KB)
Attached To
Mode
D11636: efirt: restrict visibility of EFIABI_ATTR-declared functions
Attached
Detach File
Event Timeline
Log In to Comment