Merge commit 'refs/top-bases/t/pie-sbrk' into t/pie-sbrk

5 files changed, 12 insertions, 14 deletions

diff --git a/misc/Makefile b/misc/Makefile
index ffd48e6169..4b52669dde 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -113,10 +113,6 @@ else
 $(objpfx)tst-tsearch: $(common-objpfx)math/libm.a
 endif
 
-ifeq ($(build-bounded),yes)
-$(objpfx)tst-tsearch-bp: $(common-objpfx)math/libm_b.a
-endif
-
 tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace
 tst-error1-ARGS = $(objpfx)tst-error1.out
 $(objpfx)tst-error1-mem: $(objpfx)tst-error1.out
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 81ab3187bf..f5f18e914c 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -128,14 +128,6 @@
 #endif
 
 
-/* Support for bounded pointers.  */
-#ifndef __BOUNDED_POINTERS__
-# define __bounded	/* nothing */
-# define __unbounded	/* nothing */
-# define __ptrvalue	/* nothing */
-#endif
-
-
 /* Fortify support.  */
 #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
 #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -222,6 +214,15 @@
 # define __attribute_malloc__ /* Ignore */
 #endif
 
+/* Tell the compiler which arguments to an allocation function
+   indicate the size of the allocation.  */
+#if __GNUC_PREREQ (4, 3)
+# define __attribute_alloc_size__(params) \
+  __attribute__ ((__alloc_size__ params))
+#else
+# define __attribute_alloc_size__(params) /* Ignore.  */
+#endif
+
 /* At some point during the gcc 2.96 development the `pure' attribute
    for functions was introduced.  We don't want to use it unconditionally
    (although this would be possible) since it generates warnings.  */
diff --git a/misc/sys/mman.h b/misc/sys/mman.h
index 065fd497df..70454a5bd4 100644
--- a/misc/sys/mman.h
+++ b/misc/sys/mman.h
@@ -128,7 +128,7 @@ extern int mincore (void *__start, size_t __len, unsigned char *__vec)
 /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
    NEW_LEN.  If MREMAP_MAYMOVE is set in FLAGS the returned address
    may differ from ADDR.  If MREMAP_FIXED is set in FLAGS the function
-   takes another paramter which is a fixed address at which the block
+   takes another parameter which is a fixed address at which the block
    resides after a successful call.  */
 extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
 		     int __flags, ...) __THROW;
diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c
index 87d8c630ac..c9896492fc 100644
--- a/misc/tst-efgcvt.c
+++ b/misc/tst-efgcvt.c
@@ -177,7 +177,7 @@ special (void)
 
   p = ecvt (INFINITY, 10, &decpt, &sign);
   if (sign != 0 || strcmp (p, "inf") != 0)
-    output_error ("ecvt", NAN, 10, "inf", 0, 0, p, decpt, sign);
+    output_error ("ecvt", INFINITY, 10, "inf", 0, 0, p, decpt, sign);
 
   /* Simply make sure these calls with large NDIGITs don't crash.  */
   (void) ecvt (123.456, 10000, &decpt, &sign);
diff --git a/misc/tst-pselect.c b/misc/tst-pselect.c
index 35d51d8ee0..36bc46da6c 100644
--- a/misc/tst-pselect.c
+++ b/misc/tst-pselect.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/wait.h>
+#include <stdlib.h>
 
 
 static volatile int handler_called;