lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Remove miscellaneous bounded-pointers relics in C code.

Browse Source
This commit is contained in:
Joseph Myers
2013-02-15 00:51:53 +00:00
parent dd395cf110
commit 2bdd4ca6b6
9 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
2013-02-14 Joseph Myers <joseph@codesourcery.com> 2013-02-14 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* config.h.in [USE_REGPARMS && !PROF && !__BOUNDED_POINTERS__]:
Remove __BOUNDED_POINTERS__ from condition.
* elf/dl-runtime.c [!PROF && !__BOUNDED_POINTERS__]: Likewise.
* string/bits/string2.h [!__NO_STRING_INLINES &&
!__BOUNDED_POINTERS__]: Likewise.
* sysdeps/i386/dl-machine.h [!PROF && !__BOUNDED_POINTERS__]:
Likewise.
* sysdeps/unix/sysv/linux/shmat.c (shmat) [__BOUNDED_POINTERS__]:
Remove conditional code.
* sysdeps/x86/bits/string.h [!__NO_STRING_INLINES &&
__USE_STRING_INLINES && __GNUC__ && __GNUC__ >= 2 &&
!__BOUNDED_POINTERS__]: Remove __BOUNDED_POINTERS__ from
condition.
[BZ #13550] [BZ #13550]
* csu/libc-start.c: Do not include <bp-sym.h>. * csu/libc-start.c: Do not include <bp-sym.h>.
[!LIBC_START_MAIN] (LIBC_START_MAIN): Do not use BP_SYM. [!LIBC_START_MAIN] (LIBC_START_MAIN): Do not use BP_SYM.

2
config.h.in
View File

@ -115,7 +115,7 @@
/* Defined to some form of __attribute__ ((...)) if the compiler supports /* Defined to some form of __attribute__ ((...)) if the compiler supports
a different, more efficient calling convention. */ 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)) # define internal_function __attribute__ ((regparm (3), stdcall))
#endif #endif

2
elf/dl-runtime.c
View File

@ -148,7 +148,7 @@ _dl_fixup (
return elf_machine_fixup_plt (l, result, reloc, rel_addr, value); return elf_machine_fixup_plt (l, result, reloc, rel_addr, value);
} }
#if !defined PROF && !__BOUNDED_POINTERS__ #ifndef PROF
DL_FIXUP_VALUE_TYPE DL_FIXUP_VALUE_TYPE
__attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE __attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE
_dl_profile_fixup ( _dl_profile_fixup (

6
ports/ChangeLog.am33
View File

@ -1,3 +1,9 @@
2013-02-14 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* sysdeps/am33/dl-machine.h [!PROF && !__BOUNDED_POINTERS__]:
Remove __BOUNDED_POINTERS__ from condition.
2013-02-13 Joseph Myers <joseph@codesourcery.com> 2013-02-13 Joseph Myers <joseph@codesourcery.com>
[BZ #13550] [BZ #13550]

4
ports/sysdeps/am33/dl-machine.h
View File

@ -55,7 +55,7 @@ elf_machine_load_address (void)
return off + gotaddr - gotval; 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 /* 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 the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
in registers. in registers.
@ -114,7 +114,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 /* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */ and then redirect to the address it returns. */
#if !defined PROF && !__BOUNDED_POINTERS__ #ifndef PROF
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
.text\n\ .text\n\
.globl _dl_runtime_resolve\n\ .globl _dl_runtime_resolve\n\

2
string/bits/string2.h
View File

@ -21,7 +21,7 @@
# error "Never use <bits/string2.h> directly; include <string.h> instead." # error "Never use <bits/string2.h> directly; include <string.h> instead."
#endif #endif
#if !defined __NO_STRING_INLINES && !defined __BOUNDED_POINTERS__ #ifndef __NO_STRING_INLINES
/* Unlike the definitions in the header <bits/string.h> the /* Unlike the definitions in the header <bits/string.h> the
definitions contained here are not optimized down to assembler definitions contained here are not optimized down to assembler

2
sysdeps/i386/dl-machine.h
View File

@ -144,7 +144,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
#ifdef IN_DL_RUNTIME #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 /* 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 the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
in registers. in registers.

9
sysdeps/unix/sysv/linux/shmat.c
View File

@ -38,15 +38,6 @@ shmat (shmid, shmaddr, shmflg)
unsigned long resultvar; unsigned long resultvar;
void *raddr; 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, resultvar = INTERNAL_SYSCALL (ipc, err, 5, IPCOP_shmat,
shmid, shmflg, shmid, shmflg,
(long int) &raddr, (long int) &raddr,

2
sysdeps/x86/bits/string.h
View File

@ -36,7 +36,7 @@
/* We only provide optimizations if the user selects them and if /* We only provide optimizations if the user selects them and if
GNU CC is used. */ GNU CC is used. */
# if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \ # if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \
&& defined __GNUC__ && __GNUC__ >= 2 && !__BOUNDED_POINTERS__ && defined __GNUC__ && __GNUC__ >= 2
# ifndef __STRING_INLINE # ifndef __STRING_INLINE
# ifndef __extern_inline # ifndef __extern_inline