Mon Nov 30 13:07:38 2009 UTC ()
Enable the new style build if the new style generated makefiles exist.


(uebayasi)
diff -r1.16 -r1.17 src/gnu/lib/libgcc4/Makefile.inc
diff -r1.7 -r1.8 src/gnu/lib/libgcc4/libgcc/Makefile
diff -r1.5 -r1.6 src/gnu/lib/libgcc4/libgcc_eh/Makefile
diff -r1.8 -r1.9 src/gnu/lib/libgcc4/libgcc_s/Makefile
diff -r1.3 -r1.4 src/gnu/lib/libgcc4/libgcov/Makefile
cvs diff -r1.16 -r1.17 src/gnu/lib/libgcc4/Attic/Makefile.inc (expand / switch to unified diff)

--- src/gnu/lib/libgcc4/Attic/Makefile.inc 2009/11/30 12:07:28 1.16
+++ src/gnu/lib/libgcc4/Attic/Makefile.inc 2009/11/30 13:07:38 1.17
@@ -1,32 +1,46 @@ @@ -1,32 +1,46 @@
1# $NetBSD: Makefile.inc,v 1.16 2009/11/30 12:07:28 uebayasi Exp $ 1# $NetBSD: Makefile.inc,v 1.17 2009/11/30 13:07:38 uebayasi Exp $
2 2
3.if ${MKGCC} != "no" 3.if ${MKGCC} != "no"
4.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk) 4.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
5.include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk" 5.include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk"
6.endif 6.endif
7.endif 7.endif
8 8
9DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4 9DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
10GNUHOSTDIST= ${DIST} 10GNUHOSTDIST= ${DIST}
11GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH} 11GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
12GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH} 12GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH}
13GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH} 13GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
14 14
15GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES} 15GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
16CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC} 16CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}
17CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} 17CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
18CPPFLAGS+= -I${G_EXTRA_HEADERS:M/*:H:u} 18CPPFLAGS+= -I${G_EXTRA_HEADERS:M/*:H:u}
19CPPFLAGS+= -I${DIST}/gcc/cp -I${DIST}/gcc/config -I${GCCARCHXX} -I. 19CPPFLAGS+= -I${DIST} -I${DIST}/gcc/cp -I${DIST}/gcc/config -I${GCCARCHXX} -I.
 20
 21.if ${MACHINE_ARCH} == "powerpc" || \
 22 ${MACHINE_ARCH} == "sh3el" || \
 23 ${MACHINE_ARCH} == "sh3eb" || \
 24 ${MACHINE_ARCH} == "m68000"
 25_TRADITIONAL_CPP=
 26COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c
 27.endif
 28
 29.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 30
 31#
 32# Old style libgcc build procedure.
 33#
20 34
21# This is copied from gcc/mklibgcc.in:$lib2funcs 35# This is copied from gcc/mklibgcc.in:$lib2funcs
22LIB2FUNCS_ALL= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \ 36LIB2FUNCS_ALL= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
23 _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \ 37 _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \
24 _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \ 38 _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \
25 _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \ 39 _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \
26 _enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \ 40 _enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
27 _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \ 41 _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
28 _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \ 42 _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
29 _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \ 43 _popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
30 _powixf2 _powitf2 \ 44 _powixf2 _powitf2 \
31 45
32LIB2FUNCS_ALL+= \ 46LIB2FUNCS_ALL+= \
@@ -55,34 +69,26 @@ CLEANFILES+= ${LIB1ASMFUNCS} @@ -55,34 +69,26 @@ CLEANFILES+= ${LIB1ASMFUNCS}
55 69
56.for file in ${G_LIB2ADD:M${GNUHOSTDIST}*} 70.for file in ${G_LIB2ADD:M${GNUHOSTDIST}*}
57BUILDSYMLINKS+= ${file} ${file:T:S/.asm$/.S/} 71BUILDSYMLINKS+= ${file} ${file:T:S/.asm$/.S/}
58.endfor 72.endfor
59 73
60# XXX 74# XXX
61.if ${MACHINE_ARCH} == "m68000" 75.if ${MACHINE_ARCH} == "m68000"
62CPICFLAGS:= 76CPICFLAGS:=
63BUILDSYMLINKS+= ${DIST}/gcc/config/m68k/fpgnulib.c fpgnulib.c 77BUILDSYMLINKS+= ${DIST}/gcc/config/m68k/fpgnulib.c fpgnulib.c
64BUILDSYMLINKS+= ${DIST}/gcc/config/m68k/fpgnulib.c xfgnulib.c 78BUILDSYMLINKS+= ${DIST}/gcc/config/m68k/fpgnulib.c xfgnulib.c
65CPPFLAGS.xfgnulib.c+=-DEXTFLOAT=1 79CPPFLAGS.xfgnulib.c+=-DEXTFLOAT=1
66.endif 80.endif
67 81
68.if ${MACHINE_ARCH} == "powerpc" || \ 
69 ${MACHINE_ARCH} == "sh3el" || \ 
70 ${MACHINE_ARCH} == "sh3eb" || \ 
71 ${MACHINE_ARCH} == "m68000" 
72_TRADITIONAL_CPP= 
73COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c 
74.endif 
75 
76.if ${MACHINE_ARCH} == "powerpc64" 82.if ${MACHINE_ARCH} == "powerpc64"
77COPTS+= -mlong-double-128 83COPTS+= -mlong-double-128
78.endif 84.endif
79 85
80${LIB2FUNCS} ${LIB2FUNCS_ST}: ${.CURDIR}/Makefile 86${LIB2FUNCS} ${LIB2FUNCS_ST}: ${.CURDIR}/Makefile
81 ${_MKTARGET_CREATE} 87 ${_MKTARGET_CREATE}
82 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET} 88 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET}
83 89
84${LIB2DIVMOD}: ${.CURDIR}/Makefile 90${LIB2DIVMOD}: ${.CURDIR}/Makefile
85 ${_MKTARGET_CREATE} 91 ${_MKTARGET_CREATE}
86 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET} 92 printf '#define L${.PREFIX}\n#include <libgcc2.c>\n' >${.TARGET}
87 93
88.if !empty(G_LIB1ASMFUNCS) 94.if !empty(G_LIB1ASMFUNCS)
@@ -101,26 +107,48 @@ ${LIB2_EH:.c=.so}: @@ -101,26 +107,48 @@ ${LIB2_EH:.c=.so}:
101 107
102${G_LIB2_DIVMOD_FUNCS:=.o}: 108${G_LIB2_DIVMOD_FUNCS:=.o}:
103 ${_MKTARGET_COMPILE} 109 ${_MKTARGET_COMPILE}
104 ${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC} 110 ${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
105 111
106${G_LIB2_DIVMOD_FUNCS:=.so}: 112${G_LIB2_DIVMOD_FUNCS:=.so}:
107 ${_MKTARGET_COMPILE} 113 ${_MKTARGET_COMPILE}
108 ${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC} 114 ${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
109 115
110dp-bit.c: ${.CURDIR}/Makefile 116dp-bit.c: ${.CURDIR}/Makefile
111 ${_MKTARGET_CREATE} 117 ${_MKTARGET_CREATE}
112 printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET} 118 printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET}
113 119
 120.else # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 121
 122#
 123# New style libgcc build procedure.
 124#
 125
 126.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.tmplsrcs.mk"
 127.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.cppflags.mk"
 128.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.copts.mk"
 129.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
 130.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
 131.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
 132.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
 133
 134.include "${.CURDIR}/../Makefile.wrapper"
 135
 136.endif # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 137
 138#
 139# Common rules.
 140#
 141
114.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \ 142.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \
115 ${G_CONFIGDIR} 143 ${G_CONFIGDIR}
116 144
117tconfig.h: 145tconfig.h:
118 ${_MKTARGET_CREATE} 146 ${_MKTARGET_CREATE}
119 TARGET_CPU_DEFAULT="" \ 147 TARGET_CPU_DEFAULT="" \
120 HEADERS="$(G_xm_include_list)" DEFINES="USED_FOR_TARGET $(G_xm_defines)" \ 148 HEADERS="$(G_xm_include_list)" DEFINES="USED_FOR_TARGET $(G_xm_defines)" \
121 ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tconfig.h 149 ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tconfig.h
122DPSRCS+= tconfig.h 150DPSRCS+= tconfig.h
123CLEANFILES+= tconfig.h 151CLEANFILES+= tconfig.h
124 152
125BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h 153BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
126DPSRCS+= unwind.h 154DPSRCS+= unwind.h
cvs diff -r1.7 -r1.8 src/gnu/lib/libgcc4/libgcc/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/lib/libgcc4/libgcc/Attic/Makefile 2008/10/26 07:04:04 1.7
+++ src/gnu/lib/libgcc4/libgcc/Attic/Makefile 2009/11/30 13:07:38 1.8
@@ -1,34 +1,48 @@ @@ -1,34 +1,48 @@
1# $NetBSD: Makefile,v 1.7 2008/10/26 07:04:04 mrg Exp $ 1# $NetBSD: Makefile,v 1.8 2009/11/30 13:07:38 uebayasi Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5 5
6LIB= gcc 6LIB= gcc
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10.if ${MKGCC} != "no" 10.if ${MKGCC} != "no"
11 11
12.cc: # disable .cc->NULL transform 12.cc: # disable .cc->NULL transform
13 13
 14.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 15
14SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \ 16SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
15 ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS} 17 ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
16.if ${MKPIC} == "no" 18.if ${MKPIC} == "no"
17SRCS+= ${LIB2_EH} 19SRCS+= ${LIB2_EH}
18.endif 20.endif
19 21
 22.else # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 23
 24# New style.
 25TMPLSRCS= ${TMPLSRCS.libgcc.a}
 26TMPLFPSRCS= ${TMPLFPSRCS.libgcc.a}
 27TMPLASMSRCS= ${TMPLASMSRCS.libgcc.a}
 28SRCS= ${SRCS.libgcc.a}
 29
 30.endif # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 31
20.include <bsd.lib.mk> 32.include <bsd.lib.mk>
21 33
 34.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 35
22CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2} 36CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
23 37
24.c.so: 38.c.so:
25 ${_MKTARGET_COMPILE} 39 ${_MKTARGET_COMPILE}
26 ${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1 40 ${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
27 ${NM} -pg ${.TARGET}.tmp1 | \ 41 ${NM} -pg ${.TARGET}.tmp1 | \
28 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \ 42 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
29 ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler - 43 ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
30.if defined(COPTS) && !empty(COPTS:M*-g*) 44.if defined(COPTS) && !empty(COPTS:M*-g*)
31 mv ${.TARGET}.tmp2 ${.TARGET} 45 mv ${.TARGET}.tmp2 ${.TARGET}
32.else 46.else
33 ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET} 47 ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
34 rm -f ${.TARGET}.tmp2 48 rm -f ${.TARGET}.tmp2
@@ -39,16 +53,18 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t @@ -39,16 +53,18 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
39 ${_MKTARGET_COMPILE} 53 ${_MKTARGET_COMPILE}
40 ${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1 54 ${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
41 ${NM} -pg ${.TARGET}.tmp1 | \ 55 ${NM} -pg ${.TARGET}.tmp1 | \
42 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \ 56 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
43 ${CC} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler - 57 ${CC} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
44.if defined(COPTS) && !empty(COPTS:M*-g*) 58.if defined(COPTS) && !empty(COPTS:M*-g*)
45 mv ${.TARGET}.tmp2 ${.TARGET} 59 mv ${.TARGET}.tmp2 ${.TARGET}
46.else 60.else
47 ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET} 61 ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
48 rm -f ${.TARGET}.tmp2 62 rm -f ${.TARGET}.tmp2
49.endif 63.endif
50 rm -f ${.TARGET}.tmp1 64 rm -f ${.TARGET}.tmp1
51 65
 66.endif # !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 67
52.else 68.else
53.include <bsd.prog.mk> # do nothing 69.include <bsd.prog.mk> # do nothing
54.endif 70.endif
cvs diff -r1.5 -r1.6 src/gnu/lib/libgcc4/libgcc_eh/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/lib/libgcc4/libgcc_eh/Attic/Makefile 2008/09/18 12:20:19 1.5
+++ src/gnu/lib/libgcc4/libgcc_eh/Attic/Makefile 2009/11/30 13:07:38 1.6
@@ -1,21 +1,33 @@ @@ -1,21 +1,33 @@
1# $NetBSD: Makefile,v 1.5 2008/09/18 12:20:19 skrll Exp $ 1# $NetBSD: Makefile,v 1.6 2009/11/30 13:07:38 uebayasi Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5 5
6LIB= gcc_eh 6LIB= gcc_eh
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10.if ${MKGCC} != "no" 10.if ${MKGCC} != "no"
11 11
12.cc: # disable .cc->NULL transform 12.cc: # disable .cc->NULL transform
13 13
 14.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 15
14SRCS+= ${LIB2_EH} 16SRCS+= ${LIB2_EH}
15COPTS.unwind-dw2.c = -Wno-stack-protector 17COPTS.unwind-dw2.c = -Wno-stack-protector
16 18
 19.else # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 20
 21# New style.
 22TMPLSRCS= ${TMPLSRCS.libgcc_eh.a}
 23TMPLFPSRCS= ${TMPLFPSRCS.libgcc_eh.a}
 24TMPLASMSRCS= ${TMPLASMSRCS.libgcc_eh.a}
 25SRCS= ${SRCS.libgcc_eh.a}
 26
 27.endif # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 28
17.include <bsd.lib.mk> 29.include <bsd.lib.mk>
18 30
19.else 31.else
20.include <bsd.prog.mk> # do nothing 32.include <bsd.prog.mk> # do nothing
21.endif 33.endif
cvs diff -r1.8 -r1.9 src/gnu/lib/libgcc4/libgcc_s/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/lib/libgcc4/libgcc_s/Attic/Makefile 2009/05/01 15:27:20 1.8
+++ src/gnu/lib/libgcc4/libgcc_s/Attic/Makefile 2009/11/30 13:07:38 1.9
@@ -1,39 +1,51 @@ @@ -1,39 +1,51 @@
1# $NetBSD: Makefile,v 1.8 2009/05/01 15:27:20 christos Exp $ 1# $NetBSD: Makefile,v 1.9 2009/11/30 13:07:38 uebayasi Exp $
2 2
3USE_SHLIBDIR= yes 3USE_SHLIBDIR= yes
4REQUIRETOOLS= yes 4REQUIRETOOLS= yes
5NOLINT= # defined 5NOLINT= # defined
6 6
7LIB= gcc_s 7LIB= gcc_s
8NOSTATICLIB= # defined 8NOSTATICLIB= # defined
9NOPROFILE= # defined 9NOPROFILE= # defined
10NOPICINSTALL= # defined 10NOPICINSTALL= # defined
11 11
12.include <bsd.own.mk> 12.include <bsd.own.mk>
13 13
14.if ${MKGCC} != "no" 14.if ${MKGCC} != "no"
15 15
16.cc: # disable .cc->NULL transform 16.cc: # disable .cc->NULL transform
17 17
18SHLIB_MAJOR= 1 18SHLIB_MAJOR= 1
19SHLIB_MINOR= 0 19SHLIB_MINOR= 0
20 20
21LDFLAGS+= -nodefaultlibs 21LDFLAGS+= -nodefaultlibs
22LDFLAGS+= -Wl,--version-script=${.OBJDIR}/libgcc.map 22LDFLAGS+= -Wl,--version-script=${.OBJDIR}/libgcc.map
23 23
 24.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 25
24SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \ 26SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \
25 ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS} 27 ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
26 28
 29.else # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 30
 31# New style.
 32TMPLSRCS= ${TMPLSRCS.libgcc_s.so}
 33TMPLFPSRCS= ${TMPLFPSRCS.libgcc_s.so}
 34TMPLASMSRCS= ${TMPLASMSRCS.libgcc_s.so}
 35SRCS= ${SRCS.libgcc_s.so}
 36
 37.endif # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 38
27COPTS.unwind-dw2.c = -Wno-stack-protector 39COPTS.unwind-dw2.c = -Wno-stack-protector
28 40
29DPADD+= libgcc.map 41DPADD+= libgcc.map
30CLEANFILES+= libgcc.map 42CLEANFILES+= libgcc.map
31 43
32.include <bsd.lib.mk> 44.include <bsd.lib.mk>
33 45
34.if ${MKPICLIB} != "no" 46.if ${MKPICLIB} != "no"
35LIBGCC_S_OBJS= ${SOBJS} 47LIBGCC_S_OBJS= ${SOBJS}
36.else 48.else
37LIBGCC_S_OBJS= ${OBJS} 49LIBGCC_S_OBJS= ${OBJS}
38.endif 50.endif
39 51
cvs diff -r1.3 -r1.4 src/gnu/lib/libgcc4/libgcov/Attic/Makefile (expand / switch to unified diff)

--- src/gnu/lib/libgcc4/libgcov/Attic/Makefile 2008/10/06 14:20:12 1.3
+++ src/gnu/lib/libgcc4/libgcov/Attic/Makefile 2009/11/30 13:07:38 1.4
@@ -1,33 +1,47 @@ @@ -1,33 +1,47 @@
1# $NetBSD: Makefile,v 1.3 2008/10/06 14:20:12 tron Exp $ 1# $NetBSD: Makefile,v 1.4 2009/11/30 13:07:38 uebayasi Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOPIC= # defined 4NOPIC= # defined
5NOPROFILE= # defined 5NOPROFILE= # defined
6NOLINT= # defined 6NOLINT= # defined
7 7
8LIB= gcov 8LIB= gcov
9 9
10.include <bsd.own.mk> 10.include <bsd.own.mk>
11 11
12.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no" 12.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
13 13
14.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk" 14.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
15 15
16LIBGCOVSRCS= ${G_LIBGCOV:=.c} 16LIBGCOVSRCS= ${G_LIBGCOV:=.c}
17 17
18CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} 18CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
19CPPFLAGS+= -Wno-stack-protector 19CPPFLAGS+= -Wno-stack-protector
20 20
 21.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 22
21DPSRCS+= ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk 23DPSRCS+= ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
22SRCS+= ${LIBGCOVSRCS} 24SRCS+= ${LIBGCOVSRCS}
23 25
 26.else # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 27
 28# New style.
 29SRCS= ${SRCS.libgcov.a}
 30TMPLSRCS= ${TMPLSRCS.libgcov.a}
 31TMPLFPSRCS= ${TMPLFPSRCS.libgcov.a}
 32TMPLASMSRCS= ${TMPLASMSRCS.libgcov.a}
 33
 34.endif # exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
 35
24CLEANFILES+= ${LIBGCOVSRCS} 36CLEANFILES+= ${LIBGCOVSRCS}
25 37
 38.if !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
26${LIBGCOVSRCS}: ${.CURDIR}/Makefile 39${LIBGCOVSRCS}: ${.CURDIR}/Makefile
27 ${_MKTARGET_CREATE} 40 ${_MKTARGET_CREATE}
28 printf '#define L${.PREFIX}\n#include <libgcov.c>\n' >${.TARGET} 41 printf '#define L${.PREFIX}\n#include <libgcov.c>\n' >${.TARGET}
 42.endif # !exists(${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk)
29 43
30.include <bsd.lib.mk> 44.include <bsd.lib.mk>
31.else 45.else
32.include <bsd.prog.mk> # do nothing 46.include <bsd.prog.mk> # do nothing
33.endif 47.endif