[LLDB][ppc64le] Rename enums in AuxVector

[brunoalr]

Summary

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

[brunoalr]

Adding Code Owner (Pavel Labeth) and responsible for the relevant changes (Michael Sartain).

[krytarowski]

Values like AT_NULL are macros on NetBSD and there are no problems?

[brunoalr]

In D35065#800852, @krytarowski wrote:

Values like AT_NULL are macros on NetBSD and there are no problems?

I haven't tested in ppc64le on NetBSD, but I'm afraid the same problems would occur.

[krytarowski]

What are the build failures?

[joerg]

If you want to go this way, rename them consistently and use a different prefix (e.g. AUXV_*) please.

[labath]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

11 ↗

(On Diff #105454)

Do you still get the error if you remove these includes?

As far as I can tell they are unused, and this part of the code should not depend on system headers anyway.

If that doesn't help, then we should use a different prefix as joerg suggests.

115 ↗

(On Diff #105454)

If we go about renaming them, then we should change this, as we still want to display the standard name of the entries.

[brunoalr]

In D35065#800877, @krytarowski wrote:

What are the build failures?

[2397/3183] Building CXX object tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeFiles/lldbPluginDynamicLoaderPosixDYLD.dir/AuxVector.cpp.o
FAILED: tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeFiles/lldbPluginDynamicLoaderPosixDYLD.dir/AuxVector.cpp.o
/usr/bin/c++   -DGTEST_HAS_RTTI=0 -DHAVE_ROUND -DLIBXML2_DEFINED -DLLDB_USE_BUILTIN_DEMANGLER -DLLVM_BUILD_GLOBAL_ISEL -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIM
IT_MACROS -Itools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD -I/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD -Itools/lldb/include -I/home/brosa/llvm/tools/lldb/include -Iinclude
-I/home/brosa/llvm/include -I/usr/include/python2.7 -I/home/brosa/llvm/tools/clang/include -Itools/lldb/../clang/include -I/usr/include/libxml2 -I/home/brosa/llvm/tools/lldb/source/. -fPIC -fvisibility-
inlines-hidden -Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virt
ual-dtor -Wno-comment -Wno-deprecated-declarations -Wno-unknown-pragmas -Wno-strict-aliasing -Wno-deprecated-register -Wno-vla-extension -g    -fno-exceptions -fno-rtti -MD -MT tools/lldb/source/Plugins
/DynamicLoader/POSIX-DYLD/CMakeFiles/lldbPluginDynamicLoaderPosixDYLD.dir/AuxVector.cpp.o -MF tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeFiles/lldbPluginDynamicLoaderPosixDYLD.dir/AuxVector
.cpp.o.d -o tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeFiles/lldbPluginDynamicLoaderPosixDYLD.dir/AuxVector.cpp.o -c /home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxV
ector.cpp
In file included from /usr/include/powerpc64le-linux-gnu/asm/elf.h:17:0,
                 from /usr/include/powerpc64le-linux-gnu/asm/sigcontext.h:13,
                 from /usr/include/powerpc64le-linux-gnu/bits/sigcontext.h:27,
                 from /usr/include/signal.h:306,
                 from /home/brosa/llvm/tools/lldb/include/lldb/lldb-types.h:17,
                 from /home/brosa/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h:17,
                 from /home/brosa/llvm/tools/lldb/include/lldb/lldb-private.h:17,
                 from /home/brosa/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationCollection.h:21,
                 from /home/brosa/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSite.h:22,
                 from /home/brosa/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSiteList.h:21,
                 from /home/brosa/llvm/tools/lldb/include/lldb/Target/Process.h:29,
                 from /home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp:17:
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:65:5: error: expected identifier before numeric constant
     AT_DCACHEBSIZE = 19,   ///< Data cache block size.
     ^
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:65:5: error: expected ‘}’ before numeric constant
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:65:5: error: expected unqualified-id before numeric constant
In file included from /home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp:26:0:
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:82:1: error: expected unqualified-id before ‘private’
 private:
 ^~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:85:1: error: expected unqualified-id before ‘public’
 public:
 ^~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:88:3: error: ‘iterator’ does not name a type
   iterator begin() const { return m_auxv.begin(); }
   ^~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:89:3: error: ‘iterator’ does not name a type
   iterator end() const { return m_auxv.end(); }
   ^~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:91:3: error: ‘iterator’ does not name a type
   iterator FindEntry(EntryType type) const;
   ^~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:93:41: error: ‘Entry’ does not name a type
   static const char *GetEntryName(const Entry &entry) {
                                         ^~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h: In function ‘const char* GetEntryName(const int&)’:
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:94:37: error: ‘EntryType’ does not name a type
     return GetEntryName(static_cast<EntryType>(entry.type));
                                     ^~~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:94:54: error: request for member ‘type’ in ‘entry’, which is of non-class type ‘const int’
     return GetEntryName(static_cast<EntryType>(entry.type));
                                                      ^~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h: At global scope:
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:97:35: error: ‘const char* GetEntryName’ redeclared as different kind of symbol
   static const char *GetEntryName(EntryType type);
                                   ^~~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:93:22: note: previous declaration ‘const char* GetEntryName(const int&)’
   static const char *GetEntryName(const Entry &entry) {
                      ^~~~~~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:97:35: error: ‘EntryType’ was not declared in this scope
   static const char *GetEntryName(EntryType type);
                                   ^~~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:99:42: error: non-member function ‘void DumpToLog(lldb_private::Log*)’ cannot have cv-qualifier
   void DumpToLog(lldb_private::Log *log) const;
                                          ^~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:101:1: error: expected unqualified-id before ‘private’
 private:
 ^~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:103:3: error: ‘EntryVector’ does not name a type
   EntryVector m_auxv;
   ^~~~~~~~~~~
/home/brosa/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h:108:1: error: expected declaration before ‘}’ token
 };
 ^

[brunoalr]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

11 ↗

(On Diff #105454)

I just tried it and it doesn't help, unfortunately.

[brunoalr]

In D35065#800906, @joerg wrote:

If you want to go this way, rename them consistently and use a different prefix (e.g. AUXV_*) please.

Will do.

[brunoalr]

Renaming enum consistently and updating name ENTRY_NAME macro to
correctly assign the standard names of aux vector entries.

[brunoalr]

Fixing replace mistake.

[brunoalr]

Add comments

[joerg]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

115 ↗

(On Diff #105454)

Or name = "AUXV_AT_???" ENTRY_NAME(type) name = #type and then return name + 4;

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h

46 ↗

(On Diff #105517)

I think most targets do, but they don't pull the relevant system headers in via namespace pollution.

[brunoalr]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h

46 ↗

(On Diff #105517)

Should I change this comment to

/// Added AUXV prefix to avoid potential conflicts with system-defined MACROS

?

[brunoalr]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

115 ↗

(On Diff #105454)

Hmm that looks too "hacky", doesn't it?

[krytarowski]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

115 ↗

(On Diff #105454)

name + 4 looks prettier to me.

[joerg]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

115 ↗

(On Diff #105454)

Just using the name directly makes this searchable. The cleanup is an implementation detail, even if it might waste a bit space.

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h

46 ↗

(On Diff #105517)

Yes, please.

[labath]

source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

115 ↗

(On Diff #105454)

I think name+4 (well, 5) is fine, but if you want to keep it this way, then I'd suggest you hardcode the AUXV_ prefix into the macro (#define ENTRY_NAME(type) AUXV_##type: name = #type. This is just adds redundant magic.

[brunoalr]

Applying suggestions from review

[brunoalr]

Use string+5 instead of concatenation

[brunoalr]

Small fix

[labath]

cool. thanks

[brunoalr]

@labath @joerg @krytarowski thanks for the review. Can anyone commit this, please? I still don't have commit privileges.

[brunoalr]

In D35065#803602, @brunoalr wrote:

@labath @joerg @krytarowski thanks for the review. Can anyone commit this, please? I still don't have commit privileges.

thanks, @labath

lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.h

struct Entry {
     uint64_t type;
     uint64_t value;
 
     Entry() : type(0), value(0) {}
   };
 
   /// Constants describing the type of entry.
   /// On Linux, running "LD_SHOW_AUXV=1 ./executable" will spew AUX information.
+  /// Added AUXV prefix to avoid potential conflicts with system-defined macros
   enum EntryType {
-    AT_NULL = 0,      ///< End of auxv.
-    AT_IGNORE = 1,    ///< Ignore entry.
-    AT_EXECFD = 2,    ///< File descriptor of program.
-    AT_PHDR = 3,      ///< Program headers.
-    AT_PHENT = 4,     ///< Size of program header.
-    AT_PHNUM = 5,     ///< Number of program headers.
-    AT_PAGESZ = 6,    ///< Page size.
-    AT_BASE = 7,      ///< Interpreter base address.
-    AT_FLAGS = 8,     ///< Flags.
-    AT_ENTRY = 9,     ///< Program entry point.
-    AT_NOTELF = 10,   ///< Set if program is not an ELF.
-    AT_UID = 11,      ///< UID.
-    AT_EUID = 12,     ///< Effective UID.
-    AT_GID = 13,      ///< GID.
-    AT_EGID = 14,     ///< Effective GID.
-    AT_CLKTCK = 17,   ///< Clock frequency (e.g. times(2)).
-    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_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
+    AUXV_AT_NULL = 0,            ///< End of auxv.
+    AUXV_AT_IGNORE = 1,          ///< Ignore entry.
+    AUXV_AT_EXECFD = 2,          ///< File descriptor of program.
+    AUXV_AT_PHDR = 3,            ///< Program headers.
+    AUXV_AT_PHENT = 4,           ///< Size of program header.
+    AUXV_AT_PHNUM = 5,           ///< Number of program headers.
+    AUXV_AT_PAGESZ = 6,          ///< Page size.
+    AUXV_AT_BASE = 7,            ///< Interpreter base address.
+    AUXV_AT_FLAGS = 8,           ///< Flags.
+    AUXV_AT_ENTRY = 9,           ///< Program entry point.
+    AUXV_AT_NOTELF = 10,         ///< Set if program is not an ELF.
+    AUXV_AT_UID = 11,            ///< UID.
+    AUXV_AT_EUID = 12,           ///< Effective UID.
+    AUXV_AT_GID = 13,            ///< GID.
+    AUXV_AT_EGID = 14,           ///< Effective GID.
+    AUXV_AT_CLKTCK = 17,         ///< Clock frequency (e.g. times(2)).
+    AUXV_AT_PLATFORM = 15,       ///< String identifying platform.
+    AUXV_AT_HWCAP = 16,          ///< Machine dependent hints about processor capabilities.
+    AUXV_AT_FPUCW = 18,          ///< Used FPU control word.
+    AUXV_AT_DCACHEBSIZE = 19,    ///< Data cache block size.
+    AUXV_AT_ICACHEBSIZE = 20,    ///< Instruction cache block size.
+    AUXV_AT_UCACHEBSIZE = 21,    ///< Unified cache block size.
+    AUXV_AT_IGNOREPPC = 22,      ///< Entry should be ignored.
+    AUXV_AT_SECURE = 23,         ///< Boolean, was exec setuid-like?
+    AUXV_AT_BASE_PLATFORM = 24,  ///< String identifying real platforms.
+    AUXV_AT_RANDOM = 25,         ///< Address of 16 random bytes.
+    AUXV_AT_EXECFN = 31,         ///< Filename of executable.
+    AUXV_AT_SYSINFO = 32,        ///< Pointer to the global system page used for system
                                  ///calls and other nice things.
-    AT_SYSINFO_EHDR = 33,
-    AT_L1I_CACHESHAPE = 34, ///< Shapes of the caches.
-    AT_L1D_CACHESHAPE = 35,
-    AT_L2_CACHESHAPE = 36,
-    AT_L3_CACHESHAPE = 37,
+    AUXV_AT_SYSINFO_EHDR = 33,
+    AUXV_AT_L1I_CACHESHAPE = 34, ///< Shapes of the caches.
+    AUXV_AT_L1D_CACHESHAPE = 35,
+    AUXV_AT_L2_CACHESHAPE = 36,
+    AUXV_AT_L3_CACHESHAPE = 37,
   };
 
 private:
   typedef std::vector<Entry> EntryVector;
 
 public:
   typedef EntryVector::const_iterator iterator;
 

lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp

void AuxVector::ParseAuxv(DataExtractor &data) {
   lldb::offset_t offset = 0;
 
   for (;;) {
     Entry entry;
 
     if (!ParseAuxvEntry(data, entry, &offset, byte_size))
       break;
 
-    if (entry.type == AT_NULL)
+    if (entry.type == AUXV_AT_NULL)
       break;
 
-    if (entry.type == AT_IGNORE)
+    if (entry.type == AUXV_AT_IGNORE)
       continue;
 
     m_auxv.push_back(entry);
   }
 }
 
 AuxVector::AuxVector(Process *process) : m_process(process) {
   DataExtractor data;
for (iterator I = begin(); I != end(); ++I) {
     log->Printf("   %s [%" PRIu64 "]: %" PRIx64, GetEntryName(*I), I->type,
                 I->value);
   }
 }
 
 const char *AuxVector::GetEntryName(EntryType type) {
   const char *name = "AT_???";
 
-#define ENTRY_NAME(_type)                                                      \
-  _type:                                                                       \
-  name = #_type
+#define ENTRY_NAME(_type) \
+  _type:                  \
+  name = #_type + 5
   switch (type) {
-    case ENTRY_NAME(AT_NULL);           break;
-    case ENTRY_NAME(AT_IGNORE);         break;
-    case ENTRY_NAME(AT_EXECFD);         break;
-    case ENTRY_NAME(AT_PHDR);           break;
-    case ENTRY_NAME(AT_PHENT);          break;
-    case ENTRY_NAME(AT_PHNUM);          break;
-    case ENTRY_NAME(AT_PAGESZ);         break;
-    case ENTRY_NAME(AT_BASE);           break;
-    case ENTRY_NAME(AT_FLAGS);          break;
-    case ENTRY_NAME(AT_ENTRY);          break;
-    case ENTRY_NAME(AT_NOTELF);         break;
-    case ENTRY_NAME(AT_UID);            break;
-    case ENTRY_NAME(AT_EUID);           break;
-    case ENTRY_NAME(AT_GID);            break;
-    case ENTRY_NAME(AT_EGID);           break;
-    case ENTRY_NAME(AT_CLKTCK);         break;
-    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_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_L1I_CACHESHAPE); break;
-    case ENTRY_NAME(AT_L1D_CACHESHAPE); break;
-    case ENTRY_NAME(AT_L2_CACHESHAPE);  break;
-    case ENTRY_NAME(AT_L3_CACHESHAPE);  break;
+    case ENTRY_NAME(AUXV_AT_NULL);           break;
+    case ENTRY_NAME(AUXV_AT_IGNORE);         break;
+    case ENTRY_NAME(AUXV_AT_EXECFD);         break;
+    case ENTRY_NAME(AUXV_AT_PHDR);           break;
+    case ENTRY_NAME(AUXV_AT_PHENT);          break;
+    case ENTRY_NAME(AUXV_AT_PHNUM);          break;
+    case ENTRY_NAME(AUXV_AT_PAGESZ);         break;
+    case ENTRY_NAME(AUXV_AT_BASE);           break;
+    case ENTRY_NAME(AUXV_AT_FLAGS);          break;
+    case ENTRY_NAME(AUXV_AT_ENTRY);          break;
+    case ENTRY_NAME(AUXV_AT_NOTELF);         break;
+    case ENTRY_NAME(AUXV_AT_UID);            break;
+    case ENTRY_NAME(AUXV_AT_EUID);           break;
+    case ENTRY_NAME(AUXV_AT_GID);            break;
+    case ENTRY_NAME(AUXV_AT_EGID);           break;
+    case ENTRY_NAME(AUXV_AT_CLKTCK);         break;
+    case ENTRY_NAME(AUXV_AT_PLATFORM);       break;
+    case ENTRY_NAME(AUXV_AT_HWCAP);          break;
+    case ENTRY_NAME(AUXV_AT_FPUCW);          break;
+    case ENTRY_NAME(AUXV_AT_DCACHEBSIZE);    break;
+    case ENTRY_NAME(AUXV_AT_ICACHEBSIZE);    break;
+    case ENTRY_NAME(AUXV_AT_UCACHEBSIZE);    break;
+    case ENTRY_NAME(AUXV_AT_IGNOREPPC);      break;
+    case ENTRY_NAME(AUXV_AT_SECURE);         break;
+    case ENTRY_NAME(AUXV_AT_BASE_PLATFORM);  break;
+    case ENTRY_NAME(AUXV_AT_RANDOM);         break;
+    case ENTRY_NAME(AUXV_AT_EXECFN);         break;
+    case ENTRY_NAME(AUXV_AT_SYSINFO);        break;
+    case ENTRY_NAME(AUXV_AT_SYSINFO_EHDR);   break;
+    case ENTRY_NAME(AUXV_AT_L1I_CACHESHAPE); break;
+    case ENTRY_NAME(AUXV_AT_L1D_CACHESHAPE); break;
+    case ENTRY_NAME(AUXV_AT_L2_CACHESHAPE);  break;
+    case ENTRY_NAME(AUXV_AT_L3_CACHESHAPE);  break;
     }
 #undef ENTRY_NAME
 
     return name;
 }

lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp

addr_t DynamicLoaderPOSIXDYLD::ComputeLoadOffset() {
   if (!file_entry.IsValid())
     return LLDB_INVALID_ADDRESS;
 
   m_load_offset = virt_entry - file_entry.GetFileAddress();
   return m_load_offset;
 }
 
 void DynamicLoaderPOSIXDYLD::EvalVdsoStatus() {
-  AuxVector::iterator I = m_auxv->FindEntry(AuxVector::AT_SYSINFO_EHDR);
+  AuxVector::iterator I = m_auxv->FindEntry(AuxVector::AUXV_AT_SYSINFO_EHDR);
 
   if (I != m_auxv->end())
     m_vdso_base = I->value;
 }
 
 addr_t DynamicLoaderPOSIXDYLD::GetEntryPoint() {
   if (m_entry_point != LLDB_INVALID_ADDRESS)
     return m_entry_point;
 
   if (m_auxv.get() == NULL)
     return LLDB_INVALID_ADDRESS;
 
-  AuxVector::iterator I = m_auxv->FindEntry(AuxVector::AT_ENTRY);
+  AuxVector::iterator I = m_auxv->FindEntry(AuxVector::AUXV_AT_ENTRY);
 
   if (I == m_auxv->end())
     return LLDB_INVALID_ADDRESS;
 
   m_entry_point = static_cast<addr_t>(I->value);
 
   const ArchSpec &arch = m_process->GetTarget().GetArchitecture();