update from main archive 961127

Thu Nov 28 23:03:32 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/netinet/in_systm.h: New file.
	* sysdeps/unix/sysv/linux/Dist: Add netinet/in_systm.h.
	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
	Add netinet/in_systm.h.
	Reported by NIIBE Yutaka <gniibe@mri.co.jp>.

	* sysdeps/unix/sysv/linux/i386/brk.c: Reformat copyright.

diff --git a/ChangeLog b/ChangeLog
index cac800e9df6f38b0880844343912ebf884995886..4958fa02a6dd2edcf11b8aedcea5b71154f87e95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 28 23:03:32 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+       * sysdeps/unix/sysv/linux/netinet/in_systm.h: New file.
+       * sysdeps/unix/sysv/linux/Dist: Add netinet/in_systm.h.
+       * sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
+       Add netinet/in_systm.h.
+       Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
+
 Thu Nov 28 03:11:11 1996  Ulrich Drepper  <drepper@cygnus.com>
 
        * libio/fileops.c: Update from latest libg++.
@@ -9,7 +17,7 @@ Thu Nov 28 03:11:11 1996  Ulrich Drepper  <drepper@cygnus.com>
        instead of __libc_lock_init for streams.
        Reported by a sun <asun@zoology.washington.edu>.
 
-       * sysdepsunix/sysv/linux/i386/brk.c: Reformat copyright.
+       * sysdeps/unix/sysv/linux/i386/brk.c: Reformat copyright.
 
        * sysdeps/generic/errno-loc.c: New file.  Generic definition of
        __errno_location function.

diff --git a/login/getutent_r.c b/login/getutent_r.c
index df9a7977ab017786ea9386c87f3a6dbb2b182309..580dcffb21b06d4bc6ac305ba0ae85f125bc70d8 100644 (file)
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -27,17 +27,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <utmp.h>
-#include <gnu/lib-names.h>
 #include <sys/stat.h>
 
 #include "utmp-private.h"
-#include "../elf/link.h"
 
 
 /* The various backends we have.  */
 static int __setutent_unknown (int reset);
 static int __getutent_r_unknown (struct utmp *buffer, struct utmp **result);
-static void __pututline_unknown (const struct utmp *data);
+static struct utmp *__pututline_unknown (const struct utmp *data);
 static void __endutent_unknown (void);
 
 
@@ -142,24 +140,29 @@ __getutent_r_unknown (struct utmp *buffer, struct utmp **result)
 }
 
 
-void
+struct utmp *
 __pututline (const struct utmp *data)
 {
+  struct utmp *buffer;
+
   __libc_lock_lock (__libc_utmp_lock);
 
-  (*__libc_utmp_jump_table->pututline) (data);
+  buffer = (*__libc_utmp_jump_table->pututline) (data);
 
   __libc_lock_unlock (__libc_utmp_lock);
+
+  return buffer;
 }
+weak_alias (__pututline, pututline)
 
 
-static void
+static struct utmp *
 __pututline_unknown (const struct utmp *data)
 {
   /* It is not yet initialized.  */
   __setutent_unknown (0);
 
-  (*__libc_utmp_jump_table->pututline) (data);
+  return (*__libc_utmp_jump_table->pututline) (data);
 }
 
 

diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index e1a89711e2fe7edcf5f27f927028f8f9d06a1b53..3f7d1235e5d86fc6f42b0107fb44113b05c3300c 100644 (file)
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -8,6 +8,7 @@ net/if_ppp.h
 net/ppp-comp.h
 net/ppp_defs.h
 net/route.h
+netinet/in_systm.h
 nfs/nfs.h
 sys/acct.h
 sys/debugreg.h

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index a200064a1c6a88810fb8fb8eebb1b6d67b44da43..9e6bd65bd18ebbefcb3477dfc2f5a6dd67afa2b1 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -51,5 +51,9 @@ ifeq ($(subdir), stdio-common)
 inhibit-siglist := yes
 endif
 
+ifeq ($(subdir), inet)
+sysdep_headers += netinet/in_systm.h
+endif
+
 # Don't compile the ctype glue code, since there is no old non-GNU C library.
 inhibit-glue = yes

diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
new file mode 100644 (file)
index 0000000..7883d70
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
@@ -0,0 +1,3 @@
+# File name    Caller  Syscall name    # args  Strong name     Weak names
+
+s_llseek       llseek  _llseek         5       __sys_llseek

diff --git a/sysdeps/unix/sysv/linux/netinet/in_systm.h b/sysdeps/unix/sysv/linux/netinet/in_systm.h
new file mode 100644 (file)
index 0000000..f481c55
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/netinet/in_systm.h
@@ -0,0 +1 @@
+#include <linux/in_systm.h>