(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

10 files changed, 3 insertions, 35 deletions

diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index cd0750b452..8ba980477d 100644
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -2,12 +2,6 @@
 
 #include <misc/sys/cdefs.h>
 
-/* The compiler will optimize based on the knowledge the parameter is
-   not NULL.  This will omit tests.  A robust implementation cannot allow
-   this so when compiling glibc itself we ignore this attribute.  */
-#undef __nonnull
-#define __nonnull(params)
-
 extern void __chk_fail (void) __attribute__ ((__noreturn__));
 libc_hidden_proto (__chk_fail)
 rtld_hidden_proto (__chk_fail)
diff --git a/include/sys/mman.h b/include/sys/mman.h
index a4687b30f7..14e757892e 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -11,8 +11,5 @@ extern int __mprotect (void *__addr, size_t __len, int __prot);
 
 /* This one is Linux specific.  */
 extern void *__mremap (void *__addr, size_t __old_len,
-		       size_t __new_len, int __flags, ...);
-
-libc_hidden_proto (madvise);
-
+		       size_t __new_len, int __may_move);
 #endif
diff --git a/include/sys/msg.h b/include/sys/msg.h
index 03e17f915e..02bb9aefd0 100644
--- a/include/sys/msg.h
+++ b/include/sys/msg.h
@@ -1,8 +1,8 @@
 #ifndef _SYS_MSG_H
 #include <sysvipc/sys/msg.h>
 
-extern ssize_t __libc_msgrcv (int msqid, void *msgp, size_t msgsz,
-			      long int msgtyp, int msgflg);
+extern int __libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
+			  int msgflg);
 extern int __libc_msgsnd (int msqid, const void *msgp, size_t msgsz,
 			  int msgflg);
 
diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h
deleted file mode 100644
index abe09769cc..0000000000
--- a/include/sys/sendfile.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <io/sys/sendfile.h>
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 0a226726aa..937909a125 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -59,14 +59,6 @@ extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
 extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr,
 			       socklen_t __len) attribute_hidden;
 
-/* Read N bytes into BUF from socket FD.
-   Returns the number read or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t __recv (int __fd, void *__buf, size_t __n, int __flags)
-     attribute_hidden;
-
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
    ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.  */
 extern ssize_t __libc_sendto (int __fd, __const void *__buf, size_t __n,
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 66898b1760..2e2566d9ef 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -29,10 +29,6 @@ extern __inline__ int __mknod (__const char *__path, __mode_t __mode,
 {
   return __xmknod (_MKNOD_VER, __path, __mode, &__dev);
 }
-libc_hidden_proto (__xmknodat)
-
-libc_hidden_proto (__fxstatat)
-libc_hidden_proto (__fxstatat64)
 
 
 /* The `stat', `fstat', `lstat' functions have to be handled special since
diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h
index d33055a2b3..e126bcb0e9 100644
--- a/include/sys/sysinfo.h
+++ b/include/sys/sysinfo.h
@@ -15,7 +15,4 @@ extern long int __get_phys_pages (void);
 /* Return number of available physical pages of memory in the system.  */
 extern long int __get_avphys_pages (void);
 
-/* Return maximum number of processes this real user ID can have.  */
-extern long int __get_child_max (void);
-
 #endif /* sys/sysinfo.h */
diff --git a/include/sys/syslog.h b/include/sys/syslog.h
index 8b0d59dad6..e018225333 100644
--- a/include/sys/syslog.h
+++ b/include/sys/syslog.h
@@ -2,8 +2,3 @@
 
 libc_hidden_proto (syslog)
 libc_hidden_proto (vsyslog)
-
-extern void __vsyslog_chk (int __pri, int __flag, __const char *__fmt,
-			   __gnuc_va_list __ap)
-     __attribute__ ((__format__ (__printf__, 3, 0)));
-libc_hidden_proto (__vsyslog_chk)
diff --git a/include/sys/time.h b/include/sys/time.h
index ec4055276e..c70396f04e 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -20,7 +20,6 @@ extern int __setitimer (enum __itimer_which __which,
 	attribute_hidden;
 extern int __utimes (__const char *__file, const struct timeval __tvp[2])
 	attribute_hidden;
-extern int __futimes (int fd, __const struct timeval tvp[2]) attribute_hidden;
 
 #ifndef NOT_IN_libc
 # define __gettimeofday(tv, tz) INTUSE(__gettimeofday) (tv, tz)
diff --git a/include/sys/xattr.h b/include/sys/xattr.h
deleted file mode 100644
index 64f8f56809..0000000000
--- a/include/sys/xattr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <misc/sys/xattr.h>