[PATCH 0/2] Remove ICC tool chain

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [PATCH 0/2] Remove ICC tool chain
@ 2019-04-03  8:29 Shenglei Zhang
  2019-04-03  8:29 ` [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c Shenglei Zhang
  2019-04-03  8:29 ` [PATCH 2/2] BaseTools: Remove ICC tool chain in tools_def.template Shenglei Zhang
  0 siblings, 2 replies; 4+ messages in thread
From: Shenglei Zhang @ 2019-04-03  8:29 UTC (permalink / raw)
  To: edk2-devel; +Cc: Michael D Kinney, Bob Feng, Liming Gao, Yonghong Zhu

There is no Intel complier test. So suggest to remove ICC
tool chain from tools_def.template. And also IoLibIcc.c
in MdePkg should update to be removed.
https://bugzilla.tianocore.org/show_bug.cgi?id=1666

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Shenglei Zhang (2):
  MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c
  BaseTools: Remove ICC tool chain in tools_def.template

 BaseTools/Conf/tools_def.template             | 1092 -----------------
 .../BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf |    2 -
 .../BaseIoLibIntrinsicSev.inf                 |    2 -
 MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c  |  214 ----
 4 files changed, 1310 deletions(-)
 delete mode 100644 MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c

-- 
2.18.0.windows.1



^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c
  2019-04-03  8:29 [PATCH 0/2] Remove ICC tool chain Shenglei Zhang
@ 2019-04-03  8:29 ` Shenglei Zhang
  2019-04-03 11:41   ` Gao, Liming
  2019-04-03  8:29 ` [PATCH 2/2] BaseTools: Remove ICC tool chain in tools_def.template Shenglei Zhang
  1 sibling, 1 reply; 4+ messages in thread
From: Shenglei Zhang @ 2019-04-03  8:29 UTC (permalink / raw)
  To: edk2-devel; +Cc: Michael D Kinney, Liming Gao

As ICC tool chain will be removed, IoLibIcc.c should
also be removed.
https://bugzilla.tianocore.org/show_bug.cgi?id=1666

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 .../BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf |   2 -
 .../BaseIoLibIntrinsicSev.inf                 |   2 -
 MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c  | 214 ------------------
 3 files changed, 218 deletions(-)
 delete mode 100644 MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index eb81aab2d4..6020fe90da 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -41,14 +41,12 @@
 [Sources.IA32]
   IoLibGcc.c    | GCC
   IoLibMsc.c    | MSFT
-  IoLibIcc.c    | INTEL
   IoLib.c
   Ia32/IoFifo.nasm
 
 [Sources.X64]
   IoLibGcc.c    | GCC
   IoLibMsc.c    | MSFT
-  IoLibIcc.c    | INTEL
   IoLib.c
   X64/IoFifo.nasm
 
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
index da846704d5..e92b5ed94d 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
@@ -39,14 +39,12 @@
 [Sources.IA32]
   IoLibGcc.c    | GCC
   IoLibMsc.c    | MSFT
-  IoLibIcc.c    | INTEL
   IoLib.c
   Ia32/IoFifoSev.nasm
 
 [Sources.X64]
   IoLibGcc.c    | GCC
   IoLibMsc.c    | MSFT
-  IoLibIcc.c    | INTEL
   IoLib.c
   X64/IoFifoSev.nasm
 
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
deleted file mode 100644
index 3036084f0c..0000000000
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/** @file
-  I/O Library. This file has compiler specifics for ICC as there
-  is no ANSI C standard for doing IO.
-
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-  This program and the accompanying materials are
-  licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include "BaseIoLibIntrinsicInternal.h"
-
-/**
-  Reads an 8-bit I/O port.
-
-  Reads the 8-bit I/O port specified by Port. The 8-bit read value is returned.
-  This function must guarantee that all I/O read and write operations are
-  serialized.
-
-  If 8-bit I/O port operations are not supported, then ASSERT().
-
-  @param  Port  The I/O port to read.
-
-  @return The value read.
-
-**/
-UINT8
-EFIAPI
-IoRead8 (
-  IN      UINTN                     Port
-  )
-{
-  UINT8   Data;
-
-  __asm {
-    mov dx, word ptr [Port]
-    in  al, dx
-
-    mov Data, al
-  }
-  return Data;
-}
-
-/**
-  Writes an 8-bit I/O port.
-
-  Writes the 8-bit I/O port specified by Port with the value specified by Value
-  and returns Value. This function must guarantee that all I/O read and write
-  operations are serialized.
-
-  If 8-bit I/O port operations are not supported, then ASSERT().
-
-  @param  Port  The I/O port to write.
-  @param  Value The value to write to the I/O port.
-
-  @return The value written the I/O port.
-
-**/
-UINT8
-EFIAPI
-IoWrite8 (
-  IN      UINTN                     Port,
-  IN      UINT8                     Value
-  )
-{
-  __asm {
-    mov al, byte ptr [Value]
-    mov dx, word ptr [Port]
-    out dx, al
-  }
-  return Value;
-}
-
-/**
-  Reads a 16-bit I/O port.
-
-  Reads the 16-bit I/O port specified by Port. The 16-bit read value is returned.
-  This function must guarantee that all I/O read and write operations are
-  serialized.
-
-  If 16-bit I/O port operations are not supported, then ASSERT().
-  If Port is not aligned on a 16-bit boundary, then ASSERT().
-
-  @param  Port  The I/O port to read.
-
-  @return The value read.
-
-**/
-UINT16
-EFIAPI
-IoRead16 (
-  IN      UINTN                     Port
-  )
-{
-  UINT16  Data;
-
-  ASSERT ((Port & 1) == 0);
-
-  __asm {
-    mov dx, word ptr [Port]
-    in  ax, dx
-    mov word ptr [Data], ax
-  }
-
-  return Data;
-}
-
-/**
-  Writes a 16-bit I/O port.
-
-  Writes the 16-bit I/O port specified by Port with the value specified by Value
-  and returns Value. This function must guarantee that all I/O read and write
-  operations are serialized.
-
-  If 16-bit I/O port operations are not supported, then ASSERT().
-  If Port is not aligned on a 16-bit boundary, then ASSERT().
-
-  @param  Port  The I/O port to write.
-  @param  Value The value to write to the I/O port.
-
-  @return The value written the I/O port.
-
-**/
-UINT16
-EFIAPI
-IoWrite16 (
-  IN      UINTN                     Port,
-  IN      UINT16                    Value
-  )
-{
-  ASSERT ((Port & 1) == 0);
-
-  __asm {
-    mov ax, word ptr [Value]
-    mov dx, word ptr [Port]
-    out dx, ax
-  }
-
-  return Value;
-}
-
-/**
-  Reads a 32-bit I/O port.
-
-  Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.
-  This function must guarantee that all I/O read and write operations are
-  serialized.
-
-  If 32-bit I/O port operations are not supported, then ASSERT().
-  If Port is not aligned on a 32-bit boundary, then ASSERT().
-
-  @param  Port  The I/O port to read.
-
-  @return The value read.
-
-**/
-UINT32
-EFIAPI
-IoRead32 (
-  IN      UINTN                     Port
-  )
-{
-  UINT32 Data;
-
-  ASSERT ((Port & 3) == 0);
-
-  __asm {
-    mov dx, word ptr [Port]
-    in  eax, dx
-    mov dword ptr [Data], eax
-  }
-
-  return Data;
-}
-
-/**
-  Writes a 32-bit I/O port.
-
-  Writes the 32-bit I/O port specified by Port with the value specified by Value
-  and returns Value. This function must guarantee that all I/O read and write
-  operations are serialized.
-
-  If 32-bit I/O port operations are not supported, then ASSERT().
-  If Port is not aligned on a 32-bit boundary, then ASSERT().
-
-  @param  Port  The I/O port to write.
-  @param  Value The value to write to the I/O port.
-
-  @return The value written the I/O port.
-
-**/
-UINT32
-EFIAPI
-IoWrite32 (
-  IN      UINTN                     Port,
-  IN      UINT32                    Value
-  )
-{
-  ASSERT ((Port & 3) == 0);
-
-  __asm {
-    mov eax, dword ptr [Value]
-    mov dx, word ptr [Port]
-    out dx, eax
-  }
-
-  return Value;
-}
-
-- 
2.18.0.windows.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c
  2019-04-03  8:29 ` [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c Shenglei Zhang
@ 2019-04-03 11:41   ` Gao, Liming
  0 siblings, 0 replies; 4+ messages in thread
From: Gao, Liming @ 2019-04-03 11:41 UTC (permalink / raw)
  To: Zhang, Shenglei, edk2-devel@lists.01.org; +Cc: Kinney, Michael D

Can you also clean up BaseLib to remove the support of INTEL tool chain?

> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Wednesday, April 3, 2019 4:30 PM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c
> 
> As ICC tool chain will be removed, IoLibIcc.c should
> also be removed.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1666
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  .../BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf |   2 -
>  .../BaseIoLibIntrinsicSev.inf                 |   2 -
>  MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c  | 214 ------------------
>  3 files changed, 218 deletions(-)
>  delete mode 100644 MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
> 
> diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> index eb81aab2d4..6020fe90da 100644
> --- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> +++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> @@ -41,14 +41,12 @@
>  [Sources.IA32]
>    IoLibGcc.c    | GCC
>    IoLibMsc.c    | MSFT
> -  IoLibIcc.c    | INTEL
>    IoLib.c
>    Ia32/IoFifo.nasm
> 
>  [Sources.X64]
>    IoLibGcc.c    | GCC
>    IoLibMsc.c    | MSFT
> -  IoLibIcc.c    | INTEL
>    IoLib.c
>    X64/IoFifo.nasm
> 
> diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
> index da846704d5..e92b5ed94d 100644
> --- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
> +++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
> @@ -39,14 +39,12 @@
>  [Sources.IA32]
>    IoLibGcc.c    | GCC
>    IoLibMsc.c    | MSFT
> -  IoLibIcc.c    | INTEL
>    IoLib.c
>    Ia32/IoFifoSev.nasm
> 
>  [Sources.X64]
>    IoLibGcc.c    | GCC
>    IoLibMsc.c    | MSFT
> -  IoLibIcc.c    | INTEL
>    IoLib.c
>    X64/IoFifoSev.nasm
> 
> diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
> deleted file mode 100644
> index 3036084f0c..0000000000
> --- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
> +++ /dev/null
> @@ -1,214 +0,0 @@
> -/** @file
> -  I/O Library. This file has compiler specifics for ICC as there
> -  is no ANSI C standard for doing IO.
> -
> -  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials are
> -  licensed and made available under the terms and conditions of the BSD License
> -  which accompanies this distribution.  The full text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php.
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> -
> -**/
> -
> -#include "BaseIoLibIntrinsicInternal.h"
> -
> -/**
> -  Reads an 8-bit I/O port.
> -
> -  Reads the 8-bit I/O port specified by Port. The 8-bit read value is returned.
> -  This function must guarantee that all I/O read and write operations are
> -  serialized.
> -
> -  If 8-bit I/O port operations are not supported, then ASSERT().
> -
> -  @param  Port  The I/O port to read.
> -
> -  @return The value read.
> -
> -**/
> -UINT8
> -EFIAPI
> -IoRead8 (
> -  IN      UINTN                     Port
> -  )
> -{
> -  UINT8   Data;
> -
> -  __asm {
> -    mov dx, word ptr [Port]
> -    in  al, dx
> -
> -    mov Data, al
> -  }
> -  return Data;
> -}
> -
> -/**
> -  Writes an 8-bit I/O port.
> -
> -  Writes the 8-bit I/O port specified by Port with the value specified by Value
> -  and returns Value. This function must guarantee that all I/O read and write
> -  operations are serialized.
> -
> -  If 8-bit I/O port operations are not supported, then ASSERT().
> -
> -  @param  Port  The I/O port to write.
> -  @param  Value The value to write to the I/O port.
> -
> -  @return The value written the I/O port.
> -
> -**/
> -UINT8
> -EFIAPI
> -IoWrite8 (
> -  IN      UINTN                     Port,
> -  IN      UINT8                     Value
> -  )
> -{
> -  __asm {
> -    mov al, byte ptr [Value]
> -    mov dx, word ptr [Port]
> -    out dx, al
> -  }
> -  return Value;
> -}
> -
> -/**
> -  Reads a 16-bit I/O port.
> -
> -  Reads the 16-bit I/O port specified by Port. The 16-bit read value is returned.
> -  This function must guarantee that all I/O read and write operations are
> -  serialized.
> -
> -  If 16-bit I/O port operations are not supported, then ASSERT().
> -  If Port is not aligned on a 16-bit boundary, then ASSERT().
> -
> -  @param  Port  The I/O port to read.
> -
> -  @return The value read.
> -
> -**/
> -UINT16
> -EFIAPI
> -IoRead16 (
> -  IN      UINTN                     Port
> -  )
> -{
> -  UINT16  Data;
> -
> -  ASSERT ((Port & 1) == 0);
> -
> -  __asm {
> -    mov dx, word ptr [Port]
> -    in  ax, dx
> -    mov word ptr [Data], ax
> -  }
> -
> -  return Data;
> -}
> -
> -/**
> -  Writes a 16-bit I/O port.
> -
> -  Writes the 16-bit I/O port specified by Port with the value specified by Value
> -  and returns Value. This function must guarantee that all I/O read and write
> -  operations are serialized.
> -
> -  If 16-bit I/O port operations are not supported, then ASSERT().
> -  If Port is not aligned on a 16-bit boundary, then ASSERT().
> -
> -  @param  Port  The I/O port to write.
> -  @param  Value The value to write to the I/O port.
> -
> -  @return The value written the I/O port.
> -
> -**/
> -UINT16
> -EFIAPI
> -IoWrite16 (
> -  IN      UINTN                     Port,
> -  IN      UINT16                    Value
> -  )
> -{
> -  ASSERT ((Port & 1) == 0);
> -
> -  __asm {
> -    mov ax, word ptr [Value]
> -    mov dx, word ptr [Port]
> -    out dx, ax
> -  }
> -
> -  return Value;
> -}
> -
> -/**
> -  Reads a 32-bit I/O port.
> -
> -  Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.
> -  This function must guarantee that all I/O read and write operations are
> -  serialized.
> -
> -  If 32-bit I/O port operations are not supported, then ASSERT().
> -  If Port is not aligned on a 32-bit boundary, then ASSERT().
> -
> -  @param  Port  The I/O port to read.
> -
> -  @return The value read.
> -
> -**/
> -UINT32
> -EFIAPI
> -IoRead32 (
> -  IN      UINTN                     Port
> -  )
> -{
> -  UINT32 Data;
> -
> -  ASSERT ((Port & 3) == 0);
> -
> -  __asm {
> -    mov dx, word ptr [Port]
> -    in  eax, dx
> -    mov dword ptr [Data], eax
> -  }
> -
> -  return Data;
> -}
> -
> -/**
> -  Writes a 32-bit I/O port.
> -
> -  Writes the 32-bit I/O port specified by Port with the value specified by Value
> -  and returns Value. This function must guarantee that all I/O read and write
> -  operations are serialized.
> -
> -  If 32-bit I/O port operations are not supported, then ASSERT().
> -  If Port is not aligned on a 32-bit boundary, then ASSERT().
> -
> -  @param  Port  The I/O port to write.
> -  @param  Value The value to write to the I/O port.
> -
> -  @return The value written the I/O port.
> -
> -**/
> -UINT32
> -EFIAPI
> -IoWrite32 (
> -  IN      UINTN                     Port,
> -  IN      UINT32                    Value
> -  )
> -{
> -  ASSERT ((Port & 3) == 0);
> -
> -  __asm {
> -    mov eax, dword ptr [Value]
> -    mov dx, word ptr [Port]
> -    out dx, eax
> -  }
> -
> -  return Value;
> -}
> -
> --
> 2.18.0.windows.1



^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] BaseTools: Remove ICC tool chain in tools_def.template
  2019-04-03  8:29 [PATCH 0/2] Remove ICC tool chain Shenglei Zhang
  2019-04-03  8:29 ` [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c Shenglei Zhang
@ 2019-04-03  8:29 ` Shenglei Zhang
  1 sibling, 0 replies; 4+ messages in thread
From: Shenglei Zhang @ 2019-04-03  8:29 UTC (permalink / raw)
  To: edk2-devel; +Cc: Bob Feng, Liming Gao, Yonghong Zhu

There is no Intel compiler test. Suggest to remove ICC tool chain from
tools_def.template.
https://bugzilla.tianocore.org/show_bug.cgi?id=1666

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 BaseTools/Conf/tools_def.template | 1092 -----------------------------
 1 file changed, 1092 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index abda2164a6..d826205cc1 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -103,43 +103,6 @@ DEFINE MS_VS_DLL   = DEF(VS2008_DLL)
 DEFINE WINDDK_BIN16     = ENV(WINDDK3790_PREFIX)bin16
 DEFINE WINDDK_BINX64    = ENV(WINDDK3790_PREFIX)win64\x86\amd64
 
-# NOTE: The Intel C++ Compiler for Windows requires one of the Microsoft C compiler
-#        tool chains for the linker and nmake commands.
-#        This configuration assumes a Windows 2003 Server DDK installation.
-DEFINE ICC_VERSION      = 9.1
-#DEFINE ICC_VERSION     = 10.1.021
-DEFINE ICC_BIN32        = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_ASM32        = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_BIN32x86     = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-DEFINE ICC_ASM32x86     = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin
-
-DEFINE ICC_BINX64       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_ASMX64       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_BINX64x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-DEFINE ICC_ASMX64x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin
-
-DEFINE ICC_BIN64        = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin
-DEFINE ICC_BIN64x86     = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin
-
-
-# Note: The Intel C++ Compiler 11.1 uses different installation path from previous versions
-#       We use "ICC11" tag for ICC 11.1 while "ICC" tag is dedicated for earlier versions
-#
-DEFINE ICC11_VERSION      = 11.1
-DEFINE ICC11_BUILD        = 072
-DEFINE ICC11_BIN32        = C:\Program Files\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32
-DEFINE ICC11_ASM32        = C:\Program Files\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32
-DEFINE ICC11_BIN32x86     = C:\Program Files (x86)\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32
-DEFINE ICC11_ASM32x86     = C:\Program Files (x86)\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32
-
-DEFINE ICC11_BINX64       = C:\Program Files\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32_intel64
-DEFINE ICC11_ASMX64       = C:\Program Files\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32_intel64
-DEFINE ICC11_BINX64x86    = C:\Program Files (x86)\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\intel64
-DEFINE ICC11_ASMX64x86    = C:\Program Files (x86)\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\intel64
-
-DEFINE ICC11_BIN64        = C:\Program Files\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32_ia64
-DEFINE ICC11_BIN64x86     = C:\Program Files (x86)\Intel\Compiler\DEF(ICC11_VERSION)\DEF(ICC11_BUILD)\bin\ia32_ia64
-
 DEFINE EBC_BIN          = C:\Program Files\Intel\EBC\Bin
 DEFINE EBC_BINx86       = C:\Program Files (x86)\Intel\EBC\Bin
 
@@ -178,10 +141,6 @@ DEFINE MSFT_ASLPP_FLAGS        = /nologo /E /C /FIAutoGen.h
 DEFINE MSFT_ASLCC_FLAGS        = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcpiTable
 DEFINE MSFT_ASLDLINK_FLAGS     = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE
 
-DEFINE ICC_WIN_ASLPP_FLAGS     = /nologo /E /C /FIAutoGen.h
-DEFINE ICC_WIN_ASLCC_FLAGS     = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcpiTable
-DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc
-
 DEFINE IPHONE_TOOLS            = /Developer/Platforms/iPhoneOS.platform/Developer
 
 DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
@@ -302,30 +261,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:
 #                               Intel(r) ACPI Compiler from
 #                               https://acpica.org/downloads
-#   ICC         -win32-  Requires:
-#                             Intel C Compiler V9.1
-#                        Dependencies:
-#                             Microsoft Visual Studio 2003 or 2005
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK)
-#                             version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Intel(r) ACPI Compiler (iasl.exe) from
-#                               https://acpica.org/downloads
-#   ICC11       -win32-  Requires:
-#                             Intel C Compiler V11.1
-#                        Dependencies:
-#                             Microsoft Visual Studio 2005 or 2008
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK)
-#                             version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Intel(r) ACPI Compiler (iasl.exe) from
-#                               https://acpica.org/downloads
 #   VS2008xASL  -win32-  Requires:
 #                             Microsoft Visual Studio 2008 Team Suite
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
@@ -380,30 +315,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:
 #                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
 #                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
-#   ICCxASL     -win32-  Requires:
-#                             Intel C Compiler V9.1
-#                        Dependencies:
-#                             Microsoft Visual Studio 2003 or 2005
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK)
-#                             version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
-#   ICC11xASL   -win32-  Requires:
-#                             Intel C Compiler V11.1
-#                        Dependencies:
-#                             Microsoft Visual Studio 2005 or 2008
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK)
-#                             version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
 #   VS2008x86   -win64-  Requires:
 #                             Microsoft Visual Studio 2008 (x86)
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
@@ -439,30 +350,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:
 #                               Intel(r) ACPI Compiler (iasl.exe) from
 #                               https://acpica.org/downloads
-#   ICCx86      -win64-  Requires:
-#                             Intel C Compiler V9.1(x86)
-#                        Dependencies:
-#                             Microsoft Visual Studio 2003 or 2005
-#                             Microsoft Windows Server 2003 Driver Development Kit
-#                             (Microsoft WINDDK) version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Intel(r) ACPI Compiler (iasl.exe) from
-#                               https://acpica.org/downloads
-#   ICC11x86    -win64-  Requires:
-#                             Intel C Compiler V11.1(x86)
-#                        Dependencies:
-#                             Microsoft Visual Studio 2005 or 2008
-#                             Microsoft Windows Server 2003 Driver Development Kit
-#                             (Microsoft WINDDK) version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Intel(r) ACPI Compiler (iasl.exe) from
-#                               https://acpica.org/downloads
 #  VS2008x86xASL -win64- Requires:
 #                             Microsoft Visual Studio 2008 (x86)
 #                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830
@@ -498,30 +385,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:
 #                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
 #                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
-#   ICCx86xASL  -win64-  Requires:
-#                             Intel C Compiler V9.1 (x86)
-#                        Dependencies:
-#                             Microsoft Visual Studio 2003 or 2005
-#                             Microsoft Windows Server 2003 Driver Development Kit
-#                             (Microsoft WINDDK) version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
-#   ICC11x86xASL -win64- Requires:
-#                             Intel C Compiler V11.1 (x86)
-#                        Dependencies:
-#                             Microsoft Visual Studio 2005 or 2008
-#                             Microsoft Windows Server 2003 Driver Development Kit
-#                             (Microsoft WINDDK) version 3790.1830 for X64 target architectures
-#                        Optional:
-#                             Required to build EBC drivers:
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-#                             Required to build platforms or ACPI tables:
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
 #   RVCT        -win-   Requires:
 #                             ARM C/C++ Compiler, 5.00
 #                        Optional:
@@ -3920,963 +3783,8 @@ RELEASE_CLANG38_AARCH64_CC_FLAGS    = DEF(CLANG38_AARCH64_CC_FLAGS) $(ARCHCC_FLA
 RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64
 
 
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 9.1
-#
-#   ASL  - Intel ACPI Source Language Compiler
-#
-####################################################################################
-#   ICC              - Intel C Compiler V9.1
-*_ICC_*_*_FAMILY                    = INTEL
-
-*_ICC_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICC_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICC_*_MAKE_FLAGS                       = /nologo
-*_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC_*_APP_FLAGS                        = /nologo /E /TC
-*_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICC_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICC_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)
-*_ICC_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_ICC_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_ICC_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICC_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICC_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICC_IA32_CC_PATH                  = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_SLINK_PATH               = DEF(ICC_BIN32)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICC_IA32_DLINK_PATH               = DEF(ICC_BIN32)\xilink.exe
-*_ICC_IA32_PP_PATH                  = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_VFRPP_PATH               = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_APP_PATH                 = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICC_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICC_IA32_ASLCC_PATH               = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_ASLPP_PATH               = DEF(ICC_BIN32)\icl.exe
-*_ICC_IA32_ASLDLINK_PATH            = DEF(ICC_BIN32)\xilink.exe
-
-  DEBUG_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICC_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICC_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-  DEBUG_ICC_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICC_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICC_IA32_NASM_FLAGS                = -O0 -f win32 -g
-
-      *_ICC_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICC_X64_CC_PATH                   = DEF(ICC_BINX64)\icl.exe
-*_ICC_X64_SLINK_PATH                = DEF(ICC_BINX64)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICC_X64_DLINK_PATH                = DEF(ICC_BINX64)\xilink.exe
-*_ICC_X64_PP_PATH                   = DEF(ICC_BINX64)\icl.exe
-*_ICC_X64_VFRPP_PATH                = DEF(ICC_BINX64)\icl.exe
-*_ICC_X64_APP_PATH                  = DEF(ICC_BINX64)\icl.exe
-*_ICC_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICC_X64_ASLCC_PATH                = DEF(ICC_BINX64)\icl.exe
-*_ICC_X64_ASLPP_PATH                = DEF(ICC_BINX64)\icl.exe
-*_ICC_X64_ASLDLINK_PATH             = DEF(ICC_BINX64)\xilink.exe
-
-  DEBUG_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICC_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICC_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-
-  DEBUG_ICC_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICC_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICC_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICC_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICC_EBC_*_FAMILY              = INTEL
-
-*_ICC_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICC_EBC_PP_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICC_EBC_VFRPP_PATH            = DEF(EBC_BIN)\iec.exe
-*_ICC_EBC_CC_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICC_EBC_SLINK_PATH            = DEF(EBC_BIN)\link.exe
-*_ICC_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
-
-*_ICC_EBC_MAKE_FLAGS                 = /nologo
-*_ICC_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICC_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICC_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 9.1
-#
-#   ASL  - Microsoft ACPI Source Language Compiler
-#
-####################################################################################
-#   ICCxASL              - Intel C Compiler V9.1
-*_ICCxASL_*_*_FAMILY                    = INTEL
-
-*_ICCxASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICCxASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICCxASL_*_MAKE_FLAGS                       = /nologo
-*_ICCxASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICCxASL_*_APP_FLAGS                        = /nologo /E /TC
-*_ICCxASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICCxASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICCxASL_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)
-*_ICCxASL_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_ICCxASL_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_ICCxASL_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICCxASL_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICCxASL_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICCxASL_IA32_CC_PATH                  = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_SLINK_PATH               = DEF(ICC_BIN32)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICCxASL_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICCxASL_IA32_DLINK_PATH               = DEF(ICC_BIN32)\xilink.exe
-*_ICCxASL_IA32_PP_PATH                  = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_VFRPP_PATH               = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_APP_PATH                 = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICCxASL_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICCxASL_IA32_ASLCC_PATH               = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_ASLPP_PATH               = DEF(ICC_BIN32)\icl.exe
-*_ICCxASL_IA32_ASLDLINK_PATH            = DEF(ICC_BIN32)\xilink.exe
-
-  DEBUG_ICCxASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICCxASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICCxASL_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICCxASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICCxASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICCxASL_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-
-  DEBUG_ICCxASL_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICCxASL_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICCxASL_IA32_NASM_FLAGS                = -O0 -f win32 -g
-
-      *_ICCxASL_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICCxASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICCxASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICCxASL_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICCxASL_X64_CC_PATH                   = DEF(ICC_BINX64)\icl.exe
-*_ICCxASL_X64_SLINK_PATH                = DEF(ICC_BINX64)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICCxASL_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICCxASL_X64_DLINK_PATH                = DEF(ICC_BINX64)\xilink.exe
-*_ICCxASL_X64_PP_PATH                   = DEF(ICC_BINX64)\icl.exe
-*_ICCxASL_X64_VFRPP_PATH                = DEF(ICC_BINX64)\icl.exe
-*_ICCxASL_X64_APP_PATH                  = DEF(ICC_BINX64)\icl.exe
-*_ICCxASL_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICCxASL_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICCxASL_X64_ASLCC_PATH                = DEF(ICC_BINX64)\icl.exe
-*_ICCxASL_X64_ASLPP_PATH                = DEF(ICC_BINX64)\icl.exe
-*_ICCxASL_X64_ASLDLINK_PATH             = DEF(ICC_BINX64)\xilink.exe
-
-  DEBUG_ICCxASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICCxASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICCxASL_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICCxASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICCxASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICCxASL_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-
-  DEBUG_ICCxASL_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICCxASL_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICCxASL_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICCxASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICCxASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICCxASL_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICCxASL_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICCxASL_EBC_*_FAMILY              = INTEL
-
-*_ICCxASL_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICCxASL_EBC_PP_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICCxASL_EBC_VFRPP_PATH            = DEF(EBC_BIN)\iec.exe
-*_ICCxASL_EBC_CC_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICCxASL_EBC_SLINK_PATH            = DEF(EBC_BIN)\link.exe
-*_ICCxASL_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
-
-*_ICCxASL_EBC_MAKE_FLAGS                 = /nologo
-*_ICCxASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICCxASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICCxASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICCxASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICCxASL_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 9.1 x86 (32-bit on 64-bit OS)
-#
-#   ICCx86  - Intel(R) C++ Compiler for Itanium(R)Version 9.1  Build 20060928 Package ID: W_CC_C_9.1.032
-#   ASL  - Intel ACPI Source Language Compiler
-#
-####################################################################################
-#   ICCx86              - Intel C Compiler V9.1
-*_ICCx86_*_*_FAMILY                    = INTEL
-
-*_ICCx86_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICCx86_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICCx86_*_MAKE_FLAGS                       = /nologo
-*_ICCx86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICCx86_*_APP_FLAGS                        = /nologo /E /TC
-*_ICCx86_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICCx86_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICCx86_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)
-*_ICCx86_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_ICCx86_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_ICCx86_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICCx86_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICCx86_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICCx86_IA32_CC_PATH                  = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_SLINK_PATH               = DEF(ICC_BIN32x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICCx86_IA32_DLINK_PATH               = DEF(ICC_BIN32x86)\xilink.exe
-*_ICCx86_IA32_PP_PATH                  = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_VFRPP_PATH               = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_APP_PATH                 = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICCx86_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICCx86_IA32_ASLCC_PATH               = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_ASLPP_PATH               = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86_IA32_ASLDLINK_PATH            = DEF(ICC_BIN32x86)\xilink.exe
-
-  DEBUG_ICCx86_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICCx86_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICCx86_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICCx86_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICCx86_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICCx86_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-
-  DEBUG_ICCx86_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICCx86_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICCx86_IA32_NASM_FLAGS                = -O0 -f win32 -g
-
-      *_ICCx86_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICCx86_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICCx86_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICCx86_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICCx86_X64_CC_PATH                   = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86_X64_SLINK_PATH                = DEF(ICC_BINX64x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICCx86_X64_DLINK_PATH                = DEF(ICC_BINX64x86)\xilink.exe
-*_ICCx86_X64_PP_PATH                   = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86_X64_VFRPP_PATH                = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86_X64_APP_PATH                  = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICCx86_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICCx86_X64_ASLCC_PATH                = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86_X64_ASLPP_PATH                = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86_X64_ASLDLINK_PATH             = DEF(ICC_BINX64x86)\xilink.exe
-
-  DEBUG_ICCx86_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICCx86_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICCx86_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICCx86_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICCx86_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICCx86_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-
-  DEBUG_ICCx86_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICCx86_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICCx86_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICCx86_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICCx86_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICCx86_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICCx86_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICCx86_EBC_*_FAMILY              = INTEL
-
-*_ICCx86_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICCx86_EBC_PP_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICCx86_EBC_VFRPP_PATH            = DEF(EBC_BINx86)\iec.exe
-*_ICCx86_EBC_CC_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICCx86_EBC_SLINK_PATH            = DEF(EBC_BINx86)\link.exe
-*_ICCx86_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
-
-*_ICCx86_EBC_MAKE_FLAGS                 = /nologo
-*_ICCx86_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICCx86_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICCx86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICCx86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICCx86_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 9.1 x86 (32-bit on 64-bit OS)
-#
-#   ICCx86xASL  - Intel(R) C++ Compiler for Itanium(R)Version 9.1  Build 20060928 Package ID: W_CC_C_9.1.032
-#   ASL  - Microsoft ACPI Source Language Compiler
-#
-####################################################################################
-#   ICCx86xASL              - Intel C Compiler V9.1
-*_ICCx86xASL_*_*_FAMILY                    = INTEL
-
-*_ICCx86xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICCx86xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICCx86xASL_*_MAKE_FLAGS                       = /nologo
-*_ICCx86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICCx86xASL_*_APP_FLAGS                        = /nologo /E /TC
-*_ICCx86xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICCx86ASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICCx86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)
-*_ICCx86xASL_*_ASL_FLAGS       =
-*_ICCx86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)
-*_ICCx86xASL_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICCx86xASL_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICCx86xASL_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICCx86xASL_IA32_CC_PATH                  = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_SLINK_PATH               = DEF(ICC_BIN32x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86xASL_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICCx86xASL_IA32_DLINK_PATH               = DEF(ICC_BIN32x86)\xilink.exe
-*_ICCx86xASL_IA32_PP_PATH                  = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_VFRPP_PATH               = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_APP_PATH                 = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICCx86xASL_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICCx86xASL_IA32_ASLCC_PATH               = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_ASLPP_PATH               = DEF(ICC_BIN32x86)\icl.exe
-*_ICCx86xASL_IA32_ASLDLINK_PATH            = DEF(ICC_BIN32x86)\xilink.exe
-
-  DEBUG_ICCx86xASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICCx86xASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICCx86xASL_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICCx86xASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICCx86xASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICCx86xASL_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-
-  DEBUG_ICCx86xASL_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICCx86xASL_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICCx86xASL_IA32_NASM_FLAGS                = -O0 -f win32 -g
-
-      *_ICCx86xASL_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICCx86xASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICCx86xASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICCx86xASL_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICCx86xASL_X64_CC_PATH                   = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86xASL_X64_SLINK_PATH                = DEF(ICC_BINX64x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICCx86xASL_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICCx86xASL_X64_DLINK_PATH                = DEF(ICC_BINX64x86)\xilink.exe
-*_ICCx86xASL_X64_PP_PATH                   = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86xASL_X64_VFRPP_PATH                = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86xASL_X64_APP_PATH                  = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86xASL_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICCx86xASL_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICCx86xASL_X64_ASLCC_PATH                = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86xASL_X64_ASLPP_PATH                = DEF(ICC_BINX64x86)\icl.exe
-*_ICCx86xASL_X64_ASLDLINK_PATH             = DEF(ICC_BINX64x86)\xilink.exe
-
-  DEBUG_ICCx86xASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICCx86xASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICCx86xASL_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICCx86xASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICCx86xASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICCx86xASL_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-
-  DEBUG_ICCx86xASL_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICCx86xASL_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICCx86xASL_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICCx86xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICCx86xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICCx86xASL_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICCx86xASL_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICCx86xASL_EBC_*_FAMILY              = INTEL
-
-*_ICCx86xASL_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICCx86xASL_EBC_PP_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICCx86xASL_EBC_VFRPP_PATH            = DEF(EBC_BINx86)\iec.exe
-*_ICCx86xASL_EBC_CC_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICCx86xASL_EBC_SLINK_PATH            = DEF(EBC_BINx86)\link.exe
-*_ICCx86xASL_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
-
-*_ICCx86xASL_EBC_MAKE_FLAGS                 = /nologo
-*_ICCx86xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICCx86xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICCx86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICCx86xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICCx86xASL_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 11.1
-#   IA32 - Intel(R) C++ Compiler for applications running on IA32         (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_ia32)
-#   X64  - Intel(R) C++ Compiler for applications running on Intel(R) 64  (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_intel64)
-#   ASL  - Intel ACPI Source Language Compiler
-#
-####################################################################################
-#   ICC11            - Intel C Compiler V11.1
-*_ICC11_*_*_FAMILY                    = INTEL
-
-*_ICC11_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICC11_*_MAKE_FLAGS                       = /nologo
-*_ICC11_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11_*_APP_FLAGS                        = /nologo /E /TC
-*_ICC11_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICC11_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
 
-##################
-# ASL definitions
-##################
-*_ICC11_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)
-*_ICC11_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_ICC11_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_ICC11_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICC11_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICC11_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICC11_IA32_CC_PATH                  = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_SLINK_PATH               = DEF(ICC11_BIN32)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICC11_IA32_DLINK_PATH               = DEF(ICC11_BIN32)\xilink.exe
-*_ICC11_IA32_PP_PATH                  = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_VFRPP_PATH               = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_APP_PATH                 = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICC11_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICC11_IA32_ASLCC_PATH               = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_ASLPP_PATH               = DEF(ICC11_BIN32)\icl.exe
-*_ICC11_IA32_ASLDLINK_PATH            = DEF(ICC11_BIN32)\xilink.exe
-
-  DEBUG_ICC11_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICC11_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICC11_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICC11_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICC11_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICC11_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-
-  DEBUG_ICC11_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICC11_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICC11_IA32_NASM_FLAGS                = -O0 -f win32 -g
-
-      *_ICC11_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICC11_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICC11_X64_CC_PATH                   = DEF(ICC11_BINX64)\icl.exe
-*_ICC11_X64_SLINK_PATH                = DEF(ICC11_BINX64)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICC11_X64_DLINK_PATH                = DEF(ICC11_BINX64)\xilink.exe
-*_ICC11_X64_PP_PATH                   = DEF(ICC11_BINX64)\icl.exe
-*_ICC11_X64_VFRPP_PATH                = DEF(ICC11_BINX64)\icl.exe
-*_ICC11_X64_APP_PATH                  = DEF(ICC11_BINX64)\icl.exe
-*_ICC11_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICC11_X64_ASLCC_PATH                = DEF(ICC11_BINX64)\icl.exe
-*_ICC11_X64_ASLPP_PATH                = DEF(ICC11_BINX64)\icl.exe
-*_ICC11_X64_ASLDLINK_PATH             = DEF(ICC11_BINX64)\xilink.exe
-
-  DEBUG_ICC11_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICC11_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICC11_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICC11_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICC11_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICC11_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-
-  DEBUG_ICC11_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICC11_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICC11_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICC11_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICC11_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICC11_EBC_*_FAMILY              = INTEL
-
-*_ICC11_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11_EBC_PP_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICC11_EBC_VFRPP_PATH            = DEF(EBC_BIN)\iec.exe
-*_ICC11_EBC_CC_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICC11_EBC_SLINK_PATH            = DEF(EBC_BIN)\link.exe
-*_ICC11_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
-
-*_ICC11_EBC_MAKE_FLAGS                 = /nologo
-*_ICC11_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICC11_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICC11_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-####################################################################################
 #
-# Intel(R) C++ Compiler Version 11.1
-#
-#   IA32 - Intel(R) C++ Compiler for applications running on IA32         (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_ia32)
-#   X64  - Intel(R) C++ Compiler for applications running on Intel(R) 64  (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_intel64)
-#   ASL  - Microsoft ACPI Source Language Compiler
-#
-####################################################################################
-#   ICC11xASL              - Intel C Compiler V11.1
-*_ICC11xASL_*_*_FAMILY                    = INTEL
-
-*_ICC11xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICC11xASL_*_MAKE_FLAGS                       = /nologo
-*_ICC11xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11xASL_*_APP_FLAGS                        = /nologo /E /TC
-*_ICC11xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICC11xASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICC11xASL_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)
-*_ICC11xASL_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_ICC11xASL_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_ICC11xASL_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICC11xASL_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICC11xASL_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICC11xASL_IA32_CC_PATH                  = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_SLINK_PATH               = DEF(ICC11_BIN32)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11xASL_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICC11xASL_IA32_DLINK_PATH               = DEF(ICC11_BIN32)\xilink.exe
-*_ICC11xASL_IA32_PP_PATH                  = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_VFRPP_PATH               = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_APP_PATH                 = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICC11xASL_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICC11xASL_IA32_ASLCC_PATH               = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_ASLPP_PATH               = DEF(ICC11_BIN32)\icl.exe
-*_ICC11xASL_IA32_ASLDLINK_PATH            = DEF(ICC11_BIN32)\xilink.exe
-
-  DEBUG_ICC11xASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICC11xASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICC11xASL_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICC11xASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICC11xASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICC11xASL_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-
-  DEBUG_ICC11xASL_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICC11xASL_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICC11xASL_IA32_NASM_FLAGS                = -O0 -f win32 -g
-
-      *_ICC11xASL_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICC11xASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11xASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11xASL_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICC11xASL_X64_CC_PATH                   = DEF(ICC11_BINX64)\icl.exe
-*_ICC11xASL_X64_SLINK_PATH                = DEF(ICC11_BINX64)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11xASL_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICC11xASL_X64_DLINK_PATH                = DEF(ICC11_BINX64)\xilink.exe
-*_ICC11xASL_X64_PP_PATH                   = DEF(ICC11_BINX64)\icl.exe
-*_ICC11xASL_X64_VFRPP_PATH                = DEF(ICC11_BINX64)\icl.exe
-*_ICC11xASL_X64_APP_PATH                  = DEF(ICC11_BINX64)\icl.exe
-*_ICC11xASL_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11xASL_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICC11xASL_X64_ASLCC_PATH                = DEF(ICC11_BINX64)\icl.exe
-*_ICC11xASL_X64_ASLPP_PATH                = DEF(ICC11_BINX64)\icl.exe
-*_ICC11xASL_X64_ASLDLINK_PATH             = DEF(ICC11_BINX64)\xilink.exe
-
-  DEBUG_ICC11xASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICC11xASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICC11xASL_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICC11xASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICC11xASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICC11xASL_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-
-  DEBUG_ICC11xASL_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICC11xASL_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICC11xASL_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICC11xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11xASL_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICC11xASL_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICC11xASL_EBC_*_FAMILY              = INTEL
-
-*_ICC11xASL_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11xASL_EBC_PP_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICC11xASL_EBC_VFRPP_PATH            = DEF(EBC_BIN)\iec.exe
-*_ICC11xASL_EBC_CC_PATH               = DEF(EBC_BIN)\iec.exe
-*_ICC11xASL_EBC_SLINK_PATH            = DEF(EBC_BIN)\link.exe
-*_ICC11xASL_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe
-
-*_ICC11xASL_EBC_MAKE_FLAGS                 = /nologo
-*_ICC11xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICC11xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICC11xASL_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 11.1 x86 (32-bit on 64-bit OS)
-#
-#   IA32 - Intel(R) C++ Compiler for applications running on IA32         (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_ia32)
-#   X64  - Intel(R) C++ Compiler for applications running on Intel(R) 64  (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_intel64)
-#   ASL  - Intel ACPI Source Language Compiler
-#
-####################################################################################
-#   ICC11x86              - Intel C Compiler V11.1
-*_ICC11x86_*_*_FAMILY                    = INTEL
-
-*_ICC11x86_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11x86_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICC11x86_*_MAKE_FLAGS                       = /nologo
-*_ICC11x86_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11x86_*_APP_FLAGS                        = /nologo /E /TC
-*_ICC11x86_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICC11x86_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICC11x86_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)
-*_ICC11x86_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_ICC11x86_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_ICC11x86_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICC11x86_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICC11x86_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICC11x86_IA32_CC_PATH                  = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_SLINK_PATH               = DEF(ICC11_BIN32x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICC11x86_IA32_DLINK_PATH               = DEF(ICC11_BIN32x86)\xilink.exe
-*_ICC11x86_IA32_PP_PATH                  = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_VFRPP_PATH               = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_APP_PATH                 = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICC11x86_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICC11x86_IA32_ASLCC_PATH               = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_ASLPP_PATH               = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86_IA32_ASLDLINK_PATH            = DEF(ICC11_BIN32x86)\xilink.exe
-
-  DEBUG_ICC11x86_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICC11x86_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICC11x86_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-  DEBUG_ICC11x86_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICC11x86_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICC11x86_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-  DEBUG_ICC11x86_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICC11x86_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICC11x86_IA32_NASM_FLAGS                = -O0 -f win32 -g
-      *_ICC11x86_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICC11x86_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11x86_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11x86_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICC11x86_X64_CC_PATH                   = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86_X64_SLINK_PATH                = DEF(ICC11_BINX64x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICC11x86_X64_DLINK_PATH                = DEF(ICC11_BINX64x86)\xilink.exe
-*_ICC11x86_X64_PP_PATH                   = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86_X64_VFRPP_PATH                = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86_X64_APP_PATH                  = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11x86_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICC11x86_X64_ASLCC_PATH                = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86_X64_ASLPP_PATH                = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86_X64_ASLDLINK_PATH             = DEF(ICC11_BINX64x86)\xilink.exe
-
-  DEBUG_ICC11x86_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICC11x86_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICC11x86_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-  DEBUG_ICC11x86_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICC11x86_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICC11x86_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-  DEBUG_ICC11x86_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICC11x86_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICC11x86_X64_NASM_FLAGS                 = -O0 -f win64 -g
-  DEBUG_ICC11x86_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11x86_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11x86_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICC11x86_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICC11x86_EBC_*_FAMILY              = INTEL
-
-*_ICC11x86_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11x86_EBC_PP_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICC11x86_EBC_VFRPP_PATH            = DEF(EBC_BINx86)\iec.exe
-*_ICC11x86_EBC_CC_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICC11x86_EBC_SLINK_PATH            = DEF(EBC_BINx86)\link.exe
-*_ICC11x86_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
-
-*_ICC11x86_EBC_MAKE_FLAGS                 = /nologo
-*_ICC11x86_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICC11x86_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11x86_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11x86_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICC11x86_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-
-####################################################################################
-#
-# Intel(R) C++ Compiler Version 11.1 x86 (32-bit on 64-bit OS)
-#
-#   IA32 - Intel(R) C++ Compiler for applications running on IA32         (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_ia32)
-#   X64  - Intel(R) C++ Compiler for applications running on Intel(R) 64  (Version 11.1 Build 072 Package ID: w_cproc_p_11.1.072_intel64)
-#   ASL  - Microsoft ACPI Source Language Compiler
-#
-####################################################################################
-#   ICC11x86xASL              - Intel C Compiler V11.1
-*_ICC11x86xASL_*_*_FAMILY                    = INTEL
-
-*_ICC11x86xASL_*_MAKE_PATH                   = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11x86xASL_*_RC_PATH                     = DEF(MS_VS_BIN)\rc.exe
-
-*_ICC11x86xASL_*_MAKE_FLAGS                       = /nologo
-*_ICC11x86xASL_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11x86xASL_*_APP_FLAGS                        = /nologo /E /TC
-*_ICC11x86xASL_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h
-
-*_ICC11x86xASL_*_ASM16_PATH      = DEF(MS_VS_BIN)\ml.exe
-
-##################
-# ASL definitions
-##################
-*_ICC11x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)
-*_ICC11x86xASL_*_ASL_FLAGS       =
-*_ICC11x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)
-*_ICC11x86xASL_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)
-*_ICC11x86xASL_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)
-*_ICC11x86xASL_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)
-
-##################
-# IA32 definitions
-##################
-*_ICC11x86xASL_IA32_CC_PATH                  = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_SLINK_PATH               = DEF(ICC11_BIN32x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86xASL_IA32_SLINK_DLL                = DEF(MS_VS_BIN)
-*_ICC11x86xASL_IA32_DLINK_PATH               = DEF(ICC11_BIN32x86)\xilink.exe
-*_ICC11x86xASL_IA32_PP_PATH                  = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_VFRPP_PATH               = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_APP_PATH                 = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_ASM_PATH                 = DEF(MS_VS_BIN)\ml.exe
-*_ICC11x86xASL_IA32_ASM_DLL                  = DEF(MS_VS_DLL)
-*_ICC11x86xASL_IA32_ASLCC_PATH               = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_ASLPP_PATH               = DEF(ICC11_BIN32x86)\icl.exe
-*_ICC11x86xASL_IA32_ASLDLINK_PATH            = DEF(ICC11_BIN32x86)\xilink.exe
-
-  DEBUG_ICC11x86xASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm
-RELEASE_ICC11x86xASL_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O1b2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF
-NOOPT_ICC11x86xASL_IA32_CC_FLAGS                  = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm /Od
-
-  DEBUG_ICC11x86xASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi
-RELEASE_ICC11x86xASL_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd
-NOOPT_ICC11x86xASL_IA32_ASM_FLAGS                 = /nologo /c /WX /W3 /Zd /Zi
-  DEBUG_ICC11x86xASL_IA32_NASM_FLAGS              = -Ox -f win32 -g
-RELEASE_ICC11x86xASL_IA32_NASM_FLAGS              = -Ox -f win32
-NOOPT_ICC11x86xASL_IA32_NASM_FLAGS                = -O0 -f win32 -g
-      *_ICC11x86xASL_IA32_SLINK_FLAGS             = /nologo
-  DEBUG_ICC11x86xASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11x86xASL_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11x86xASL_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# X64 definitions
-##################
-*_ICC11x86xASL_X64_CC_PATH                   = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86xASL_X64_SLINK_PATH                = DEF(ICC11_BINX64x86)\xilib.exe
-# xilib.exe needs lib.exe from Visual Studio
-*_ICC11x86xASL_X64_SLINK_DLL                 = DEF(MS_VS_BIN)
-*_ICC11x86xASL_X64_DLINK_PATH                = DEF(ICC11_BINX64x86)\xilink.exe
-*_ICC11x86xASL_X64_PP_PATH                   = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86xASL_X64_VFRPP_PATH                = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86xASL_X64_APP_PATH                  = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86xASL_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe
-*_ICC11x86xASL_X64_ASM_DLL                   = DEF(MS_VS_DLL)
-*_ICC11x86xASL_X64_ASLCC_PATH                = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86xASL_X64_ASLPP_PATH                = DEF(ICC11_BINX64x86)\icl.exe
-*_ICC11x86xASL_X64_ASLDLINK_PATH             = DEF(ICC11_BINX64x86)\xilink.exe
-
-  DEBUG_ICC11x86xASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF
-RELEASE_ICC11x86xASL_X64_CC_FLAGS                 = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF
-NOOPT_ICC11x86xASL_X64_CC_FLAGS                   = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF /Od
-
-  DEBUG_ICC11x86xASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_ICC11x86xASL_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_ICC11x86xASL_X64_ASM_FLAGS                  = /nologo /c /WX /W3 /Cx /Zd /Zi
-  DEBUG_ICC11x86xASL_X64_NASM_FLAGS               = -Ox -f win64 -g
-RELEASE_ICC11x86xASL_X64_NASM_FLAGS               = -Ox -f win64
-NOOPT_ICC11x86xASL_X64_NASM_FLAGS                 = -O0 -f win64 -g
-
-  DEBUG_ICC11x86xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_ICC11x86xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_ICC11x86xASL_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-      *_ICC11x86xASL_X64_SLINK_FLAGS              = /nologo /LTCG
-
-
-##################
-# EBC definitions
-##################
-*_ICC11x86xASL_EBC_*_FAMILY              = INTEL
-
-*_ICC11x86xASL_EBC_MAKE_PATH             = DEF(MS_VS_BIN)\nmake.exe
-*_ICC11x86xASL_EBC_PP_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICC11x86xASL_EBC_VFRPP_PATH            = DEF(EBC_BINx86)\iec.exe
-*_ICC11x86xASL_EBC_CC_PATH               = DEF(EBC_BINx86)\iec.exe
-*_ICC11x86xASL_EBC_SLINK_PATH            = DEF(EBC_BINx86)\link.exe
-*_ICC11x86xASL_EBC_DLINK_PATH            = DEF(EBC_BINx86)\link.exe
-
-*_ICC11x86xASL_EBC_MAKE_FLAGS                 = /nologo
-*_ICC11x86xASL_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h
-*_ICC11x86xASL_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_ICC11x86xASL_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_ICC11x86xASL_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC
-*_ICC11x86xASL_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
-
-
 #
 # XCODE5 support
 #
-- 
2.18.0.windows.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-04-03 11:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-03  8:29 [PATCH 0/2] Remove ICC tool chain Shenglei Zhang
2019-04-03  8:29 ` [PATCH 1/2] MdePkg/BaseIoLibIntrinsic: Remove IoLibIcc.c Shenglei Zhang
2019-04-03 11:41   ` Gao, Liming
2019-04-03  8:29 ` [PATCH 2/2] BaseTools: Remove ICC tool chain in tools_def.template Shenglei Zhang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox