Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.332.2.1
retrieving revision 1.344
diff -u -p -r1.332.2.1 -r1.344
--- src/share/mk/bsd.lib.mk	2013/03/26 01:54:23	1.332.2.1
+++ src/share/mk/bsd.lib.mk	2013/12/16 21:34:16	1.344
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.332.2.1 2013/03/26 01:54:23 agc Exp $
+#	$NetBSD: bsd.lib.mk,v 1.344 2013/12/16 21:34:16 matt Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -47,13 +47,6 @@ CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}
 .endif
 
-.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
-    (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
-# We only add -g to the shared library objects
-# because we don't currently split .a archives.
-CSHLIBFLAGS+=	-g
-.endif
-
 ##### Libraries that this may depend upon.
 .if defined(LIBDPLIBS) && ${MKPIC} != "no"				# {
 .for _lib _dir in ${LIBDPLIBS}
@@ -136,7 +129,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 
 
 # Set PICFLAGS to cc flags for producing position-independent code,
-# if not already set.  Includes -DPIC, if required.
+# if not already set.
 
 # Data-driven table using make variables to control how shared libraries
 # are built for different platforms and object formats.
@@ -150,48 +143,11 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 #			with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:	support .o file, call C++ file-level constructors
 # SHLIB_LDENDFILE:	support .o file, call C++ file-level destructors
-# FPICFLAGS:		flags for ${FC} to compile .[fF] files to .pico objects.
-# CPPPICFLAGS:		flags for ${CPP} to preprocess .[sS] files for ${AS}
-# CPICFLAGS:		flags for ${CC} to compile .[cC] files to pic objects.
-# CSHLIBFLAGS:		flags for ${CC} to compile .[cC] files to .pico objects.
-#			(usually includes ${CPICFLAGS})
-# CAPICFLAGS:		flags for ${CC} to compiling .[Ss] files
-#		 	(usually just ${CPPPICFLAGS} ${CPICFLAGS})
-# APICFLAGS:		flags for ${AS} to assemble .[sS] to .pico objects.
-
-.if ${MACHINE_ARCH} == "alpha"						# {
-
-FPICFLAGS ?= -fPIC
-CPICFLAGS ?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC
-CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS ?=
-
-.elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") 	# } {
-
-# If you use -fPIC you need to define BIGPIC to turn on 32-bit
-# relocations in asm code
-FPICFLAGS ?= -fPIC
-CPICFLAGS ?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC -DBIGPIC
-CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS ?= -KPIC
-
-.else									# } {
-
-# Platform-independent flags for NetBSD shared libraries
-SHLIB_SOVERSION=${SHLIB_FULLVERSION}
-SHLIB_SHFLAGS=
-FPICFLAGS ?= -fPIC
-CPICFLAGS?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC
-CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS?= -k
 
-.endif									# }
+PICFLAGS ?= -fPIC
 
 .if ${MKPICLIB} != "no"
-CSHLIBFLAGS+= ${CPICFLAGS}
+CSHLIBFLAGS+= ${PICFLAGS}
 .endif
 
 .if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)
@@ -200,10 +156,24 @@ MKSHLIBOBJS= yes
 MKSHLIBOBJS= no
 .endif
 
+.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
+    (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
+# We only add -g to the shared library objects
+# because we don't currently split .a archives.
+CSHLIBFLAGS+=	-g
+.if ${LIBISPRIVATE} == "yes"
+CFLAGS+=	-g
+.endif
+.endif
+
 # Platform-independent linker flags for ELF shared libraries
 SHLIB_SOVERSION=	${SHLIB_MAJOR}
 SHLIB_SHFLAGS=		-Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
 SHLIB_SHFLAGS+=		-Wl,--warn-shared-textrel
+.if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
+SHLIB_SHFLAGS+=		-Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
+.endif
+CLEANFILES+=		${_LIB}.so.${SHLIB_SOVERSION}.map
 SHLIB_LDSTARTFILE?=	${_GCC_CRTI} ${_GCC_CRTBEGINS}
 SHLIB_LDENDFILE?=	${_GCC_CRTENDS} ${_GCC_CRTN}
 
@@ -218,13 +188,27 @@ CTFFLAGS+=	-g
 .endif
 .endif
 
+LIBSTRIPAOBJS=	yes
+.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+LIBSTRIPCOBJS=	yes
+.endif
+.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+LIBSTRIPOBJCOBJS=	yes
+.endif
+.if !defined(FFLAGS) || empty(FFLAGS:M*-g*)
+LIBSTRIPFOBJS=	yes
+.endif
+.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*) 
+LIBSTRIPSHLIBOBJS=	yes
+.endif
+
 .c.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -234,7 +218,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -245,21 +229,21 @@ CTFFLAGS+=	-g
 .c.pico:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*) 
+.if defined(LIBSTRIPSHLIBOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
 .cc.o .cpp.o .cxx.o .C.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
 .cc.po .cpp.po .cxx.po .C.po:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -270,7 +254,7 @@ CTFFLAGS+=	-g
 .cc.pico .cpp.pico .cxx.pico .C.pico:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
+.if defined(LIBSTRIPSHLIBOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -280,7 +264,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -290,7 +274,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+.if defined(LIBSTRIPFOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -300,8 +284,8 @@ CTFFLAGS+=	-g
 
 .f.pico:
 	${_MKTARGET_COMPILE}
-	${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if !defined(FOPTS) || empty(FOPTS:M*-g*)
+	${COMPILE.f} ${PICFLAGS} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPFOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -315,7 +299,7 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -325,21 +309,21 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
 .m.go:
 	${_MKTARGET_COMPILE}
 	${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
 .m.pico:
 	${_MKTARGET_COMPILE}
 	${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJCOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif
 
@@ -349,7 +333,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
 
 .S.o:
 	${_MKTARGET_COMPILE}
@@ -357,7 +343,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
 
 .s.po:
 	${_MKTARGET_COMPILE}
@@ -365,7 +353,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
 
 .S.po:
 	${_MKTARGET_COMPILE}
@@ -373,7 +363,9 @@ CTFFLAGS+=	-g
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
 
 .s.go:
 	${_MKTARGET_COMPILE}
@@ -385,13 +377,17 @@ CTFFLAGS+=	-g
 
 .s.pico:
 	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.s} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
 
 .S.pico:
 	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.S} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(LIBSTRIPAOBJS)
 	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
+.endif
 
 # Declare a few variables to make our life easier later.
 _LIB:=${_LIB_PREFIX}${LIB}
@@ -414,6 +410,7 @@ _DEST.LIB:=${DESTDIR}${LIBDIR}
 _DEST.OBJ:=${DESTDIR}${_LIBSODIR}
 _DEST.LINT:=${DESTDIR}${LINTLIBDIR}
 _DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
+_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
 
 .if defined(LIB)							# {
 .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
@@ -441,7 +438,7 @@ OBJS+=		${_LIB}_combine.o
 ${_LIB}_combine.o: ${COMBINESRCS}
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
+.if defined(LIBSTRIPOBJS)
 	${OBJCOPY} -x ${.TARGET}
 .endif
 
@@ -455,15 +452,6 @@ CLEANFILES+=	${_LIB}_combine.d
 OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 .endif							# }
 
-# Symbol versioning 
-MK_SYMVER?=no
-.if ${MK_SYMVER} == "yes"
-VERSION_MAP?=	${.CURDIR}/Version.map
-.  if exists(${VERSION_MAP})
-LDFLAGS+=       -Wl,--version-script=${VERSION_MAP}
-.  endif
-.endif
-
 STOBJS+=${OBJS}
 
 LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
@@ -601,7 +589,7 @@ DPLIBC ?= ${DESTDIR}${LIBC_SO}
 .endif
 .else
 LDLIBC ?= -nodefaultlibs
-.if ${LIB} == "c"
+.if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
 LDADD+= -lgcc
 .endif
 .endif
@@ -609,6 +597,13 @@ LDADD+= -lgcc
 
 .if ${LIBISCXX} != "no"
 LIBCC:=	${CXX}
+. if ${MKLIBCXX} == "yes"
+LIBDPLIBS+=     c++	${.CURDIR}/../../../../../external/bsd/libc++/lib
+. elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
+LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+. else
+LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+. endif
 .else
 LIBCC:=	${CC}
 .endif
@@ -818,6 +813,10 @@ ${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
 	    ${.ALLSRC} ${.TARGET}
+.if ${_LIBSODIR} != ${LIBDIR}
+	${INSTALL_SYMLINK} -l r ${_DEST.DEBUG}/${_LIB.so.debug} \
+	    ${_DEST.ODEBUG}/${_LIB.so.debug} 
+.endif
 .endif
 
 .if ${MKLINT} != "no" && !empty(LOBJS)