Mon Nov 30 11:55:12 2009 UTC ()
Minor clean-up for the coming changes.


(uebayasi)
diff -r1.14 -r1.15 src/gnu/lib/libgcc4/Makefile.inc
cvs diff -r1.14 -r1.15 src/gnu/lib/libgcc4/Attic/Makefile.inc (expand / switch to unified diff)

--- src/gnu/lib/libgcc4/Attic/Makefile.inc 2009/10/01 20:07:09 1.14
+++ src/gnu/lib/libgcc4/Attic/Makefile.inc 2009/11/30 11:55:12 1.15
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: Makefile.inc,v 1.14 2009/10/01 20:07:09 martin Exp $ 1# $NetBSD: Makefile.inc,v 1.15 2009/11/30 11:55:12 uebayasi Exp $
2 2
3.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk) && ${MKGCC} != "no" 3.if ${MKGCC} != "no"
 4.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
4.include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk" 5.include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk"
5.endif 6.endif
 7.endif
6 8
7DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4 9DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
8GNUHOSTDIST= ${DIST} 10GNUHOSTDIST= ${DIST}
9GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH} 11GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
10GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH} 12GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH}
11GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH} 13GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
12 14
13GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES} 15GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
14CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC} 16CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}
15CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} 17CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
16CPPFLAGS+= -I${G_EXTRA_HEADERS:M/*:H:u} 18CPPFLAGS+= -I${G_EXTRA_HEADERS:M/*:H:u}
17CPPFLAGS+= -I${DIST}/gcc/cp -I${DIST}/gcc/config -I${GCCARCHXX} -I. 19CPPFLAGS+= -I${DIST}/gcc/cp -I${DIST}/gcc/config -I${GCCARCHXX} -I.
18 20
@@ -35,29 +37,28 @@ LIB2_DIVMOD_FUNCS:=${G_LIB2_DIVMOD_FUNCS @@ -35,29 +37,28 @@ LIB2_DIVMOD_FUNCS:=${G_LIB2_DIVMOD_FUNCS
35.for f in ${G_LIB1ASMFUNCS}; do 37.for f in ${G_LIB1ASMFUNCS}; do
36LIB2FUNCS_SHORT:=${LIB2FUNCS_SHORT:N${f}} 38LIB2FUNCS_SHORT:=${LIB2FUNCS_SHORT:N${f}}
37LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N${f}} 39LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N${f}}
38.endfor 40.endfor
39 41
40LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c} 42LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c}
41LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c} 43LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c}
42LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c} 44LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
43LIB2_EH= ${G_LIB2ADDEH:M*.c:T} 45LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
44.if !empty(G_LIB1ASMFUNCS) 46.if !empty(G_LIB1ASMFUNCS)
45LIB1ASMFUNCS= ${G_LIB1ASMFUNCS:=.S} 47LIB1ASMFUNCS= ${G_LIB1ASMFUNCS:=.S}
46.endif 48.endif
47 49
48DPSRCS+= ${.CURDIR}/../arch/${MACHINE_ARCH}.mk tconfig.h 50DPSRCS+= ${.CURDIR}/../arch/${MACHINE_ARCH}.mk
49CLEANFILES+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} cs-tconfig.h \ 51CLEANFILES+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} cs-tconfig.h
50 tconfig.h 
51.if !empty(G_LIB1ASMFUNCS) 52.if !empty(G_LIB1ASMFUNCS)
52CLEANFILES+= ${LIB1ASMFUNCS} 53CLEANFILES+= ${LIB1ASMFUNCS}
53.endif 54.endif
54 55
55.for file in ${G_LIB2ADD:M${GNUHOSTDIST}*} 56.for file in ${G_LIB2ADD:M${GNUHOSTDIST}*}
56BUILDSYMLINKS+= ${file} ${file:T:S/.asm$/.S/} 57BUILDSYMLINKS+= ${file} ${file:T:S/.asm$/.S/}
57.endfor 58.endfor
58 59
59# XXX 60# XXX
60.if ${MACHINE_ARCH} == "m68000" 61.if ${MACHINE_ARCH} == "m68000"
61CPICFLAGS:= 62CPICFLAGS:=
62COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c 63COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c
63_TRADITIONAL_CPP= 64_TRADITIONAL_CPP=
@@ -109,24 +110,26 @@ ${G_LIB2_DIVMOD_FUNCS:=.so}: @@ -109,24 +110,26 @@ ${G_LIB2_DIVMOD_FUNCS:=.so}:
109 110
110dp-bit.c: ${.CURDIR}/Makefile 111dp-bit.c: ${.CURDIR}/Makefile
111 ${_MKTARGET_CREATE} 112 ${_MKTARGET_CREATE}
112 printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET} 113 printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET}
113 114
114.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \ 115.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \
115 ${G_CONFIGDIR} 116 ${G_CONFIGDIR}
116 117
117tconfig.h: 118tconfig.h:
118 ${_MKTARGET_CREATE} 119 ${_MKTARGET_CREATE}
119 TARGET_CPU_DEFAULT="" \ 120 TARGET_CPU_DEFAULT="" \
120 HEADERS="$(G_xm_include_list)" DEFINES="USED_FOR_TARGET $(G_xm_defines)" \ 121 HEADERS="$(G_xm_include_list)" DEFINES="USED_FOR_TARGET $(G_xm_defines)" \
121 ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tconfig.h 122 ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tconfig.h
 123DPSRCS+= tconfig.h
 124CLEANFILES+= tconfig.h
122 125
123BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h 126BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
124DPSRCS+= unwind.h 127DPSRCS+= unwind.h
125 128
126# these aren't necessary but are #include'd 129# these aren't necessary but are #include'd
127FAKEHEADERS=options.h insn-flags.h insn-constants.h 130FAKEHEADERS=options.h insn-flags.h insn-constants.h
128${FAKEHEADERS}: 131${FAKEHEADERS}:
129 ${_MKTARGET_CREATE} 132 ${_MKTARGET_CREATE}
130 touch ${.TARGET} 133 touch ${.TARGET}
131DPSRCS+= ${FAKEHEADERS} 134DPSRCS+= ${FAKEHEADERS}
132CLEANFILES+= ${FAKEHEADERS} 135CLEANFILES+= ${FAKEHEADERS}