197,215d196
< //These are the auxilliary vector types
< enum auxTypes
< {
< SPARC_AT_HWCAP = 16,
< SPARC_AT_PAGESZ = 6,
< SPARC_AT_CLKTCK = 17,
< SPARC_AT_PHDR = 3,
< SPARC_AT_PHENT = 4,
< SPARC_AT_PHNUM = 5,
< SPARC_AT_BASE = 7,
< SPARC_AT_FLAGS = 8,
< SPARC_AT_ENTRY = 9,
< SPARC_AT_UID = 11,
< SPARC_AT_EUID = 12,
< SPARC_AT_GID = 13,
< SPARC_AT_EGID = 14,
< SPARC_AT_SECURE = 23
< };
<
244c225
< auxv.push_back(auxv_t(SPARC_AT_HWCAP, hwcap));
---
> auxv.push_back(auxv_t(M5_AT_HWCAP, hwcap));
246c227
< auxv.push_back(auxv_t(SPARC_AT_PAGESZ, SparcISA::VMPageSize));
---
> auxv.push_back(auxv_t(M5_AT_PAGESZ, SparcISA::VMPageSize));
249c230
< auxv.push_back(auxv_t(SPARC_AT_CLKTCK, 100));
---
> auxv.push_back(auxv_t(M5_AT_CLKTCK, 100));
252c233
< auxv.push_back(auxv_t(SPARC_AT_PHDR, elfObject->programHeaderTable()));
---
> auxv.push_back(auxv_t(M5_AT_PHDR, elfObject->programHeaderTable()));
254c235
< auxv.push_back(auxv_t(SPARC_AT_PHENT, elfObject->programHeaderSize()));
---
> auxv.push_back(auxv_t(M5_AT_PHENT, elfObject->programHeaderSize()));
256c237
< auxv.push_back(auxv_t(SPARC_AT_PHNUM, elfObject->programHeaderCount()));
---
> auxv.push_back(auxv_t(M5_AT_PHNUM, elfObject->programHeaderCount()));
260c241
< auxv.push_back(auxv_t(SPARC_AT_BASE, 0));
---
> auxv.push_back(auxv_t(M5_AT_BASE, 0));
262c243
< auxv.push_back(auxv_t(SPARC_AT_FLAGS, 0));
---
> auxv.push_back(auxv_t(M5_AT_FLAGS, 0));
264c245
< auxv.push_back(auxv_t(SPARC_AT_ENTRY, objFile->entryPoint()));
---
> auxv.push_back(auxv_t(M5_AT_ENTRY, objFile->entryPoint()));
266,269c247,250
< auxv.push_back(auxv_t(SPARC_AT_UID, uid()));
< auxv.push_back(auxv_t(SPARC_AT_EUID, euid()));
< auxv.push_back(auxv_t(SPARC_AT_GID, gid()));
< auxv.push_back(auxv_t(SPARC_AT_EGID, egid()));
---
> auxv.push_back(auxv_t(M5_AT_UID, uid()));
> auxv.push_back(auxv_t(M5_AT_EUID, euid()));
> auxv.push_back(auxv_t(M5_AT_GID, gid()));
> auxv.push_back(auxv_t(M5_AT_EGID, egid()));
271c252
< auxv.push_back(auxv_t(SPARC_AT_SECURE, 0));
---
> auxv.push_back(auxv_t(M5_AT_SECURE, 0));