[src/trunk]: src/external/gpl3/gcc/lib/libgcc PR/49087: Jarmo Jaakkola: Make ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e339f2ded58
branches:  trunk
changeset: 331714:6e339f2ded58
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 21 08:52:23 2014 +0000

description:
PR/49087: Jarmo Jaakkola: Make sure that the first dependency is the C source
file so ${.IMPSRC} gets set correctly.

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile.inc |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r d23efbe06986 -r 6e339f2ded58 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 21 07:57:25 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 21 08:52:23 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.28 2014/06/01 19:51:01 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.29 2014/08/21 08:52:23 christos Exp $
 
 LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
 
@@ -149,19 +149,22 @@
        printf '#define L${.PREFIX}\n#include <${G_LIB1ASMSRC}>\n' >${.TARGET}
 .endif
 
-${LIB2_EH:.c=.o}:
+# Use dynamic sources to arrange for the C file to be the first dependency
+# so ${.IMPSRC} will work.
+
+${LIB2_EH:.c=.o}: $(.PREFIX).c
        ${_MKTARGET_COMPILE}
        ${COMPILE.c} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
 
-${LIB2_EH:.c=.pico}:
+${LIB2_EH:.c=.pico}: $(.PREFIX).c
        ${_MKTARGET_COMPILE}
        ${COMPILE.c} ${CPICFLAGS} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
 
-${G_LIB2_DIVMOD_FUNCS:=.o}:
+${G_LIB2_DIVMOD_FUNCS:=.o}: $(.PREFIX).c
        ${_MKTARGET_COMPILE}
        ${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
 
-${G_LIB2_DIVMOD_FUNCS:=.pico}:
+${G_LIB2_DIVMOD_FUNCS:=.pico}: $(.PREFIX).c
        ${_MKTARGET_COMPILE}
        ${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}