Use C comments since we now preprocess these files with CPP.

30 files changed, 242 insertions, 166 deletions

diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
index 5640062..f12222f 100644
--- a/lib/libc/amd64/Symbol.map
+++ b/lib/libc/amd64/Symbol.map
@@ -1,12 +1,14 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
-#
-# This only needs to contain symbols that are not listed in
-# symbol maps from other parts of libc (i.e., not found in
-# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
-#
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
+ */
 FBSD_1.0 {
-	# PSEUDO syscalls
+	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
@@ -47,11 +49,13 @@ FBSD_1.0 {
 	vfork;
 };
 
-#
-# FreeBSD private ABI
-#
-FBSDprivate {
-	# PSEUDO syscalls
+/*
+ *
+ * FreeBSD private ABI
+ *
+ */
+FBSDprivate_1.0 {
+	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index 44709af..a8edfba 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -1,12 +1,14 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
-#
-# This only needs to contain symbols that are not listed in
-# symbol maps from other parts of libc (i.e., not found in
-# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
-#
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
+ */
 FBSD_1.0 {
-	# PSEUDO syscalls
+	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
@@ -31,13 +33,13 @@ FBSD_1.0 {
 	__ntohs;
 	vfork;
 	brk;
-	cerror;		# XXX - Should this be .cerror (see sys/cerror.S)?
+	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
 	fork;
 	sbrk;
 };
 
-FBSDprivate {
-	# PSEUDO syscalls
+FBSDprivate_1.0 {
+	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
@@ -56,7 +58,7 @@ FBSDprivate {
 	__sys_vfork;
 	_vfork;
 	_brk;
-	end;		# XXX - Should this be _end (see sys/brk.S)?
+	end;		/* XXX - Should this be _end (see sys/brk.S)? */
 	curbrk;
 	minbrk;
 	_brk;
diff --git a/lib/libc/compat-43/Symbol.map b/lib/libc/compat-43/Symbol.map
index 09e2a61..e859a31 100644
--- a/lib/libc/compat-43/Symbol.map
+++ b/lib/libc/compat-43/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	creat;
@@ -15,7 +17,7 @@ FBSD_1.0 {
 	sigvec;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	__creat;
 	_creat;
 };
diff --git a/lib/libc/db/Symbol.map b/lib/libc/db/Symbol.map
index c1dce63..14df29f 100644
--- a/lib/libc/db/Symbol.map
+++ b/lib/libc/db/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	dbopen;
@@ -22,7 +24,7 @@ FBSD_1.0 {
 	mpool_stat;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	__bt_open;
 	__dbpanic;
 	__hash_open;
diff --git a/lib/libc/gdtoa/Symbol.map b/lib/libc/gdtoa/Symbol.map
index 62d6c70..31e0b68 100644
--- a/lib/libc/gdtoa/Symbol.map
+++ b/lib/libc/gdtoa/Symbol.map
@@ -1,8 +1,12 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
-	# Standard functions from contrib/gdtoa
-	#   (dtoa is renamed to __dtoa and not exported)
+	/*
+	 * Standard functions from contrib/gdtoa
+	 *   (dtoa is renamed to __dtoa and not exported)
+	 */
 	freedtoa;
 	g_Qfmt;
 	g_ddfmt;
@@ -34,6 +38,6 @@ FBSD_1.0 {
 	strtorx;
 	strtorxL;
 
-	# FreeBSD additions
+	/* FreeBSD additions */
 	strtold;
 };
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 193abb4..aac9460 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	__xuname;
@@ -166,8 +168,10 @@ FBSD_1.0 {
 	getgrnam;
 	getgrgid;
 	getgrent;
-	#  Why are __gr_parse_entry() and __gr_match_entry() not static in
-	#  gen/getgrent.c?
+	/*
+	 * Why are __gr_parse_entry() and __gr_match_entry() not static in
+	 * gen/getgrent.c?
+	 */
 	getgrouplist;
 	gethostname;
 	getloadavg;
@@ -309,10 +313,13 @@ FBSD_1.0 {
 	cfmakeraw;
 	tcsendbreak;
 	_init_tls;
+#if defined(i386)
+	___tls_get_addr;
+#endif
+	__tls_get_addr;
 	tcdrain;
 	tcflush;
 	tcflow;
-	__tls_get_addr;
 	ualarm;
 	ulimit;
 	uname;
@@ -332,8 +339,8 @@ FBSD_1.0 {
 	wordfree;
 };
 
-FBSDprivate {
-	# needed by thread libraries
+FBSDprivate_1.0 {
+	/* needed by thread libraries */
 	__thr_jtable;
 
 	_pthread_atfork;
@@ -398,22 +405,22 @@ FBSDprivate {
 	_spinlock;
 	_spinlock_debug;
 	_spinunlock;
-	_rtld_error;		# for private use
-	_rtld_thread_init;	# for private use
+	_rtld_error;		/* for private use */
+	_rtld_thread_init;	/* for private use */
 	_err;
 	_warn;
 	__fmtcheck;
-	# __pw_match_entry;
-	# __pw_parse_entry;
-	__fdnlist;	# used by libkvm
-	# __aout_fdnlist;
-	# __elf_is_okay__;
-	# __elf_fdnlist;
+	/* __pw_match_entry; */
+	/* __pw_parse_entry; */
+	__fdnlist;	/* used by libkvm */
+	/* __aout_fdnlist; */
+	/* __elf_is_okay__; */
+	/* __elf_fdnlist; */
 	__opendir2;
 	__pause;
 	_pause;
 	__pselect;
-	__pw_scan;	# Used by (at least) libutil
+	__pw_scan;	/* Used by (at least) libutil */
 	__raise;
 	_raise;
 	__sem_init;
@@ -430,6 +437,10 @@ FBSDprivate {
 	_sleep;
 	_rtld_allocate_tls;
 	_rtld_free_tls;
+#if defined(i386)
+	___libc_tls_get_addr;	/* x86 only */
+#endif
+	__libc_tls_get_addr;
 	__tcdrain;
 	_tcdrain;
 	__usleep;
diff --git a/lib/libc/gmon/Symbol.map b/lib/libc/gmon/Symbol.map
index b94339b..f2198ec 100644
--- a/lib/libc/gmon/Symbol.map
+++ b/lib/libc/gmon/Symbol.map
@@ -1,13 +1,15 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
+	.mcount;
+	_mcleanup;
 	monstartup;
 	moncontrol;
 	mexitcount;
 };
 
-FBSDprivate {
-	.mcount;	# ???
+FBSDprivate_1.0 {
 	_gmonparam;
-	_mcleanup;
 };
diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
index 55046a6..1f17793 100644
--- a/lib/libc/i386/Symbol.map
+++ b/lib/libc/i386/Symbol.map
@@ -1,12 +1,14 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
-#
-# This only needs to contain symbols that are not listed in
-# symbol maps from other parts of libc (i.e., not found in
-# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
-#
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
+ */
 FBSD_1.0 {
-	# PSEUDO syscalls
+	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
@@ -49,8 +51,8 @@ FBSD_1.0 {
 	___tls_get_addr;
 };
 
-FBSDprivate {
-	# PSEUDO syscalls
+FBSDprivate_1.0 {
+	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
diff --git a/lib/libc/ia64/Symbol.map b/lib/libc/ia64/Symbol.map
index 401c03a..123165f 100644
--- a/lib/libc/ia64/Symbol.map
+++ b/lib/libc/ia64/Symbol.map
@@ -1,12 +1,14 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
-#
-# This only needs to contain symbols that are not listed in
-# symbol maps from other parts of libc (i.e., not found in
-# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
-#
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
+ */
 FBSD_1.0 {
-	# PSEUDO syscalls
+	/* PSEUDO syscalls */
 	_exit;
 
 	mcount;
@@ -41,8 +43,8 @@ FBSD_1.0 {
 	sbrk;
 };
 
-FBSDprivate {
-	# PSEUDO syscalls
+FBSDprivate_1.0 {
+	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
diff --git a/lib/libc/inet/Symbol.map b/lib/libc/inet/Symbol.map
index 03cacc7..13d1f47 100644
--- a/lib/libc/inet/Symbol.map
+++ b/lib/libc/inet/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	__inet_addr;
diff --git a/lib/libc/locale/Symbol.map b/lib/libc/locale/Symbol.map
index ce56657..12daba1 100644
--- a/lib/libc/locale/Symbol.map
+++ b/lib/libc/locale/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	btowc;
@@ -94,7 +96,7 @@ FBSD_1.0 {
 	wcwidth;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	_PathLocale;
 	__detect_path_locale;
 	__collate_load_error;
diff --git a/lib/libc/nameser/Symbol.map b/lib/libc/nameser/Symbol.map
index 51cf669..190a59f 100644
--- a/lib/libc/nameser/Symbol.map
+++ b/lib/libc/nameser/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	__ns_makecanon;
diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map
index 86f9417..ba8aff1 100644
--- a/lib/libc/net/Symbol.map
+++ b/lib/libc/net/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	__b64_ntop;
@@ -122,12 +124,12 @@ FBSD_1.0 {
 	in6addr_linklocal_allnodes;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	_nsdispatch;
-	_nsyyerror;	# generated from nslexer.l
-	_nsyylex;	# generated from nslexer.l
-	_nsyyparse;	# generated from nsparser.y
-	_nsyylineno;	# generated from nsparser.y
+	_nsyyerror;	/* generated from nslexer.l */
+	_nsyylex;	/* generated from nslexer.l */
+	_nsyyparse;	/* generated from nsparser.y */
+	_nsyylineno;	/* generated from nsparser.y */
 	__dns_getanswer;
 	__ivaliduser;
 	__ivaliduser_af;
diff --git a/lib/libc/nls/Symbol.map b/lib/libc/nls/Symbol.map
index 3c10a62..818466e 100644
--- a/lib/libc/nls/Symbol.map
+++ b/lib/libc/nls/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	catopen;
diff --git a/lib/libc/posix1e/Symbol.map b/lib/libc/posix1e/Symbol.map
index 228d668..72ad6d7 100644
--- a/lib/libc/posix1e/Symbol.map
+++ b/lib/libc/posix1e/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	acl_calc_mask;
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
index a8af2ca..3c11baf 100644
--- a/lib/libc/powerpc/Symbol.map
+++ b/lib/libc/powerpc/Symbol.map
@@ -1,12 +1,14 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
-#
-# This only needs to contain symbols that are not listed in
-# symbol maps from other parts of libc (i.e., not found in
-# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
-#
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
+ */
 FBSD_1.0 {
-	# PSEUDO syscalls
+	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
@@ -40,8 +42,8 @@ FBSD_1.0 {
 	sbrk;
 };
 
-FBSDprivate {
-	# PSEUDO syscalls
+FBSDprivate_1.0 {
+	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
diff --git a/lib/libc/quad/Symbol.map b/lib/libc/quad/Symbol.map
index e1c1d30..30ad932 100644
--- a/lib/libc/quad/Symbol.map
+++ b/lib/libc/quad/Symbol.map
@@ -1,34 +1,38 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 };
 
-# XXX - Do these really need to be exported???
-FBSDprivate {
-	#__adddi3;
-	#__anddi3;
-	#__ashldi3;
-	#__ashrdi3;
-	#__cmpdi2;
-	#__divdi3;
-	#__fixdfdi;
-	#__fixsfdi;
-	#__fixunsdfdi;
-	#__fixunssfdi;
-	#__floatdidf;
-	#__floatdisf;
-	#__floatunsdidf;
-	#__iordi3;
-	#__lshldi3;
-	#__lshrdi3;
-	#__moddi3;
-	#__muldi3;
-	#__negdi2;
-	#__one_cmpldi2;
-	#__qdivrem;
-	#__subdi3;
-	#__ucmpdi2;
-	#__udivdi3;
-	#__umoddi3;
-	#__xordi3;
+/* XXX - Do these really need to be exported??? */
+FBSDprivate_1.0 {
+#if 0
+	__adddi3;
+	__anddi3;
+	__ashldi3;
+	__ashrdi3;
+	__cmpdi2;
+	__divdi3;
+	__fixdfdi;
+	__fixsfdi;
+	__fixunsdfdi;
+	__fixunssfdi;
+	__floatdidf;
+	__floatdisf;
+	__floatunsdidf;
+	__iordi3;
+	__lshldi3;
+	__lshrdi3;
+	__moddi3;
+	__muldi3;
+	__negdi2;
+	__one_cmpldi2;
+	__qdivrem;
+	__subdi3;
+	__ucmpdi2;
+	__udivdi3;
+	__umoddi3;
+	__xordi3;
+#endif
 };
diff --git a/lib/libc/regex/Symbol.map b/lib/libc/regex/Symbol.map
index dda1af8..5821f62 100644
--- a/lib/libc/regex/Symbol.map
+++ b/lib/libc/regex/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	regcomp;
diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map
index 90d8137..211f2c4 100644
--- a/lib/libc/resolv/Symbol.map
+++ b/lib/libc/resolv/Symbol.map
@@ -1,7 +1,9 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
-	#h_nerr;	# Why is this not staticized in net/herror.c?
+	/* h_nerr; */	/* Why is this not staticized in net/herror.c? */
 	h_errlist;
 	herror;
 	hstrerror;
@@ -66,8 +68,6 @@ FBSD_1.0 {
 	__res_mkupdrec;
 	__res_mkupdate;
 	__res_opt;
-	#__res_get_nibblesuffix;	# Excluded
-	#__res_get_nibblesuffix2;	# Excluded
 	__res_getservers;
 	__res_hostalias;
 	__res_nametoclass;
diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map
index 98dc510..40c0ede 100644
--- a/lib/libc/rpc/Symbol.map
+++ b/lib/libc/rpc/Symbol.map
@@ -1,16 +1,18 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
-	# From crypt_clnt.c (generated by rpcgen - include/rpcsvc/crypt.x)
+	/* From crypt_clnt.c (generated by rpcgen - include/rpcsvc/crypt.x) */
 	des_crypt_1;
 
-	# From crypt_xdr.c (generated by rpcgen - include/rpcsvc/crypt.x)
+	/* From crypt_xdr.c (generated by rpcgen - include/rpcsvc/crypt.x) */
 	xdr_des_dir;
 	xdr_des_mode;
 	xdr_desargs;
 	xdr_desresp;
 
-	# From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x)
+	/* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */
 	xdr_domainname;
 	xdr_keydat;
 	xdr_mapname;
@@ -233,12 +235,14 @@ FBSD_1.0 {
 	__rpc_get_local_uid;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	__des_crypt_LOCAL;
 	__key_encryptsession_pk_LOCAL;
 	__key_decryptsession_pk_LOCAL;
 	__key_gendes_LOCAL;
-	__tsd_lock;	# Why does usr.bin/rpcinfo/Makefile need rpc_generic.c?
-			# Remove this hack if rpcinfo stops building with it.
+	__tsd_lock;	/*
+			 * Why does usr.bin/rpcinfo/Makefile need rpc_generic.c?
+			 * Remove this hack if rpcinfo stops building with it.
+			 */
 	__svc_clean_idle;
 };
diff --git a/lib/libc/softfloat/Symbol.map b/lib/libc/softfloat/Symbol.map
index 273a901..12fb335 100644
--- a/lib/libc/softfloat/Symbol.map
+++ b/lib/libc/softfloat/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	_fpgetmask;
@@ -15,7 +17,7 @@ FBSD_1.0 {
 	fpsetsticky;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	_softfloat_float_exception_flags;
 	_softfloat_float_exception_mask;
 	_softfloat_float_rounding_mode;
diff --git a/lib/libc/sparc64/Symbol.map b/lib/libc/sparc64/Symbol.map
index c3ccdab..a2e8505 100644
--- a/lib/libc/sparc64/Symbol.map
+++ b/lib/libc/sparc64/Symbol.map
@@ -1,12 +1,14 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
-#
-# This only needs to contain symbols that are not listed in
-# symbol maps from other parts of libc (i.e., not found in
-# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
-#
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
+ */ 
 FBSD_1.0 {
-	# PSEUDO syscalls
+	/* PSEUDO syscalls */
 	_exit;
 
 	_setjmp;
@@ -39,7 +41,7 @@ FBSD_1.0 {
 	sbrk;
 	vfork;
 
-	# SCD libc 64 psABI
+	/* SCD libc 64 psABI */
 	_Qp_sqrt;
 	_Qp_add;
 	_Qp_div;
@@ -69,8 +71,8 @@ FBSD_1.0 {
 	__sparc_utrap_install;
 };
 
-FBSDprivate {
-	# PSEUDO syscalls
+FBSDprivate_1.0 {
+	/* PSEUDO syscalls */
 	__sys_getlogin;
 	_getlogin;
 	__sys_exit;
@@ -95,6 +97,6 @@ FBSDprivate {
 	__sys_vfork;
 	_vfork;
 
-	# used in src/lib/csu/sparc64/crt1.c
+	/* used in src/lib/csu/sparc64/crt1.c */
 	__sparc_utrap_setup;
 };
diff --git a/lib/libc/stdio/Symbol.map b/lib/libc/stdio/Symbol.map
index 1296258..05389dc 100644
--- a/lib/libc/stdio/Symbol.map
+++ b/lib/libc/stdio/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	flockfile;
@@ -24,7 +26,7 @@ FBSD_1.0 {
 	__stdinp;
 	__stdoutp;
 	__stderrp;
-	f_prealloc;	# deprecated???
+	f_prealloc;	/* deprecated??? */
 	fopen;
 	fprintf;
 	fpurge;
@@ -135,7 +137,7 @@ FBSD_1.0 {
 	__printf_render_vis;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	_flockfile;
 	_flockfile_debug_stub;
 	_flockfile_debug;
diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map
index ff11d7a..cbb9fb1 100644
--- a/lib/libc/stdlib/Symbol.map
+++ b/lib/libc/stdlib/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	_Exit;
@@ -91,7 +93,7 @@ FBSD_1.0 {
 	twalk;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	__use_pts;
 	_malloc_prefork;
 	_malloc_postfork;
diff --git a/lib/libc/stdtime/Symbol.map b/lib/libc/stdtime/Symbol.map
index 43b4d8e..43c1c47 100644
--- a/lib/libc/stdtime/Symbol.map
+++ b/lib/libc/stdtime/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	_time32_to_time;
diff --git a/lib/libc/string/Symbol.map b/lib/libc/string/Symbol.map
index 577727a..ad9f743 100644
--- a/lib/libc/string/Symbol.map
+++ b/lib/libc/string/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	bcmp;
@@ -75,6 +77,6 @@ FBSD_1.0 {
 	wmemset;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	__strtok_r;
 };
diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
index 58e3822..f437f94 100644
--- a/lib/libc/sys/Symbol.map
+++ b/lib/libc/sys/Symbol.map
@@ -1,9 +1,12 @@
-# $FreeBSD$
-#
-# It'd be nice to have this automatically generated, but we don't
-# know to what version they will eventually belong, so for now
-# it has to be manual.
-#
+/*
+ * $FreeBSD$
+ */
+
+/*
+ * It'd be nice to have this automatically generated, but we don't
+ * know to what version they will eventually belong, so for now
+ * it has to be manual.
+ */
 FBSD_1.0 {
 	__acl_aclcheck_fd;
 	__acl_aclcheck_file;
@@ -139,8 +142,8 @@ FBSD_1.0 {
 	kldunload;
 	kldunloadf;
 	kqueue;
-	kmq_notify;		# Do we want these to be publc interfaces?
-	kmq_open;		# librt uses them to provide mq_xxx.
+	kmq_notify;		/* Do we want these to be publc interfaces? */
+	kmq_open;		/* librt uses them to provide mq_xxx. */
 	kmq_setattr;
 	kmq_timedreceive;
 	kmq_timedsend;
@@ -301,8 +304,8 @@ FBSD_1.0 {
 	thr_set_name;
 	thr_suspend;
 	thr_wake;
-	ktimer_create;		# Do we want these to be publc interfaces?
-	ktimer_delete;		# librt uses them to provide timer_xxx.
+	ktimer_create;		/* Do we want these to be publc interfaces? */
+	ktimer_delete;		/* librt uses them to provide timer_xxx. */
 	ktimer_getoverrun;
 	ktimer_gettime;
 	ktimer_settime;
@@ -327,7 +330,7 @@ FBSD_1.0 {
 	truncate;
 };
 
-FBSDprivate {
+FBSDprivate_1.0 {
 	___acl_aclcheck_fd;
 	__sys___acl_aclcheck_fd;
 	___acl_aclcheck_file;
diff --git a/lib/libc/uuid/Symbol.map b/lib/libc/uuid/Symbol.map
index cf1dba6..974a964 100644
--- a/lib/libc/uuid/Symbol.map
+++ b/lib/libc/uuid/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	uuid_to_string;
diff --git a/lib/libc/xdr/Symbol.map b/lib/libc/xdr/Symbol.map
index f279dc5..4cceeb7 100644
--- a/lib/libc/xdr/Symbol.map
+++ b/lib/libc/xdr/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	xdr_free;
@@ -40,6 +42,6 @@ FBSD_1.0 {
 	xdrrec_endofrecord;
 	xdr_reference;
 	xdr_pointer;
-	#xdr_sizeof;	# Why is xdr_sizeof.c not included in Makefileinc?
+	/* xdr_sizeof; */ /* Why is xdr_sizeof.c not included in Makefileinc? */
 	xdrstdio_create;
 };
diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map
index 4fdc707..cf2470a 100644
--- a/lib/libc/yp/Symbol.map
+++ b/lib/libc/yp/Symbol.map
@@ -1,4 +1,6 @@
-# $FreeBSD$
+/*
+ * $FreeBSD$
+ */
 
 FBSD_1.0 {
 	xdr_datum;