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.303 retrieving revision 1.317 diff -u -p -r1.303 -r1.317 --- src/share/mk/bsd.lib.mk 2010/01/25 00:43:00 1.303 +++ src/share/mk/bsd.lib.mk 2011/09/25 11:20:41 1.317 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.303 2010/01/25 00:43:00 christos Exp $ +# $NetBSD: bsd.lib.mk,v 1.317 2011/09/25 11:20:41 apb Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -37,7 +37,6 @@ MKPROFILE:= no ##### Basic targets .PHONY: checkver libinstall realinstall: checkver libinstall -clean: cleanlib ##### LIB specific flags. # XXX: This is needed for programs that link with .a libraries @@ -61,17 +60,7 @@ DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so .endif # } ##### Build and install rules -MKDEP_SUFFIXES?= .o .po .so .go .ln - -# Use purely kernel private headers in rump builds -.if !defined(RUMPKERNEL) -.if empty(CPPFLAGS:M-nostdinc) -CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} -.endif -.if empty(CXXFLAGS:M-nostdinc++) -CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} -.endif -.endif +MKDEP_SUFFIXES?= .o .po .pico .go .ln .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE}) # { SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major @@ -130,8 +119,8 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} # add additional suffixes not exported. # .po is used for profiling object files. -# .so is used for PIC object files. -.SUFFIXES: .out .a .ln .so .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h +# .pico is used for PIC object files. +.SUFFIXES: .out .a .ln .pico .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h .SUFFIXES: .sh .m4 .m @@ -140,7 +129,6 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} # Data-driven table using make variables to control how shared libraries # are built for different platforms and object formats. -# OBJECT_FMT: currently either "ELF" or "a.out", from # SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version # numbers of shared library # SHLIB_SOVERSION: version number to be compiled into a shared library @@ -151,14 +139,14 @@ 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 .so objects. +# 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 .so 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 .so objects. +# APICFLAGS: flags for ${AS} to assemble .[sS] to .pico objects. .if ${MACHINE_ARCH} == "alpha" # { @@ -168,8 +156,7 @@ CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS ?= -.elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && \ - ${OBJECT_FMT} == "ELF" # } { +.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 @@ -203,22 +190,29 @@ MKSHLIBOBJS= no .endif # Platform-independent linker flags for ELF shared libraries -.if ${OBJECT_FMT} == "ELF" SHLIB_SOVERSION= ${SHLIB_MAJOR} SHLIB_SHFLAGS= -Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION} SHLIB_SHFLAGS+= -Wl,--warn-shared-textrel SHLIB_LDSTARTFILE?= ${_GCC_CRTDIR}/crti.o ${_GCC_CRTBEGINS} SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${_GCC_CRTDIR}/crtn.o -.endif CFLAGS+= ${COPTS} OBJCFLAGS+= ${OBJCOPTS} AFLAGS+= ${COPTS} FFLAGS+= ${FOPTS} +.if defined(CTFCONVERT) +.if defined(CFLAGS) && !empty(CFLAGS:M*-g*) +CTFFLAGS+= -g +.endif +.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*) ${OBJCOPY} -x ${.TARGET} .endif @@ -226,6 +220,9 @@ FFLAGS+= ${FOPTS} .c.po: ${_MKTARGET_COMPILE} ${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .if !defined(CFLAGS) || empty(CFLAGS:M*-g*) ${OBJCOPY} -X ${.TARGET} .endif @@ -234,7 +231,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.c} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET} -.c.so: +.c.pico: ${_MKTARGET_COMPILE} ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET} .if !defined(CFLAGS) || empty(CFLAGS:M*-g*) @@ -259,7 +256,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.cc} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET} -.cc.so .cpp.so .cxx.so .C.so: +.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(CFLAGS) || empty(CFLAGS:M*-g*) @@ -269,6 +266,9 @@ FFLAGS+= ${FOPTS} .f.o: ${_MKTARGET_COMPILE} ${COMPILE.f} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .if !defined(FOPTS) || empty(FOPTS:M*-g*) ${OBJCOPY} -x ${.TARGET} .endif @@ -276,6 +276,9 @@ FFLAGS+= ${FOPTS} .f.po: ${_MKTARGET_COMPILE} ${COMPILE.f} ${PROFFLAGS} -pg ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .if !defined(FOPTS) || empty(FOPTS:M*-g*) ${OBJCOPY} -X ${.TARGET} .endif @@ -284,7 +287,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.f} ${DEBUGFLAGS} -g ${.IMPSRC} -o ${.TARGET} -.f.so: +.f.pico: ${_MKTARGET_COMPILE} ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET} .if !defined(FOPTS) || empty(FOPTS:M*-g*) @@ -298,6 +301,9 @@ FFLAGS+= ${FOPTS} .m.o: ${_MKTARGET_COMPILE} ${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) ${OBJCOPY} -x ${.TARGET} .endif @@ -305,6 +311,9 @@ FFLAGS+= ${FOPTS} .m.po: ${_MKTARGET_COMPILE} ${COMPILE.m} ${PROFFLAGS} -pg ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) ${OBJCOPY} -X ${.TARGET} .endif @@ -316,7 +325,7 @@ FFLAGS+= ${FOPTS} ${OBJCOPY} -X ${.TARGET} .endif -.m.so: +.m.pico: ${_MKTARGET_COMPILE} ${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) @@ -326,21 +335,33 @@ FFLAGS+= ${FOPTS} .s.o: ${_MKTARGET_COMPILE} ${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif ${OBJCOPY} -x ${.TARGET} .S.o: ${_MKTARGET_COMPILE} ${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif ${OBJCOPY} -x ${.TARGET} .s.po: ${_MKTARGET_COMPILE} ${COMPILE.s} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif ${OBJCOPY} -X ${.TARGET} .S.po: ${_MKTARGET_COMPILE} ${COMPILE.S} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif ${OBJCOPY} -X ${.TARGET} .s.go: @@ -351,12 +372,12 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.S} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} -.s.so: +.s.pico: ${_MKTARGET_COMPILE} ${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${OBJCOPY} -x ${.TARGET} -.S.so: +.S.pico: ${_MKTARGET_COMPILE} ${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${OBJCOPY} -x ${.TARGET} @@ -378,7 +399,7 @@ LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.l .if ${LIBISPRIVATE} != "no" # No installation is required libinstall:: -.endif # ${LIBISPRIVATE} == "no" # { +.endif .if ${MKDEBUGLIB} != "no" _LIBS+=lib${LIB}_g.a @@ -399,16 +420,20 @@ PROFFLAGS?=-DGPROF -DPROF # since it's needed for making shared lib. # but don't install it. SOLIB=lib${LIB}_pic.a -SOBJS+=${OBJS:.o=.so} +SOBJS+=${OBJS:.o=.pico} .else SOLIB=lib${LIB}.a .endif .else SOLIB=lib${LIB}_pic.a _LIBS+=${SOLIB} -SOBJS+=${OBJS:.o=.so} +SOBJS+=${OBJS:.o=.pico} .endif .if defined(SHLIB_FULLVERSION) +_LIB.so:=lib${LIB}.so.${SHLIB_FULLVERSION} +.if ${MKDEBUG} != "no" +_LIB.debug:=${_LIB.so}.debug +.endif _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION} .endif .endif # } @@ -435,7 +460,7 @@ _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH .NOPATH: ${ALLOBJS} ${_LIBS} ${_YLSRCS} -realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} +realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.debug} MKARZERO?=no @@ -485,12 +510,11 @@ lib${LIB}_g.a:: ${GOBJS} __archivebuild _LIBLDOPTS= .if ${SHLIBDIR} != "/usr/lib" -_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \ - -R${SHLIBDIR} \ - -L${DESTDIR}${SHLIBDIR} +_LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \ + -L=${SHLIBDIR} .elif ${SHLIBINSTALLDIR} != "/usr/lib" -_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \ - -L${DESTDIR}${SHLIBINSTALLDIR} +_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \ + -L=${SHLIBINSTALLDIR} .endif # gcc -shared now adds -lc automatically. For libraries other than libc and @@ -499,10 +523,14 @@ _LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}$ # -Xl,-nostdlib is not enough because we want to tell the compiler-driver not # to add standard libraries, not the linker. .if !defined(LIB) +.if !empty(LIBC_SO) DPLIBC ?= ${DESTDIR}${LIBC_SO} +.endif .else .if ${LIB} != "c" && ${LIB:Mgcc*} == "" +.if !empty(LIBC_SO) DPLIBC ?= ${DESTDIR}${LIBC_SO} +.endif .else LDLIBC ?= -nodefaultlibs .if ${LIB} == "c" @@ -524,19 +552,9 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} ${_MKTARGET_BUILD} rm -f lib${LIB}.so.${SHLIB_FULLVERSION} -.if defined(DESTDIR) - ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}${SHLIBDIR}/ \ - -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ - -Wl,--whole-archive ${SOLIB} \ - -Wl,--no-whole-archive ${_LDADD.lib${LIB}} \ - ${_LIBLDOPTS} ${_LDFLAGS.lib${LIB}} \ - -L${_GCC_LIBGCCDIR} -.else ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${_LDFLAGS.lib${LIB}} \ -o ${.TARGET} ${_LIBLDOPTS} \ -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${_LDADD.lib${LIB}} -.endif -.if ${OBJECT_FMT} == "ELF" # We don't use INSTALL_SYMLINK here because this is just # happening inside the build directory/objdir. XXX Why does # this spend so much effort on libraries that aren't live??? XXX @@ -547,11 +565,19 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL .endif ${HOST_LN} -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp mv -f lib${LIB}.so.tmp lib${LIB}.so -.endif .if ${MKSTRIPIDENT} != "no" ${OBJCOPY} -R .ident ${.TARGET} .endif +.if defined(_LIB.debug) +${_LIB.debug}: ${_LIB.so} + ${_MKTARGET_CREATE} + ( ${OBJCOPY} --only-keep-debug ${_LIB.so} ${_LIB.debug} \ + && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \ + --add-gnu-debuglink=${_LIB.debug} ${_LIB.so} \ + ) || (rm -f ${_LIB.debug}; false) +.endif + .if !empty(LOBJS) # { LLIBS?= -lc llib-l${LIB}.ln: ${LOBJS} @@ -569,15 +595,27 @@ lint: ${LOBJS} ${LINT} ${LINTFLAGS} ${LOBJS} .endif -cleanlib: .PHONY - rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} - rm -f lib${LIB}.a ${STOBJS} - rm -f lib${LIB}_p.a ${POBJS} - rm -f lib${LIB}_g.a ${GOBJS} - rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS} - rm -f ${STOBJS:=.tmp} ${POBJS:=.tmp} ${SOBJS:=.tmp} ${GOBJS:=.tmp} - rm -f llib-l${LIB}.ln ${LOBJS} - +# If the number of entries in CLEANFILES is too large, then the +# commands in bsd.clean.mk encounter errors like "exec(/bin/sh) +# failed (Argument list too long)". Avoid that by splitting the +# files to clean into several lists using different variable names. +# __cleanuse is an internal target in bsd.clean.mk; the way we +# use it here mimics the way it's used by the clean target in +# bsd.clean.mk. +# +clean: libclean1 libclean2 libclean3 libclean4 libclean5 +libclean1: .PHONY .MADE __cleanuse LIBCLEANFILES1 +libclean2: .PHONY .MADE __cleanuse LIBCLEANFILES2 +libclean3: .PHONY .MADE __cleanuse LIBCLEANFILES3 +libclean4: .PHONY .MADE __cleanuse LIBCLEANFILES4 +libclean5: .PHONY .MADE __cleanuse LIBCLEANFILES5 +CLEANFILES+= a.out [Ee]rrs mklog core *.core +LIBCLEANFILES1+= lib${LIB}.a ${STOBJS} ${STOBJS:=.tmp} +LIBCLEANFILES2+= lib${LIB}_p.a ${POBJS} ${POBJS:=.tmp} +LIBCLEANFILES3+= lib${LIB}_g.a ${GOBJS} ${GOBJS:=.tmp} +LIBCLEANFILES4+= lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${_LIB.debug} +LIBCLEANFILES4+= ${SOBJS} ${SOBJS:=.tmp} +LIBCLEANFILES5+= llib-l${LIB}.ln ${LOBJS} .if !target(libinstall) # { # Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no @@ -685,10 +723,6 @@ ${_LIB_SO_TGT}.${SHLIB_FULLVERSION}: lib ${_LIB_SO_TGT}.${SHLIB_FULLVERSION} \ ${_LIB_SO_TGTLIBDIR}.${SHLIB_FULLVERSION} .endif -.if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR) - /sbin/ldconfig -m ${_LIBSODIR} ${LIBDIR} -.endif -.if ${OBJECT_FMT} == "ELF" .if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \ "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}" ${INSTALL_SYMLINK} \ @@ -711,6 +745,15 @@ ${_LIB_SO_TGT}.${SHLIB_FULLVERSION}: lib .endif .endif .endif + +.if defined(_LIB.debug) +libinstall:: ${DESTDIR}${DEBUGDIR}${LIBDIR}/${_LIB.debug} +.PRECIOUS: ${DESTDIR}${DEBUGDIR}${LIBDIR}/${_LIB.debug} + +${DESTDIR}${DEBUGDIR}${LIBDIR}/${_LIB.debug}: ${_LIB.debug} + ${_MKTARGET_INSTALL} + ${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \ + ${.ALLSRC} ${.TARGET} .endif .if ${MKLINT} != "no" && !empty(LOBJS) @@ -744,5 +787,7 @@ LINKSMODE?= ${LIBMODE} .include .include .include +.include +.include ${TARGETS}: # ensure existence