summaryrefslogtreecommitdiff
path: root/gnu/lib
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2004-03-25 07:48:34 +0000
committerskrll <skrll@NetBSD.org>2004-03-25 07:48:34 +0000
commit79ddf7b5dc2e301e890d3d65938aa0d81897db4f (patch)
treeee8d4716f37b6e71e0897d8fa772d61c9fd61eef /gnu/lib
parent8dded85639bc0582c9d5b85249012954e769398a (diff)
Remove the LIB2FUNCS_ST objects from libgcc_s.
Diffstat (limited to 'gnu/lib')
-rw-r--r--gnu/lib/libgcc3/Makefile.inc7
-rw-r--r--gnu/lib/libgcc3/libgcc/Makefile4
2 files changed, 6 insertions, 5 deletions
diff --git a/gnu/lib/libgcc3/Makefile.inc b/gnu/lib/libgcc3/Makefile.inc
index b25dc2e0ef5..8f8476d5ec3 100644
--- a/gnu/lib/libgcc3/Makefile.inc
+++ b/gnu/lib/libgcc3/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2004/03/22 17:08:23 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.6 2004/03/25 07:48:34 skrll Exp $
.if exists(${.CURDIR}/arch/${MACHINE_ARCH}.mk) && ${MKGCC} != "no"
.include "${.CURDIR}/arch/${MACHINE_ARCH}.mk"
@@ -15,7 +15,8 @@ CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
CPPFLAGS+= -I${G_EXTRA_HEADERS:H:u}
CPPFLAGS+= -I${DIST}/gcc/cp -I${GCCARCHXX} -I.
-LIB2FUNCS= ${G_LIB2FUNCS_1:=.c} ${G_LIB2FUNCS_2:=.c} ${G_LIB2FUNCS_ST:=.c}
+LIB2FUNCS= ${G_LIB2FUNCS_1:=.c} ${G_LIB2FUNCS_2:=.c}
+LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c}
LIB2DIVMOD= ${G_LIB2_DIVMOD_FUNCS:=.c}
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
.if !empty(G_LIB1ASMFUNCS)
@@ -49,7 +50,7 @@ _TRADITIONAL_CPP=
COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c
.endif
-${LIB2FUNCS}: ${.CURDIR}/Makefile
+${LIB2FUNCS} ${LIB2FUNCS_ST}: ${.CURDIR}/Makefile
${_MKTARGET_CREATE}
printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET}
diff --git a/gnu/lib/libgcc3/libgcc/Makefile b/gnu/lib/libgcc3/libgcc/Makefile
index baef3ad9a04..043cb5a432f 100644
--- a/gnu/lib/libgcc3/libgcc/Makefile
+++ b/gnu/lib/libgcc3/libgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/10 22:18:17 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/25 07:48:34 skrll Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -15,7 +15,7 @@ LIB= gcc
.cc: # disable .cc->NULL transform
-SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} \
+SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
SRCS+= ${LIB2_EH}