qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Steve Ellcey 2017-08-30 09:25:51 -07:00
parent ec2c1fcefb
commit 44bcba80f3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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]

10
sysdeps/unix/sysv/linux/aarch64/makecontext.c
View File

@ -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);
}