Move content from CPU specific ProcessorBind.h files into Base.h if the content is...

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

diff --git a/MdePkg/Include/Ebc/ProcessorBind.h b/MdePkg/Include/Ebc/ProcessorBind.h
index 4e8517537164648b0242782ed27eceb5334fd193..86b9b99408b34cc4bb3331d3dc22923bed119106 100644 (file)
--- a/MdePkg/Include/Ebc/ProcessorBind.h
+++ b/MdePkg/Include/Ebc/ProcessorBind.h
@@ -121,14 +121,6 @@ typedef unsigned long         UINTN;
 #define EFIAPI    \r
 #endif\r
 \r
 #define EFIAPI    \r
 #endif\r
 \r

-///\r
-/// The Microsoft* C compiler can removed references to unreferenced data items\r
-///  if the /OPT:REF linker option is used. We defined a macro as this is a \r
-///  a non standard extension. Currently not supported by the EBC compiler\r
-///\r
-#define GLOBAL_REMOVE_IF_UNREFERENCED\r
-\r
-\r

 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
   On EBC architectures, these two pointer values are the same, \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
   On EBC architectures, these two pointer values are the same, \r

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index a3567267d8db62fc23d841414e7b2f49f8f1207b..d70d3232cf49e171fbd83fb57254b98031f627eb 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -313,41 +313,10 @@ typedef INT32   INTN;
   #endif  \r
 #endif\r
 \r
   #endif  \r
 #endif\r
 \r

-//\r
-// The Microsoft* C compiler can removed references to unreferenced data items\r
-//  if the /OPT:REF linker option is used. We defined a macro as this is a \r
-//  a non standard extension\r
-//\r
-#if defined(_MSC_EXTENSIONS)\r
-  ///\r
-  /// Remove global variable from the linked image if there are no references to \r
-  /// it after all compiler and linker optimizations have been performed.\r
-  ///\r
-  #define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)\r
-#else\r
-  ///\r
-  /// Remove global variable from the linked image if there are no references to \r
-  /// it after all compiler and linker optimizations have been performed.\r
-  ///\r
-  #define GLOBAL_REMOVE_IF_UNREFERENCED\r
-#endif\r
-\r

 //\r
 // For symbol name in GNU assembly code, an extra "_" is necessary\r
 //\r
 #if defined(__GNUC__)\r
 //\r
 // For symbol name in GNU assembly code, an extra "_" is necessary\r
 //\r
 #if defined(__GNUC__)\r

-  ///\r
-  /// Private worker functions for ASM_PFX()\r
-  ///\r
-  #define _CONCATENATE(a, b)  __CONCATENATE(a, b)\r
-  #define __CONCATENATE(a, b) a ## b\r
-\r
-  ///\r
-  /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix\r
-  /// on symbols in assembly language.\r
-  ///\r
-  #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)\r
-\r

   ///\r
   /// For GNU assembly code, .global or .globl can declare global symbols.\r
   /// Define this macro to unify the usage.\r
   ///\r
   /// For GNU assembly code, .global or .globl can declare global symbols.\r
   /// Define this macro to unify the usage.\r

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index c58588214f6a3c59ecf8ac015b55f88b38eecc9e..1fdf8adde768ee0a19e0f0dbd51c2dedaf4f904b 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -371,27 +371,6 @@ typedef INT64   INTN;
   #define EFIAPI\r
 #endif\r
 \r
   #define EFIAPI\r
 #endif\r
 \r

-//\r
-// The Microsoft* C compiler can removed references to unreferenced data items\r
-//  if the /OPT:REF linker option is used. We defined a macro as this is a\r
-//  a non standard extension\r
-//\r
-#if defined(_MSC_EXTENSIONS)\r
-  ///\r
-  /// Remove global variable from the linked image if there are no references to \r
-  /// it after all compiler and linker optimizations have been performed.\r
-  ///\r
-  ///\r
-  #define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)\r
-#else\r
-  ///\r
-  /// Remove global variable from the linked image if there are no references to \r
-  /// it after all compiler and linker optimizations have been performed.\r
-  ///\r
-  ///\r
-  #define GLOBAL_REMOVE_IF_UNREFERENCED\r
-#endif\r
-\r

 ///\r
 /// For GNU assembly code, .global or .globl can declare global symbols.\r
 /// Define this macro to unify the usage.\r
 ///\r
 /// For GNU assembly code, .global or .globl can declare global symbols.\r
 /// Define this macro to unify the usage.\r

diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 027d8d0f59fc56efb0e47646ce9d668ceb41a58e..026d6331b4fc0c1ef6a8751dbad3538733241300 100644 (file)
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -20,7 +20,6 @@
 ///\r
 #define MDE_CPU_X64\r
 \r
 ///\r
 #define MDE_CPU_X64\r
 \r

-\r

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


@@ -375,43 +374,10 @@ typedef INT64   INTN;
   #define EFIAPI       \r
 #endif\r
 \r
   #define EFIAPI       \r
 #endif\r
 \r

-//\r
-// The Microsoft* C compiler can removed references to unreferenced data items\r
-//  if the /OPT:REF linker option is used. We defined a macro as this is a \r
-//  a non standard extension\r
-//\r
-#if defined(_MSC_EXTENSIONS)\r
-  ///\r
-  /// Remove global variable from the linked image if there are no references to \r
-  /// it after all compiler and linker optimizations have been performed.\r
-  ///\r
-  ///\r
-  #define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)\r
-#else\r
-  ///\r
-  /// Remove global variable from the linked image if there are no references to \r
-  /// it after all compiler and linker optimizations have been performed.\r
-  ///\r
-  ///\r
-  #define GLOBAL_REMOVE_IF_UNREFERENCED\r
-#endif\r
-\r

 //\r
 // For symbol name in GNU assembly code, an extra "_" is necessary\r
 //\r
 #if defined(__GNUC__)\r
 //\r
 // For symbol name in GNU assembly code, an extra "_" is necessary\r
 //\r
 #if defined(__GNUC__)\r

-  ///\r
-  /// Private worker functions for ASM_PFX()\r
-  ///\r
-  #define _CONCATENATE(a, b)  __CONCATENATE(a, b)\r
-  #define __CONCATENATE(a, b) a ## b\r
-\r
-  ///\r
-  /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix\r
-  /// on symbols in assembly language.\r
-  ///\r
-  #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)\r
-\r

   ///\r
   /// For GNU assembly code, .global or .globl can declare global symbols.\r
   /// Define this macro to unify the usage.\r
   ///\r
   /// For GNU assembly code, .global or .globl can declare global symbols.\r
   /// Define this macro to unify the usage.\r