Remove __ptrvalue, __bounded and __unbounded.

60 files changed, 234 insertions, 155 deletions

diff --git a/ChangeLog b/ChangeLog
index 295864b6fc..9a35f15b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,80 @@
+2013-02-13  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #13550]
+	* misc/sys/cdefs.h [!__BOUNDED_POINTERS__]: Remove conditional
+	code.
+	* csu/libc-start.c (LIBC_START_MAIN): Do not use __unbounded in
+	prototype or function definition.  Rename ubp_* variables and
+	parameters.  Remove argv definitions conditional on
+	[__BOUNDED_POINTERS__].
+	* debug/backtrace.c (__backtrace): Do not use __unbounded.
+	* elf/dl-runtime.c (_dl_fixup): Likewise.
+	* include/set-hooks.h (RUN_HOOK): Likewise.
+	* stdio-common/vfprintf.c (JUMP): Do not use __unbounded in either
+	definition.
+	* string/strcpy.c (strcpy): Do not use __unbounded.
+	* sysdeps/generic/frame.h (struct layout): Likewise.
+	* sysdeps/gnu/bits/msq.h (struct msqid_ds): Likewise.
+	* sysdeps/i386/dl-machine.h (_dl_fixup): Likewise.
+	* sysdeps/powerpc/powerpc32/backtrace.c (struct layout): Likewise.
+	* sysdeps/powerpc/powerpc64/backtrace.c (struct layout): Likewise.
+	* sysdeps/sparc/backtrace.c (struct layout): Likewise.
+	(__backtrace): Likewise.
+	* sysdeps/unix/sysv/linux/aio_sigqueue.c (__aio_sigqueue): Do not
+	use __ptrvalue.
+	* sysdeps/unix/sysv/linux/fxstat.c (__fxstat): Likewise.
+	* sysdeps/unix/sysv/linux/fxstatat.c (__fxstatat): Likewise.
+	* sysdeps/unix/sysv/linux/gai_sigqueue.c (__gai_sigqueue):
+	Likewise.
+	* sysdeps/unix/sysv/linux/i386/brk.c (__brk): Likewise.
+	* sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Likewise.
+	* sysdeps/unix/sysv/linux/i386/fxstatat.c (__fxstatat): Likewise.
+	* sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat): Likewise.
+	* sysdeps/unix/sysv/linux/i386/msgctl.c (struct __old_msqid_ds):
+	Do not use __unbounded.
+	* sysdeps/unix/sysv/linux/i386/setrlimit.c (__new_setrlimit):
+	Rename __unboundedrlimits parameter to rlimits in prototype.
+	* sysdeps/unix/sysv/linux/i386/shmctl.c (struct __old_shmid_ds):
+	Do not use __unbounded.
+	* sysdeps/unix/sysv/linux/i386/sigaction.c (__libc_sigaction): Do
+	not use __ptrvalue.
+	* sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Likewise.
+	* sysdeps/unix/sysv/linux/llseek.c (__llseek): Likewise.
+	* sysdeps/unix/sysv/linux/lxstat.c (__lxstat): Likewise.
+	* sysdeps/unix/sysv/linux/mmap64.c (__mmap64): Do not use
+	__ptrvalue or __unbounded.
+	(__mmap64) [__BOUNDED_POINTERS__]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/msgctl.c (struct __old_msqid_ds): Do not
+	use __unbounded.
+	(__new_msgctl): Do not use __ptrvalue.
+	* sysdeps/unix/sysv/linux/msgrcv.c (struct ipc_kludge): Do not use
+	__unbounded.
+	(__libc_msgrcv): Do not use __ptrvalue.
+	* sysdeps/unix/sysv/linux/powerpc/libc-start.c (struct
+	startup_info): Do not use __unbounded.
+	(__libc_start_main): Likewise.  Rename ubp_* variables and
+	parameters.  Remove argv definitions conditional on
+	[__BOUNDED_POINTERS__].
+	* sysdeps/unix/sysv/linux/ptrace.c (ptrace): Do not use
+	__ptrvalue.
+	* sysdeps/unix/sysv/linux/semctl.c (struct __old_semid_ds): Do not
+	use __unbounded.
+	* sysdeps/unix/sysv/linux/shmat.c (shmat): Do not use __unbounded
+	or __ptrvalue.
+	* sysdeps/unix/sysv/linux/shmctl.c (struct __old_shmid_ds): Do not
+	use __unbounded.
+	(__new_shmctl): Do not use __ptrvalue.
+	* sysdeps/unix/sysv/linux/shmdt.c (shmdt): Likewise.
+	* sysdeps/unix/sysv/linux/sigaction.c (__libc_sigaction):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sigqueue.c (__sigqueue): Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c
+	(__libc_sigaction): Likewise.
+	* sysdeps/unix/sysv/linux/sysctl.c (__sysctl): Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/sigaction.c (__libc_sigaction):
+	Likewise.
+	* sysdeps/unix/sysv/linux/xstat.c (__xstat): Likewise.
+
 2013-02-13   Ondřej Bílka  <neleai@seznam.cz>
 
 	* stdlib/Makefile (headers): Add bits/stdlib-bsearch.h.
diff --git a/csu/libc-start.c b/csu/libc-start.c
index d4a135f21b..4f2a3366a6 100644
--- a/csu/libc-start.c
+++ b/csu/libc-start.c
@@ -101,14 +101,14 @@ apply_irel (void)
 STATIC int LIBC_START_MAIN (int (*main) (int, char **, char **
 					 MAIN_AUXVEC_DECL),
 			    int argc,
-			    char *__unbounded *__unbounded ubp_av,
+			    char **argv,
 #ifdef LIBC_START_MAIN_AUXVEC_ARG
-			    ElfW(auxv_t) *__unbounded auxvec,
+			    ElfW(auxv_t) *auxvec,
 #endif
 			    __typeof (main) init,
 			    void (*fini) (void),
 			    void (*rtld_fini) (void),
-			    void *__unbounded stack_end)
+			    void *stack_end)
      __attribute__ ((noreturn));
 
 
@@ -117,29 +117,23 @@ STATIC int LIBC_START_MAIN (int (*main) (int, char **, char **
    finalizers were called in more than one place.  */
 STATIC int
 LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
-		 int argc, char *__unbounded *__unbounded ubp_av,
+		 int argc, char **argv,
 #ifdef LIBC_START_MAIN_AUXVEC_ARG
-		 ElfW(auxv_t) *__unbounded auxvec,
+		 ElfW(auxv_t) *auxvec,
 #endif
 		 __typeof (main) init,
 		 void (*fini) (void),
-		 void (*rtld_fini) (void), void *__unbounded stack_end)
+		 void (*rtld_fini) (void), void *stack_end)
 {
-#if __BOUNDED_POINTERS__
-  char **argv;
-#else
-# define argv ubp_av
-#endif
-
   /* Result of the 'main' function.  */
   int result;
 
   __libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up;
 
 #ifndef SHARED
-  char *__unbounded *__unbounded ubp_ev = &ubp_av[argc + 1];
+  char **ev = &argv[argc + 1];
 
-  __environ = ubp_ev;
+  __environ = ev;
 
   /* Store the lowest stack address.  This is done in ld.so if this is
      the code for the DSO.  */
@@ -149,12 +143,12 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
   /* First process the auxiliary vector since we need to find the
      program header to locate an eventually present PT_TLS entry.  */
 #  ifndef LIBC_START_MAIN_AUXVEC_ARG
-  ElfW(auxv_t) *__unbounded auxvec;
+  ElfW(auxv_t) *auxvec;
   {
-    char *__unbounded *__unbounded evp = ubp_ev;
+    char **evp = ev;
     while (*evp++ != NULL)
       ;
-    auxvec = (ElfW(auxv_t) *__unbounded) evp;
+    auxvec = (ElfW(auxv_t) *) evp;
   }
 #  endif
   _dl_aux_init (auxvec);
diff --git a/debug/backtrace.c b/debug/backtrace.c
index ca80797fc9..84594986cf 100644
--- a/debug/backtrace.c
+++ b/debug/backtrace.c
@@ -63,8 +63,8 @@ __backtrace (array, size)
      int size;
 {
   struct layout *current;
-  void *__unbounded top_frame;
-  void *__unbounded top_stack;
+  void *top_frame;
+  void *top_stack;
   int cnt = 0;
 
   top_frame = FIRST_FRAME_POINTER;
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 9ac2726102..3ca02f51b9 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -62,9 +62,7 @@ _dl_fixup (
 # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
 	   ELF_MACHINE_RUNTIME_FIXUP_ARGS,
 # endif
-	   /* GKM FIXME: Fix trampoline to pass bounds so we can do
-	      without the `__unbounded' qualifier.  */
-	   struct link_map *__unbounded l, ElfW(Word) reloc_arg)
+	   struct link_map *l, ElfW(Word) reloc_arg)
 {
   const ElfW(Sym) *const symtab
     = (const void *) D_PTR (l, l_info[DT_SYMTAB]);
diff --git a/include/set-hooks.h b/include/set-hooks.h
index 5c751ee372..e58f444d42 100644
--- a/include/set-hooks.h
+++ b/include/set-hooks.h
@@ -41,7 +41,7 @@
 
 # define RUN_HOOK(NAME, ARGS)						      \
 do {									      \
-  void *const *__unbounded ptr;						      \
+  void *const *ptr;						      \
   for (ptr = (void *const *) symbol_set_first_element (NAME);		      \
        ! symbol_set_end_p (NAME, ptr); ++ptr)				      \
     (*(__##NAME##_hook_function_t *) *ptr) ARGS;			      \
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 81ab3187bf..7794e4e26d 100644
--- a/misc/sys/cdefs.h
+++ b/