From 2665faf49713872c4bd3a175f85e6d5254e28259 Mon Sep 17 00:00:00 2001
From: Daniel Eischen <deischen@FreeBSD.org>
Date: Thu, 31 May 2007 13:01:34 +0000
Subject: [PATCH] Some libc symbol map cleanups.

  net: endhostdnsent is named _endhostdnsent and is
  private to netdb family of functions.

  posix1e: acl_size.c has been never compiled in,
  so there's no "acl_size".

  rpc: "getnetid" is a static function.

  stdtime: "gtime" is #ifdef'ed out in the source.

  some symbols are specific only to some architectures,
  e.g., ___tls_get_addr is only defined on i386.

  __htonl, __htons, __ntohl and __ntohs are no longer
  functions, they are now (internal) defines in
  <machine/endian.h>.

Submitted by:	ru
---
 lib/libc/amd64/Symbol.map   | 4 ----
 lib/libc/arm/Symbol.map     | 4 ----
 lib/libc/gen/Symbol.map     | 3 ---
 lib/libc/i386/Symbol.map    | 4 ----
 lib/libc/ia64/Symbol.map    | 4 ----
 lib/libc/net/Symbol.map     | 1 -
 lib/libc/posix1e/Symbol.map | 1 -
 lib/libc/powerpc/Symbol.map | 4 ----
 lib/libc/rpc/Symbol.map     | 1 -
 lib/libc/sparc64/Symbol.map | 4 ----
 lib/libc/stdtime/Symbol.map | 1 -
 11 files changed, 31 deletions(-)

diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
index 2ba706aa043f..ab8578150c26 100644
--- a/lib/libc/amd64/Symbol.map
+++ b/lib/libc/amd64/Symbol.map
@@ -33,13 +33,9 @@ FBSD_1.0 {
 	sigsetjmp;
 	siglongjmp;
 	htonl;
-	__htonl;
 	htons;
-	__htons;
 	ntohl;
-	__ntohl;
 	ntohs;
-	__ntohs;
 	amd64_get_fsbase;
 	amd64_get_gsbase;
 	amd64_set_fsbase;
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index 428b51ec8d46..c85a6209d1f8 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -25,13 +25,9 @@ FBSD_1.0 {
 	sigsetjmp;
 	siglongjmp;
 	htonl;
-	__htonl;
 	htons;
-	__htons;
 	ntohl;
-	__ntohl;
 	ntohs;
-	__ntohs;
 	vfork;
 	brk;
 	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index aac946015a13..697775a7e913 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -313,9 +313,6 @@ FBSD_1.0 {
 	cfmakeraw;
 	tcsendbreak;
 	_init_tls;
-#if defined(i386)
-	___tls_get_addr;
-#endif
 	__tls_get_addr;
 	tcdrain;
 	tcflush;
diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
index 0bcfdc6d5944..9fd9dc2051d4 100644
--- a/lib/libc/i386/Symbol.map
+++ b/lib/libc/i386/Symbol.map
@@ -26,13 +26,9 @@ FBSD_1.0 {
 	longjmp;
 	sigsetjmp;
 	siglongjmp;
-	__htonl;
 	htonl;
-	__htons;
 	htons;
-	__ntohl;
 	ntohl;
-	__ntohs;
 	ntohs;
 	vfork;
 	brk;
diff --git a/lib/libc/ia64/Symbol.map b/lib/libc/ia64/Symbol.map
index 123165fc03bd..97dbf1ea0075 100644
--- a/lib/libc/ia64/Symbol.map
+++ b/lib/libc/ia64/Symbol.map
@@ -29,13 +29,9 @@ FBSD_1.0 {
 	sigsetjmp;
 	siglongjmp;
 	htonl;
-	__htonl;
 	htons;
-	__htons;
 	ntohl;
-	__ntohl;
 	ntohs;
-	__ntohs;
 	vfork;
 	brk;
 	exect;
diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map
index 6471433893db..7fb0f3b54f5b 100644
--- a/lib/libc/net/Symbol.map
+++ b/lib/libc/net/Symbol.map
@@ -19,7 +19,6 @@ FBSD_1.0 {
 	gai_strerror;
 	freeaddrinfo;
 	getaddrinfo;
-	endhostdnsent;
 	gethostent;
 	gethostent_r;
 	gethostbyname;
diff --git a/lib/libc/posix1e/Symbol.map b/lib/libc/posix1e/Symbol.map
index 72ad6d7b8ef3..dd3c08fe0689 100644
--- a/lib/libc/posix1e/Symbol.map
+++ b/lib/libc/posix1e/Symbol.map
@@ -37,7 +37,6 @@ FBSD_1.0 {
 	acl_set_permset;
 	acl_set_qualifier;
 	acl_set_tag_type;
-	acl_size;
 	acl_to_text;
 	acl_valid;
 	acl_valid_file_np;
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
index 137aa7bcdf49..6982c6e36f8c 100644
--- a/lib/libc/powerpc/Symbol.map
+++ b/lib/libc/powerpc/Symbol.map
@@ -30,13 +30,9 @@ FBSD_1.0 {
 	sigsetjmp;
 	siglongjmp;
 	htonl;
-	__hton;
 	htons;
-	__htons;
 	ntohl;
-	__ntohl;
 	ntohs;
-	__ntohs;
 	brk;
 	exect;
 	pipe;
diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map
index 40c0edeb593a..e3ac6a608f7a 100644
--- a/lib/libc/rpc/Symbol.map
+++ b/lib/libc/rpc/Symbol.map
@@ -119,7 +119,6 @@ FBSD_1.0 {
 	host2netname;
 	netname2user;
 	netname2host;
-	getnetid;
 	pmap_set;
 	pmap_unset;
 	pmap_getmaps;
diff --git a/lib/libc/sparc64/Symbol.map b/lib/libc/sparc64/Symbol.map
index d7fd308fbdac..73d0ed51c4ec 100644
--- a/lib/libc/sparc64/Symbol.map
+++ b/lib/libc/sparc64/Symbol.map
@@ -30,13 +30,9 @@ FBSD_1.0 {
 	sigsetjmp;
 	siglongjmp;
 	htonl;
-	__htonl;
 	htons;
-	__htons;
 	ntohl;
-	__ntohl;
 	ntohs;
-	__ntohs;
 	brk;
 	exect;
 	sbrk;
diff --git a/lib/libc/stdtime/Symbol.map b/lib/libc/stdtime/Symbol.map
index 43c1c47c0ba1..3bee3735f7e6 100644
--- a/lib/libc/stdtime/Symbol.map
+++ b/lib/libc/stdtime/Symbol.map
@@ -27,7 +27,6 @@ FBSD_1.0 {
 	timelocal;
 	timegm;
 	timeoff;
-	gtime;
 	time2posix;
 	posix2time;
 	difftime;