Sync BaseTool trunk (version r2649) into EDKII BaseTools.

Signed-off-by: Gao, Liming <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15188 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 159 insertions, 159 deletions

diff --git a/BaseTools/Source/C/Include/Arm/ProcessorBind.h b/BaseTools/Source/C/Include/Arm/ProcessorBind.h
index 1ca26ab6f3..d84f16e7ba 100644
--- a/BaseTools/Source/C/Include/Arm/ProcessorBind.h
+++ b/BaseTools/Source/C/Include/Arm/ProcessorBind.h
@@ -1,158 +1,158 @@
-/** @file
-  Processor or Compiler specific defines and types for ARM.
-
-  Copyright (c) 2006 - 2012, 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                                            
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-**/
-
-#ifndef __PROCESSOR_BIND_H__
-#define __PROCESSOR_BIND_H__
-
-///
-/// Define the processor type so other code can make processor based choices
-///
-#define MDE_CPU_ARM
-
-//
-// Make sure we are using the correct packing rules per EFI specification
-//
-#ifndef __GNUC__
-#pragma pack()
-#endif
-
-#if _MSC_EXTENSIONS 
-  //
-  // use Microsoft* C complier dependent integer width types 
-  //
-  typedef unsigned __int64    UINT64;
-  typedef __int64             INT64;
-  typedef unsigned __int32    UINT32;
-  typedef __int32             INT32;
-  typedef unsigned short      UINT16;
-  typedef unsigned short      CHAR16;
-  typedef short               INT16;
-  typedef unsigned char       BOOLEAN;
-  typedef unsigned char       UINT8;
-  typedef char                CHAR8;
-  typedef signed char         INT8;
-#else
-  //
-  // Assume standard ARM alignment. 
-  //
-  typedef unsigned long long  UINT64;
-  typedef long long           INT64;
-  typedef unsigned int        UINT32;
-  typedef int                 INT32;
-  typedef unsigned short      UINT16;
-  typedef unsigned short      CHAR16;
-  typedef short               INT16;
-  typedef unsigned char       BOOLEAN;
-  typedef unsigned char       UINT8;
-  typedef char                CHAR8;
-  typedef signed char         INT8;
-
-  #define UINT8_MAX 0xff
-#endif
-
-///
-/// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,
-/// 8 bytes on supported 64-bit processor instructions)
-///
-typedef UINT32  UINTN;
-
-///
-/// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,
-/// 8 bytes on supported 64-bit processor instructions)
-///
-typedef INT32   INTN;
-
-//
-// Processor specific defines
-//
-
-///
-/// A value of native width with the highest bit set.
-///
-#define MAX_BIT      0x80000000
-
-///
-/// A value of native width with the two highest bits set.
-///
-#define MAX_2_BITS   0xC0000000
-
-///
-/// Maximum legal ARM address
-///
-#define MAX_ADDRESS  0xFFFFFFFF
-
-///
-/// The stack alignment required for ARM
-///
-#define CPU_STACK_ALIGNMENT  sizeof(UINT64)
-
-//
-// Modifier to ensure that all protocol member functions and EFI intrinsics
-// use the correct C calling convention. All protocol member functions and
-// EFI intrinsics are required to modify their member functions with EFIAPI.
-//
-#define EFIAPI    
-
-#if defined(__GNUC__)
-  ///
-  /// For GNU assembly code, .global or .globl can declare global symbols.
-  /// Define this macro to unify the usage.
-  ///
-  #define ASM_GLOBAL .globl
-
-  #if !defined(__APPLE__)
-    ///
-    /// ARM EABI defines that the linker should not manipulate call relocations
-    /// (do bl/blx conversion) unless the target symbol has function type.
-    /// CodeSourcery 2010.09 started requiring the .type to function properly
-    ///
-    #define INTERWORK_FUNC(func__)   .type ASM_PFX(func__), %function
-
-    #define GCC_ASM_EXPORT(func__)  \
-             .global  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    ;\
-             .type ASM_PFX(func__), %function  
-
-    #define GCC_ASM_IMPORT(func__)  \
-             .extern  _CONCATENATE (__USER_LABEL_PREFIX__, func__)
-             
-  #else
-    //
-    // .type not supported by Apple Xcode tools 
-    //
-    #define INTERWORK_FUNC(func__)  
-
-    #define GCC_ASM_EXPORT(func__)  \
-             .globl  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    \
-  
-    #define GCC_ASM_IMPORT(name)  
-
-  #endif
-#endif
-
-/**
-  Return the pointer to the first instruction of a function given a function pointer.
-  On ARM CPU architectures, these two pointer values are the same, 
-  so the implementation of this macro is very simple.
-  
-  @param  FunctionPointer   A pointer to a function.
-
-  @return The pointer to the first instruction of a function given a function pointer.
-  
-**/
-#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)
-
-#endif
-
-
+/** @file

+  Processor or Compiler specific defines and types for ARM.

+

+  Copyright (c) 2006 - 2012, 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                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+**/

+

+#ifndef __PROCESSOR_BIND_H__

+#define __PROCESSOR_BIND_H__

+

+///

+/// Define the processor type so other code can make processor based choices

+///

+#define MDE_CPU_ARM

+

+//

+// Make sure we are using the correct packing rules per EFI specification

+//

+#ifndef __GNUC__

+#pragma pack()

+#endif

+

+#if _MSC_EXTENSIONS 

+  //

+  // use Microsoft* C complier dependent integer width types 

+  //

+  typedef unsigned __int64    UINT64;

+  typedef __int64             INT64;

+  typedef unsigned __int32    UINT32;

+  typedef __int32             INT32;

+  typedef unsigned short      UINT16;

+  typedef unsigned short      CHAR16;

+  typedef short               INT16;

+  typedef unsigned char       BOOLEAN;

+  typedef unsigned char       UINT8;

+  typedef char                CHAR8;

+  typedef signed char         INT8;

+#else

+  //

+  // Assume standard ARM alignment. 

+  //

+  typedef unsigned long long  UINT64;

+  typedef long long           INT64;

+  typedef unsigned int        UINT32;

+  typedef int                 INT32;

+  typedef unsigned short      UINT16;

+  typedef unsigned short      CHAR16;

+  typedef short               INT16;

+  typedef unsigned char       BOOLEAN;

+  typedef unsigned char       UINT8;

+  typedef char                CHAR8;

+  typedef signed char         INT8;

+

+  #define UINT8_MAX 0xff

+#endif

+

+///

+/// Unsigned value of native width.  (4 bytes on supported 32-bit processor instructions,

+/// 8 bytes on supported 64-bit processor instructions)

+///

+typedef UINT32  UINTN;

+

+///

+/// Signed value of native width.  (4 bytes on supported 32-bit processor instructions,

+/// 8 bytes on supported 64-bit processor instructions)

+///

+typedef INT32   INTN;

+

+//

+// Processor specific defines

+//

+

+///

+/// A value of native width with the highest bit set.

+///

+#define MAX_BIT      0x80000000

+

+///

+/// A value of native width with the two highest bits set.

+///

+#define MAX_2_BITS   0xC0000000

+

+///

+/// Maximum legal ARM address

+///

+#define MAX_ADDRESS  0xFFFFFFFF

+

+///

+/// The stack alignment required for ARM

+///

+#define CPU_STACK_ALIGNMENT  sizeof(UINT64)

+

+//

+// Modifier to ensure that all protocol member functions and EFI intrinsics

+// use the correct C calling convention. All protocol member functions and

+// EFI intrinsics are required to modify their member functions with EFIAPI.

+//

+#define EFIAPI    

+

+#if defined(__GNUC__)

+  ///

+  /// For GNU assembly code, .global or .globl can declare global symbols.

+  /// Define this macro to unify the usage.

+  ///

+  #define ASM_GLOBAL .globl

+

+  #if !defined(__APPLE__)

+    ///

+    /// ARM EABI defines that the linker should not manipulate call relocations

+    /// (do bl/blx conversion) unless the target symbol has function type.

+    /// CodeSourcery 2010.09 started requiring the .type to function properly

+    ///

+    #define INTERWORK_FUNC(func__)   .type ASM_PFX(func__), %function

+

+    #define GCC_ASM_EXPORT(func__)  \

+             .global  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    ;\

+             .type ASM_PFX(func__), %function  

+

+    #define GCC_ASM_IMPORT(func__)  \

+             .extern  _CONCATENATE (__USER_LABEL_PREFIX__, func__)

+             

+  #else

+    //

+    // .type not supported by Apple Xcode tools 

+    //

+    #define INTERWORK_FUNC(func__)  

+

+    #define GCC_ASM_EXPORT(func__)  \

+             .globl  _CONCATENATE (__USER_LABEL_PREFIX__, func__)    \

+  

+    #define GCC_ASM_IMPORT(name)  

+

+  #endif

+#endif

+

+/**

+  Return the pointer to the first instruction of a function given a function pointer.

+  On ARM CPU architectures, these two pointer values are the same, 

+  so the implementation of this macro is very simple.

+  

+  @param  FunctionPointer   A pointer to a function.

+

+  @return The pointer to the first instruction of a function given a function pointer.

+  

+**/

+#define FUNCTION_ENTRY_POINT(FunctionPointer) (VOID *)(UINTN)(FunctionPointer)

+

+#endif

+

+

diff --git a/BaseTools/Source/C/Include/Common/BuildVersion.h b/BaseTools/Source/C/Include/Common/BuildVersion.h
index dd9852bad3..d3ad7c265b 100644
--- a/BaseTools/Source/C/Include/Common/BuildVersion.h
+++ b/BaseTools/Source/C/Include/Common/BuildVersion.h
@@ -14,4 +14,4 @@
 

 **/

 

-#define __BUILD_VERSION "Build 2640"

+#define __BUILD_VERSION "Build 2649"