diff options
| author | Steve Ellcey <sellcey@caviumnetworks.com> | 2017-08-30 09:25:51 -0700 |
|---|---|---|
| committer | Steve Ellcey <sellcey@caviumnetworks.com> | 2017-08-30 09:25:51 -0700 |
| commit | 44bcba80f309b7517f8f954b0389e60eb421373b (patch) | |
| tree | c66befde2e12ab89f895e4f76c3d1539086dd729 | |
| parent | ec2c1fcefb200c6cb7e09553f3c6af8815013d83 (diff) | |
| download | glibc-44bcba80f309b7517f8f954b0389e60eb421373b.tar.gz glibc-44bcba80f309b7517f8f954b0389e60eb421373b.tar.xz glibc-44bcba80f309b7517f8f954b0389e60eb421373b.zip | |
aarch64: Fix tst-makecontext3 in ILP32 mode.
* sysdeps/unix/sysv/linux/aarch64/makecontext.c (__makecontext): Use pointer to uint64_t instead of long int for sp.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/makecontext.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 086b21cc69..8a1b3baa07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-08-30 Steve Ellcey <sellcey@cavium.com> + + * sysdeps/unix/sysv/linux/aarch64/makecontext.c (__makecontext): + Use pointer to uint64_t instead of long int for sp. + 2017-08-30 Florian Weimer <fweimer@redhat.com> [BZ #21754] diff --git a/sysdeps/unix/sysv/linux/aarch64/makecontext.c b/sysdeps/unix/sysv/linux/aarch64/makecontext.c index f510f48e9f..20057f8926 100644 --- a/sysdeps/unix/sysv/linux/aarch64/makecontext.c +++ b/sysdeps/unix/sysv/linux/aarch64/makecontext.c @@ -42,18 +42,18 @@ void __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) { extern void __startcontext (void); - unsigned long int *sp; + uint64_t *sp; va_list ap; int i; - sp = (unsigned long int *) + sp = (uint64_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size); /* Allocate stack arguments. */ sp -= argc < 8 ? 0 : argc - 8; /* Keep the stack aligned. */ - sp = (unsigned long int *) (((uintptr_t) sp) & -16L); + sp = (uint64_t *) (((uintptr_t) sp) & -16L); ucp->uc_mcontext.regs[19] = (uintptr_t) ucp->uc_link; ucp->uc_mcontext.sp = (uintptr_t) sp; @@ -64,9 +64,9 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) va_start (ap, argc); for (i = 0; i < argc; ++i) if (i < 8) - ucp->uc_mcontext.regs[i] = va_arg (ap, unsigned long int); + ucp->uc_mcontext.regs[i] = va_arg (ap, uint64_t); else - sp[i - 8] = va_arg (ap, unsigned long int); + sp[i - 8] = va_arg (ap, uint64_t); va_end (ap); } |