3 files changed, 76 insertions, 8 deletions
diff --git a/include/libc-internal.h b/include/libc-internal.h
index 0ce501900..11e020ee1 100644
--- a/include/libc-internal.h
+++ b/include/libc-internal.h
@@ -116,4 +116,68 @@
 /* --- this is added to integrate linuxthreads */
 #define __USE_UNIX98            1
 
+#ifndef __ASSEMBLER__
+# ifdef IS_IN_libc
+
+#  include <bits/types.h>
+
+#  ifndef __ssize_t_defined
+typedef __ssize_t ssize_t;
+#   define __ssize_t_defined
+#  endif
+
+#  define __need_size_t
+#  include <stddef.h>
+
+#  include <bits/sigset.h>
+
+/* prototypes for internal use, please keep these in sync w/ updated headers */
+/* #include <fcntl.h> */
+extern int __open(__const char *__file, int __oflag, ...) attribute_hidden;
+
+/* #include <string.h> */
+extern int __memcmp (__const void *__s1, __const void *__s2, size_t __n) attribute_hidden;
+extern void *__memcpy (void *__restrict __dest,
+		     __const void *__restrict __src, size_t __n) attribute_hidden;
+extern void *__memmove (void *__dest, __const void *__src, size_t __n) attribute_hidden;
+extern void *__memset (void *__s, int __c, size_t __n) attribute_hidden;
+extern char *__strcpy (char *__restrict __dest, __const char *__restrict __src) attribute_hidden;
+extern size_t __strlen (__const char *__s) attribute_hidden;
+extern int __strcmp (__const char *__s1, __const char *__s2) attribute_hidden;
+extern char *__strcat (char *__restrict __dest, __const char *__restrict __src) attribute_hidden;
+extern char *__strncpy (char *__restrict __dest,
+		      __const char *__restrict __src, size_t __n) attribute_hidden;
+extern char *__strchr (__const char *__s, int __c) attribute_hidden;
+extern int __strncmp (__const char *__s1, __const char *__s2, size_t __n) attribute_hidden;
+extern char *__strdup (__const char *__s) attribute_hidden;
+
+/* #include <unistd.h> */
+extern ssize_t __read(int __fd, void *__buf, size_t __nbytes) attribute_hidden;
+extern ssize_t __write(int __fd, __const void *__buf, size_t __n) attribute_hidden;
+extern int __close(int __fd) attribute_hidden;
+
+/* #include <signal.h> */
+extern int __sigprocmask (int __how, __const __sigset_t *__restrict __set,
+			__sigset_t *__restrict __oset) attribute_hidden;
+
+/* #include <sys/time.h> */
+#  if 0 /* undoable here */
+#   define __need_timeval
+#   include <bits/time.h>
+extern int __gettimeofday(struct timeval *__restrict __tv, *__restrict __timezone__ptr_t __tz) attribute_hidden;
+#  else
+#   define gettimeofday __gettimeofday
+#  endif
+
+# elif IS_IN_libpthread
+
+#  define gettimeofday __libc_gettimeofday
+
+# else
+
+#  define open __libc_open
+
+# endif
+#endif
+
 #endif /* _LIBC_INTERNAL_H */
diff --git a/include/ssp-internal.h b/include/ssp-internal.h
index 81a83f70c..cd44b4f5d 100644
--- a/include/ssp-internal.h
+++ b/include/ssp-internal.h
@@ -21,6 +21,10 @@
 #include <signal.h>
 #include <linux/unistd.h>
 
+#ifndef errno
+extern int errno;
+#endif
+
 #ifndef __SSP_QUICK_CANARY__
 #define __NR___kernel_open		__NR_open
 static __always_inline _syscall3(int,__kernel_open,const char *,path,int,flags,__kernel_mode_t,mode);
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index 788468180..3b82571a3 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -2,19 +2,19 @@
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _SYSCALL_H
 #define _SYSCALL_H	1