From ef6099ee4aa93ea44d0a15a14d01790c3007f53e Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 31 Aug 2014 14:00:34 +0400
Subject: Don't include bp-check.h and don't use CHECK_1

Related to a2da1673fe32540799c801e8aec374dc1c0e0596
and f3aae3f3eb4e4345413dc238e941cdb52f747d16
---
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat.c     | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat64.c   | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat.c   | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat64.c | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/getcwd.c     | 1 -
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat.c     | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat64.c   | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/reboot.c     | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xmknod.c     | 1 -
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat.c      | 3 +--
 sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat64.c    | 3 +--
 11 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'sysdeps/unix/sysv/solaris2')

diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat.c
index 1eac7909d8..2d8fcc82e3 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat.c
@@ -20,7 +20,6 @@
 #include <inline-syscall.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, fstat, int filedes, struct stat *buf);
 
@@ -33,7 +32,7 @@ __fxstat (int vers, int fd, struct stat *buf)
       return -1;
     }
 
-  return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 (buf));
+  return INLINE_SYSCALL (fstat, 2, fd, buf);
 }
 
 hidden_def (__fxstat)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat64.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat64.c
index ebf02d8a50..04417633dd 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat64.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstat64.c
@@ -20,7 +20,6 @@
 #include <inline-syscall.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, fstat64, int filedes, struct stat64 *buf);
 
@@ -33,7 +32,7 @@ __fxstat64 (int vers, int fd, struct stat64 *buf)
       return -1;
   }
 
-  return INLINE_SYSCALL (fstat64, 2, fd, CHECK_1 (buf));
+  return INLINE_SYSCALL (fstat64, 2, fd, buf);
 }
 
 hidden_def (__fxstat64)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat.c
index 5d89db1515..3fe111ac13 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat.c
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/stat.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, fstatat, int fd, const char *name,
     struct stat *sb, int flags);
@@ -35,6 +34,6 @@ __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag)
       return -1;
     }
 
-  return INLINE_SYSCALL (fstatat, 2, fd, filename, CHECK_1 (buf), flag);
+  return INLINE_SYSCALL (fstatat, 2, fd, filename, buf, flag);
 }
 libc_hidden_def (__fxstatat)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat64.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat64.c
index 27a6277653..952503497a 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat64.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/fxstatat64.c
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/stat.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, fstatat64, int fd, const char *name,
     struct stat64 *sb, int flags);
@@ -37,7 +36,7 @@ __fxstatat64 (int vers, int fd, const char *filename, struct stat64 *buf,
       return -1;
     }
 
-  return INLINE_SYSCALL (fstatat64, 2, fd, filename, CHECK_1 (buf), flag);
+  return INLINE_SYSCALL (fstatat64, 2, fd, filename, buf, flag);
 }
 
 libc_hidden_def (__fxstatat64)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/getcwd.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/getcwd.c
index c353cf0be5..d76487e093 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/getcwd.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/getcwd.c
@@ -27,7 +27,6 @@
 #include <stddef.h>
 #include <limits.h>
 #include <memory.h>
-#include <bp-checks.h>
 #include <signal.h>
 #include <assert.h>
 #include <bits/libc-lock.h>
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat.c
index 04e1d407f6..b0d7fd45d4 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat.c
@@ -20,7 +20,6 @@
 #include <inline-syscall.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, lstat, const char *path, struct stat *buf);
 
@@ -33,7 +32,7 @@ __lxstat (int vers, const char *file, struct stat *buf)
       return -1;
     }
 
-  return INLINE_SYSCALL (lstat, 2, file, CHECK_1 (buf));
+  return INLINE_SYSCALL (lstat, 2, file, buf);
 }
 
 hidden_def (__lxstat)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat64.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat64.c
index 9bb45b2e32..b7529c40c4 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat64.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/lxstat64.c
@@ -20,7 +20,6 @@
 #include <inline-syscall.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, lstat64, const char *path, struct stat64 *buf);
 
@@ -33,7 +32,7 @@ __lxstat64 (int vers, const char *file, struct stat64 *buf)
       return -1;
     }
 
-  return INLINE_SYSCALL (lstat64, 2, file, CHECK_1 (buf));
+  return INLINE_SYSCALL (lstat64, 2, file, buf);
 }
 
 hidden_def (__lxstat64)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/reboot.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/reboot.c
index 29f11a5c1c..f57b6d7407 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/reboot.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/reboot.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <sys/reboot.h>
 #include <sys/uadmin.h>
-#include <bp-checks.h>
 
 int
 reboot (howto, bootargs)
@@ -51,5 +50,5 @@ reboot (howto, bootargs)
     else
       fcn = AD_BOOT;
 
-  return uadmin (cmd, fcn, (uintptr_t)CHECK_1 (bootargs));
+  return uadmin (cmd, fcn, (uintptr_t)bootargs);
 }
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xmknod.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xmknod.c
index 8fc57253e3..eaae84a47a 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xmknod.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xmknod.c
@@ -26,7 +26,6 @@
 
 #include <sysdep.h>
 #include <syscallP.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, mknod, const char *, mode_t, dev_t);
 
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat.c
index f83cde9065..def64d0fa0 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat.c
@@ -20,7 +20,6 @@
 #include <inline-syscall.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, stat, const char *path, struct stat *buf);
 
@@ -33,7 +32,7 @@ __xstat (int vers, const char *file, struct stat *buf)
       return -1;
     }
 
-  return INLINE_SYSCALL (stat, 2, file, CHECK_1 (buf));
+  return INLINE_SYSCALL (stat, 2, file, buf);
 }
 
 hidden_def (__xstat)
diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat64.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat64.c
index a818957dc4..75d598197e 100644
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat64.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/xstat64.c
@@ -20,7 +20,6 @@
 #include <inline-syscall.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <bp-checks.h>
 
 DECLARE_INLINE_SYSCALL (int, stat64, const char *path, struct stat64 *buf);
 
@@ -33,7 +32,7 @@ __xstat64 (int vers, const char *file, struct stat64 *buf)
     return -1;
   }
 
-  return INLINE_SYSCALL (stat64, 2, file, CHECK_1 (buf));
+  return INLINE_SYSCALL (stat64, 2, file, buf);
 }
 
 hidden_def (__xstat64)
-- 
cgit v1.2.3