Author: bdrewery
Date: Sat Mar 12 18:59:03 2016
New Revision: 296744
URL: https://svnweb.freebsd.org/changeset/base/296744
Log:
MFC r296002,r296012:
r296002:
Don't hide AR command as bsd.lib.mk's r283925 changed as well.
r296012:
OBJS and POBJS have not been used since r215127.
Modified:
stable/10/gnu/lib/libgcc/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/gnu/lib/libgcc/Makefile
==============================================================================
--- stable/10/gnu/lib/libgcc/Makefile Sat Mar 12 18:57:34 2016
(r296743)
+++ stable/10/gnu/lib/libgcc/Makefile Sat Mar 12 18:59:03 2016
(r296744)
@@ -31,7 +31,7 @@ LDFLAGS+= -nodefaultlibs
DPADD+= ${LIBC}
LDADD+= -lc
-OBJS= # added to below in various ways depending on TARGET_CPUARCH
+SOBJS= # added to below in various ways depending on TARGET_CPUARCH
#---------------------------------------------------------------------------
#
@@ -227,7 +227,7 @@ OBJ_GRPS += FPBIT DPBIT
${T}_OBJS_T = ${${T}_FUNCS:S/$/.o/}
${T}_OBJS_P = ${${T}_FUNCS:S/$/.po/}
${T}_OBJS_S = ${${T}_FUNCS:S/$/.So/}
-OBJS += ${${T}_FUNCS:S/$/.o/}
+SOBJS += ${${T}_FUNCS:S/$/.So/}
${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS}
${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
@@ -242,9 +242,7 @@ ${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHD
# Extra objects coming from separate files
#
.if !empty(LIB2ADD)
-OBJS += ${LIB2ADD:R:S/$/.o/}
SOBJS += ${LIB2ADD:R:S/$/.So/}
-POBJS += ${LIB2ADD:R:S/$/.po/}
.endif
#-----------------------------------------------------------------------
@@ -270,7 +268,7 @@ ASM_T = ${LIB1ASMFUNCS:S/$/.o/}
ASM_P = ${LIB1ASMFUNCS:S/$/.po/}
ASM_S = ${LIB1ASMFUNCS:S/$/.So/}
ASM_V = ${LIB1ASMFUNCS:S/$/.vis/}
-OBJS += ${LIB1ASMFUNCS:S/$/.o/}
+SOBJS += ${LIB1ASMFUNCS:S/$/.So/}
${ASM_T}: ${LIB1ASMSRC} ${.PREFIX}.vis
${CC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
@@ -335,7 +333,7 @@ SHLIB_MAPFILES += ${GCCDIR}/config/arm/
.endif
VERSION_MAP = libgcc.map
-libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS} ${OBJS:R:S/$/.So/}
+libgcc.map: ${SHLIB_MKMAP} ${SHLIB_MAPFILES} ${SOBJS}
( ${NM} -pg ${SOBJS};echo %% ; \
cat ${SHLIB_MAPFILES} \
| sed -e '/^[ ]*#/d' \
@@ -352,7 +350,7 @@ CLEANFILES += libgcc.map
libgcc_eh.a: ${EH_OBJS_T}
@${ECHO} building static gcc_eh library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
+ ${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
all: libgcc_eh.a
@@ -361,7 +359,7 @@ all: libgcc_eh.a
libgcc_eh_p.a: ${EH_OBJS_P}
@${ECHO} building profiled gcc_eh library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
+ ${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
all: libgcc_eh_p.a
.endif
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
