commit 2bdd4ca6b6c38367e301042c2247395568c63ebd Author: Joseph Myers Date: Fri Feb 15 00:51:53 2013 +0000 Remove miscellaneous bounded-pointers relics in C code. diff --git a/config.h.in b/config.h.in index 07bc713e23f89e46..ef33c23c75ad2220 100644 --- a/config.h.in +++ b/config.h.in @@ -137,7 +137,7 @@ /* Defined to some form of __attribute__ ((...)) if the compiler supports a different, more efficient calling convention. */ -#if defined USE_REGPARMS && !defined PROF && !defined __BOUNDED_POINTERS__ +#if defined USE_REGPARMS && !defined PROF # define internal_function __attribute__ ((regparm (3), stdcall)) #endif diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index de55b2676fc80645..1ad2e4da7a654633 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -148,7 +148,7 @@ _dl_fixup ( return elf_machine_fixup_plt (l, result, reloc, rel_addr, value); } -#if !defined PROF && !__BOUNDED_POINTERS__ +#ifndef PROF DL_FIXUP_VALUE_TYPE __attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE _dl_profile_fixup ( diff --git a/ports/sysdeps/am33/dl-machine.h b/ports/sysdeps/am33/dl-machine.h index 90083c7dc45fc602..d4b321aca094863e 100644 --- a/ports/sysdeps/am33/dl-machine.h +++ b/ports/sysdeps/am33/dl-machine.h @@ -56,7 +56,7 @@ elf_machine_load_address (void) return off + gotaddr - gotval; } -#if !defined PROF && !__BOUNDED_POINTERS__ +#ifndef PROF /* We add a declaration of this function here so that in dl-runtime.c the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters in registers. @@ -115,7 +115,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) /* This code is used in dl-runtime.c to call the `fixup' function and then redirect to the address it returns. */ -#if !defined PROF && !__BOUNDED_POINTERS__ +#ifndef PROF # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ .text\n\ .globl _dl_runtime_resolve\n\ diff --git a/string/bits/string2.h b/string/bits/string2.h index bbf05a3df620d655..acd0679e72b10fbf 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -21,7 +21,7 @@ # error "Never use directly; include instead." #endif -#if !defined __NO_STRING_INLINES && !defined __BOUNDED_POINTERS__ +#ifndef __NO_STRING_INLINES /* Unlike the definitions in the header the definitions contained here are not optimized down to assembler diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index fc2b976651e20ca7..67d23228782d39c9 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -145,7 +145,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) #ifdef IN_DL_RUNTIME -# if !defined PROF && !__BOUNDED_POINTERS__ +# ifndef PROF /* We add a declaration of this function here so that in dl-runtime.c the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters in registers. diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index 5ac515bc023e6783..401f00b7c01a6a14 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -38,15 +38,6 @@ shmat (shmid, shmaddr, shmflg) unsigned long resultvar; void *raddr; -#if __BOUNDED_POINTERS__ - size_t length = ~0; - struct shmid_ds shmds; - /* It's unfortunate that we need to make another system call to get - the shared memory segment length... */ - if (shmctl (shmid, IPC_STAT, &shmds) == 0) - length = shmds.shm_segsz; -#endif - resultvar = INTERNAL_SYSCALL (ipc, err, 5, IPCOP_shmat, shmid, shmflg, (long int) &raddr, diff --git a/sysdeps/x86/bits/string.h b/sysdeps/x86/bits/string.h index 14793029638ac613..bfa43cca72a92229 100644 --- a/sysdeps/x86/bits/string.h +++ b/sysdeps/x86/bits/string.h @@ -36,7 +36,7 @@ /* We only provide optimizations if the user selects them and if GNU CC is used. */ # if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \ - && defined __GNUC__ && __GNUC__ >= 2 && !__BOUNDED_POINTERS__ + && defined __GNUC__ && __GNUC__ >= 2 # ifndef __STRING_INLINE # ifndef __extern_inline