diff options
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/ChangeLog | 10 | ||||
| -rw-r--r-- | sim/cris/sim-if.c | 31 |
2 files changed, 18 insertions, 23 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 067d2ec..d502ab6 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,15 @@ 2009-01-03 Hans-Peter Nilsson <hp@axis.com> + * cris/sim-if.c (TARGET_AT_NULL, TARGET_AT_PHDR, TARGET_AT_PHENT) + (TARGET_AT_PHNUM, TARGET_AT_PAGESZ, TARGET_AT_BASE) + (TARGET_AT_FLAGS, TARGET_AT_ENTRY, TARGET_AT_UID, TARGET_AT_EUID) + (TARGET_AT_GID, TARGET_AT_EGID, TARGET_AT_HWCAP) + (TARGET_AT_CLKTCK): Remove redundant macros. + (AUX_ENT): Adjust to use standard ELF AT_* macros. + (AUX_ENTF): Ditto. Remove always-0 middle argument. Update all + callers. + (sim_open): Also pass AT_SECURE. + * cris/sim-main.h (struct _sim_cpu): New member set_target_thread_data. * cris/crisv32f.c (CRIS_TLS_REGISTER): Define. diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c index 29e796e..4fe02c9 100644 --- a/sim/cris/sim-if.c +++ b/sim/cris/sim-if.c @@ -41,22 +41,6 @@ char *missing_environ[] = { "SHELL=/bin/sh", "PATH=/bin:/usr/bin", NULL }; #define GET_ENVIRON() missing_environ #endif -/* AUX vector entries. */ -#define TARGET_AT_NULL 0 -#define TARGET_AT_PHDR 3 -#define TARGET_AT_PHENT 4 -#define TARGET_AT_PHNUM 5 -#define TARGET_AT_PAGESZ 6 -#define TARGET_AT_BASE 7 -#define TARGET_AT_FLAGS 8 -#define TARGET_AT_ENTRY 9 -#define TARGET_AT_UID 11 -#define TARGET_AT_EUID 12 -#define TARGET_AT_GID 13 -#define TARGET_AT_EGID 14 -#define TARGET_AT_HWCAP 16 -#define TARGET_AT_CLKTCK 17 - /* Used with get_progbounds to find out how much memory is needed for the program. We don't want to allocate more, since that could mask invalid memory accesses program bugs. */ @@ -628,23 +612,24 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, USI val; } auxv_entries[] = { -#define AUX_ENT(a, b) {TARGET_ ## a, NULL, b} -#define AUX_ENTF(a, b, f) {TARGET_ ## a, f, b} +#define AUX_ENT(a, b) {a, NULL, b} +#define AUX_ENTF(a, f) {a, f, 0} AUX_ENT (AT_HWCAP, 0), AUX_ENT (AT_PAGESZ, 8192), AUX_ENT (AT_CLKTCK, 100), - AUX_ENTF (AT_PHDR, 0, aux_ent_phdr), - AUX_ENTF (AT_PHENT, 0, aux_ent_phent), - AUX_ENTF (AT_PHNUM, 0, aux_ent_phnum), - AUX_ENTF (AT_BASE, 0, aux_ent_base), + AUX_ENTF (AT_PHDR, aux_ent_phdr), + AUX_ENTF (AT_PHENT, aux_ent_phent), + AUX_ENTF (AT_PHNUM, aux_ent_phnum), + AUX_ENTF (AT_BASE, aux_ent_base), AUX_ENT (AT_FLAGS, 0), - AUX_ENTF (AT_ENTRY, 0, aux_ent_entry), + AUX_ENTF (AT_ENTRY, aux_ent_entry), /* Or is root better? Maybe have it settable? */ AUX_ENT (AT_UID, 500), AUX_ENT (AT_EUID, 500), AUX_ENT (AT_GID, 500), AUX_ENT (AT_EGID, 500), + AUX_ENT (AT_SECURE, 0), AUX_ENT (AT_NULL, 0) }; |