summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-02-24 22:27:18 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-02-24 22:27:18 +0000
commitd1ef443e3536c33693046ca0ac3c0fd1d7847dc1 (patch)
tree8d943712b58ece9d5218adcdd961d255a5cf7665
parent4c4becd77e5fd09fea589c662bc1ccdfb645886e (diff)
downloadFreeBSD-src-d1ef443e3536c33693046ca0ac3c0fd1d7847dc1.zip
FreeBSD-src-d1ef443e3536c33693046ca0ac3c0fd1d7847dc1.tar.gz
OBJS and POBJS have not been used since r215127.
r215127 disabled building of libgcc.a. MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
-rw-r--r--gnu/lib/libgcc/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 12a6226..f824bbc 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -33,7 +33,7 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
LDFLAGS+= -nodefaultlibs
LIBADD+= c
-OBJS= # added to below in various ways depending on TARGET_CPUARCH
+SOBJS= # added to below in various ways depending on TARGET_CPUARCH
#---------------------------------------------------------------------------
#
@@ -252,7 +252,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}
@@ -267,9 +267,7 @@ ${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHDRS}
# 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
#-----------------------------------------------------------------------
@@ -295,7 +293,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} \
@@ -363,7 +361,7 @@ SHLIB_MAPFILES += ${GCCDIR}/config/arm/libgcc-bpabi.ver
.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' \
OpenPOWER on IntegriCloud