Blame SOURCES/glibc-rh1505492-bounded-12.patch

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