Index: lib/Makefile.inc =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/Makefile.inc,v retrieving revision 1.3 diff -u -r1.3 Makefile.inc --- lib/Makefile.inc 22 Jul 2005 17:18:58 -0000 1.3 +++ lib/Makefile.inc 2 Mar 2007 07:06:39 -0000 @@ -1,3 +1,3 @@ # $FreeBSD: src/lib/Makefile.inc,v 1.3 2005/07/22 17:18:58 kensmith Exp $ # Default version for system libs (override in /Makefile if necessary) -SHLIB_MAJOR?= 3 +SHLIB_MAJOR?= 4 Index: lib/libatm/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libatm/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- lib/libatm/Makefile 21 May 2006 15:15:20 -0000 1.13 +++ lib/libatm/Makefile 2 Mar 2007 07:08:00 -0000 @@ -24,7 +24,7 @@ # $FreeBSD: src/lib/libatm/Makefile,v 1.13 2006/05/21 15:15:20 ume Exp $ LIB= atm -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SHLIBDIR?= /lib SRCS= atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c INCS= libatm.h Index: lib/libautofs/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libautofs/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- lib/libautofs/Makefile 8 Sep 2004 08:44:14 -0000 1.4 +++ lib/libautofs/Makefile 2 Mar 2007 07:08:06 -0000 @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libautofs/Makefile,v 1.4 2004/09/08 08:44:14 alfred Exp $ LIB= autofs -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 WARNS?= 4 SRCS= libautofs.c Index: lib/libbegemot/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libbegemot/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- lib/libbegemot/Makefile 22 Jul 2005 17:18:59 -0000 1.3 +++ lib/libbegemot/Makefile 2 Mar 2007 07:08:11 -0000 @@ -5,7 +5,7 @@ .PATH: ${LIBBEGEMOT_DIR} LIB= begemot -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SHLIBDIR?= /lib # WARNS?= 6 Index: lib/libbluetooth/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libbluetooth/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- lib/libbluetooth/Makefile 22 Jul 2005 17:18:59 -0000 1.2 +++ lib/libbluetooth/Makefile 2 Mar 2007 07:08:14 -0000 @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= bluetooth.c INCS= bluetooth.h Index: lib/libbsm/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libbsm/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- lib/libbsm/Makefile 25 Sep 2006 11:53:58 -0000 1.5 +++ lib/libbsm/Makefile 2 Mar 2007 07:08:18 -0000 @@ -6,7 +6,7 @@ LIBBSMDIR= ${OPENBSMDIR}/libbsm LIB= bsm -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 .PATH: ${LIBBSMDIR} .PATH: ${OPENBSMDIR}/bsm Index: lib/libbz2/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libbz2/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- lib/libbz2/Makefile 22 Jul 2005 17:18:59 -0000 1.6 +++ lib/libbz2/Makefile 2 Mar 2007 07:08:23 -0000 @@ -4,7 +4,7 @@ .PATH: ${BZ2DIR} LIB= bz2 -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \ huffman.c randtable.c INCS= bzlib.h Index: lib/libc/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/Makefile,v retrieving revision 1.69 diff -u -r1.69 Makefile --- lib/libc/Makefile 4 Mar 2007 12:25:03 -0000 1.69 +++ lib/libc/Makefile 8 Apr 2007 23:37:21 -0000 @@ -76,7 +76,7 @@ CFLAGS+=-D_FREEFALL_CONFIG .endif -.if defined(SYMVER_ENABLED) +.if !defined(NO_SYMVER) VERSION_DEF=${.CURDIR}/Versions.def SYMBOL_MAPS=${SYM_MAPS} CFLAGS+= -DSYMBOL_VERSIONING Index: lib/libc/Versions.def =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/Versions.def,v retrieving revision 1.1 diff -u -r1.1 Versions.def --- lib/libc/Versions.def 13 Mar 2006 00:53:15 -0000 1.1 +++ lib/libc/Versions.def 25 Feb 2007 07:38:57 -0000 @@ -8,5 +8,5 @@ # strictly for use only by other FreeBSD applications and libraries # are listed here. We use a separate namespace so we can write # simple ABI-checking tools. -FBSDprivate { +FBSDprivate_1.0 { }; Index: lib/libc/amd64/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/amd64/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/amd64/Symbol.map 13 Mar 2006 00:53:16 -0000 1.1 +++ lib/libc/amd64/Symbol.map 1 Mar 2007 05:45:31 -0000 @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ + */ -# -# 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 @@ vfork; }; -# -# FreeBSD private ABI -# -FBSDprivate { - # PSEUDO syscalls +/* + * + * FreeBSD private ABI + * + */ +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; Index: lib/libc/arm/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/arm/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/arm/Symbol.map 13 Mar 2006 00:53:16 -0000 1.1 +++ lib/libc/arm/Symbol.map 1 Mar 2007 03:35:42 -0000 @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ + */ -# -# 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 @@ __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 @@ __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; Index: lib/libc/compat-43/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/compat-43/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/compat-43/Symbol.map 13 Mar 2006 00:53:16 -0000 1.1 +++ lib/libc/compat-43/Symbol.map 1 Mar 2007 05:45:36 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/compat-43/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/compat-43/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ + */ FBSD_1.0 { creat; @@ -15,7 +17,7 @@ sigvec; }; -FBSDprivate { +FBSDprivate_1.0 { __creat; _creat; }; Index: lib/libc/db/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/db/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/db/Symbol.map 13 Mar 2006 00:53:17 -0000 1.1 +++ lib/libc/db/Symbol.map 1 Mar 2007 05:45:38 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/db/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/db/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ + */ FBSD_1.0 { dbopen; @@ -22,7 +24,7 @@ mpool_stat; }; -FBSDprivate { +FBSDprivate_1.0 { __bt_open; __dbpanic; __hash_open; Index: lib/libc/gdtoa/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/gdtoa/Symbol.map,v retrieving revision 1.3 diff -u -r1.3 Symbol.map --- lib/libc/gdtoa/Symbol.map 15 Apr 2006 15:35:20 -0000 1.3 +++ lib/libc/gdtoa/Symbol.map 1 Mar 2007 05:45:40 -0000 @@ -1,8 +1,12 @@ -# $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.3 2006/04/15 15:35:20 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.3 2006/04/15 15:35:20 deischen Exp $ + */ 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 @@ strtorx; strtorxL; - # FreeBSD additions + /* FreeBSD additions */ strtold; }; Index: lib/libc/gen/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/gen/Symbol.map,v retrieving revision 1.3 diff -u -r1.3 Symbol.map --- lib/libc/gen/Symbol.map 3 Apr 2007 18:38:01 -0000 1.3 +++ lib/libc/gen/Symbol.map 7 Mar 2007 20:28:46 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.3 2007/04/03 18:38:01 kan Exp $ +/* + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.3 2007/04/03 18:38:01 kan Exp $ + */ FBSD_1.0 { __xuname; @@ -166,8 +168,10 @@ 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,6 +313,10 @@ cfmakeraw; tcsendbreak; _init_tls; +#if defined(i386) + ___tls_get_addr; +endif + __tls_get_addr; tcdrain; tcflush; tcflow; @@ -331,8 +339,8 @@ wordfree; }; -FBSDprivate { - # needed by thread libraries +FBSDprivate_1.0 { + /* needed by thread libraries */ __thr_jtable; _pthread_atfork; @@ -397,22 +405,22 @@ _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; @@ -431,10 +439,10 @@ _rtld_free_tls; __libc_allocate_tls; __libc_free_tls; - ___tls_get_addr; # x86 only - ___libc_tls_get_addr; # x86 only +#if defined(i386) + ___libc_tls_get_addr; /* x86 only */ +#endif __libc_tls_get_addr; - __tls_get_addr; __tcdrain; _tcdrain; __usleep; Index: lib/libc/gmon/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/gmon/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/gmon/Symbol.map 13 Mar 2006 00:53:17 -0000 1.1 +++ lib/libc/gmon/Symbol.map 3 Mar 2007 16:08:35 -0000 @@ -1,13 +1,15 @@ -# $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ + */ FBSD_1.0 { + .mcount; + _mcleanup; monstartup; moncontrol; mexitcount; }; -FBSDprivate { - .mcount; # ??? +FBSDprivate_1.0 { _gmonparam; - _mcleanup; }; Index: lib/libc/i386/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/i386/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/i386/Symbol.map 13 Mar 2006 00:53:17 -0000 1.1 +++ lib/libc/i386/Symbol.map 1 Mar 2007 03:37:54 -0000 @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ + */ -# -# 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; @@ -48,8 +50,8 @@ sbrk; }; -FBSDprivate { - # PSEUDO syscalls +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; Index: lib/libc/ia64/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/ia64/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/ia64/Symbol.map 13 Mar 2006 00:53:17 -0000 1.1 +++ lib/libc/ia64/Symbol.map 1 Mar 2007 03:38:25 -0000 @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/ia64/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/ia64/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $ + */ -# -# 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 @@ sbrk; }; -FBSDprivate { - # PSEUDO syscalls +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; Index: lib/libc/inet/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/inet/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/inet/Symbol.map 21 Mar 2006 15:37:15 -0000 1.1 +++ lib/libc/inet/Symbol.map 1 Mar 2007 03:38:33 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/inet/Symbol.map,v 1.1 2006/03/21 15:37:15 ume Exp $ +/* + * $FreeBSD: src/lib/libc/inet/Symbol.map,v 1.1 2006/03/21 15:37:15 ume Exp $ + */ FBSD_1.0 { __inet_addr; Index: lib/libc/locale/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/locale/Symbol.map,v retrieving revision 1.2 diff -u -r1.2 Symbol.map --- lib/libc/locale/Symbol.map 30 Mar 2006 04:37:08 -0000 1.2 +++ lib/libc/locale/Symbol.map 1 Mar 2007 03:38:43 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.2 2006/03/30 04:37:08 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.2 2006/03/30 04:37:08 deischen Exp $ + */ FBSD_1.0 { btowc; @@ -94,7 +96,7 @@ wcwidth; }; -FBSDprivate { +FBSDprivate_1.0 { _PathLocale; __detect_path_locale; __collate_load_error; Index: lib/libc/nameser/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/nameser/Symbol.map,v retrieving revision 1.2 diff -u -r1.2 Symbol.map --- lib/libc/nameser/Symbol.map 21 May 2006 11:19:36 -0000 1.2 +++ lib/libc/nameser/Symbol.map 1 Mar 2007 03:38:50 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/nameser/Symbol.map,v 1.2 2006/05/21 11:19:36 ume Exp $ +/* + * $FreeBSD: src/lib/libc/nameser/Symbol.map,v 1.2 2006/05/21 11:19:36 ume Exp $ + */ FBSD_1.0 { __ns_makecanon; Index: lib/libc/net/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/net/Symbol.map,v retrieving revision 1.7 diff -u -r1.7 Symbol.map --- lib/libc/net/Symbol.map 28 Feb 2007 21:18:38 -0000 1.7 +++ lib/libc/net/Symbol.map 4 Mar 2007 17:19:45 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/net/Symbol.map,v 1.7 2007/02/28 21:18:38 bms Exp $ +/* + * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.7 2007/02/28 21:18:38 bms Exp $ + */ FBSD_1.0 { __b64_ntop; @@ -122,12 +124,12 @@ 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; Index: lib/libc/nls/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/nls/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/nls/Symbol.map 13 Mar 2006 00:53:18 -0000 1.1 +++ lib/libc/nls/Symbol.map 1 Mar 2007 03:39:28 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/nls/Symbol.map,v 1.1 2006/03/13 00:53:18 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/nls/Symbol.map,v 1.1 2006/03/13 00:53:18 deischen Exp $ + */ FBSD_1.0 { catopen; Index: lib/libc/posix1e/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/posix1e/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/posix1e/Symbol.map 13 Mar 2006 00:53:18 -0000 1.1 +++ lib/libc/posix1e/Symbol.map 1 Mar 2007 03:39:34 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/posix1e/Symbol.map,v 1.1 2006/03/13 00:53:18 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/posix1e/Symbol.map,v 1.1 2006/03/13 00:53:18 deischen Exp $ + */ FBSD_1.0 { acl_calc_mask; Index: lib/libc/powerpc/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/powerpc/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/powerpc/Symbol.map 13 Mar 2006 00:53:18 -0000 1.1 +++ lib/libc/powerpc/Symbol.map 1 Mar 2007 03:40:14 -0000 @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.1 2006/03/13 00:53:18 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.1 2006/03/13 00:53:18 deischen Exp $ + */ -# -# 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 @@ sbrk; }; -FBSDprivate { - # PSEUDO syscalls +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; Index: lib/libc/quad/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/quad/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/quad/Symbol.map 13 Mar 2006 00:53:19 -0000 1.1 +++ lib/libc/quad/Symbol.map 1 Mar 2007 03:40:56 -0000 @@ -1,34 +1,38 @@ -# $FreeBSD: src/lib/libc/quad/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/quad/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ + */ 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 }; Index: lib/libc/regex/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/regex/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/regex/Symbol.map 13 Mar 2006 00:53:19 -0000 1.1 +++ lib/libc/regex/Symbol.map 1 Mar 2007 03:41:17 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/regex/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/regex/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ + */ FBSD_1.0 { regcomp; Index: lib/libc/resolv/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/resolv/Symbol.map,v retrieving revision 1.6 diff -u -r1.6 Symbol.map --- lib/libc/resolv/Symbol.map 6 Apr 2007 19:45:17 -0000 1.6 +++ lib/libc/resolv/Symbol.map 8 Apr 2007 23:27:16 -0000 @@ -1,7 +1,9 @@ -# $FreeBSD: src/lib/libc/resolv/Symbol.map,v 1.6 2007/04/06 19:45:17 kan Exp $ +/* + * $FreeBSD: src/lib/libc/resolv/Symbol.map,v 1.6 2007/04/06 19:45:17 kan Exp $ + */ 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 @@ __res_mkupdrec; __res_mkupdate; __res_opt; - #__res_get_nibblesuffix; # Excluded - #__res_get_nibblesuffix2; # Excluded __res_getservers; __res_hostalias; __res_nametoclass; Index: lib/libc/rpc/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/rpc/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/rpc/Symbol.map 13 Mar 2006 00:53:19 -0000 1.1 +++ lib/libc/rpc/Symbol.map 1 Mar 2007 05:41:07 -0000 @@ -1,16 +1,18 @@ -# $FreeBSD: src/lib/libc/rpc/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/rpc/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ + */ 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 @@ __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; }; Index: lib/libc/softfloat/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/softfloat/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/softfloat/Symbol.map 13 Mar 2006 00:53:19 -0000 1.1 +++ lib/libc/softfloat/Symbol.map 1 Mar 2007 05:42:29 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/softfloat/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/softfloat/Symbol.map,v 1.1 2006/03/13 00:53:19 deischen Exp $ + */ FBSD_1.0 { _fpgetmask; @@ -15,7 +17,7 @@ fpsetsticky; }; -FBSDprivate { +FBSDprivate_1.0 { _softfloat_float_exception_flags; _softfloat_float_exception_mask; _softfloat_float_rounding_mode; Index: lib/libc/sparc64/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/sparc64/Symbol.map,v retrieving revision 1.2 diff -u -r1.2 Symbol.map --- lib/libc/sparc64/Symbol.map 11 Apr 2006 19:43:36 -0000 1.2 +++ lib/libc/sparc64/Symbol.map 1 Mar 2007 05:43:20 -0000 @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.2 2006/04/11 19:43:36 marius Exp $ - -# -# 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, ...). -# +/* + * $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.2 2006/04/11 19:43:36 marius Exp $ + */ + +/* + * 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 @@ sbrk; vfork; - # SCD libc 64 psABI + /* SCD libc 64 psABI */ _Qp_sqrt; _Qp_add; _Qp_div; @@ -69,8 +71,8 @@ __sparc_utrap_install; }; -FBSDprivate { - # PSEUDO syscalls +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; @@ -95,6 +97,6 @@ __sys_vfork; _vfork; - # used in src/lib/csu/sparc64/crt1.c + /* used in src/lib/csu/sparc64/crt1.c */ __sparc_utrap_setup; }; Index: lib/libc/stdio/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/stdio/Symbol.map,v retrieving revision 1.4 diff -u -r1.4 Symbol.map --- lib/libc/stdio/Symbol.map 22 Apr 2006 15:11:33 -0000 1.4 +++ lib/libc/stdio/Symbol.map 1 Mar 2007 05:43:40 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.4 2006/04/22 15:11:33 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.4 2006/04/22 15:11:33 deischen Exp $ + */ FBSD_1.0 { flockfile; @@ -24,7 +26,7 @@ __stdinp; __stdoutp; __stderrp; - f_prealloc; # deprecated??? + f_prealloc; /* deprecated??? */ fopen; fprintf; fpurge; @@ -135,7 +137,7 @@ __printf_render_vis; }; -FBSDprivate { +FBSDprivate_1.0 { _flockfile; _flockfile_debug_stub; _flockfile_debug; Index: lib/libc/stdlib/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/stdlib/Symbol.map,v retrieving revision 1.3 diff -u -r1.3 Symbol.map --- lib/libc/stdlib/Symbol.map 28 Mar 2006 22:16:04 -0000 1.3 +++ lib/libc/stdlib/Symbol.map 1 Mar 2007 05:43:49 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.3 2006/03/28 22:16:04 jasone Exp $ +/* + * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.3 2006/03/28 22:16:04 jasone Exp $ + */ FBSD_1.0 { _Exit; @@ -91,7 +93,7 @@ twalk; }; -FBSDprivate { +FBSDprivate_1.0 { __use_pts; _malloc_prefork; _malloc_postfork; Index: lib/libc/stdtime/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/stdtime/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/stdtime/Symbol.map 13 Mar 2006 00:53:20 -0000 1.1 +++ lib/libc/stdtime/Symbol.map 1 Mar 2007 05:43:55 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/stdtime/Symbol.map,v 1.1 2006/03/13 00:53:20 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/stdtime/Symbol.map,v 1.1 2006/03/13 00:53:20 deischen Exp $ + */ FBSD_1.0 { _time32_to_time; Index: lib/libc/string/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/string/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/string/Symbol.map 13 Mar 2006 00:53:20 -0000 1.1 +++ lib/libc/string/Symbol.map 1 Mar 2007 05:44:03 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/string/Symbol.map,v 1.1 2006/03/13 00:53:20 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.1 2006/03/13 00:53:20 deischen Exp $ + */ FBSD_1.0 { bcmp; @@ -75,6 +77,6 @@ wmemset; }; -FBSDprivate { +FBSDprivate_1.0 { __strtok_r; }; Index: lib/libc/sys/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/sys/Symbol.map,v retrieving revision 1.4 diff -u -r1.4 Symbol.map --- lib/libc/sys/Symbol.map 21 Sep 2006 04:22:46 -0000 1.4 +++ lib/libc/sys/Symbol.map 1 Mar 2007 05:44:46 -0000 @@ -1,9 +1,12 @@ -# $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.4 2006/09/21 04:22:46 davidxu Exp $ -# -# 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: src/lib/libc/sys/Symbol.map,v 1.4 2006/09/21 04:22:46 davidxu Exp $ + */ + +/* + * 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 @@ 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 @@ 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 @@ truncate; }; -FBSDprivate { +FBSDprivate_1.0 { ___acl_aclcheck_fd; __sys___acl_aclcheck_fd; ___acl_aclcheck_file; Index: lib/libc/uuid/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/uuid/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/uuid/Symbol.map 13 Mar 2006 00:53:20 -0000 1.1 +++ lib/libc/uuid/Symbol.map 1 Mar 2007 05:44:53 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.1 2006/03/13 00:53:20 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.1 2006/03/13 00:53:20 deischen Exp $ + */ FBSD_1.0 { uuid_to_string; Index: lib/libc/xdr/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/xdr/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/xdr/Symbol.map 13 Mar 2006 00:53:21 -0000 1.1 +++ lib/libc/xdr/Symbol.map 1 Mar 2007 05:45:13 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/xdr/Symbol.map,v 1.1 2006/03/13 00:53:21 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/xdr/Symbol.map,v 1.1 2006/03/13 00:53:21 deischen Exp $ + */ FBSD_1.0 { xdr_free; @@ -40,6 +42,6 @@ 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; }; Index: lib/libc/yp/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc/yp/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libc/yp/Symbol.map 13 Mar 2006 00:53:21 -0000 1.1 +++ lib/libc/yp/Symbol.map 1 Mar 2007 05:45:20 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libc/yp/Symbol.map,v 1.1 2006/03/13 00:53:21 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/yp/Symbol.map,v 1.1 2006/03/13 00:53:21 deischen Exp $ + */ FBSD_1.0 { xdr_datum; Index: lib/libc_r/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libc_r/Makefile,v retrieving revision 1.45 diff -u -r1.45 Makefile --- lib/libc_r/Makefile 22 Aug 2006 07:51:07 -0000 1.45 +++ lib/libc_r/Makefile 3 Mar 2007 10:12:29 -0000 @@ -7,8 +7,11 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. + +.include + LIB=c_r -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ -I${.CURDIR}/../../include @@ -25,7 +28,8 @@ .include "${.CURDIR}/uthread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" -.if ${MACHINE_ARCH} == "sparc64" +.if ${DEFAULT_THREAD_LIB} == "libc_r" +SHLIBDIR?= /lib SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so Index: lib/libcrypt/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libcrypt/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- lib/libcrypt/Makefile 18 Mar 2006 11:01:06 -0000 1.38 +++ lib/libcrypt/Makefile 2 Mar 2007 07:09:03 -0000 @@ -6,7 +6,7 @@ .include -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 LIB= crypt .PATH: ${.CURDIR}/../libmd Index: lib/libdevstat/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libdevstat/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- lib/libdevstat/Makefile 22 Jul 2005 17:19:00 -0000 1.15 +++ lib/libdevstat/Makefile 2 Mar 2007 07:09:09 -0000 @@ -3,7 +3,7 @@ LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 SRCS= devstat.c INCS= devstat.h Index: lib/libedit/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libedit/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- lib/libedit/Makefile 7 Aug 2005 20:51:52 -0000 1.30 +++ lib/libedit/Makefile 2 Mar 2007 07:09:14 -0000 @@ -3,7 +3,7 @@ # $FreeBSD: src/lib/libedit/Makefile,v 1.30 2005/08/07 20:51:52 stefanf Exp $ LIB= edit -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 SHLIBDIR?= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ Index: lib/libelf/Version.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libelf/Version.map,v retrieving revision 1.2 diff -u -r1.2 Version.map --- lib/libelf/Version.map 25 Dec 2006 02:22:22 -0000 1.2 +++ lib/libelf/Version.map 2 Mar 2007 15:06:05 -0000 @@ -1,6 +1,6 @@ -# -# $FreeBSD: src/lib/libelf/Version.map,v 1.2 2006/12/25 02:22:22 jkoshy Exp $ -# +/* + * $FreeBSD: src/lib/libelf/Version.map,v 1.2 2006/12/25 02:22:22 jkoshy Exp $ + */ FBSD_1.0 { global: elf32_checksum; @@ -90,10 +90,10 @@ *; }; -# -# Private symbols, mostly test hooks -# -FBSDprivate { +/* + * Private symbols, mostly test hooks + */ +FBSDprivate_1.0 { global: _libelf_set_error; _libelf_get_max_error; Index: lib/libexpat/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libexpat/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- lib/libexpat/Makefile 22 Jul 2005 17:19:00 -0000 1.5 +++ lib/libexpat/Makefile 2 Mar 2007 07:09:25 -0000 @@ -4,7 +4,7 @@ LIB= bsdxml SHLIBDIR?= /lib -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h MAN= libbsdxml.3 Index: lib/libfetch/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libfetch/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- lib/libfetch/Makefile 27 Jul 2006 04:54:03 -0000 1.47 +++ lib/libfetch/Makefile 2 Mar 2007 07:09:31 -0000 @@ -23,7 +23,7 @@ CSTD?= c99 WARNS?= 2 -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 ftperr.h: ftp.errors @echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET} Index: lib/libftpio/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libftpio/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- lib/libftpio/Makefile 27 Jul 2006 04:54:03 -0000 1.15 +++ lib/libftpio/Makefile 2 Mar 2007 07:09:36 -0000 @@ -3,7 +3,7 @@ .include LIB= ftpio -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 SRCS= ftpio.c ftperr.c INCS= ftpio.h Index: lib/libgpib/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libgpib/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- lib/libgpib/Makefile 13 Apr 2006 08:12:31 -0000 1.5 +++ lib/libgpib/Makefile 2 Mar 2007 07:09:44 -0000 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libgpib/Makefile,v 1.5 2006/04/13 08:12:31 ru Exp $ LIB= gpib -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 INCS= gpib.h INCSDIR= ${INCLUDEDIR}/gpib SRCS= ibfoo.c Index: lib/libipsec/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libipsec/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- lib/libipsec/Makefile 18 Mar 2006 11:01:06 -0000 1.19 +++ lib/libipsec/Makefile 2 Mar 2007 07:09:55 -0000 @@ -32,7 +32,7 @@ .include LIB= ipsec -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC .if ${MK_INET6_SUPPORT} != "no" Index: lib/libkiconv/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libkiconv/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- lib/libkiconv/Makefile 22 Jul 2005 17:19:01 -0000 1.3 +++ lib/libkiconv/Makefile 2 Mar 2007 07:10:02 -0000 @@ -5,7 +5,7 @@ SRCS= xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 MAN= kiconv.3 Index: lib/libmagic/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libmagic/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- lib/libmagic/Makefile 19 Jun 2006 08:10:23 -0000 1.9 +++ lib/libmagic/Makefile 2 Mar 2007 07:10:07 -0000 @@ -5,7 +5,7 @@ .PATH: ${CONTRDIR} LIB= magic -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 DPADD= ${LIBZ} LDADD= -lz MAN= libmagic.3 magic.5 Index: lib/libmemstat/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libmemstat/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- lib/libmemstat/Makefile 13 Nov 2005 13:42:03 -0000 1.5 +++ lib/libmemstat/Makefile 2 Mar 2007 07:10:13 -0000 @@ -2,7 +2,7 @@ WARNS?= 3 LIB= memstat -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 DPADD= ${LIBKVM} LDADD= -lkvm SRCS+= memstat.c Index: lib/libmp/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libmp/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- lib/libmp/Makefile 10 Nov 2005 18:07:06 -0000 1.11 +++ lib/libmp/Makefile 2 Mar 2007 07:10:19 -0000 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libmp/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ LIB= mp -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 DPADD= ${LIBCRYPTO} LDADD= -lcrypto MAN= libmp.3 Index: lib/libncp/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libncp/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- lib/libncp/Makefile 16 Mar 2006 15:18:16 -0000 1.8 +++ lib/libncp/Makefile 2 Mar 2007 07:10:23 -0000 @@ -2,7 +2,7 @@ LIB= ncp -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 DPADD= ${LIBIPX} LDADD= -lipx Index: lib/libnetgraph/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libnetgraph/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- lib/libnetgraph/Makefile 22 Jul 2005 17:19:02 -0000 1.11 +++ lib/libnetgraph/Makefile 2 Mar 2007 07:10:27 -0000 @@ -5,7 +5,7 @@ WARNS?= 3 MAN= netgraph.3 -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= sock.c msg.c debug.c INCS= netgraph.h Index: lib/libngatm/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libngatm/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- lib/libngatm/Makefile 22 Jul 2005 17:19:02 -0000 1.6 +++ lib/libngatm/Makefile 2 Mar 2007 07:10:30 -0000 @@ -3,7 +3,7 @@ # Author: Harti Brandt # LIB= ngatm -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 WARNS?= 6 Index: lib/libopie/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libopie/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- lib/libopie/Makefile 22 Jul 2005 17:19:02 -0000 1.21 +++ lib/libopie/Makefile 2 Mar 2007 07:10:34 -0000 @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 KEYFILE?= \"/etc/opiekeys\" Index: lib/libpcap/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libpcap/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- lib/libpcap/Makefile 13 Apr 2006 07:25:02 -0000 1.38 +++ lib/libpcap/Makefile 2 Mar 2007 07:10:40 -0000 @@ -23,7 +23,7 @@ CFLAGS+=-DINET6 .endif -SHLIB_MAJOR=4 +SHLIB_MAJOR=5 # # Magic to grab sources out of src/contrib Index: lib/libpthread/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libpthread/Makefile,v retrieving revision 1.59 diff -u -r1.59 Makefile --- lib/libpthread/Makefile 22 Aug 2006 07:51:07 -0000 1.59 +++ lib/libpthread/Makefile 8 Apr 2007 23:59:00 -0000 @@ -7,13 +7,11 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -.if ${MACHINE_ARCH} == "sparc64" + +.include + LIB=kse -.else -LIB=pthread -SHLIBDIR?= /lib -.endif -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include @@ -37,13 +35,6 @@ VERSION_MAP=${.CURDIR}/pthread.map -.if defined(SYMVER_ENABLED) -# Remove this if library version is bumped and LIBPTHREAD_1_0 -# compatability hacks are removed (see thread/thr_private.h). -LDFLAGS+=-Wl,-zmuldefs -CFLAGS+=-DSYMBOL_VERSIONING -.endif - PRECIOUSLIB= .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" @@ -51,4 +42,15 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" +.if ${DEFAULT_THREAD_LIB} == "libpthread" +SHLIBDIR?= /lib +SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a +.if !defined(NO_PIC) +SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so +.endif +.if ${MK_PROFILE} != "no" +SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a +.endif +.endif + .include Index: lib/libpthread/pthread.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libpthread/pthread.map,v retrieving revision 1.18 diff -u -r1.18 pthread.map --- lib/libpthread/pthread.map 17 May 2006 04:59:59 -0000 1.18 +++ lib/libpthread/pthread.map 2 Mar 2007 14:58:21 -0000 @@ -1,377 +1,10 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.18 2006/05/17 04:59:59 davidxu Exp $ +/* + * $FreeBSD: src/lib/libpthread/pthread.map,v 1.18 2006/05/17 04:59:59 davidxu Exp $ + */ -# -# Hack. libpthread had versioning before libc, but we need to -# reside in the same namespace as libc if we want to override -# libc functions. Use this so we don't break older applications -# that require symbols from "LIBTHREAD_1_0". -# -# From now on, use the same naming scheme as libc. -# -# -LIBTHREAD_1_0 { -global: - ___creat; - __accept; - __close; - __connect; - __error; - __fcntl; - __fsync; - __msync; - __nanosleep; - __open; - __poll; - __pthread_cond_timedwait; - __pthread_cond_wait; - __pthread_mutex_init; - __pthread_mutex_lock; - __pthread_mutex_trylock; - __pthread_mutex_timedlock; - __read; - __readv; - __select; - __sigsuspend; - __sigtimedwait; - __sigwait; - __sigwaitinfo; - __wait4; - __write; - __writev; - _aio_suspend; - _execve; - _fork; - _nanosleep; - _pause; - _pselect; - _pthread_atfork; - _pthread_barrier_destroy; - _pthread_barrier_init; - _pthread_barrier_wait; - _pthread_barrierattr_destroy; - _pthread_barrierattr_getpshared; - _pthread_barrierattr_init; - _pthread_barrierattr_setpshared; - _pthread_attr_destroy; - _pthread_attr_get_np; - _pthread_attr_getdetachstate; - _pthread_attr_getguardsize; - _pthread_attr_getinheritsched; - _pthread_attr_getschedparam; - _pthread_attr_getschedpolicy; - _pthread_attr_getscope; - _pthread_attr_getstack; - _pthread_attr_getstackaddr; - _pthread_attr_getstacksize; - _pthread_attr_init; - _pthread_attr_setcreatesuspend_np; - _pthread_attr_setdetachstate; - _pthread_attr_setguardsize; - _pthread_attr_setinheritsched; - _pthread_attr_setschedparam; - _pthread_attr_setschedpolicy; - _pthread_attr_setscope; - _pthread_attr_setstack; - _pthread_attr_setstackaddr; - _pthread_attr_setstacksize; - _pthread_cancel; - _pthread_cleanup_pop; - _pthread_cleanup_push; - _pthread_cond_broadcast; - _pthread_cond_destroy; - _pthread_cond_init; - _pthread_cond_signal; - _pthread_cond_timedwait; - _pthread_cond_wait; - _pthread_condattr_default; - _pthread_condattr_destroy; - _pthread_condattr_getpshared; - _pthread_condattr_init; - _pthread_condattr_setpshared; - _pthread_create; - _pthread_detach; - _pthread_equal; - _pthread_exit; - _pthread_getconcurrency; - _pthread_getprio; - _pthread_getschedparam; - _pthread_getspecific; - _pthread_join; - _pthread_key_create; - _pthread_key_delete; - _pthread_kill; - _pthread_main_np; - _pthread_multi_np; - _pthread_mutex_destroy; - _pthread_mutex_getprioceiling; - _pthread_mutex_init; - _pthread_mutex_lock; - _pthread_mutex_setprioceiling; - _pthread_mutex_timedlock; - _pthread_mutex_trylock; - _pthread_mutex_unlock; - _pthread_mutexattr_default; - _pthread_mutexattr_destroy; - _pthread_mutexattr_getkind_np; - _pthread_mutexattr_getprioceiling; - _pthread_mutexattr_getprotocol; - _pthread_mutexattr_getpshared; - _pthread_mutexattr_gettype; - _pthread_mutexattr_init; - _pthread_mutexattr_setkind_np; - _pthread_mutexattr_setprioceiling; - _pthread_mutexattr_setprotocol; - _pthread_mutexattr_setpshared; - _pthread_mutexattr_settype; - _pthread_once; - _pthread_resume_all_np; - _pthread_resume_np; - _pthread_rwlock_destroy; - _pthread_rwlock_init; - _pthread_rwlock_rdlock; - _pthread_rwlock_timedrdlock; - _pthread_rwlock_timedwrlock; - _pthread_rwlock_tryrdlock; - _pthread_rwlock_trywrlock; - _pthread_rwlock_unlock; - _pthread_rwlock_wrlock; - _pthread_rwlockattr_destroy; - _pthread_rwlockattr_getpshared; - _pthread_rwlockattr_init; - _pthread_rwlockattr_setpshared; - _pthread_self; - _pthread_set_name_np; - _pthread_setcancelstate; - _pthread_setcanceltype; - _pthread_setconcurrency; - _pthread_setprio; - _pthread_setschedparam; - _pthread_setspecific; - _pthread_sigmask; - _pthread_single_np; - _pthread_spin_destroy; - _pthread_spin_init; - _pthread_spin_lock; - _pthread_spin_trylock; - _pthread_spin_unlock; - _pthread_suspend_all_np; - _pthread_suspend_np; - _pthread_switch_add_np; - _pthread_switch_delete_np; - _pthread_testcancel; - _pthread_yield; - _raise; - _sched_yield; - _sem_init; - _sem_post; - _sem_timedwait; - _sem_wait; - _sigaction; - _sigaltstack; - _sigpending; - _sigprocmask; - _sigsuspend; - _sigtimedwait; - _sigwait; - _sigwaitinfo; - _sleep; - _spinlock; - _spinlock_debug; - _spinunlock; - _system; - _tcdrain; - _usleep; - _vfork; - _wait; - _waitpid; - accept; - aio_suspend; - close; - connect; - creat; - execve; - fcntl; - fork; - fsync; - msync; - nanosleep; - open; - pause; - poll; - pselect; - pthread_atfork; - pthread_barrier_destroy; - pthread_barrier_init; - pthread_barrier_wait; - pthread_barrierattr_destroy; - pthread_barrierattr_getpshared; - pthread_barrierattr_init; - pthread_barrierattr_setpshared; - pthread_attr_destroy; - pthread_attr_get_np; - pthread_attr_getdetachstate; - pthread_attr_getguardsize; - pthread_attr_getinheritsched; - pthread_attr_getschedparam; - pthread_attr_getschedpolicy; - pthread_attr_getscope; - pthread_attr_getstack; - pthread_attr_getstackaddr; - pthread_attr_getstacksize; - pthread_attr_init; - pthread_attr_setcreatesuspend_np; - pthread_attr_setdetachstate; - pthread_attr_setguardsize; - pthread_attr_setinheritsched; - pthread_attr_setschedparam; - pthread_attr_setschedpolicy; - pthread_attr_setscope; - pthread_attr_setstack; - pthread_attr_setstackaddr; - pthread_attr_setstacksize; - pthread_cancel; - pthread_cleanup_pop; - pthread_cleanup_push; - pthread_cond_broadcast; - pthread_cond_destroy; - pthread_cond_init; - pthread_cond_signal; - pthread_cond_timedwait; - pthread_cond_wait; - pthread_condattr_destroy; - pthread_condattr_getpshared; - pthread_condattr_init; - pthread_condattr_setpshared; - pthread_create; - pthread_detach; - pthread_equal; - pthread_exit; - pthread_getconcurrency; - pthread_getprio; - pthread_getschedparam; - pthread_getspecific; - pthread_join; - pthread_key_create; - pthread_key_delete; - pthread_kill; - pthread_main_np; - pthread_multi_np; - pthread_mutex_destroy; - pthread_mutex_getprioceiling; - pthread_mutex_init; - pthread_mutex_lock; - pthread_mutex_setprioceiling; - pthread_mutex_timedlock; - pthread_mutex_trylock; - pthread_mutex_unlock; - pthread_mutexattr_destroy; - pthread_mutexattr_getkind_np; - pthread_mutexattr_getprioceiling; - pthread_mutexattr_getprotocol; - pthread_mutexattr_getpshared; - pthread_mutexattr_gettype; - pthread_mutexattr_init; - pthread_mutexattr_setkind_np; - pthread_mutexattr_setprioceiling; - pthread_mutexattr_setprotocol; - pthread_mutexattr_setpshared; - pthread_mutexattr_settype; - pthread_once; - pthread_resume_all_np; - pthread_resume_np; - pthread_rwlock_destroy; - pthread_rwlock_init; - pthread_rwlock_rdlock; - pthread_rwlock_timedrdlock; - pthread_rwlock_timedwrlock; - pthread_rwlock_tryrdlock; - pthread_rwlock_trywrlock; - pthread_rwlock_unlock; - pthread_rwlock_wrlock; - pthread_rwlockattr_destroy; - pthread_rwlockattr_getpshared; - pthread_rwlockattr_init; - pthread_rwlockattr_setpshared; - pthread_self; - pthread_set_name_np; - pthread_setcancelstate; - pthread_setcanceltype; - pthread_setconcurrency; - pthread_setprio; - pthread_setschedparam; - pthread_setspecific; - pthread_sigmask; - pthread_single_np; - pthread_spin_destroy; - pthread_spin_init; - pthread_spin_lock; - pthread_spin_trylock; - pthread_spin_unlock; - pthread_suspend_all_np; - pthread_suspend_np; - pthread_switch_add_np; - pthread_switch_delete_np; - pthread_testcancel; - pthread_yield; - raise; - read; - readv; - sched_yield; - select; - sem_init; - sem_post; - sem_timedwait; - sem_wait; - sigaction; - sigaltstack; - sigpending; - sigprocmask; - sigsuspend; - sigwait; - sigwaitinfo; - sigtimedwait; - sleep; - system; - tcdrain; - usleep; - vfork; - wait4; - wait; - waitpid; - write; - writev; - - # Debugger needs these. - _libkse_debug; - _thread_activated; - _thread_active_threads; - _thread_keytable; - _thread_list; - _thread_max_keys; - _thread_off_attr_flags; - _thread_off_dtv; - _thread_off_linkmap; - _thread_off_next; - _thread_off_tcb; - _thread_off_tmbx; - _thread_off_key_allocated; - _thread_off_key_destructor; - _thread_off_kse; - _thread_off_kse_locklevel; - _thread_off_state; - _thread_off_thr_locklevel; - _thread_off_tlsindex; - _thread_size_key; - _thread_state_running; - _thread_state_zoombie; - -local: - *; -}; - -# -# Use the same naming scheme as libc. -# +/* + * Use the same naming scheme as libc. + */ FBSD_1.0 { global: __error; @@ -531,11 +164,11 @@ *; }; -# -# List the private interfaces reserved for use in FreeBSD libraries. -# These are not part of our application ABI. -# -FBSDprivate { +/* + * List the private interfaces reserved for use in FreeBSD libraries. + * These are not part of our application ABI. + */ +FBSDprivate_1.0 { global: ___creat; __accept; @@ -706,7 +339,7 @@ _wait; _waitpid; - # Debugger needs these. + /* Debugger needs these. */ _libkse_debug; _thread_activated; _thread_active_threads; Index: lib/libpthread/thread/thr_info.c =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libpthread/thread/thr_info.c,v retrieving revision 1.29 diff -u -r1.29 thr_info.c --- lib/libpthread/thread/thr_info.c 12 Jan 2007 07:26:18 -0000 1.29 +++ lib/libpthread/thread/thr_info.c 7 Mar 2007 23:43:32 -0000 @@ -214,12 +214,29 @@ void _pthread_set_name_np(pthread_t thread, char *name) { + struct pthread *curthread = _get_curthread(); + char *new_name; + char *prev_name; + + new_name = strdup(name); /* Check if the caller has specified a valid thread: */ - if (thread != NULL && thread->magic == THR_MAGIC) { + if (curthread == thread) { if (thread->name != NULL) { /* Free space for previous name. */ free(thread->name); } - thread->name = strdup(name); + thread->name = new_name; + } + else if (_thr_ref_add(curthread, thread, 0) != 0) + free(new_name); + else { + THR_THREAD_LOCK(curthread, thread); + prev_name = thread->name; + thread->name = new_name; + THR_THREAD_UNLOCK(curthread, thread); + if (prev_name != NULL) { + /* Free space for previous name. */ + free(prev_name); + } } } Index: lib/libpthread/thread/thr_private.h =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libpthread/thread/thr_private.h,v retrieving revision 1.128 diff -u -r1.128 thr_private.h --- lib/libpthread/thread/thr_private.h 12 Jan 2007 07:26:18 -0000 1.128 +++ lib/libpthread/thread/thr_private.h 2 Mar 2007 14:52:52 -0000 @@ -64,7 +64,8 @@ * LIBTHREAD_1_0, we need to provide a compatible interface for * those symbols. */ -#if defined(SYMBOL_VERSIONING) && defined(PIC) +/* #if defined(SYMBOL_VERSIONING) && defined(PIC) */ +#if 0 #define SYM_LT10(sym) __CONCAT(sym, _lt10) #define SYM_FB10(sym) __CONCAT(sym, _fb10) #define SYM_FBP10(sym) __CONCAT(sym, _fbp10) Index: lib/libradius/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libradius/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- lib/libradius/Makefile 17 Mar 2006 18:54:27 -0000 1.14 +++ lib/libradius/Makefile 2 Mar 2007 07:10:50 -0000 @@ -30,7 +30,7 @@ SRCS= radlib.c INCS= radlib.h radlib_vs.h CFLAGS+= -Wall -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 MAN= libradius.3 radius.conf.5 .if ${MK_OPENSSL} == "no" Index: lib/librt/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/librt/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- lib/librt/Makefile 15 Mar 2006 10:41:58 -0000 1.2 +++ lib/librt/Makefile 9 Apr 2007 10:31:14 -0000 @@ -11,4 +11,6 @@ PRECIOUSLIB= +VERSION_MAP= ${.CURDIR}/Version.map + .include Index: lib/librt/Version.map =================================================================== RCS file: lib/librt/Version.map diff -N lib/librt/Version.map --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lib/librt/Version.map 2 Mar 2007 07:20:04 -0000 @@ -0,0 +1,69 @@ +/* + * $FreeBSD$ + */ + +FBSD_1.0 { + aio_read; + aio_write; + aio_return; + aio_waitcomplete; + aio_fsync; + mq_open; + mq_close; + mq_notify; + mq_getattr; + mq_setattr; + mq_timedreceive; + mq_timedsend; + mq_unlink; + mq_send; + mq_receive; + timer_create; + timer_delete; + timer_gettime; + timer_settime; + timer_getoverrun; +}; + +FBSDprivate_1.0 { + _aio_read; + _aio_write; + _aio_return; + _aio_waitcomplete; + _aio_fsync; + __aio_read; + __aio_write; + __aio_return; + __aio_waitcomplete; + __aio_fsync; + _mq_open; + _mq_close; + _mq_notify; + _mq_getattr; + _mq_setattr; + _mq_timedreceive; + _mq_timedsend; + _mq_unlink; + _mq_send; + _mq_receive; + __mq_open; + __mq_close; + __mq_notify; + __mq_getattr; + __mq_setattr; + __mq_timedreceive; + __mq_timedsend; + __mq_unlink; + __mq_send; + __mq_receive; + _timer_create; + _timer_delete; + _timer_gettime; + _timer_settime; + _timer_getoverrun; + __timer_create; + __timer_delete; + __timer_gettime; + __timer_settime; + __timer_getoverrun; +}; Index: lib/libsdp/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libsdp/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- lib/libsdp/Makefile 22 Jul 2005 17:19:03 -0000 1.4 +++ lib/libsdp/Makefile 2 Mar 2007 07:11:01 -0000 @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= search.c service.c session.c util.c INCS= sdp.h Index: lib/libsmb/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libsmb/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- lib/libsmb/Makefile 16 Mar 2006 15:18:16 -0000 1.10 +++ lib/libsmb/Makefile 2 Mar 2007 07:11:05 -0000 @@ -4,7 +4,7 @@ .PATH: ${CONTRIBDIR}/lib/smb LIB= smb -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 DPADD= ${LIBKICONV} LDADD= -lkiconv Index: lib/libtacplus/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libtacplus/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- lib/libtacplus/Makefile 22 Jul 2005 17:19:03 -0000 1.7 +++ lib/libtacplus/Makefile 2 Mar 2007 07:11:13 -0000 @@ -30,7 +30,7 @@ CFLAGS+= -Wall DPADD= ${LIBMD} LDADD= -lmd -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 MAN= libtacplus.3 tacplus.conf.5 .include Index: lib/libthr/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libthr/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- lib/libthr/Makefile 26 Nov 2006 14:36:33 -0000 1.21 +++ lib/libthr/Makefile 5 Mar 2007 19:42:25 -0000 @@ -10,12 +10,8 @@ .include -.if ${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no" -SHLIBDIR= /lib -.endif - LIB=thr -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include @@ -42,7 +38,8 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no" +.if ${DEFAULT_THREAD_LIB} == "libthr" +SHLIBDIR?= /lib SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so Index: lib/libthr/pthread.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libthr/pthread.map,v retrieving revision 1.16 diff -u -r1.16 pthread.map --- lib/libthr/pthread.map 25 Jul 2006 12:50:04 -0000 1.16 +++ lib/libthr/pthread.map 2 Mar 2007 14:58:04 -0000 @@ -1,381 +1,10 @@ -# $FreeBSD: src/lib/libthr/pthread.map,v 1.16 2006/07/25 12:50:04 davidxu Exp $ -LIBTHREAD_1_0 { -global: - ___creat; - ___pause; - ___pselect; - ___sleep; - ___system; - ___tcdrain; - ___usleep; - ___wait; - ___waitpid; - __accept; - __aio_suspend; - __close; - __connect; - __error; - __fcntl; - __fsync; - __msync; - __nanosleep; - __open; - __poll; - __pthread_cond_timedwait; - __pthread_cond_wait; - __pthread_mutex_init; - __pthread_mutex_lock; - __pthread_mutex_timedlock; - __pthread_mutex_trylock; - __read; - __readv; - __recvfrom; - __recvmsg; - __select; - __sendmsg; - __sendto; - __sigsuspend; - __sigtimedwait; - __sigwait; - __sigwaitinfo; - __wait3; - __wait4; - __write; - __writev; - _fork; - _pthread_atfork; - _pthread_barrier_destroy; - _pthread_barrier_init; - _pthread_barrier_wait; - _pthread_barrierattr_destroy; - _pthread_barrierattr_getpshared; - _pthread_barrierattr_init; - _pthread_barrierattr_setpshared; - _pthread_attr_destroy; - _pthread_attr_get_np; - _pthread_attr_getdetachstate; - _pthread_attr_getguardsize; - _pthread_attr_getinheritsched; - _pthread_attr_getschedparam; - _pthread_attr_getschedpolicy; - _pthread_attr_getscope; - _pthread_attr_getstack; - _pthread_attr_getstackaddr; - _pthread_attr_getstacksize; - _pthread_attr_init; - _pthread_attr_setcreatesuspend_np; - _pthread_attr_setdetachstate; - _pthread_attr_setguardsize; - _pthread_attr_setinheritsched; - _pthread_attr_setschedparam; - _pthread_attr_setschedpolicy; - _pthread_attr_setscope; - _pthread_attr_setstack; - _pthread_attr_setstackaddr; - _pthread_attr_setstacksize; - _pthread_cancel; - _pthread_cleanup_pop; - _pthread_cleanup_push; - _pthread_cond_broadcast; - _pthread_cond_destroy; - _pthread_cond_init; - _pthread_cond_signal; - _pthread_cond_timedwait; - _pthread_cond_wait; - _pthread_condattr_destroy; - _pthread_condattr_getclock; - _pthread_condattr_getpshared; - _pthread_condattr_init; - _pthread_condattr_setclock; - _pthread_condattr_setpshared; - _pthread_create; - _pthread_detach; - _pthread_equal; - _pthread_exit; - _pthread_getconcurrency; - _pthread_getprio; - _pthread_getschedparam; - _pthread_getspecific; - _pthread_join; - _pthread_key_create; - _pthread_key_delete; - _pthread_kill; - _pthread_main_np; - _pthread_multi_np; - _pthread_mutex_destroy; - _pthread_mutex_getprioceiling; - _pthread_mutex_init; - _pthread_mutex_lock; - _pthread_mutex_setprioceiling; - _pthread_mutex_timedlock; - _pthread_mutex_trylock; - _pthread_mutex_unlock; - _pthread_mutexattr_destroy; - _pthread_mutexattr_getkind_np; - _pthread_mutexattr_getprioceiling; - _pthread_mutexattr_getprotocol; - _pthread_mutexattr_getpshared; - _pthread_mutexattr_gettype; - _pthread_mutexattr_init; - _pthread_mutexattr_setkind_np; - _pthread_mutexattr_setprioceiling; - _pthread_mutexattr_setprotocol; - _pthread_mutexattr_setpshared; - _pthread_mutexattr_settype; - _pthread_once; - _pthread_resume_all_np; - _pthread_resume_np; - _pthread_rwlock_destroy; - _pthread_rwlock_init; - _pthread_rwlock_rdlock; - _pthread_rwlock_timedrdlock; - _pthread_rwlock_timedwrlock; - _pthread_rwlock_tryrdlock; - _pthread_rwlock_trywrlock; - _pthread_rwlock_unlock; - _pthread_rwlock_wrlock; - _pthread_rwlockattr_destroy; - _pthread_rwlockattr_getpshared; - _pthread_rwlockattr_init; - _pthread_rwlockattr_setpshared; - _pthread_self; - _pthread_set_name_np; - _pthread_setcancelstate; - _pthread_setcanceltype; - _pthread_setconcurrency; - _pthread_setprio; - _pthread_setschedparam; - _pthread_setspecific; - _pthread_sigmask; - _pthread_single_np; - _pthread_spin_destroy; - _pthread_spin_init; - _pthread_spin_lock; - _pthread_spin_trylock; - _pthread_spin_unlock; - _pthread_suspend_all_np; - _pthread_suspend_np; - _pthread_switch_add_np; - _pthread_switch_delete_np; - _pthread_testcancel; - _pthread_timedjoin_np; - _pthread_yield; - _raise; - _sem_destroy; - _sem_getvalue; - _sem_init; - _sem_post; - _sem_timedwait; - _sem_trywait; - _sem_wait; - _sigaction; - _sigprocmask; - _sigsuspend; - _sigtimedwait; - _sigwait; - _sigwaitinfo; - _spinlock; - _spinlock_debug; - _spinunlock; - _vfork; - accept; - aio_suspend; - close; - connect; - creat; - execve; - fcntl; - fork; - fsync; - msync; - nanosleep; - open; - pause; - poll; - pselect; - pthread_atfork; - pthread_barrier_destroy; - pthread_barrier_init; - pthread_barrier_wait; - pthread_barrierattr_destroy; - pthread_barrierattr_getpshared; - pthread_barrierattr_init; - pthread_barrierattr_setpshared; - pthread_attr_destroy; - pthread_attr_get_np; - pthread_attr_getdetachstate; - pthread_attr_getguardsize; - pthread_attr_getinheritsched; - pthread_attr_getschedparam; - pthread_attr_getschedpolicy; - pthread_attr_getscope; - pthread_attr_getstack; - pthread_attr_getstackaddr; - pthread_attr_getstacksize; - pthread_attr_init; - pthread_attr_setcreatesuspend_np; - pthread_attr_setdetachstate; - pthread_attr_setguardsize; - pthread_attr_setinheritsched; - pthread_attr_setschedparam; - pthread_attr_setschedpolicy; - pthread_attr_setscope; - pthread_attr_setstack; - pthread_attr_setstackaddr; - pthread_attr_setstacksize; - pthread_cancel; - pthread_cleanup_pop; - pthread_cleanup_push; - pthread_cond_broadcast; - pthread_cond_destroy; - pthread_cond_init; - pthread_cond_signal; - pthread_cond_timedwait; - pthread_cond_wait; - pthread_condattr_destroy; - pthread_condattr_getclock; - pthread_condattr_getpshared; - pthread_condattr_init; - pthread_condattr_setclock; - pthread_condattr_setpshared; - pthread_create; - pthread_detach; - pthread_equal; - pthread_exit; - pthread_getconcurrency; - pthread_getprio; - pthread_getschedparam; - pthread_getspecific; - pthread_join; - pthread_key_create; - pthread_key_delete; - pthread_kill; - pthread_main_np; - pthread_multi_np; - pthread_mutex_destroy; - pthread_mutex_getprioceiling; - pthread_mutex_init; - pthread_mutex_lock; - pthread_mutex_setprioceiling; - pthread_mutex_timedlock; - pthread_mutex_trylock; - pthread_mutex_unlock; - pthread_mutexattr_destroy; - pthread_mutexattr_getkind_np; - pthread_mutexattr_getprioceiling; - pthread_mutexattr_getpshared; - pthread_mutexattr_getprotocol; - pthread_mutexattr_gettype; - pthread_mutexattr_init; - pthread_mutexattr_setkind_np; - pthread_mutexattr_setprioceiling; - pthread_mutexattr_setprotocol; - pthread_mutexattr_setpshared; - pthread_mutexattr_settype; - pthread_once; - pthread_resume_all_np; - pthread_resume_np; - pthread_rwlock_destroy; - pthread_rwlock_init; - pthread_rwlock_rdlock; - pthread_rwlock_timedrdlock; - pthread_rwlock_timedwrlock; - pthread_rwlock_tryrdlock; - pthread_rwlock_trywrlock; - pthread_rwlock_unlock; - pthread_rwlock_wrlock; - pthread_rwlockattr_destroy; - pthread_rwlockattr_getpshared; - pthread_rwlockattr_init; - pthread_rwlockattr_setpshared; - pthread_self; - pthread_set_name_np; - pthread_setcancelstate; - pthread_setcanceltype; - pthread_setconcurrency; - pthread_setprio; - pthread_setschedparam; - pthread_setspecific; - pthread_sigmask; - pthread_single_np; - pthread_spin_destroy; - pthread_spin_init; - pthread_spin_lock; - pthread_spin_trylock; - pthread_spin_unlock; - pthread_suspend_all_np; - pthread_suspend_np; - pthread_switch_add_np; - pthread_switch_delete_np; - pthread_testcancel; - pthread_timedjoin_np; - pthread_yield; - raise; - read; - readv; - recvfrom; - recvmsg; - select; - sem_destroy; - sem_getvalue; - sem_init; - sem_post; - sem_timedwait; - sem_trywait; - sem_wait; - sendmsg; - sendto; - sigaction; - sigprocmask; - sigsuspend; - sigwait; - sigwaitinfo; - sigtimedwait; - sleep; - system; - tcdrain; - usleep; - vfork; - wait; - wait3; - wait4; - waitpid; - write; - writev; - - # Debugger needs these. - _libthr_debug; - _thread_active_threads; - _thread_bp_create; - _thread_bp_death; - _thread_event_mask; - _thread_keytable; - _thread_last_event; - _thread_list; - _thread_max_keys; - _thread_off_attr_flags; - _thread_off_dtv; - _thread_off_event_buf; - _thread_off_event_mask; - _thread_off_key_allocated; - _thread_off_key_destructor; - _thread_off_linkmap; - _thread_off_next; - _thread_off_report_events; - _thread_off_state; - _thread_off_tcb; - _thread_off_tid; - _thread_off_tlsindex; - _thread_size_key; - _thread_state_running; - _thread_state_zoombie; -local: - *; -}; +/* + * $FreeBSD: src/lib/libthr/pthread.map,v 1.16 2006/07/25 12:50:04 davidxu Exp $ + */ -# -# Use the same naming scheme as libc. -# +/* + * Use the same naming scheme as libc. + */ FBSD_1.0 { global: __error; @@ -547,11 +176,11 @@ *; }; -# -# List the private interfaces reserved for use in FreeBSD libraries. -# These are not part of our application ABI. -# -FBSDprivate { +/* + * List the private interfaces reserved for use in FreeBSD libraries. + * These are not part of our application ABI. + */ +FBSDprivate_1.0 { global: ___creat; ___pause; @@ -730,7 +359,7 @@ _spinunlock; _vfork; - # Debugger needs these. + /* Debugger needs these. */ _libthr_debug; _thread_active_threads; _thread_bp_create; Index: lib/libthread_db/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libthread_db/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- lib/libthread_db/Makefile 5 Oct 2006 06:26:31 -0000 1.8 +++ lib/libthread_db/Makefile 8 Apr 2007 23:37:36 -0000 @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} LIB= thread_db -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= thread_db.c SRCS+= libpthread_db.c libpthread_md.c SRCS+= libthr_db.c @@ -13,7 +13,7 @@ CFLAGS+=-I. -I${.CURDIR} SYM_MAPS+=${.CURDIR}/Symbol.map -.if defined(SYMVER_ENABLED) +.if !defined(NO_SYMVER) SYMBOL_MAPS=${SYM_MAPS} VERSION_DEF=${.CURDIR}/../libc/Versions.def .endif Index: lib/libthread_db/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libthread_db/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/libthread_db/Symbol.map 29 Mar 2006 14:08:45 -0000 1.1 +++ lib/libthread_db/Symbol.map 2 Mar 2007 15:00:08 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/libthread_db/Symbol.map,v 1.1 2006/03/29 14:08:45 deischen Exp $ +/* + * $FreeBSD: src/lib/libthread_db/Symbol.map,v 1.1 2006/03/29 14:08:45 deischen Exp $ + */ FBSD_1.0 { td_init; @@ -20,12 +22,14 @@ td_thr_get_info; td_thr_getfpregs; td_thr_getgregs; - td_thr_getxmmregs; # x86 only +#if defined(i386) + td_thr_getxmmregs; + td_thr_setxmmregs; +#endif td_thr_set_event; td_thr_setfpregs; td_thr_setgregs; - td_thr_setxmmregs; # x86 only - td_thr_sstep; # FreeBSD extension to GDB<->thread interface + td_thr_sstep; /* FreeBSD extension to GDB<->thread interface */ td_thr_tls_get_addr; td_thr_validate; }; Index: lib/libugidfw/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libugidfw/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- lib/libugidfw/Makefile 22 Jul 2005 17:19:04 -0000 1.7 +++ lib/libugidfw/Makefile 2 Mar 2007 07:11:26 -0000 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $ LIB= ugidfw -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= ugidfw.c INCS= ugidfw.h Index: lib/libusbhid/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libusbhid/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- lib/libusbhid/Makefile 22 Jul 2005 17:19:04 -0000 1.10 +++ lib/libusbhid/Makefile 2 Mar 2007 07:11:30 -0000 @@ -4,7 +4,7 @@ LIB= usbhid MAN= usbhid.3 -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \ usbhid.3 hid_dispose_report_desc.3 \ Index: lib/libutil/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libutil/Makefile,v retrieving revision 1.63 diff -u -r1.63 Makefile --- lib/libutil/Makefile 27 Jul 2006 12:36:46 -0000 1.63 +++ lib/libutil/Makefile 2 Mar 2007 07:11:35 -0000 @@ -6,7 +6,7 @@ .include LIB= util -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 SRCS= _secure_path.c auth.c fparseln.c humanize_number.c kld.c login.c \ login_auth.c login_cap.c login_class.c login_crypt.c login_ok.c \ Index: lib/libvgl/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libvgl/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- lib/libvgl/Makefile 22 Jul 2005 17:19:04 -0000 1.11 +++ lib/libvgl/Makefile 2 Mar 2007 07:11:39 -0000 @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $ LIB= vgl -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 CFLAGS+=-Wall -I${.CURDIR} SRCS= main.c simple.c bitmap.c text.c mouse.c keyboard.c INCS= vgl.h Index: lib/libwrap/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libwrap/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- lib/libwrap/Makefile 27 Feb 2007 16:13:19 -0000 1.21 +++ lib/libwrap/Makefile 4 Mar 2007 17:10:22 -0000 @@ -5,7 +5,7 @@ .include LIB= wrap -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 Index: lib/libypclnt/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/libypclnt/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- lib/libypclnt/Makefile 30 Mar 2007 06:12:45 -0000 1.15 +++ lib/libypclnt/Makefile 7 Mar 2007 20:29:17 -0000 @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libypclnt/Makefile,v 1.15 2007/03/30 06:12:45 trhodes Exp $ LIB= ypclnt -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= ypclnt_connect.c \ ypclnt_error.c \ ypclnt_free.c \ Index: lib/msun/Makefile =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/Makefile,v retrieving revision 1.76 diff -u -r1.76 Makefile --- lib/msun/Makefile 7 Jan 2007 07:54:20 -0000 1.76 +++ lib/msun/Makefile 8 Apr 2007 23:37:50 -0000 @@ -26,7 +26,7 @@ LIB= m SHLIBDIR?= /lib -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \ e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \ e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \ @@ -63,7 +63,7 @@ CFLAGS+= -I${LIBCDIR}/include -I${LIBCDIR}/${MACHINE_ARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map -.if defined(SYMVER_ENABLED) +.if !defined(NO_SYMVER) VERSION_DEF= ${LIBCDIR}/Versions.def SYMBOL_MAPS= ${SYM_MAPS} .endif Index: lib/msun/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/Symbol.map,v retrieving revision 1.3 diff -u -r1.3 Symbol.map --- lib/msun/Symbol.map 7 Jan 2007 07:54:21 -0000 1.3 +++ lib/msun/Symbol.map 2 Mar 2007 15:02:20 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/msun/Symbol.map,v 1.3 2007/01/07 07:54:21 das Exp $ +/* + * $FreeBSD: src/lib/msun/Symbol.map,v 1.3 2007/01/07 07:54:21 das Exp $ + */ FBSD_1.0 { __fe_dfl_env; tgamma; Index: lib/msun/amd64/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/amd64/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/msun/amd64/Symbol.map 27 Mar 2006 23:59:44 -0000 1.1 +++ lib/msun/amd64/Symbol.map 2 Mar 2007 15:02:35 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/msun/amd64/Symbol.map,v 1.1 2006/03/27 23:59:44 deischen Exp $ +/* + * $FreeBSD: src/lib/msun/amd64/Symbol.map,v 1.1 2006/03/27 23:59:44 deischen Exp $ + */ FBSD_1.0 { fesetexceptflag; feraiseexcept; Index: lib/msun/arm/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/arm/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/msun/arm/Symbol.map 27 Mar 2006 23:59:44 -0000 1.1 +++ lib/msun/arm/Symbol.map 2 Mar 2007 15:02:46 -0000 @@ -1,3 +1,5 @@ -# $FreeBSD: src/lib/msun/arm/Symbol.map,v 1.1 2006/03/27 23:59:44 deischen Exp $ +/* + * $FreeBSD: src/lib/msun/arm/Symbol.map,v 1.1 2006/03/27 23:59:44 deischen Exp $ + */ FBSD_1.0 { }; Index: lib/msun/i387/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/i387/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/msun/i387/Symbol.map 27 Mar 2006 23:59:45 -0000 1.1 +++ lib/msun/i387/Symbol.map 2 Mar 2007 15:02:55 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/msun/i387/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ +/* + * $FreeBSD: src/lib/msun/i387/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ + */ FBSD_1.0 { __has_sse; __test_sse; Index: lib/msun/ia64/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/ia64/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/msun/ia64/Symbol.map 27 Mar 2006 23:59:45 -0000 1.1 +++ lib/msun/ia64/Symbol.map 2 Mar 2007 15:03:02 -0000 @@ -1,4 +1,6 @@ -# $FreeBSD: src/lib/msun/ia64/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ +/* + * $FreeBSD: src/lib/msun/ia64/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ + */ FBSD_1.0 { feupdateenv; }; Index: lib/msun/powerpc/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/powerpc/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/msun/powerpc/Symbol.map 27 Mar 2006 23:59:45 -0000 1.1 +++ lib/msun/powerpc/Symbol.map 2 Mar 2007 15:03:10 -0000 @@ -1,3 +1,5 @@ -# $FreeBSD: src/lib/msun/powerpc/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ +/* + * $FreeBSD: src/lib/msun/powerpc/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ + */ FBSD_1.0 { }; Index: lib/msun/sparc64/Symbol.map =================================================================== RCS file: /opt/FreeBSD/cvs/src/lib/msun/sparc64/Symbol.map,v retrieving revision 1.1 diff -u -r1.1 Symbol.map --- lib/msun/sparc64/Symbol.map 27 Mar 2006 23:59:45 -0000 1.1 +++ lib/msun/sparc64/Symbol.map 2 Mar 2007 15:03:17 -0000 @@ -1,3 +1,5 @@ -# $FreeBSD: src/lib/msun/sparc64/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ +/* + * $FreeBSD: src/lib/msun/sparc64/Symbol.map,v 1.1 2006/03/27 23:59:45 deischen Exp $ + */ FBSD_1.0 { }; Index: share/mk/bsd.lib.mk =================================================================== RCS file: /opt/FreeBSD/cvs/src/share/mk/bsd.lib.mk,v retrieving revision 1.180 diff -u -r1.180 bsd.lib.mk --- share/mk/bsd.lib.mk 3 Apr 2007 18:56:05 -0000 1.180 +++ share/mk/bsd.lib.mk 7 Mar 2007 20:31:03 -0000 @@ -24,6 +24,8 @@ SONAME?= ${SHLIB_NAME} .endif +DEFAULT_THREAD_LIB?= libthr + .if defined(CRUNCH_CFLAGS) CFLAGS+= ${CRUNCH_CFLAGS} .endif Index: share/mk/bsd.symver.mk =================================================================== RCS file: /opt/FreeBSD/cvs/src/share/mk/bsd.symver.mk,v retrieving revision 1.1 diff -u -r1.1 bsd.symver.mk --- share/mk/bsd.symver.mk 3 Apr 2007 18:56:05 -0000 1.1 +++ share/mk/bsd.symver.mk 7 Mar 2007 20:30:29 -0000 @@ -35,8 +35,10 @@ .endif .endfor +# Run the symbol maps through the C preprocessor before passing +# them to the symbol version generator. ${VERSION_MAP}: ${VERSION_DEF} ${_vgen} ${SYMBOL_MAPS} - awk -v vfile=${VERSION_DEF} -f ${_vgen} ${SYMBOL_MAPS} \ - > ${.TARGET} + cat ${SYMBOL_MAPS} | ${CPP} - - \ + | awk -v vfile=${VERSION_DEF} -f ${_vgen} > ${.TARGET} .endif # !empty(VERSION_DEF) && !empty(SYMBOL_MAPS) .endif # !target(____) Index: share/mk/version_gen.awk =================================================================== RCS file: /opt/FreeBSD/cvs/src/share/mk/version_gen.awk,v retrieving revision 1.1 diff -u -r1.1 version_gen.awk --- share/mk/version_gen.awk 16 Mar 2006 15:12:26 -0000 1.1 +++ share/mk/version_gen.awk 1 Mar 2007 14:00:46 -0000 @@ -34,6 +34,7 @@ # version name. # symbols[][] - array index by [version name, symbol index], contains # names of symbols defined for each version. +# order[] - array (1 .. n) of version names in order they are defined # BEGIN { brackets = 0; @@ -53,6 +54,7 @@ symver = $1; versions[symver] = 1; successors[symver] = ""; + order[version_count] = symver; version_count++; } else if (/^[ \t]*} *[a-zA-Z0-9._]+ *;/) { @@ -142,17 +144,18 @@ } END { - for (v in versions) { + for (i = 0; i < version_count; i++) { + v = order[i]; printf("\n"); printf("%s {\n", v); # The version count is always one more that actual, # so the loop ranges from 1 to n-1. # - for (i = 1; i < versions[v]; i++) { - if (i == 1) + for (j = 1; j < versions[v]; j++) { + if (j == 1) printf("global:\n"); - printf("\t%s\n", symbols[v, i]); + printf("\t%s\n", symbols[v, j]); } if (successors[v] == "") { # This version succeeds no other version.