From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: devel@edk2.groups.io, liming.gao@intel.com
Subject: Re: [edk2-devel] [Patch v2 04/11] MdePkg Base.h: Add definition for CLANG9 tool chain
Date: Tue, 15 Oct 2019 11:32:39 +0200 [thread overview]
Message-ID: <a58f6ee3-1857-8037-360a-ebbaa659da65@redhat.com> (raw)
In-Reply-To: <1571099210-12432-5-git-send-email-liming.gao@intel.com>
On 10/15/19 2:26 AM, Liming Gao wrote:
> CLANG9 tool chain defines __clang__ macro only,
> doesn't define __GNUC__ macro. But, it uses some same definitions with GCC.
> So, update base definition for CLANG9 tool chain.
>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
> MdePkg/Include/Base.h | 6 +++---
> MdePkg/Include/Ia32/ProcessorBind.h | 4 ++--
> MdePkg/Include/X64/ProcessorBind.h | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
> index d94b8a5f93..4680e64136 100644
> --- a/MdePkg/Include/Base.h
> +++ b/MdePkg/Include/Base.h
> @@ -621,9 +621,9 @@ typedef char* VA_LIST;
> #define VA_END(Marker) (Marker = (VA_LIST) 0)
> #define VA_COPY(Dest, Start) ((void)((Dest) = (Start)))
>
> -#elif defined(__GNUC__)
> +#elif defined(__GNUC__) || defined(__clang__)
>
> -#if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS)
> +#if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS) && !defined(__clang__)
> //
> // X64 only. Use MS ABI version of GCC built-in macros for variable argument lists.
> //
> @@ -1274,7 +1274,7 @@ typedef UINTN RETURN_STATUS;
>
> **/
> #define RETURN_ADDRESS(L) ((L == 0) ? _ReturnAddress() : (VOID *) 0)
> -#elif defined(__GNUC__)
> +#elif defined (__GNUC__) || defined (__clang__)
> void * __builtin_return_address (unsigned int level);
> /**
> Get the return address of the calling function.
> diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
> index 497c58b33b..fa4b7e8e98 100644
> --- a/MdePkg/Include/Ia32/ProcessorBind.h
> +++ b/MdePkg/Include/Ia32/ProcessorBind.h
> @@ -281,7 +281,7 @@ typedef INT32 INTN;
> /// Microsoft* compiler specific method for EFIAPI calling convention.
> ///
> #define EFIAPI __cdecl
> -#elif defined(__GNUC__)
> +#elif defined(__GNUC__) || defined(__clang__)
> ///
> /// GCC specific method for EFIAPI calling convention.
> ///
> @@ -294,7 +294,7 @@ typedef INT32 INTN;
> #define EFIAPI
> #endif
>
> -#if defined(__GNUC__)
> +#if defined(__GNUC__) || defined(__clang__)
> ///
> /// For GNU assembly code, .global or .globl can declare global symbols.
> /// Define this macro to unify the usage.
> diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
> index 6f65acd609..387e9c5c9c 100644
> --- a/MdePkg/Include/X64/ProcessorBind.h
> +++ b/MdePkg/Include/X64/ProcessorBind.h
> @@ -313,7 +313,7 @@ typedef INT64 INTN;
> #define EFIAPI
> #endif
>
> -#if defined(__GNUC__)
> +#if defined(__GNUC__) || defined(__clang__)
> ///
> /// For GNU assembly code, .global or .globl can declare global symbols.
> /// Define this macro to unify the usage.
>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
next prev parent reply other threads:[~2019-10-15 9:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 0:26 [Patch v2 00/11] New Cross OS tool chain CLANG9 Liming Gao
2019-10-15 0:26 ` [Patch v2 01/11] BaseTools tools_def.template: Remove unnecessary $(DEST_DIR_DEBUG) path Liming Gao
2019-10-16 8:59 ` [edk2-devel] " Bob Feng
2019-10-15 0:26 ` [Patch v2 02/11] BaseTools tools_def: Add CLANG9 tool chain to directly generate PE image Liming Gao
2019-10-15 0:26 ` [Patch v2 03/11] BaseTools GenFw: Fix the issue to update the wrong size as SectionSize Liming Gao
2019-10-15 9:21 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-10-16 9:27 ` Bob Feng
2019-10-17 2:18 ` Liming Gao
2019-10-15 0:26 ` [Patch v2 04/11] MdePkg Base.h: Add definition for CLANG9 tool chain Liming Gao
2019-10-15 9:32 ` Philippe Mathieu-Daudé [this message]
2019-10-15 0:26 ` [Patch v2 05/11] MdePkg BaseIoLibIntrinsic: Remove __inline__ attribute for IO functions Liming Gao
2019-10-15 9:26 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-10-22 1:42 ` Michael D Kinney
2019-10-15 0:26 ` [Patch v2 06/11] MdeModulePkg LzmaCustomDecompressLib: Update macro to be same in CLANG tool Liming Gao
2019-10-16 2:05 ` [edk2-devel] " Wu, Hao A
2019-10-15 0:26 ` [Patch v2 07/11] MdeModulePkg RegularExpressionDxe: Disable warning for CLANG9 tool chain Liming Gao
2019-10-16 2:06 ` [edk2-devel] " Wu, Hao A
2019-10-15 0:26 ` [Patch v2 08/11] CryptoPkg: Append options to make CLANG9 tool chain pass build Liming Gao
2019-10-15 9:29 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-10-16 1:12 ` Wang, Jian J
2019-10-15 0:26 ` [Patch v2 09/11] CryptoPkg IntrinsicLib: Make _fltused always be used Liming Gao
2019-10-15 9:30 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-10-16 1:10 ` Wang, Jian J
2019-10-15 0:26 ` [Patch v2 10/11] EmulatorPkg: Enable CLANG9 tool chain Liming Gao
2019-10-16 9:32 ` [edk2-devel] " Ni, Ray
2019-10-17 3:31 ` Liming Gao
2019-10-17 5:21 ` Ni, Ray
2019-10-15 0:26 ` [Patch v2 11/11] OvmfPkg: " Liming Gao
2019-10-15 7:36 ` [edk2-devel] [Patch v2 00/11] New Cross OS tool chain CLANG9 Laszlo Ersek
2019-10-16 0:55 ` Liming Gao
2019-10-16 9:19 ` Bob Feng
2019-10-17 2:15 ` Liming Gao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a58f6ee3-1857-8037-360a-ebbaa659da65@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox