[edk2,edk2-staging,07/19] IntelUndiPkg/GigUndiDxe: create GCC alternatives for MSFT build options

Message ID 20181106175833.26964-8-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC
Related show

Commit Message

Ard Biesheuvel Nov. 6, 2018, 5:58 p.m.
Prefix the existing MSFT only build option overrides with MSFT: and
create the GCC: counterparts so we can build this code with GCC as
well.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

-- 
2.19.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ryszard Knop Jan. 30, 2019, 11:48 a.m. | #1
Just one note for this: We have separate defines for EFI32 (IA32),
EFI64 (IPF) and EFIX64 (X64) to sprinkle some workarounds where needed.
It seems ARM doesn't need that for now, but I'll add similar defines
for it as well so that we have that available in the future.

Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com>


On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote:
> Prefix the existing MSFT only build option overrides with MSFT: and

> create the GCC: counterparts so we can build this code with GCC as

> well.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>

> ---

>  IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf | 16 ++++++++--------

>  1 file changed, 8 insertions(+), 8 deletions(-)

> 

> diff --git a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> index 6c195872c00f..19dae9a0987a 100644

> --- a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> +++ b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> @@ -41,20 +41,20 @@ ENTRY_POINT          = InitializeGigUNDIDriver

>  UNLOAD_IMAGE         = GigUndiUnload

>  

>  [BuildOptions.common]

> -

> -*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG

> +  MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG

> +  GCC:RELEASE_*_*_CC_FLAGS = -D MDEPKG_NDEBUG

>  

>  [BuildOptions.X64]

> -

> -*_*_*_CC_FLAGS = /D EFIX64 

> +  MSFT:*_*_*_CC_FLAGS = /D EFIX64

> +  GCC:*_*_*_CC_FLAGS = -D EFIX64

>  

>  [BuildOptions.IPF]

> -

> -*_*_*_CC_FLAGS = /D EFI64

> +  MSFT:*_*_*_CC_FLAGS = /D EFI64

> +  GCC:*_*_*_CC_FLAGS = -D EFI64

>  

>  [BuildOptions.IA32]

> -

> -*_*_*_CC_FLAGS = /D EFI32

> +  MSFT:*_*_*_CC_FLAGS = /D EFI32

> +  GCC:*_*_*_CC_FLAGS = -D EFI32

>  

>  [sources.common]

>  InventoryStrings.uni


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
index 6c195872c00f..19dae9a0987a 100644
--- a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
+++ b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
@@ -41,20 +41,20 @@  ENTRY_POINT          = InitializeGigUNDIDriver
 UNLOAD_IMAGE         = GigUndiUnload
 
 [BuildOptions.common]
-
-*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG
+  MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG
+  GCC:RELEASE_*_*_CC_FLAGS = -D MDEPKG_NDEBUG
 
 [BuildOptions.X64]
-
-*_*_*_CC_FLAGS = /D EFIX64 
+  MSFT:*_*_*_CC_FLAGS = /D EFIX64
+  GCC:*_*_*_CC_FLAGS = -D EFIX64
 
 [BuildOptions.IPF]
-
-*_*_*_CC_FLAGS = /D EFI64
+  MSFT:*_*_*_CC_FLAGS = /D EFI64
+  GCC:*_*_*_CC_FLAGS = -D EFI64
 
 [BuildOptions.IA32]
-
-*_*_*_CC_FLAGS = /D EFI32
+  MSFT:*_*_*_CC_FLAGS = /D EFI32
+  GCC:*_*_*_CC_FLAGS = -D EFI32
 
 [sources.common]
 InventoryStrings.uni