Fix stdarg to work the same everywhere.

This gets us the same working definition for VA_* va_* etc everywhere,
and it's the same definition edk2 is using.

Signed-off-by: Peter Jones <pjones@redhat.com>

4 files changed, 35 insertions, 112 deletions

diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h
index 6bb7ba64..1f475a32 100644
--- a/Cryptlib/Include/OpenSslSupport.h
+++ b/Cryptlib/Include/OpenSslSupport.h
@@ -15,6 +15,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __OPEN_SSL_SUPPORT_H__

 #define __OPEN_SSL_SUPPORT_H__

 

+#if defined(__x86_64__)

+/* shim.h will check if the compiler is new enough in some other CU */

+

+#if !defined(GNU_EFI_USE_EXTERNAL_STDARG)

+#define GNU_EFI_USE_EXTERNAL_STDARG

+#endif

+

+#if !defined(GNU_EFI_USE_MS_ABI)

+#define GNU_EFI_USE_MS_ABI

+#endif

+

+#ifdef NO_BUILTIN_VA_FUNCS

+#undef NO_BUILTIN_VA_FUNCS

+#endif

+#endif

+

 /*

  * Include stddef.h to avoid redefining "offsetof"

  */

@@ -65,113 +81,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef VOID  *FILE;

 

 //

-// Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h

-//

-#if !defined(__CC_ARM) || defined(_STDARG_H) // if va_list is not already defined

-/*

- * These are now unconditionally #defined by GNU_EFI's efistdarg.h,

- * so we should #undef them here before providing a new definition.

- */

-#undef va_arg

-#undef va_start

-#undef va_end

-

-#define va_list   VA_LIST

-#define va_arg    VA_ARG

-#define va_start  VA_START

-#define va_end    VA_END

-

-# if !defined(NO_BUILTIN_VA_FUNCS)

-

-typedef __builtin_va_list VA_LIST;

-

-#define VA_START(Marker, Parameter)  __builtin_va_start (Marker, Parameter)

-

-#define VA_ARG(Marker, TYPE)         ((sizeof (TYPE) < sizeof (UINTN)) ? (TYPE)(__builtin_va_arg (Marker, UINTN)) : (TYPE)(__builtin_va_arg (Marker, TYPE)))

-

-#define VA_END(Marker)               __builtin_va_end (Marker)

-

-#define VA_COPY(Dest, Start)         __builtin_va_copy (Dest, Start)

-

-# else

-

-#define _INT_SIZE_OF(n) ((sizeof (n) + sizeof (UINTN) - 1) &~(sizeof (UINTN) - 1))

-///

-/// Variable used to traverse the list of arguments. This type can vary by

-/// implementation and could be an array or structure.

-///

-typedef CHAR8 *VA_LIST;

-

-/**

-  Retrieves a pointer to the beginning of a variable argument list, based on

-  the name of the parameter that immediately precedes the variable argument list.

-

-  This function initializes Marker to point to the beginning of the variable

-  argument list that immediately follows Parameter.  The method for computing the

-  pointer to the next argument in the argument list is CPU-specific following the

-  EFIAPI ABI.

-

-  @param   Marker       The VA_LIST used to traverse the list of arguments.

-  @param   Parameter    The name of the parameter that immediately precedes

-                        the variable argument list.

-

-  @return  A pointer to the beginning of a variable argument list.

-

-**/

-#define VA_START(Marker, Parameter) (Marker = (VA_LIST) ((UINTN) & (Parameter) + _INT_SIZE_OF (Parameter)))

-

-/**

-  Returns an argument of a specified type from a variable argument list and updates

-  the pointer to the variable argument list to point to the next argument.

-

-  This function returns an argument of the type specified by TYPE from the beginning

-  of the variable argument list specified by Marker.  Marker is then updated to point

-  to the next argument in the variable argument list.  The method for computing the

-  pointer to the next argument in the argument list is CPU-specific following the EFIAPI ABI.

-

-  @param   Marker   VA_LIST used to traverse the list of arguments.

-  @param   TYPE     The type of argument to retrieve from the beginning

-                    of the variable argument list.

-

-  @return  An argument of the type specified by TYPE.

-

-**/

-#define VA_ARG(Marker, TYPE)   (*(TYPE *) ((Marker += _INT_SIZE_OF (TYPE)) - _INT_SIZE_OF (TYPE)))

-

-/**

-  Terminates the use of a variable argument list.

-

-  This function initializes Marker so it can no longer be used with VA_ARG().

-  After this macro is used, the only way to access the variable argument list is

-  by using VA_START() again.

-

-  @param   Marker   VA_LIST used to traverse the list of arguments.

-

-**/

-#define VA_END(Marker)      (Marker = (VA_LIST) 0)

-

-/**

-  Initializes a VA_LIST as a copy of an existing VA_LIST.

-

-  This macro initializes Dest as a copy of Start, as if the VA_START macro had been applied to Dest

-  followed by the same sequence of uses of the VA_ARG macro as had previously been used to reach

-  the present state of Start.

-

-  @param   Dest   VA_LIST used to traverse the list of arguments.

-  @param   Start  VA_LIST used to traverse the list of arguments.

-

-**/

-#define VA_COPY(Dest, Start)  ((void)((Dest) = (Start)))

-

-# endif

-

-#else // __CC_ARM

-#define va_start(Marker, Parameter)   __va_start(Marker, Parameter)

-#define va_arg(Marker, TYPE)          __va_arg(Marker, TYPE)

-#define va_end(Marker)                ((void)0)

-#endif

-

-//

 // #defines from EFI Application Toolkit required to buiild Open SSL

 //

 #define ENOMEM       12               /* Cannot allocate memory */

@@ -318,7 +227,7 @@ size_t         fwrite      (const void *, size_t, size_t, FILE *);
 char           *fgets      (char *, int, FILE *);

 int            fputs       (const char *, FILE *);

 int            fprintf     (FILE *, const char *, ...);

-int            vfprintf    (FILE *, const char *, VA_LIST);

+int            vfprintf    (FILE *, const char *, va_list);

 int            fflush      (FILE *);

 int            fclose      (FILE *);

 DIR            *opendir    (const char *);

diff --git a/Cryptlib/Library/BaseLib.h b/Cryptlib/Library/BaseLib.h
index 93d5c691..94b25c93 100644
--- a/Cryptlib/Library/BaseLib.h
+++ b/Cryptlib/Library/BaseLib.h
@@ -1,3 +1,19 @@
+#if defined(__x86_64__)
+/* shim.h will check if the compiler is new enough in some other CU */
+
+#if !defined(GNU_EFI_USE_EXTERNAL_STDARG)
+#define GNU_EFI_USE_EXTERNAL_STDARG
+#endif
+
+#if !defined(GNU_EFI_USE_MS_ABI)
+#define GNU_EFI_USE_MS_ABI
+#endif
+
+#ifdef NO_BUILTIN_VA_FUNCS
+#undef NO_BUILTIN_VA_FUNCS
+#endif
+#endif
+
 #include <efi.h>
 #include <efilib.h>
 
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
index 27614618..547fd106 100644
--- a/Cryptlib/Makefile
+++ b/Cryptlib/Makefile
@@ -22,8 +22,7 @@ CLANG_BUGS	= $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)
 
 ifeq ($(ARCH),x86_64)
 FEATUREFLAGS	+= -m64 -mno-mmx -mno-sse -mno-red-zone $(CLANG_BUGS)
-DEFINES		+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI \
-		   -DNO_BUILTIN_VA_FUNCS -DMDE_CPU_X64
+DEFINES		+= -DMDE_CPU_X64
 endif
 ifeq ($(ARCH),ia32)
 FEATUREFLAGS	+= -m32 -mno-mmx -mno-sse -mno-red-zone $(CLANG_BUGS)
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 294e889a..1b8ca318 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -36,8 +36,7 @@ CLANG_BUGS	= $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)
 
 ifeq ($(ARCH),x86_64)
 FEATUREFLAGS	+= -m64 -mno-mmx -mno-sse -mno-red-zone $(CLANG_BUGS)
-DEFINES		+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI \
-		   -UNO_BUILTIN_VA_FUNCS -DMDE_CPU_X64
+DEFINES		+= -DMDE_CPU_X64
 endif
 ifeq ($(ARCH),ia32)
 FEATUREFLAGS	+= -m32 -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS)