[BACK]Return to bsd.lib.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

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

Diff for /src/share/mk/bsd.lib.mk between version 1.335 and 1.352

version 1.335, 2013/04/22 22:16:14 version 1.352, 2014/04/11 15:56:09
Line 129  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 129  SHLIB_FULLVERSION=${SHLIB_MAJOR}
   
   
 # Set PICFLAGS to cc flags for producing position-independent code,  # 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  # Data-driven table using make variables to control how shared libraries
 # are built for different platforms and object formats.  # are built for different platforms and object formats.
Line 143  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 143  SHLIB_FULLVERSION=${SHLIB_MAJOR}
 #                       with ELF, also set shared-lib version for ld.so.  #                       with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors  # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors
 # SHLIB_LDENDFILE:      support .o file, call C++ file-level destructors  # 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"  .if ${MKPICLIB} != "no"
 CSHLIBFLAGS+= ${CPICFLAGS}  CSHLIBFLAGS+= ${PICFLAGS}
 .endif  .endif
   
 .if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)  .if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)
Line 207  CFLAGS+= -g
Line 170  CFLAGS+= -g
 SHLIB_SOVERSION=        ${SHLIB_MAJOR}  SHLIB_SOVERSION=        ${SHLIB_MAJOR}
 SHLIB_SHFLAGS=          -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}  SHLIB_SHFLAGS=          -Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
 SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel  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_LDSTARTFILE?=     ${_GCC_CRTI} ${_GCC_CRTBEGINS}
 SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${_GCC_CRTN}  SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${_GCC_CRTN}
   
Line 218  FFLAGS+= ${FOPTS}
Line 185  FFLAGS+= ${FOPTS}
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
 .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)  .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
 CTFFLAGS+=      -g  CTFFLAGS+=      -g
   .if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
   #CFLAGS+=       -gdwarf-2
   .endif
 .endif  .endif
 .endif  .endif
   
Line 317  LIBSTRIPSHLIBOBJS= yes
Line 287  LIBSTRIPSHLIBOBJS= yes
   
 .f.pico:  .f.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.f} ${PICFLAGS} ${.IMPSRC} -o ${.TARGET}
 .if defined(LIBSTRIPFOBJS)  .if defined(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
Line 410  LIBSTRIPSHLIBOBJS= yes
Line 380  LIBSTRIPSHLIBOBJS= yes
   
 .s.pico:  .s.pico:
         ${_MKTARGET_COMPILE}          ${_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)  .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 .S.pico:  .S.pico:
         ${_MKTARGET_COMPILE}          ${_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)  .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
Line 472  ${_LIB}_combine.o: ${COMBINESRCS}
Line 442  ${_LIB}_combine.o: ${COMBINESRCS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}          ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
 .if defined(LIBSTRIPOBJS)  .if defined(LIBSTRIPOBJS)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 CLEANFILES+=    ${_LIB}_combine.d  CLEANFILES+=    ${_LIB}_combine.d
Line 551  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 521  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}
   
 MKARZERO?=no  MKARZERO?= ${MKREPRO:Uno}
   
 .if ${MKARZERO} == "yes"  .if ${MKARZERO} == "yes"
 _ARFL=crsD  _ARFL=crsD
Line 622  DPLIBC ?= ${DESTDIR}${LIBC_SO}
Line 592  DPLIBC ?= ${DESTDIR}${LIBC_SO}
 .endif  .endif
 .else  .else
 LDLIBC ?= -nodefaultlibs  LDLIBC ?= -nodefaultlibs
 .if ${LIB} == "c"  .if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
 LDADD+= -lgcc  LDADD+= -lgcc
 .endif  .endif
 .endif  .endif
Line 630  LDADD+= -lgcc
Line 600  LDADD+= -lgcc
   
 .if ${LIBISCXX} != "no"  .if ${LIBISCXX} != "no"
 LIBCC:= ${CXX}  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/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
   . endif
 .else  .else
 LIBCC:= ${CC}  LIBCC:= ${CC}
 .endif  .endif
Line 641  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
Line 618  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
         ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \          ${LIBCC} ${LDLIBC} -shared ${SHLIB_SHFLAGS} \
             ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \              ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${_LDADD.${_LIB}}              -Wl,--no-whole-archive ${_LDADD.${_LIB}}
   # XXX[1]: When the arm linker bug where -Wl,-x eats $a,$d,$t from shared
   # libraries remove the following conditional and put this back in the linker
   # line. For now we delay stripping symbols until the debug split step or skip
   # it alltogether if we are using -g
   .if !defined(_LIB.so.debug) && !empty(CFLAGS:M*-g*)
           ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
 #  We don't use INSTALL_SYMLINK here because this is just  #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does  #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX  #  this spend so much effort on libraries that aren't live??? XXX
Line 662  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
Line 646  ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
 .if defined(_LIB.so.debug)  .if defined(_LIB.so.debug)
 ${_LIB.so.debug}: ${_LIB.so.full}  ${_LIB.so.debug}: ${_LIB.so.full}
         ${_MKTARGET_CREATE}          ${_MKTARGET_CREATE}
   # XXX[2]: OBJCOPYLIBFLAGS is used to strip the symbols because it was not
   # done above.
         (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \          (  ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
         && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \          && ${OBJCOPY} ${OBJCOPYLIBFLAGS} --strip-debug -p -R .gnu_debuglink \
                 --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \                  --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
         ) || (rm -f ${.TARGET}; false)          ) || (rm -f ${.TARGET}; false)
 .endif  .endif

Legend:
Removed from v.1.335  
changed lines
  Added in v.1.352

CVSweb <webmaster@jp.NetBSD.org>