Sync EDKII BaseTools to BaseTools project r1971

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

14 files changed, 54 insertions, 30 deletions

diff --git a/BaseTools/Conf/FrameworkDatabase.template b/BaseTools/Conf/FrameworkDatabase.template
index eb9bdbc..6d88349 100644
--- a/BaseTools/Conf/FrameworkDatabase.template
+++ b/BaseTools/Conf/FrameworkDatabase.template
@@ -8,7 +8,7 @@
     <Description>

       This Database tracks all packages and archives installed in this workspace.

     </Description>

-    <Copyright>Copyright (c) 2007 - 2009,  Intel Corporation    All rights reserved.</Copyright>

+    <Copyright>Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.</Copyright>

     <License>

       This program and the accompanying materials are licensed and made available

       under the terms and conditions of the BSD License which accompanies this

diff --git a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
index 23cce95..b7cda67 100644
--- a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
+++ b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Filename: DistributionPackage.xsd
 
-Copyright (c) 2008, Intel Corp.  All rights reserved.
+Copyright (c) 2008, Intel Corporation. All rights reserved.
 
 This program and the accompanying materials are licensed and made available 
 under the terms and conditions of the BSD License which may be found at 
@@ -230,7 +230,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 							code provided in the distribution file. Alternatively, this may
 							point to a filename that contains the License. The file (included
 							in the content zip file) will be stored in the same location as
-							the distribution package’s .pkg file. </xs:documentation>
+							the distribution package's .pkg file. </xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element minOccurs="1" maxOccurs="1" name="Abstract"
diff --git a/BaseTools/Conf/XMLSchema/FarManifest.xsd b/BaseTools/Conf/XMLSchema/FarManifest.xsd
index 6e75734..6e8c34a 100644
--- a/BaseTools/Conf/XMLSchema/FarManifest.xsd
+++ b/BaseTools/Conf/XMLSchema/FarManifest.xsd
@@ -2,8 +2,8 @@
 <!--

 Filename: FarManifest.xsd

 

-Copyright (c) 2007, Intel Corp.

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2007, Intel Corporation. All rights reserved.

+This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which may be found at http://opensource.org/licenses/bsd-license.php

 

diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
index d40561e..eeb48d9 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkDataAttributes.xsd
@@ -3,8 +3,8 @@
   <!--

     Filename: FrameworkDataAttributes.xsd

     

-    Copyright (c) 2007, Intel Corp.

-    All rights reserved. This program and the accompanying materials

+    Copyright (c) 2007, Intel Corporation. All rights reserved.

+    This program and the accompanying materials

     are licensed and made available under the terms and conditions of the BSD License

     which may be found at http://opensource.org/licenses/bsd-license.php

     

diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
index 12bba93..e094c1b 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkDataElements.xsd
@@ -3,8 +3,8 @@
   <!--

     Filename: FrameworkDataElements.xsd

     

-    Copyright (c) 2007, Intel Corp.

-    All rights reserved. This program and the accompanying materials

+    Copyright (c) 2007, Intel Corporation. All rights reserved.

+    This program and the accompanying materials

     are licensed and made available under the terms and conditions of the BSD License

     which may be found at http://opensource.org/licenses/bsd-license.php

     

diff --git a/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd b/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
index 18db608..9a46a02 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkDataTypes.xsd
@@ -3,8 +3,8 @@
   <!--

     Filename: FrameworkDataTypes.xsd

     

-    Copyright (c) 2007, Intel Corp.

-    All rights reserved. This program and the accompanying materials

+    Copyright (c) 2007, Intel Corporation. All rights reserved.

+    This program and the accompanying materials

     are licensed and made available under the terms and conditions of the BSD License

     which may be found at http://opensource.org/licenses/bsd-license.php

     

diff --git a/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd b/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
index 6927c7b..e2745af 100644
--- a/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
+++ b/BaseTools/Conf/XMLSchema/FrameworkHeaders.xsd
@@ -3,9 +3,9 @@
   <!--

     Filename: FrameworkHeaders.xsd

     

-    Copyright (c) 2007, Intel Corp.

+    Copyright (c) 2007, Intel Corporation. All rights reserved.

 

-    All rights reserved. This program and the accompanying materials

+    This program and the accompanying materials

     are licensed and made available under the terms and conditions of the BSD License

     which may be found at http://opensource.org/licenses/bsd-license.php

     

diff --git a/BaseTools/Conf/XMLSchema/NamingConvention.xsd b/BaseTools/Conf/XMLSchema/NamingConvention.xsd
index 809f1a8..8a76639 100644
--- a/BaseTools/Conf/XMLSchema/NamingConvention.xsd
+++ b/BaseTools/Conf/XMLSchema/NamingConvention.xsd
@@ -3,8 +3,8 @@
   <!--

     Filename: NamingConvention.xsd

     

-    Copyright (c) 2007, Intel Corp.

-    All rights reserved. This program and the accompanying materials

+    Copyright (c) 2007, Intel Corporation. All rights reserved.

+    This program and the accompanying materials

     are licensed and made available under the terms and conditions of the BSD License

     which may be found at http://opensource.org/licenses/bsd-license.php

     

diff --git a/BaseTools/Conf/XMLSchema/SurfaceArea.xsd b/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
index f95de26..c941be8 100644
--- a/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
+++ b/BaseTools/Conf/XMLSchema/SurfaceArea.xsd
@@ -3,8 +3,8 @@
   <!--

     Filename: SurfaceArea.xsd

     

-    Copyright (c) 2007, Intel Corp.

-    All rights reserved. This program and the accompanying materials

+    Copyright (c) 2007, Intel Corporation. All rights reserved.

+    This program and the accompanying materials

     are licensed and made available under the terms and conditions of the BSD License

     which may be found at http://opensource.org/licenses/bsd-license.php

     

diff --git a/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig b/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
index c2fdaf8..5d86b98 100644
--- a/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
+++ b/BaseTools/Conf/XMLSchema/SurfaceArea.xsdconfig
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-Copyright (c) 2007, Intel Corp.

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2007, Intel Corporation. All rights reserved.

+This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which may be found at http://opensource.org/licenses/bsd-license.php

 

diff --git a/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd b/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
index 8809792..1c9491a 100644
--- a/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
+++ b/BaseTools/Conf/XMLSchema/WorkspaceContent.xsd
@@ -2,7 +2,7 @@
 <!--

     Filename: WorkspaceContent.xsd

     

-    Copyright (c) 2008, Intel Corp.  All rights reserved.

+    Copyright (c) 2008, Intel Corporation. All rights reserved.

     

     This program and the accompanying materials are licensed and made available 

     under the terms and conditions of the BSD License which may be found at 

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 95bb5ed..c2b7dfa 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -1,7 +1,7 @@
 #

-#  Copyright (c) 2007-2010, Intel Corporation

-#  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.

-#  All rights reserved. This program and the accompanying materials

+#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Portions copyright (c) 2008 - 2009, Apple Inc. 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

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index 75eba36..7f0771e 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -1,7 +1,7 @@
 #

-#  Copyright (c) 2006-2007, Intel Corporation

+#  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b53826b..c5a4bd7 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1,8 +1,8 @@
 #

-#  Copyright (c) 2006-2010, Intel Corporation

-#  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.

+#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

 #

-#  All rights reserved. This program and the accompanying materials

+#  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

@@ -109,6 +109,8 @@ DEFINE CYGWIN_BINIPF           = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
 

 DEFINE GCC44_IA32_PREFIX       = /usr/bin/

 #DEFINE GCC44_IA32_PREFIX       = ENV(HOME)/programs/gcc/4.4/ia32/

+DEFINE GCC44_X64_PREFIX        = /usr/bin/

+#DEFINE GCC44_X64_PREFIX       = ENV(HOME)/programs/gcc/4.4/x64/

 

 DEFINE UNIX_IASL_BIN           = /usr/bin/iasl

 #DEFINE UNIX_IASL_BIN           = $(HOME)/programs/iasl

@@ -1571,10 +1573,11 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little -B ia64 --re
 

 DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-stack-protector -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -ffunction-sections -fdata-sections -c -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

 DEFINE GCC44_IA32_CC_FLAGS           = DEF(GCC44_ALL_CC_FLAGS) -m32 -malign-double -D EFI32

-DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -Wno-address

+DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS -mno-red-zone -Wno-address

 DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -n -q --gc-sections

 DEFINE GCC44_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON) --entry ReferenceAcpiTable -u ReferenceAcpiTable

 DEFINE GCC44_IA32_X64_DLINK_FLAGS    = DEF(GCC44_IA32_X64_DLINK_COMMON) --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

+DEFINE GCC44_X64_DLINK_FLAGS         = DEF(GCC44_IA32_X64_DLINK_FLAGS)  -melf_x86_64 --oformat=elf64-x86-64 --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script

 DEFINE GCC44_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)

 

 ####################################################################################

@@ -1703,6 +1706,27 @@ DEFINE GCC44_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)
 *_GCC44_IA32_DLINK_FLAGS          = DEF(GCC44_IA32_X64_DLINK_FLAGS) -m elf_i386 --oformat=elf32-i386

 *_GCC44_IA32_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)

 

+##################

+# GCC44 X64 definitions

+##################

+*_GCC44_X64_CC_PATH              = DEF(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_SLINK_PATH           = DEF(GCC44_X64_PREFIX)ar

+*_GCC44_X64_DLINK_PATH           = DEF(GCC44_X64_PREFIX)ld

+*_GCC44_X64_ASLDLINK_PATH        = DEF(GCC44_X64_PREFIX)ld

+*_GCC44_X64_ASM_PATH             = DEF(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_PP_PATH              = DEF(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_VFRPP_PATH           = DEF(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_ASLCC_PATH           = DEF(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_ASLPP_PATH           = DEF(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_RC_PATH              = DEF(GCC44_X64_PREFIX)objcopy

+

+*_GCC44_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

+*_GCC44_X64_ASLDLINK_FLAGS       = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64

+*_GCC44_X64_ASM_FLAGS            = DEF(GCC44_ASM_FLAGS) -m64 --64 -melf_x86_64

+*_GCC44_X64_CC_FLAGS             = DEF(GCC44_X64_CC_FLAGS) -Os

+*_GCC44_X64_DLINK_FLAGS          = DEF(GCC44_X64_DLINK_FLAGS)

+*_GCC44_X64_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)

+

 

 ####################################################################################

 #