[Lldb-commits] [PATCH] D35065: Rename enums in AuxVector

[Bruno Rosa via Phabricator via lldb-commits]

brunoalr created this revision.

On linux on ppc64le some of the enums in AuxVector have the same name
as macros defined in the system.


https://reviews.llvm.org/D35065

Files:
  source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
  source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h
  source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp


Index: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
===================================================================
--- source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+++ source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
@@ -561,7 +561,7 @@
 }
 
 void DynamicLoaderPOSIXDYLD::EvalVdsoStatus() {
-  AuxVector::iterator I = m_auxv->FindEntry(AuxVector::AT_SYSINFO_EHDR);
+  AuxVector::iterator I = m_auxv->FindEntry(AuxVector::AT_SYSINFO_EHDRENTRY);
 
   if (I != m_auxv->end())
     m_vdso_base = I->value;
Index: source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h
===================================================================
--- source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h
+++ source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h
@@ -62,17 +62,17 @@
     AT_PLATFORM = 15, ///< String identifying platform.
     AT_HWCAP = 16,    ///< Machine dependent hints about processor capabilities.
     AT_FPUCW = 18,    ///< Used FPU control word.
-    AT_DCACHEBSIZE = 19,   ///< Data cache block size.
-    AT_ICACHEBSIZE = 20,   ///< Instruction cache block size.
-    AT_UCACHEBSIZE = 21,   ///< Unified cache block size.
-    AT_IGNOREPPC = 22,     ///< Entry should be ignored.
+    AT_DCACHEBLOCKSIZE = 19,   ///< Data cache block size.
+    AT_ICACHEBLOCKSIZE = 20,   ///< Instruction cache block size.
+    AT_UCACHEBLOCKSIZE = 21,   ///< Unified cache block size.
+    AT_IGNOREPPCENTRY = 22,     ///< Entry should be ignored.
     AT_SECURE = 23,        ///< Boolean, was exec setuid-like?
     AT_BASE_PLATFORM = 24, ///< String identifying real platforms.
     AT_RANDOM = 25,        ///< Address of 16 random bytes.
     AT_EXECFN = 31,        ///< Filename of executable.
     AT_SYSINFO = 32, ///< Pointer to the global system page used for system
                      ///calls and other nice things.
-    AT_SYSINFO_EHDR = 33,
+    AT_SYSINFO_EHDRENTRY = 33,
     AT_L1I_CACHESHAPE = 34, ///< Shapes of the caches.
     AT_L1D_CACHESHAPE = 35,
     AT_L2_CACHESHAPE = 36,
Index: source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
===================================================================
--- source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
+++ source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
@@ -133,16 +133,16 @@
     case ENTRY_NAME(AT_PLATFORM);       break;
     case ENTRY_NAME(AT_HWCAP);          break;
     case ENTRY_NAME(AT_FPUCW);          break;
-    case ENTRY_NAME(AT_DCACHEBSIZE);    break;
-    case ENTRY_NAME(AT_ICACHEBSIZE);    break;
-    case ENTRY_NAME(AT_UCACHEBSIZE);    break;
-    case ENTRY_NAME(AT_IGNOREPPC);      break;
+    case ENTRY_NAME(AT_DCACHEBLOCKSIZE);    break;
+    case ENTRY_NAME(AT_ICACHEBLOCKSIZE);    break;
+    case ENTRY_NAME(AT_UCACHEBLOCKSIZE);    break;
+    case ENTRY_NAME(AT_IGNOREPPCENTRY);      break;
     case ENTRY_NAME(AT_SECURE);         break;
     case ENTRY_NAME(AT_BASE_PLATFORM);  break;
     case ENTRY_NAME(AT_RANDOM);         break;
     case ENTRY_NAME(AT_EXECFN);         break;
     case ENTRY_NAME(AT_SYSINFO);        break;
-    case ENTRY_NAME(AT_SYSINFO_EHDR);   break;
+    case ENTRY_NAME(AT_SYSINFO_EHDRENTRY);   break;
     case ENTRY_NAME(AT_L1I_CACHESHAPE); break;
     case ENTRY_NAME(AT_L1D_CACHESHAPE); break;
     case ENTRY_NAME(AT_L2_CACHESHAPE);  break;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35065.105454.patch
Type: text/x-patch
Size: 3357 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20170706/efabc0cf/attachment.bin>