d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi: restrict visibility of EFIABI_ATTR-declared functions

Browse Source 
In-tree gcc (4.2) doesn't understand __attribute__((ms_abi))
(EFIABI_ATTR).  Avoid declaring functions with that attribute when the
compiler is detected to be gcc < 4.4.

Reviewed by:	kib, imp (previous version)
Approved by:	markj (mentor)
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D11636
This commit is contained in:
Ryan Libby 2017-07-20 06:47:06 +00:00
parent 8490e4c207
commit 5e6f40bdef
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/include/efi.h
View File

@ -36,8 +36,14 @@
* XXX: from gcc 6.2 manual: * XXX: from gcc 6.2 manual:
* Note, the ms_abi attribute for Microsoft Windows 64-bit targets * Note, the ms_abi attribute for Microsoft Windows 64-bit targets
* currently requires the -maccumulate-outgoing-args option. * 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)) #define EFIABI_ATTR __attribute__((ms_abi))
#endif
#ifdef _KERNEL #ifdef _KERNEL
struct uuid; struct uuid;

5
sys/sys/efi.h
View File

@ -122,6 +122,9 @@ struct efi_tblhdr {
uint32_t __res; uint32_t __res;
}; };
#ifdef _KERNEL
#ifdef EFIABI_ATTR
struct efi_rt { struct efi_rt {
struct efi_tblhdr rt_hdr; struct efi_tblhdr rt_hdr;
efi_status (*rt_gettime)(struct efi_tm *, struct efi_tmcap *) efi_status (*rt_gettime)(struct efi_tm *, struct efi_tmcap *)
@ -144,6 +147,7 @@ struct efi_rt {
efi_status (*rt_reset)(enum efi_reset, efi_status, u_long, efi_status (*rt_reset)(enum efi_reset, efi_status, u_long,
efi_char *) EFIABI_ATTR; efi_char *) EFIABI_ATTR;
}; };
#endif
struct efi_systbl { struct efi_systbl {
struct efi_tblhdr st_hdr; struct efi_tblhdr st_hdr;
@ -163,7 +167,6 @@ struct efi_systbl {
uint64_t st_cfgtbl; uint64_t st_cfgtbl;
}; };
#ifdef _KERNEL
extern vm_paddr_t efi_systbl_phys; extern vm_paddr_t efi_systbl_phys;
#endif /* _KERNEL */ #endif /* _KERNEL */