Remove CHECK_1 and CHECK_1_NULL_OK.

44 files changed, 179 insertions, 176 deletions

diff --git a/ChangeLog b/ChangeLog
index a1923147f0..e387dd2847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,99 @@
 2013-02-08  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13550]
+	* sysdeps/generic/bp-checks.h (CHECK_1): Remove all definitions.
+	(CHECK_1_NULL_OK): Likewise.
+	* sysdeps/unix/sysv/linux/fxstat.c: Do not include <bp-checks.h>.
+	(__fxstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/fxstat64.c: Do not include
+	<bp-checks.h>.
+	(___fxstat64): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/fxstatat.c: Do not include
+	<bp-checks.h>.
+	(__fxstatat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/fxstatat64.c: Do not include
+	<bp-checks.h>.
+	(__fxstatat64): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/fxstat.c: Do not include
+	<bp-checks.h>.
+	(__fxstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/fxstatat.c: Do not include
+	<bp-checks.h>.
+	(__fxstatat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/getresgid.c: Do not include
+	<bp-checks.h>.
+	(__getresgid): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/getresuid.c: Do not include
+	<bp-checks.h>.
+	(__getresuid): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/lxstat.c: Do not include
+	<bp-checks.h>.
+	(__lxstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/msgctl.c: Do not include
+	<bp-checks.h>.
+	(__old_msgctl): Do not use CHECK_1.
+	(__new_msgctl): Likewise.
+	* sysdeps/unix/sysv/linux/i386/setrlimit.c: Do not include
+	<bp-checks.h>.
+	(__new_setrlimit): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/i386/shmctl.c: Do not include
+	<bp-checks.h>.
+	(__old_shmctl): Do not use CHECK_1.
+	(__new_shmctl): Likewise.
+	* sysdeps/unix/sysv/linux/i386/xstat.c: Do not include
+	<bp-checks.h>.
+	(__xstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/lxstat.c: Do not include <bp-checks.h>.
+	(__lxstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/lxstat64.c: Do not include
+	<bp-checks.h>.
+	(___lxstat64): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/msgctl.c: Do not include <bp-checks.h>.
+	(__old_msgctl): Do not use CHECK_1.
+	(__new_msgctl): Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/gettimeofday.c: Do not include
+	<bp-checks.h>.
+	(__gettimeofday): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/ptrace.c: Do not include <bp-checks.h>.
+	(ptrace) [__BOUNDED_POINTERS__]: Remove conditional code.
+	* sysdeps/unix/sysv/linux/s390/gettimeofday.c: Do not include
+	<bp-checks.h>.
+	(__gettimeofday): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/shmctl.c: Do not include <bp-checks.h>.
+	(__old_shmctl): Do not use CHECK_1_NULL_OK.
+	(__new_shmctl): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/sigtimedwait.c: Do not include
+	<bp-checks.h>.
+	(do_sigtimedwait): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/sigwaitinfo.c: Do not include
+	<bp-checks.h>.
+	(do_sigwaitinfo): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c: Do not include
+	<bp-checks.h>.
+	(msgctl): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c: Do not include
+	<bp-checks.h>.
+	(shmctl): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/ustat.c: Do not include <bp-checks.h>.
+	(ustat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/wordsize-64/fxstat.c: Do not include
+	<bp-checks.h>.
+	(__fxstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c: Do not include
+	<bp-checks.h>.
+	(__fxstatat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/wordsize-64/lxstat.c: Do not include
+	<bp-checks.h>.
+	(__lxstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/wordsize-64/xstat.c: Do not include
+	<bp-checks.h>.
+	(__xstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/xstat.c: Do not include <bp-checks.h>.
+	(__xstat): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/xstat64.c: Do not include <bp-checks.h>.
+	(___xstat64): Do not use CHECK_1.
+
+	[BZ #13550]
 	* sysdeps/generic/bp-checks.h (CHECK_BOUNDS_LOW): Remove all
 	definitions.
 	(CHECK_BOUNDS_HIGH): Likewise.
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index 5a42510cb6..767e1f1b5a 100644
--- a/ports/ChangeLog.aarch64
+++ b/ports/ChangeLog.aarch64
@@ -1,3 +1,10 @@
+2013-02-08  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #13550]
+	* sysdeps/unix/sysv/linux/aarch64/gettimeofday.c: Do not include
+	<bp-checks.h>.
+	(__gettimeofday): Do not use CHECK_1.
+
 2013-01-23  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
 
         * sysdeps/aarch64/strncmp.S: New file.
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 758e97c950..f631c5bfb2 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,13 @@
+2013-02-08  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #13550]
+	* sysdeps/unix/sysv/linux/alpha/msgctl.c: Do not include
+	<bp-checks.h>.
+	(__new_msgctl): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/alpha/shmctl.c: Do not include
+	<bp-checks.h>.
+	(__new_shmctl): Do not use CHECK_1.
+
 2013-01-31  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13550]
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 3b00dafe85..26d99f7b22 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
+2013-02-08  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #13550]
+	* sysdeps/unix/sysv/linux/ia64/sigaction.c: Do not include
+	<bp-checks.h>.
+	(__libc_sigaction): Do not use CHECK_1_NULL_OK.
+
 2013-02-04  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13550]
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index f1496e2f69..b04001ecf0 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,16 @@
+2013-02-08  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #13550]
+	* sysdeps/unix/sysv/linux/mips/mips64/msgctl.c: Do not include
+	<bp-checks.h>.
+	(__msgctl): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/mips/mips64/shmctl.c: Do not include
+	<bp-checks.h>.
+	(__shmctl): Do not use CHECK_1.
+	* sysdeps/unix/sysv/linux/mips/ustat.c: Do not include
+	<bp-checks.h>.
+	(ustat): Do not use CHECK_1.
+
 2013-02-05  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Add a missing
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c b/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
index 1da284dec8..4d1ec3b101 100644
--- a/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
@@ -22,7 +22,6 @@
 #undef __gettimeofday
 
 #include <bits/libc-vdso.h>
-#include <bp-checks.h>
 
 /* Get the current time of day and timezone information,
    putting it into *tv and *tz.  If tz is null, *tz is not filled.
@@ -32,7 +31,7 @@ __gettimeofday (tv, tz)
      struct timeval *tv;
      struct timezone *tz;
 {
-  return INLINE_VSYSCALL (gettimeofday, 2, CHECK_1 (tv), CHECK_1 (tz));
+  return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
 }
 libc_hidden_def (__gettimeofday)
 weak_alias (__gettimeofday, gettimeofday)
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c b/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c
index b4633f4135..dbd03c1b2c 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c
+++ b/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c
@@ -21,13 +21,12 @@
 #include <ipc_priv.h>
 #include <sysdep.h>
 #include <sys/syscall.h>
-#include <bp-checks.h>
 
 
 int
 __new_msgctl (int msqid, int cmd, struct msqid_ds *buf)
 {
-  return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, CHECK_1 (buf));
+  return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, buf);
 }
 
 #include <shlib-compat.h>
diff --git a/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c b/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c
index 5e52200442..f2217a2b5a 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c
+++ b/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c
@@ -22,13 +22,12 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 #include <bits/wordsize.h>
-#include <bp-checks.h>
 
 
 int
 __new_shmctl (int shmid, int cmd, struct shmid_ds *buf)
 {
-  return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, CHECK_1 (buf));
+  return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, buf);
 }
 
 #include <shlib-compat.h>
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c b/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c
index b41c6c3a7e..664d0e12b9 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c
+++ b/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c
@@ -26,7 +26,6 @@
 
 #include <sysdep.h>
 #include <sys/syscall.h>
-#include <bp-checks.h>
 
 /* The variable is shared between all wrappers around signal handling
    functions which have RT equivalents.  This is the definition.  */
@@ -42,8 +41,7 @@ __libc_sigaction (sig, act, oact)
 {
   /* XXX The size argument hopefully will have to be changed to the
      real size of the user-level sigset_t.  */
-  return INLINE_SYSCALL (rt_sigaction, 4, sig,
-			 CHECK_1_NULL_OK (act), CHECK_1_NULL_OK (oact), _NSIG / 8);
+  return INLINE_SYSCALL (rt_sigaction, 4, sig, act, oact, _NSIG / 8);
 }
 libc_hidden_def (__libc_sigaction)
 
diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c
index b8905edd7d..3b94b1befe 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c
@@ -20,14 +20,12 @@
 #include <ipc_priv.h>
 #include <sysdep.h>
 
-#include <bp-checks.h>
-
 int __msgctl (int msqid, int cmd, struct msqid_ds *buf);
 
 int
 __msgctl (int msqid, int cmd, struct msqid_ds *buf)
 {
-  return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, CHECK_1 (buf));
+  return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, buf);
 }
 
 #include <shlib-compat.h>
diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c
index 9b183f335c..197f7eb809 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c
@@ -20,14 +20,12 @@
 #include <ipc_priv.h>
 #include <sysdep.h>
 
-#include <bp-checks.h>
-
 int __shmctl (int shmid, int cmd, struct shmid_ds *buf);
 
 int
 __shmctl (int shmid, int cmd, struct shmid_ds *buf)
 {
-  return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, CHECK_1 (buf));
+  return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, buf);
 }
 
 #include <shlib-compat.h>
diff --git a/ports/sysdeps/unix/sysv/linux/mips/ustat.c b/ports/sysdeps/unix/sysv/linux/mips/ustat.c
index f05bba6294..6db482e96b 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/ustat.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/ustat.c
@@ -22,7 +22,6 @@
 
 #include <sysdep.h>
 #include <sys/syscall.h>
-#include <bp-checks.h>
 
 int
 ustat (dev_t dev, struct ustat *ubuf)
@@ -32,5 +31,5 @@ ustat (dev_t dev, struct ustat *ubuf)
   /* We must convert the value to dev_t type used by the kernel.  */
   k_dev = ((major (dev) & 0xff) << 8) | (minor (dev) & 0xff);
 
-  return INLINE_SYSCALL (ustat, 2, k_dev, CHECK_1 (ubuf));
+  return INLINE_SYSCALL (ustat, 2, k_dev, ubuf);
 }
diff --git a/sysdeps/generic/bp-checks.h b/sysdeps/generic/bp-checks.h
index 618497cba1..162f785187 100644
--- a/sysdeps/generic/bp-checks.h
+++ b/sysdeps/generic/bp-checks.h
@@ -36,18 +36,11 @@
 /* Same