5 files changed, 13 insertions, 48 deletions
diff --git a/sysdeps/generic/ntohs.c b/sysdeps/generic/bits/htontoh.h
index f4f37eec93..fa4efed867 100644
--- a/sysdeps/generic/ntohs.c
+++ b/sysdeps/generic/bits/htontoh.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,17 +16,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <netinet/in.h>
-
-#undef	ntohs
-
-u_int16_t
-ntohs (x)
-     u_int16_t x;
-{
-#if BYTE_ORDER == LITTLE_ENDIAN
-  x = (x << 8) | (x >> 8);
+#ifndef _NETINET_IN_H
+# error "Don't include this file directly, use <netinet/in.h>"
 #endif
 
-  return x;
-}
+/* We cannot give generic optimized versions here.  */
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index c5e85274b0..e18f0b89a4 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -32,7 +32,7 @@ extern char **_dl_argv;
 extern char **_environ;
 extern size_t _dl_pagesize;
 extern void _end;
-extern void _start (void);
+extern void ENTRY_POINT (void);
 
 int __libc_enable_secure;
 int __libc_multiple_libcs;	/* Defining this here avoids the inclusion
diff --git a/sysdeps/generic/htonl.c b/sysdeps/generic/htonl.c
index f1e077ae1a..d460d40f89 100644
--- a/sysdeps/generic/htonl.c
+++ b/sysdeps/generic/htonl.c
@@ -21,7 +21,7 @@
 #undef	htonl
 
 u_int32_t
-htonl (x)
+__htonl (x)
      u_int32_t x;
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
@@ -30,3 +30,6 @@ htonl (x)
 
   return x;
 }
+strong_alias (__htonl, __ntohl)
+weak_alias (__htonl, htonl)
+weak_alias (__ntohl, ntohl)
diff --git a/sysdeps/generic/htons.c b/sysdeps/generic/htons.c
index 3aaf28551c..a0a0e81adf 100644
--- a/sysdeps/generic/htons.c
+++ b/sysdeps/generic/htons.c
@@ -21,7 +21,7 @@
 #undef	htons
 
 u_int16_t
-htons (x)
+__htons (x)
      u_int16_t x;
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
@@ -30,3 +30,6 @@ htons (x)
 
   return x;
 }
+strong_alias (__htons, __ntohs)
+weak_alias (__htons, htons)
+weak_alias (__ntohs, ntohs)
diff --git a/sysdeps/generic/ntohl.c b/sysdeps/generic/ntohl.c
deleted file mode 100644
index 0cb83c5aa4..0000000000
--- a/sysdeps/generic/ntohl.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
-   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.
-
-   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.
-
-   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.  */
-
-#include <netinet/in.h>
-
-#undef	ntohl
-
-u_int32_t
-ntohl (x)
-     u_int32_t x;
-{
-#if BYTE_ORDER == LITTLE_ENDIAN
-  x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
-#endif
-
-  return x;
-}