Thu Aug 21 08:52:24 2014 UTC ()
PR/49087: Jarmo Jaakkola: Make sure that the first dependency is the C source
file so ${.IMPSRC} gets set correctly.


(christos)
diff -r1.28 -r1.29 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs diff -r1.28 -r1.29 src/external/gpl3/gcc/lib/libgcc/Makefile.inc (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc 2014/06/01 19:51:01 1.28
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc 2014/08/21 08:52:23 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.28 2014/06/01 19:51:01 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.29 2014/08/21 08:52:23 christos Exp $
2 2
3LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} 3LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
4 4
5.if ${MKGCC} != "no" 5.if ${MKGCC} != "no"
6.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk) 6.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk)
7.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk" 7.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk"
8.endif 8.endif
9.endif 9.endif
10 10
11UNSUPPORTED_COMPILER.clang= # defined 11UNSUPPORTED_COMPILER.clang= # defined
12 12
13DIST= ${GCCDIST} 13DIST= ${GCCDIST}
14GNUHOSTDIST= ${DIST} 14GNUHOSTDIST= ${DIST}
@@ -139,39 +139,42 @@ ${LIB2FUNCS} ${LIB2FUNCS_ST}: ${.CURDIR} @@ -139,39 +139,42 @@ ${LIB2FUNCS} ${LIB2FUNCS_ST}: ${.CURDIR}
139 ${_MKTARGET_CREATE} 139 ${_MKTARGET_CREATE}
140 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET} 140 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET}
141 141
142${LIB2DIVMOD}: ${.CURDIR}/Makefile 142${LIB2DIVMOD}: ${.CURDIR}/Makefile
143 ${_MKTARGET_CREATE} 143 ${_MKTARGET_CREATE}
144 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET} 144 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET}
145 145
146.if !empty(G_LIB1ASMFUNCS) 146.if !empty(G_LIB1ASMFUNCS)
147${LIB1ASMFUNCS}: ${.CURDIR}/Makefile 147${LIB1ASMFUNCS}: ${.CURDIR}/Makefile
148 ${_MKTARGET_CREATE} 148 ${_MKTARGET_CREATE}
149 printf '#define L${.PREFIX}\n#include <${G_LIB1ASMSRC}>\n' >${.TARGET} 149 printf '#define L${.PREFIX}\n#include <${G_LIB1ASMSRC}>\n' >${.TARGET}
150.endif 150.endif
151 151
152${LIB2_EH:.c=.o}: 152# Use dynamic sources to arrange for the C file to be the first dependency
 153# so ${.IMPSRC} will work.
 154
 155${LIB2_EH:.c=.o}: $(.PREFIX).c
153 ${_MKTARGET_COMPILE} 156 ${_MKTARGET_COMPILE}
154 ${COMPILE.c} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC} 157 ${COMPILE.c} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
155 158
156${LIB2_EH:.c=.pico}: 159${LIB2_EH:.c=.pico}: $(.PREFIX).c
157 ${_MKTARGET_COMPILE} 160 ${_MKTARGET_COMPILE}
158 ${COMPILE.c} ${CPICFLAGS} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC} 161 ${COMPILE.c} ${CPICFLAGS} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
159 162
160${G_LIB2_DIVMOD_FUNCS:=.o}: 163${G_LIB2_DIVMOD_FUNCS:=.o}: $(.PREFIX).c
161 ${_MKTARGET_COMPILE} 164 ${_MKTARGET_COMPILE}
162 ${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC} 165 ${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
163 166
164${G_LIB2_DIVMOD_FUNCS:=.pico}: 167${G_LIB2_DIVMOD_FUNCS:=.pico}: $(.PREFIX).c
165 ${_MKTARGET_COMPILE} 168 ${_MKTARGET_COMPILE}
166 ${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC} 169 ${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
167 170
168dp-bit.c: ${.CURDIR}/Makefile 171dp-bit.c: ${.CURDIR}/Makefile
169 ${_MKTARGET_CREATE} 172 ${_MKTARGET_CREATE}
170 printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET} 173 printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET}
171 174
172# 175#
173# Common rules. 176# Common rules.
174# 177#
175 178
176.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \ 179.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \
177 ${G_LIB2ADD:H:O:u} ${G_LIB2ADDEH:H:O:u} ${GCCARCHLIBGCC} 180 ${G_LIB2ADD:H:O:u} ${G_LIB2ADDEH:H:O:u} ${GCCARCHLIBGCC}