1. Remove #ifdef _MSC_EXTENSION_ from all source files

2. Remove #ifdef _GCC_ from all resource files
3. Remove #if 0 from all resource files
4. Remove #ifdef MDE_CPU_IPF and #ifdef MDE_CPU_EBC
5. Remove #progam from Decode.c
6. Remove #ifdef TIANO_EXTENSION_FLAG from source files
7. Remove #ifdef SUPPORT_IPV6, since code base doesn't support IPV6 at all.
8. Remove #ifdef SpecialNowaitVersion from pxe_bc_mtftp.c, since it's only used for test.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2470 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 6 insertions, 12 deletions

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
index 74d433207f..e974647289 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
@@ -39,12 +39,12 @@
   <SourceFiles>
     <Filename>IoLibMmioBuffer.c</Filename>
     <Filename SupArchList="IA32">IoLib.c</Filename>
-    <Filename SupArchList="IA32">IoLibMsc.c</Filename>
-    <Filename SupArchList="IA32">IoLibGcc.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">IoLibGcc.c</Filename>
     <Filename SupArchList="IA32">IoHighLevel.c</Filename>
     <Filename SupArchList="X64">IoLib.c</Filename>
-    <Filename SupArchList="X64">IoLibMsc.c</Filename>
-    <Filename SupArchList="X64">IoLibGcc.c</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">IoLibGcc.c</Filename>
     <Filename SupArchList="X64">IoHighLevel.c</Filename>
     <Filename SupArchList="IPF">IoLibIpf.c</Filename>
     <Filename SupArchList="IPF">IoHighLevel.c</Filename>
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
index 69fb878888..806f44bbe7 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
@@ -10,7 +10,7 @@
   We don't advocate putting compiler specifics in libraries or drivers but there

   is no other way to make this work.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. 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

@@ -23,8 +23,6 @@
 

 **/

 

-#ifdef __GNUC__

-

 /**

   Reads an 8-bit MMIO register.

 

@@ -383,4 +381,3 @@ IoWrite32 (
   return Value;

 }

 

-#endif

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index d05a7fcace..2c68a3e43c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -8,7 +8,7 @@
   We don't advocate putting compiler specifics in libraries or drivers but there

   is no other way to make this work.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. 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

@@ -22,8 +22,6 @@
 **/

 

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -426,4 +424,3 @@ MmioWrite64 (
   return *(volatile UINT64*)Address = Value;

 }

 

-#endif