diff options
author | Joseph Myers <joseph@codesourcery.com> | 2013-02-15 00:51:53 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-15 00:51:53 +0000 |
commit | 2bdd4ca6b6c38367e301042c2247395568c63ebd (patch) | |
tree | 8fb33d2cfb3fc67852327483322747eceefb91ae /sysdeps | |
parent | dd395cf1103ec8e26affcf501791505ded4d31c6 (diff) | |
download | glibc-2bdd4ca6b6c38367e301042c2247395568c63ebd.zip glibc-2bdd4ca6b6c38367e301042c2247395568c63ebd.tar.gz glibc-2bdd4ca6b6c38367e301042c2247395568c63ebd.tar.bz2 |
Remove miscellaneous bounded-pointers relics in C code.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/i386/dl-machine.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/shmat.c | 9 | ||||
-rw-r--r-- | sysdeps/x86/bits/string.h | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 1f2cb60..0b4c467 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -144,7 +144,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 45f0dea..bac1b29 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 41d2041..24b64ec 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 |