Thu Aug 22 00:16:54 2013 UTC ()
Add MACHINE_ARCH's evbearmv5-e[bl] to work
Don't build _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 on earm and coldfire


(matt)
diff -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Makefile
diff -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
diff -r1.20 -r1.21 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -r1.13 -r1.14 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile
diff -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgomp/Makefile
diff -r1.3 -r1.4 src/external/gpl3/gcc/lib/libiberty/Makefile
diff -r1.6 -r1.7 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs diff -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/Makefile 2011/06/21 06:02:25 1.1
+++ src/external/gpl3/gcc/lib/libgcc/Makefile 2013/08/22 00:16:54 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2013/08/22 00:16:54 matt Exp $
2 
3SUBDIR+= libgcc 
4 2
5.include <bsd.own.mk> 3.include <bsd.own.mk>
6 4
 5SUBDIR+= libgcc
 6
7.if ${MKPIC} != "no" 7.if ${MKPIC} != "no"
8SUBDIR+= libgcc_eh libgcc_s 8SUBDIR+= libgcc_eh libgcc_s
9.endif 9.endif
10 10
11SUBDIR+= libgcov 11SUBDIR+= libgcov
12 12
13.include <bsd.subdir.mk> 13.include <bsd.subdir.mk>
cvs diff -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Attic/Makefile.srcs (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/Attic/Makefile.srcs 2011/06/21 06:02:25 1.1
+++ src/external/gpl3/gcc/lib/libgcc/Attic/Makefile.srcs 2013/08/22 00:16:54 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile.srcs,v 1.1 2011/06/21 06:02:25 mrg Exp $ 1# $NetBSD: Makefile.srcs,v 1.2 2013/08/22 00:16:54 matt Exp $
2 2
3# 3#
4# Generated makefiles. 4# Generated makefiles.
5# 5#
6 6
7.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.tmplsrcs.mk" 7.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.tmplsrcs.mk"
8.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.cppflags.mk" 8.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.cppflags.mk"
9.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.copts.mk" 9.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.copts.mk"
10.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk" 10.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
11.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk" 11.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
12.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk" 12.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
13.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk" 13.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
cvs diff -r1.20 -r1.21 src/external/gpl3/gcc/lib/libgcc/Makefile.inc (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc 2013/07/18 22:39:57 1.20
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc 2013/08/22 00:16:54 1.21
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile.inc,v 1.20 2013/07/18 22:39:57 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.21 2013/08/22 00:16:54 matt Exp $
2 2
3.if ${MKGCC} != "no" 3.if ${MKGCC} != "no"
4LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH} 4LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
5#.info LIBGCC_MACHINE_ARCH=${LIBGCC_MACHINE_ARCH} 
6.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk) 5.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk)
7.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk" 6.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk"
8.endif 7.endif
9.endif 8.endif
10 9
11UNSUPPORTED_COMPILER.clang= # defined 10UNSUPPORTED_COMPILER.clang= # defined
12 11
13DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist 12DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
14GNUHOSTDIST= ${DIST} 13GNUHOSTDIST= ${DIST}
15GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH} 14GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH}
16GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH} 15GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}
17GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH} 16GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH}
18 17
@@ -36,27 +35,34 @@ COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} - @@ -36,27 +35,34 @@ COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -
36# 35#
37 36
38# This is copied from gcc/mklibgcc.in:$lib2funcs 37# This is copied from gcc/mklibgcc.in:$lib2funcs
39LIB2FUNCS_ALL= \ 38LIB2FUNCS_ALL= \
40 _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _cmpdi2 _ucmpdi2 \ 39 _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _cmpdi2 _ucmpdi2 \
41 _clear_cache _enable_execute_stack _trampoline __main _absvsi2 \ 40 _clear_cache _enable_execute_stack _trampoline __main _absvsi2 \
42 _absvdi2 _addvsi3 _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 \ 41 _absvdi2 _addvsi3 _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 \
43 _negvsi2 _negvdi2 _ctors _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 \ 42 _negvsi2 _negvdi2 _ctors _ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 \
44 _ctzsi2 _ctzdi2 _popcount_tab _popcountsi2 _popcountdi2 \ 43 _ctzsi2 _ctzdi2 _popcount_tab _popcountsi2 _popcountdi2 \
45 _paritysi2 _paritydi2 _powisf2 _powidf2 _powixf2 _powitf2 \ 44 _paritysi2 _paritydi2 _powisf2 _powidf2 _powixf2 _powitf2 \
46 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3 \ 45 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3 \
47 _divtc3 _bswapsi2 _bswapdi2 46 _divtc3 _bswapsi2 _bswapdi2
48 47
49.if ${MACHINE_ARCH} != "coldfire" 48.if ${LIBGCC_MACHINE_ARCH} != "coldfire" && empty(LIBGCC_MACHINE_ARCH:Mearm*)
 49
 50LIB2FUNCS_ALL+= \
 51 _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3
 52
 53.endif
 54
 55.if ${LIBGCC_MACHINE_ARCH} != "coldfire" && empty(LIBGCC_MACHINE_ARCH:Mearm*)
50 56
51# non swfloat versions  57# non swfloat versions
52.for _p in _fix _fixuns 58.for _p in _fix _fixuns
53. for _m in sf df xf tf 59. for _m in sf df xf tf
54LIB2FUNCS_ALL+= ${_p}${_m}di 60LIB2FUNCS_ALL+= ${_p}${_m}di
55. endfor 61. endfor
56.endfor 62.endfor
57 63
58.for _p in _float _floatun 64.for _p in _float _floatun
59. for _m in sf df xf tf 65. for _m in sf df xf tf
60LIB2FUNCS_ALL+= ${_p}di${_m} 66LIB2FUNCS_ALL+= ${_p}di${_m}
61. endfor 67. endfor
62.endfor 68.endfor
@@ -153,27 +159,27 @@ DPSRCS+= tconfig.h @@ -153,27 +159,27 @@ DPSRCS+= tconfig.h
153BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h 159BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
154DPSRCS+= unwind.h 160DPSRCS+= unwind.h
155.endif 161.endif
156 162
157# these aren't necessary but are #include'd 163# these aren't necessary but are #include'd
158FAKEHEADERS=options.h insn-flags.h insn-constants.h sysroot-suffix.h 164FAKEHEADERS=options.h insn-flags.h insn-constants.h sysroot-suffix.h
159${FAKEHEADERS}: 165${FAKEHEADERS}:
160 ${_MKTARGET_CREATE} 166 ${_MKTARGET_CREATE}
161 touch ${.TARGET} 167 touch ${.TARGET}
162DPSRCS+= ${FAKEHEADERS} 168DPSRCS+= ${FAKEHEADERS}
163CLEANFILES+= ${FAKEHEADERS} 169CLEANFILES+= ${FAKEHEADERS}
164 170
165# XXX arm hack 171# XXX arm hack
166.if ${MACHINE_CPU} == "arm" 172.if !empty(LIBGCC_MACHINE_ARCH:M*arm*)
167${SRCS}: insn-modes.h 173${SRCS}: insn-modes.h
168# XXX XXX 174# XXX XXX
169${__DPSRCS.d}: insn-modes.h 175${__DPSRCS.d}: insn-modes.h
170insn-modes.h: 176insn-modes.h:
171 ${_MKTARGET_CREATE} 177 ${_MKTARGET_CREATE}
172 echo "enum machine_mode { X };" > ${.TARGET} 178 echo "enum machine_mode { X };" > ${.TARGET}
173DPSRCS+= insn-modes.h 179DPSRCS+= insn-modes.h
174CLEANFILES+= insn-modes.h 180CLEANFILES+= insn-modes.h
175.endif 181.endif
176 182
177# XXX 183# XXX
178.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${LIBGCC_MACHINE_ARCH} == "m68k" 184.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${LIBGCC_MACHINE_ARCH} == "m68k"
179COPTS._fixunsxfdi.c+= -O0 185COPTS._fixunsxfdi.c+= -O0
cvs diff -r1.13 -r1.14 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile 2013/04/30 02:28:16 1.13
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile 2013/08/22 00:16:54 1.14
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.13 2013/04/30 02:28:16 matt Exp $ 1# $NetBSD: Makefile,v 1.14 2013/08/22 00:16:54 matt Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5NOPIC= # defined 5NOPIC= # defined
6NOPROFILE= # defined 6NOPROFILE= # defined
7 7
8LIB= gcc 8LIB= gcc
9 9
10.include <bsd.own.mk> 10.include <bsd.own.mk>
11 11
12.if ${MKGCC} != "no" 12.if ${MKGCC} != "no"
13 13
 14.include <bsd.init.mk>
 15
14.cc: # disable .cc->NULL transform 16.cc: # disable .cc->NULL transform
15 17
16# XXX handle this better? 18# XXX handle this better?
17.if ${MACHINE} == "emips" 19.if ${MACHINE} == "emips"
18G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \ 20G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
19 ${GNUHOSTDIST}/gcc/config/floatunsisf.c 21 ${GNUHOSTDIST}/gcc/config/floatunsisf.c
20.endif 22.endif
21 23
22SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \ 24SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
23 ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \ 25 ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \
24 ${G_LIB2ADD_ST} ${LIB1ASMFUNCS} 26 ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
25.if ${MKPIC} == "no" 27.if ${MKPIC} == "no"
26LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH} 
27.if empty(LIBGCC_MACHINE_ARCH:Mearm*) 28.if empty(LIBGCC_MACHINE_ARCH:Mearm*)
28SRCS+= ${LIB2_EH} ${LIB2_EHASM} 29SRCS+= ${LIB2_EH} ${LIB2_EHASM}
29.endif 30.endif
30.else 31.else
31CPPFLAGS+= -DPIC 32CPPFLAGS+= -DPIC
32.endif 33.endif
33 34
34# These usually just have "foo.S", we need to link from the 35# These usually just have "foo.S", we need to link from the
35# gcc/config/$PLATFORM/foo.asm to it. So far, only rs6000 uses it, 36# gcc/config/$PLATFORM/foo.asm to it. So far, only rs6000 uses it,
36# so we hack it for now. 37# so we hack it for now.
37#.for file in ${G_LIB2ADD_ST} 38#.for file in ${G_LIB2ADD_ST}
38. if ${LIBGCC_MACHINE_ARCH} == "powerpc" # XXX XXX why does the above work?* 39. if ${LIBGCC_MACHINE_ARCH} == "powerpc" # XXX XXX why does the above work?*
39.for file in crtsavfpr.S crtresfpr.S crtsavgpr.S crtresgpr.S crtresxfpr.S crtresxgpr.S 40.for file in crtsavfpr.S crtresfpr.S crtsavgpr.S crtresgpr.S crtresxfpr.S crtresxgpr.S
cvs diff -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile 2013/04/29 12:59:55 1.4
+++ src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile 2013/08/22 00:16:54 1.5
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.4 2013/04/29 12:59:55 skrll Exp $ 1# $NetBSD: Makefile,v 1.5 2013/08/22 00:16:54 matt 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.include <bsd.init.mk>
11 12
12.if ${MKGCC} != "no" 13.if ${MKGCC} != "no"
13 14
14.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk" 15.include "${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}/defs.mk"
15 16
16LIBGCOVSRCS= ${G_LIBGCOV:=.c} 17LIBGCOVSRCS= ${G_LIBGCOV:=.c}
17 18
18CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} 19CPPFLAGS+= -I${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}
19CPPFLAGS+= -Wno-stack-protector 20CPPFLAGS+= -Wno-stack-protector
20 21
21DPSRCS+= ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk 22DPSRCS+= ${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}/defs.mk
22SRCS+= ${LIBGCOVSRCS} 23SRCS+= ${LIBGCOVSRCS}
23 24
24CLEANFILES+= ${LIBGCOVSRCS} 25CLEANFILES+= ${LIBGCOVSRCS}
25 26
26${LIBGCOVSRCS}: ${.CURDIR}/Makefile 27${LIBGCOVSRCS}: ${.CURDIR}/Makefile
27 ${_MKTARGET_CREATE} 28 ${_MKTARGET_CREATE}
28 printf '#define L${.PREFIX}\n#include <libgcov.c>\n' >${.TARGET} 29 printf '#define L${.PREFIX}\n#include <libgcov.c>\n' >${.TARGET}
29 30
30.include <bsd.lib.mk> 31.include <bsd.lib.mk>
31.else 32.else
32.include <bsd.prog.mk> # do nothing 33.include <bsd.prog.mk> # do nothing
33.endif 34.endif
cvs diff -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgomp/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgomp/Makefile 2012/02/23 11:05:02 1.7
+++ src/external/gpl3/gcc/lib/libgomp/Makefile 2013/08/22 00:16:54 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2012/02/23 11:05:02 nonaka Exp $ 1# $NetBSD: Makefile,v 1.8 2013/08/22 00:16:54 matt Exp $
2 2
3# build GCC's libgomp, so that -fopenmp works. 3# build GCC's libgomp, so that -fopenmp works.
4 4
5# XXX 5# XXX
6NOLINT= # defined 6NOLINT= # defined
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10.if !defined(NO_LIBGOMP) # { 10.if !defined(NO_LIBGOMP) # {
11 11
12DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist 12DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
13 13
14LIB= gomp 14LIB= gomp
@@ -29,27 +29,27 @@ SRCS= \ @@ -29,27 +29,27 @@ SRCS= \
29 task.c \ 29 task.c \
30 team.c \ 30 team.c \
31 work.c \ 31 work.c \
32 lock.c \ 32 lock.c \
33 mutex.c \ 33 mutex.c \
34 proc.c \ 34 proc.c \
35 sem.c \ 35 sem.c \
36 bar.c \ 36 bar.c \
37 ptrlock.c \ 37 ptrlock.c \
38 time.c \ 38 time.c \
39 fortran.c \ 39 fortran.c \
40 affinity.c 40 affinity.c
41 41
42GOMP_MACHINE_ARCH?= ${MACHINE_ARCH} 42GOMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/}
43ARCHDIR= ${.CURDIR}/arch/${GOMP_MACHINE_ARCH} 43ARCHDIR= ${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
44 44
45CPPFLAGS+= \ 45CPPFLAGS+= \
46 -DHAVE_CONFIG_H \ 46 -DHAVE_CONFIG_H \
47 -I${DIST}/libgomp \ 47 -I${DIST}/libgomp \
48 -I${DIST}/libgomp/config/posix \ 48 -I${DIST}/libgomp/config/posix \
49 -I${DIST}/libgcc \ 49 -I${DIST}/libgcc \
50 -I${ARCHDIR} 50 -I${ARCHDIR}
51CFLAGS+=-pthread 51CFLAGS+=-pthread
52 52
53CWARNFLAGS.clang+= -Wno-conversion 53CWARNFLAGS.clang+= -Wno-conversion
54 54
55# libgomp.so.1.0 is in GCC 4.5. 55# libgomp.so.1.0 is in GCC 4.5.
cvs diff -r1.3 -r1.4 src/external/gpl3/gcc/lib/libiberty/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libiberty/Makefile 2011/08/09 12:58:55 1.3
+++ src/external/gpl3/gcc/lib/libiberty/Makefile 2013/08/22 00:16:54 1.4
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.3 2011/08/09 12:58:55 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2013/08/22 00:16:54 matt Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
 7GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
 8
7LIB= iberty 9LIB= iberty
8 10
9.include "${.CURDIR}/defs.mk" 11.include "${.CURDIR}/defs.mk"
10 12
11DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist 13DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
12GNUHOSTDIST= ${DIST} 14GNUHOSTDIST= ${DIST}
13 15
14SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \ 16SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
15 ${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c} 17 ${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
16 18
17CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${MACHINE_ARCH} \ 19CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${GCC_MACHINE_ARCH} \
18 -I${DIST}/include 20 -I${DIST}/include
19 21
20COPTS.argv.c = -Wno-stack-protector 22COPTS.argv.c = -Wno-stack-protector
21COPTS.cp-demangle.c = -Wno-stack-protector 23COPTS.cp-demangle.c = -Wno-stack-protector
22COPTS.make-relative-prefix.c = -Wno-stack-protector 24COPTS.make-relative-prefix.c = -Wno-stack-protector
23COPTS.regex.c = -Wno-stack-protector 25COPTS.regex.c = -Wno-stack-protector
24 26
25CWARNFLAGS.clang+= -Wno-unused-value 27CWARNFLAGS.clang+= -Wno-unused-value
26 28
27.PATH: ${DIST}/libiberty 29.PATH: ${DIST}/libiberty
28 30
29.include <bsd.lib.mk> 31.include <bsd.lib.mk>
cvs diff -r1.6 -r1.7 src/external/gpl3/gcc/lib/libobjc/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libobjc/Makefile 2011/07/01 10:04:36 1.6
+++ src/external/gpl3/gcc/lib/libobjc/Makefile 2013/08/22 00:16:54 1.7
@@ -1,56 +1,57 @@ @@ -1,56 +1,57 @@
1# $NetBSD: Makefile,v 1.6 2011/07/01 10:04:36 mrg Exp $ 1# $NetBSD: Makefile,v 1.7 2013/08/22 00:16:54 matt Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5 5
6UNSUPPORTED_COMPILER.clang= # defined 6UNSUPPORTED_COMPILER.clang= # defined
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10LIB= objc 10LIB= objc
 11GCC_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/}
11 12
12.if ${MKGCC} != "no" 13.if ${MKGCC} != "no"
13 14
14SHLIB_MAJOR= 3 15SHLIB_MAJOR= 3
15SHLIB_MINOR= 0 16SHLIB_MINOR= 0
16 17
17# XXX just while all platforms defs.mk are updated.. 18# XXX just while all platforms defs.mk are updated..
18.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) 19.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk)
19# Machine-dependent definitions (include file names). 20# Machine-dependent definitions (include file names).
20.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk" 21.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk"
21EXTRA_FAKEHEADERS= 22EXTRA_FAKEHEADERS=
22.else 23.else
23# Machine-independent definitions (include file names). 24# Machine-independent definitions (include file names).
24.include "${.CURDIR}/defs.mk" 25.include "${.CURDIR}/defs.mk"
25EXTRA_FAKEHEADERS= 26EXTRA_FAKEHEADERS=
26.endif 27.endif
27 28
28LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR} 29LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR}
29 30
30DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist 31DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
31GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist 32GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
32GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH} 33GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
33LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${MACHINE_ARCH} 34LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${GCC_MACHINE_ARCH}
34GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH} 35GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH}
35 36
36SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m 37SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m
37 38
38GCPPFLAGS= ${G_ALL_CFLAGS} ${G_INCLUDES} 39GCPPFLAGS= ${G_ALL_CFLAGS} ${G_INCLUDES}
39CPPFLAGS+= -I. -I${.CURDIR}/arch/${MACHINE_ARCH} 40CPPFLAGS+= -I. -I${.CURDIR}/arch/${GCC_MACHINE_ARCH}
40CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} 41CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
41CPPFLAGS+= -I${GCCLIBXX} 42CPPFLAGS+= -I${GCCLIBXX}
42 43
43BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH} bits 44BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH} bits
44DPSRCS+= bits 45DPSRCS+= bits
45 46
46.for f in Protocol.m Object.m NXConstStr.m linking.m 47.for f in Protocol.m Object.m NXConstStr.m linking.m
47OBJCOPTS.${f}= -fgnu-runtime 48OBJCOPTS.${f}= -fgnu-runtime
48.endfor 49.endfor
49 50
50.for f in thr.c thr-objc.c 51.for f in thr.c thr-objc.c
51COPTS.${f}= -Wno-missing-noreturn 52COPTS.${f}= -Wno-missing-noreturn
52.endfor 53.endfor
53 54
54COPTS+= -fno-strict-aliasing -fexceptions 55COPTS+= -fno-strict-aliasing -fexceptions
55OBJCOPTS+= -fno-strict-aliasing -fexceptions 56OBJCOPTS+= -fno-strict-aliasing -fexceptions
56 57
@@ -70,27 +71,27 @@ runtime-info.h: @@ -70,27 +71,27 @@ runtime-info.h:
70.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc 71.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc
71 72
72${OBJS} ${POBJS} ${SOBJS}: runtime-info.h 73${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
73 74
74${SRCS}: tconfig.h unwind.h options.h 75${SRCS}: tconfig.h unwind.h options.h
75 76
76BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h 77BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
77DPSRCS+= unwind.h 78DPSRCS+= unwind.h
78 79
79.include "../Makefile.tconfigh" 80.include "../Makefile.tconfigh"
80.include "../Makefile.hacks" 81.include "../Makefile.hacks"
81 82
82# XXX just while all platforms defs.mk are updated.. 83# XXX just while all platforms defs.mk are updated..
83.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) 84.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk)
84optionlist: ${G_ALL_OPT_FILES} ${LIBOBJCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk 85optionlist: ${G_ALL_OPT_FILES} ${LIBOBJCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
85 ${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} \ 86 ${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} \
86 > ${.TARGET} 87 > ${.TARGET}
87 88
88options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk 89options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk
89 ${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk \ 90 ${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk \
90 -f ${DIST}/gcc/opth-gen.awk \ 91 -f ${DIST}/gcc/opth-gen.awk \
91 < optionlist > ${.TARGET} 92 < optionlist > ${.TARGET}
92 93
93CLEANFILES+= options.h optionlist 94CLEANFILES+= options.h optionlist
94.endif 95.endif
95 96
96.include <bsd.lib.mk> 97.include <bsd.lib.mk>