From 3618d8fe530ee97d1ef7bc982f5d99b69a9a21bd Mon Sep 17 00:00:00 2001 From: Daniel Eischen Date: Thu, 16 Mar 2006 15:17:47 +0000 Subject: [PATCH] Suuply the name of the version map and let bsd.lib.mk supply the link arguments. --- lib/libkse/Makefile | 10 +++++++--- lib/libpthread/Makefile | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index ccb8493e3d0f..a30bccb42c97 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -31,11 +31,15 @@ CFLAGS+=-D_LOCK_DEBUG # however it is no longer strictly conformed to POSIX # CFLAGS+=-DSYSTEM_SCOPE_ONLY -LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map -Wl,-zmuldefs - -# enable extra internal consistancy checks +# Enable extra internal consistancy checks. CFLAGS+=-D_PTHREADS_INVARIANTS -Wall + +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 diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index ccb8493e3d0f..a30bccb42c97 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -31,11 +31,15 @@ CFLAGS+=-D_LOCK_DEBUG # however it is no longer strictly conformed to POSIX # CFLAGS+=-DSYSTEM_SCOPE_ONLY -LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map -Wl,-zmuldefs - -# enable extra internal consistancy checks +# Enable extra internal consistancy checks. CFLAGS+=-D_PTHREADS_INVARIANTS -Wall + +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