From: Andrew Cooper Date: Fri, 12 Feb 2016 09:33:52 +0000 (+0100) Subject: x86: drop uefi_call_wrapper() and EFI_FUNCTION_WRAPPER X-Git-Tag: 4.7.0-rc1~595 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=08471ecdcf97687afda42b33e5f19f938b94f8a8;p=xen.git x86: drop uefi_call_wrapper() and EFI_FUNCTION_WRAPPER Nothing in the codebase uses them, and clang falls into the #error case Signed-off-by: Andrew Cooper --- diff --git a/xen/include/asm-x86/x86_64/efibind.h b/xen/include/asm-x86/x86_64/efibind.h index 2db3568e46..b013db175d 100644 --- a/xen/include/asm-x86/x86_64/efibind.h +++ b/xen/include/asm-x86/x86_64/efibind.h @@ -274,17 +274,6 @@ typedef uint64_t UINTN; #endif #endif -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) -#define uefi_call_wrapper(func, va_num, ...) func(__VA_ARGS__) -#else -/* for x86_64, EFI_FUNCTION_WRAPPER must be defined */ -#ifdef EFI_FUNCTION_WRAPPER -UINTN uefi_call_wrapper(void *func, unsigned long va_num, ...); -#else -#error "EFI_FUNCTION_WRAPPER must be defined for x86_64 architecture" -#endif -#endif - #ifdef _MSC_EXTENSIONS #pragma warning ( disable : 4731 ) // Suppress warnings about modification of EBP #endif