Module Name: src
Committed By: agc
Date: Sun Mar 31 23:06:44 UTC 2013
Modified Files:
src/external/cddl/osnet/lib/libzpool [agc-symver]: Makefile
src/external/cddl/osnet/sbin/zpool [agc-symver]: Makefile
Added Files:
src/lib/libpthread [agc-symver]: Version.map
Log Message:
add symbol versioning information for libpthread
To generate a diff of this commit:
cvs rdiff -u -r1.6.18.1 -r1.6.18.2 \
src/external/cddl/osnet/lib/libzpool/Makefile
cvs rdiff -u -r1.4.18.1 -r1.4.18.2 \
src/external/cddl/osnet/sbin/zpool/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/lib/libpthread/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.6.18.1 src/external/cddl/osnet/lib/libzpool/Makefile:1.6.18.2
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.6.18.1 Tue Mar 26 01:59:13 2013
+++ src/external/cddl/osnet/lib/libzpool/Makefile Sun Mar 31 23:06:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.18.1 2013/03/26 01:59:13 agc Exp $
+# $NetBSD: Makefile,v 1.6.18.2 2013/03/31 23:06:42 agc Exp $
.include <bsd.own.mk>
@@ -12,9 +12,8 @@
.PATH: ${.CURDIR}/../../dist/uts/common/os
LIB= zpool
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CPPFLAGS+= -std=c99
#CPPFLAGS+=-Wall -Wno-unknown-pragmas
Index: src/external/cddl/osnet/sbin/zpool/Makefile
diff -u src/external/cddl/osnet/sbin/zpool/Makefile:1.4.18.1 src/external/cddl/osnet/sbin/zpool/Makefile:1.4.18.2
--- src/external/cddl/osnet/sbin/zpool/Makefile:1.4.18.1 Tue Mar 26 01:59:13 2013
+++ src/external/cddl/osnet/sbin/zpool/Makefile Sun Mar 31 23:06:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.18.1 2013/03/26 01:59:13 agc Exp $
+# $NetBSD: Makefile,v 1.4.18.2 2013/03/31 23:06:43 agc Exp $
.include <bsd.own.mk>
@@ -31,9 +31,10 @@ LDADD+= -L${LIBUMEM_OBJDIR} -lum
LIBZPOOL_OBJDIR!= cd ${LIBZPOOL_SRCDIR} && ${PRINTOBJDIR}
LDADD+= -L${LIBZPOOL_OBJDIR} -lzpool
-LDADD+= -lm -lutil -lpthread
+LDADD+= -lm -lutil
-PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+PROGDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
.PATH: ${ZFSDIR}/dist/cmd/zpool
Added files:
Index: src/lib/libpthread/Version.map
diff -u /dev/null src/lib/libpthread/Version.map:1.1.2.1
--- /dev/null Sun Mar 31 23:06:44 2013
+++ src/lib/libpthread/Version.map Sun Mar 31 23:06:43 2013
@@ -0,0 +1,246 @@
+LIBPTHREAD_private_1.1.0.0 {
+};
+
+LIBPTHREAD_1.1.0.0 {
+global:
+ ___msync13;
+ ___nanosleep50;
+ __aio_suspend50;
+ __kevent50;
+ __libc_cond_broadcast;
+ __libc_cond_destroy;
+ __libc_cond_init;
+ __libc_cond_signal;
+ __libc_cond_timedwait;
+ __libc_cond_wait;
+ __libc_mutex_destroy;
+ __libc_mutex_init;
+ __libc_mutex_lock;
+ __libc_mutex_trylock;
+ __libc_mutex_unlock;
+ __libc_mutexattr_destroy;
+ __libc_mutexattr_init;
+ __libc_mutexattr_settype;
+ __libc_rwlock_destroy;
+ __libc_rwlock_init;
+ __libc_rwlock_rdlock;
+ __libc_rwlock_tryrdlock;
+ __libc_rwlock_trywrlock;
+ __libc_rwlock_unlock;
+ __libc_rwlock_wrlock;
+ __libc_thr_create;
+ __libc_thr_curcpu;
+ __libc_thr_equal;
+ __libc_thr_errno;
+ __libc_thr_exit;
+ __libc_thr_getspecific;
+ __libc_thr_init;
+ __libc_thr_keycreate;
+ __libc_thr_keydelete;
+ __libc_thr_once;
+ __libc_thr_self;
+ __libc_thr_setcancelstate;
+ __libc_thr_setspecific;
+ __libc_thr_sigsetmask;
+ __libc_thr_yield;
+ __mq_timedreceive50;
+ __mq_timedsend50;
+ __msync13;
+ __nanosleep50;
+ __pollts50;
+ __pselect50;
+ __res_get_state;
+ __res_put_state;
+ __res_state;
+ __select50;
+ __sigprocmask14;
+ __sigsuspend14;
+ __sigtimedwait50;
+ __uselibcstub;
+ __wait450;
+ _close;
+ _fcntl;
+ _fdatasync;
+ _fini;
+ _fsync;
+ _fsync_range;
+ _init;
+ _mq_receive;
+ _mq_send;
+ _msgrcv;
+ _msgsnd;
+ _open;
+ _poll;
+ _pread;
+ _pthread_attr_get_np;
+ _pthread_cond_has_waiters_np;
+ _pthread_mutex_held_np;
+ _pthread_mutex_owner_np;
+ _pthread_rwlock_held_np;
+ _pthread_rwlock_rdheld_np;
+ _pthread_rwlock_wrheld_np;
+ _pwrite;
+ _read;
+ _readv;
+ _sigwait;
+ _write;
+ _writev;
+ accept;
+ close;
+ connect;
+ fcntl;
+ fdatasync;
+ fsync;
+ fsync_range;
+ mq_receive;
+ mq_send;
+ msgrcv;
+ msgsnd;
+ open;
+ poll;
+ pread;
+ pthread__allqueue;
+ pthread__alltree_lock;
+ pthread__cancel_stub_binder;
+ pthread__cleanup_pop;
+ pthread__cleanup_push;
+ pthread__concurrency;
+ pthread__dbg;
+ pthread__deadqueue;
+ pthread__deadqueue_lock;
+ pthread__errno;
+ pthread__init;
+ pthread__lock_ops;
+ pthread__lock_ras_end;
+ pthread__lock_ras_start;
+ pthread__nspins;
+ pthread__pagesize;
+ pthread__sched_yield;
+ pthread__stacksize;
+ pthread__started;
+ pthread__static_lib_binder;
+ pthread__tsd_destructors;
+ pthread__tsd_list;
+ pthread__unpark_max;
+ pthread_attr_destroy;
+ pthread_attr_get_np;
+ pthread_attr_getdetachstate;
+ pthread_attr_getguardsize;
+ pthread_attr_getinheritsched;
+ pthread_attr_getname_np;
+ 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_setname_np;
+ pthread_attr_setschedparam;
+ pthread_attr_setschedpolicy;
+ pthread_attr_setscope;
+ pthread_attr_setstack;
+ pthread_attr_setstackaddr;
+ pthread_attr_setstacksize;
+ pthread_barrier_destroy;
+ pthread_barrier_init;
+ pthread_barrier_wait;
+ pthread_barrierattr_destroy;
+ pthread_barrierattr_init;
+ pthread_cancel;
+ pthread_cond_broadcast;
+ pthread_cond_destroy;
+ pthread_cond_has_waiters_np;
+ pthread_cond_init;
+ pthread_cond_signal;
+ pthread_cond_timedwait;
+ pthread_cond_wait;
+ pthread_condattr_destroy;
+ pthread_condattr_init;
+ pthread_condattr_setclock;
+ pthread_create;
+ pthread_curcpu_np;
+ pthread_detach;
+ pthread_equal;
+ pthread_exit;
+ pthread_getaffinity_np;
+ pthread_getattr_np;
+ pthread_getname_np;
+ pthread_getschedparam;
+ pthread_getspecific;
+ pthread_join;
+ pthread_key_create;
+ pthread_key_delete;
+ pthread_kill;
+ pthread_mutex_destroy;
+ pthread_mutex_held_np;
+ pthread_mutex_init;
+ pthread_mutex_lock;
+ pthread_mutex_owner_np;
+ pthread_mutex_trylock;
+ pthread_mutex_unlock;
+ pthread_mutexattr_destroy;
+ pthread_mutexattr_gettype;
+ pthread_mutexattr_init;
+ pthread_mutexattr_settype;
+ pthread_once;
+ pthread_resume_np;
+ pthread_rwlock_destroy;
+ pthread_rwlock_held_np;
+ pthread_rwlock_init;
+ pthread_rwlock_rdheld_np;
+ pthread_rwlock_rdlock;
+ pthread_rwlock_timedrdlock;
+ pthread_rwlock_timedwrlock;
+ pthread_rwlock_tryrdlock;
+ pthread_rwlock_trywrlock;
+ pthread_rwlock_unlock;
+ pthread_rwlock_wrheld_np;
+ pthread_rwlock_wrlock;
+ pthread_rwlockattr_destroy;
+ pthread_rwlockattr_init;
+ pthread_self;
+ pthread_setaffinity_np;
+ pthread_setcancelstate;
+ pthread_setcanceltype;
+ pthread_setcontext;
+ pthread_setname_np;
+ pthread_setschedparam;
+ pthread_setschedprio;
+ pthread_setspecific;
+ pthread_sigmask;
+ pthread_spin_destroy;
+ pthread_spin_init;
+ pthread_spin_lock;
+ pthread_spin_trylock;
+ pthread_spin_unlock;
+ pthread_suspend_np;
+ pthread_testcancel;
+ pwrite;
+ read;
+ readv;
+ sem_close;
+ sem_destroy;
+ sem_getvalue;
+ sem_init;
+ sem_open;
+ sem_post;
+ sem_timedwait;
+ sem_trywait;
+ sem_unlink;
+ sem_wait;
+ setcontext;
+ sigwait;
+ write;
+ writev;
+};
+
+NetBSD_6.99.18.0 {
+local:
+ *;
+} LIBPTHREAD_1.1.0.0;
+
