From 70d9946a44ba381f81eb08c71cc150315cc112ad Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 13 Feb 2013 23:30:40 +0000 Subject: Remove __ptrvalue, __bounded and __unbounded. --- ports/sysdeps/am33/dl-machine.h | 4 +--- ports/sysdeps/arm/frame.h | 6 +++--- ports/sysdeps/unix/sysv/linux/aarch64/sigaction.c | 4 ++-- ports/sysdeps/unix/sysv/linux/alpha/sigaction.c | 4 ++-- ports/sysdeps/unix/sysv/linux/am33/brk.c | 2 +- ports/sysdeps/unix/sysv/linux/arm/sigaction.c | 4 ++-- ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c | 2 +- ports/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c | 4 ++-- ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c | 2 +- ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c | 2 +- ports/sysdeps/unix/sysv/linux/mips/sigaction.c | 4 ++-- 11 files changed, 18 insertions(+), 20 deletions(-) (limited to 'ports/sysdeps') diff --git a/ports/sysdeps/am33/dl-machine.h b/ports/sysdeps/am33/dl-machine.h index 2db27378db..f22fee875e 100644 --- a/ports/sysdeps/am33/dl-machine.h +++ b/ports/sysdeps/am33/dl-machine.h @@ -62,9 +62,7 @@ elf_machine_load_address (void) We cannot use this scheme for profiling because the _mcount call destroys the passed register information. */ -/* GKM FIXME: Fix trampoline to pass bounds so we can do - without the `__unbounded' qualifier. */ -static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset) +static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset) __attribute__ ((unused)); static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset, ElfW(Addr) retaddr) diff --git a/ports/sysdeps/arm/frame.h b/ports/sysdeps/arm/frame.h index c5a8ed17ec..db3529939b 100644 --- a/ports/sysdeps/arm/frame.h +++ b/ports/sysdeps/arm/frame.h @@ -19,9 +19,9 @@ /* This is the APCS stack backtrace structure. */ struct layout { - struct layout *__unbounded next; - void *__unbounded sp; - void *__unbounded return_address; + struct layout *next; + void *sp; + void *return_address; }; #define FIRST_FRAME_POINTER ADVANCE_STACK_FRAME (__builtin_frame_address (0)) diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/sigaction.c b/ports/sysdeps/unix/sysv/linux/aarch64/sigaction.c index 74b6675647..dbaa2246b7 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/sigaction.c +++ b/ports/sysdeps/unix/sysv/linux/aarch64/sigaction.c @@ -51,8 +51,8 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) } result = INLINE_SYSCALL (rt_sigaction, 4, sig, - act ? __ptrvalue (&kact) : NULL, - oact ? __ptrvalue (&koact) : NULL, _NSIG / 8); + act ? &kact : NULL, + oact ? &koact : NULL, _NSIG / 8); if (result >= 0 || errno != ENOSYS) { if (oact && result >= 0) diff --git a/ports/sysdeps/unix/sysv/linux/alpha/sigaction.c b/ports/sysdeps/unix/sysv/linux/alpha/sigaction.c index 77c0115c4b..ad3860dfc0 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/sigaction.c +++ b/ports/sysdeps/unix/sysv/linux/alpha/sigaction.c @@ -32,7 +32,7 @@ : INLINE_SYSCALL1(name, nr, args)) struct kernel_sigaction; -extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *__unbounded, - struct kernel_sigaction *__unbounded, size_t); +extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *, + struct kernel_sigaction *, size_t); #include diff --git a/ports/sysdeps/unix/sysv/linux/am33/brk.c b/ports/sysdeps/unix/sysv/linux/am33/brk.c index 51b59adc9d..8fd2ff01d9 100644 --- a/ports/sysdeps/unix/sysv/linux/am33/brk.c +++ b/ports/sysdeps/unix/sysv/linux/am33/brk.c @@ -30,7 +30,7 @@ __brk (void *addr) { void *newbrk; - newbrk = INLINE_SYSCALL (brk, 1, __ptrvalue (addr)); + newbrk = INLINE_SYSCALL (brk, 1, addr); __curbrk = newbrk; diff --git a/ports/sysdeps/unix/sysv/linux/arm/sigaction.c b/ports/sysdeps/unix/sysv/linux/arm/sigaction.c index c039b857f0..21bf506ef7 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/sigaction.c +++ b/ports/sysdeps/unix/sysv/linux/arm/sigaction.c @@ -83,8 +83,8 @@ __libc_sigaction (sig, act, oact) /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ result = INLINE_SYSCALL (rt_sigaction, 4, sig, - act ? __ptrvalue (&kact) : NULL, - oact ? __ptrvalue (&koact) : NULL, _NSIG / 8); + act ? &kact : NULL, + oact ? &koact : NULL, _NSIG / 8); if (oact && result >= 0) { diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c index 434c7cd835..624994022f 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c @@ -34,7 +34,7 @@ __fxstat64 (int vers, int fd, struct stat64 *buf) int result; struct kernel_stat kbuf; - result = INLINE_SYSCALL (fstat, 2, fd, __ptrvalue (&kbuf)); + result = INLINE_SYSCALL (fstat, 2, fd, &kbuf); if (result == 0) result = __xstat64_conv (vers, &kbuf, buf); diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index 42c9f5c404..ca2f2f6153 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -95,9 +95,9 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) } if (flag & AT_SYMLINK_NOFOLLOW) - result = INTERNAL_SYSCALL (lstat, err, 2, file, __ptrvalue (&kst)); + result = INTERNAL_SYSCALL (lstat, err, 2, file, &kst); else - result = INTERNAL_SYSCALL (stat, err, 2, file, __ptrvalue (&kst)); + result = INTERNAL_SYSCALL (stat, err, 2, file, &kst); if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) return __xstat64_conv (vers, &kst, st); diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c index fdaa755837..b01204deb7 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c @@ -33,7 +33,7 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf) int result; struct kernel_stat kbuf; - result = INLINE_SYSCALL (lstat, 2, name, __ptrvalue (&kbuf)); + result = INLINE_SYSCALL (lstat, 2, name, &kbuf); if (result == 0) result = __xstat64_conv (vers, &kbuf, buf); diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c index c6d8b5e798..89cde2b33a 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c @@ -34,7 +34,7 @@ __xstat64 (int vers, const char *name, struct stat64 *buf) int result; struct kernel_stat kbuf; - result = INLINE_SYSCALL (stat, 2, name, __ptrvalue (&kbuf)); + result = INLINE_SYSCALL (stat, 2, name, &kbuf); if (result == 0) result = __xstat64_conv (vers, &kbuf, buf); diff --git a/ports/sysdeps/unix/sysv/linux/mips/sigaction.c b/ports/sysdeps/unix/sysv/linux/mips/sigaction.c index c490dd144e..9d8ee76d02 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/sigaction.c +++ b/ports/sysdeps/unix/sysv/linux/mips/sigaction.c @@ -71,8 +71,8 @@ __libc_sigaction (sig, act, oact) /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ result = INLINE_SYSCALL (rt_sigaction, 4, sig, - act ? __ptrvalue (&kact) : NULL, - oact ? __ptrvalue (&koact) : NULL, + act ? &kact : NULL, + oact ? &koact : NULL, sizeof (kernel_sigset_t)); if (oact && result >= 0) -- cgit 1.4.1