Sat Sep 5 11:40:56 2020 UTC ()
endfor not endif


(mrg)
diff -r1.45 -r1.46 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs diff -r1.45 -r1.46 src/external/gpl3/gcc/lib/libgcc/Makefile.inc (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc 2020/09/05 09:50:15 1.45
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc 2020/09/05 11:40:56 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.45 2020/09/05 09:50:15 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.46 2020/09/05 11:40:56 mrg Exp $
2 2
3LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} 3LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
4GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/} 4GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/}
5 5
6.if ${MKGCC} != "no" 6.if ${MKGCC} != "no"
7.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk) 7.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk)
8.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk" 8.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk"
9.endif 9.endif
10.endif 10.endif
11 11
12UNSUPPORTED_COMPILER.clang= # defined 12UNSUPPORTED_COMPILER.clang= # defined
13 13
14DIST= ${GCCDIST} 14DIST= ${GCCDIST}
@@ -96,27 +96,27 @@ LIB2FUNCS_ALL+= _fixuns${_m}si @@ -96,27 +96,27 @@ LIB2FUNCS_ALL+= _fixuns${_m}si
96.endif 96.endif
97 97
98LIB2FUNCS_SHORT:=${LIB2FUNCS_ALL} 98LIB2FUNCS_SHORT:=${LIB2FUNCS_ALL}
99LIB2_DIVMOD_FUNCS:=${G_LIB2_DIVMOD_FUNCS} 99LIB2_DIVMOD_FUNCS:=${G_LIB2_DIVMOD_FUNCS}
100.for f in ${G_LIB1ASMFUNCS}; do 100.for f in ${G_LIB1ASMFUNCS}; do
101LIB2FUNCS_SHORT:=${LIB2FUNCS_SHORT:N${f}} 101LIB2FUNCS_SHORT:=${LIB2FUNCS_SHORT:N${f}}
102LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N${f}} 102LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N${f}}
103.endfor 103.endfor
104 104
105LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c} 105LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c}
106_LIB2FUNCS= ${G_LIB2FUNCS_ST} 106_LIB2FUNCS= ${G_LIB2FUNCS_ST}
107.for _f in ${LIB2FUNCS_EXCLUDE} 107.for _f in ${LIB2FUNCS_EXCLUDE}
108_LIB2FUNCS= ${_LIB2FUNCS:N${_f}} 108_LIB2FUNCS= ${_LIB2FUNCS:N${_f}}
109.endif 109.endfor
110LIB2FUNCS_ST= ${_LIB2FUNCS:=.c} 110LIB2FUNCS_ST= ${_LIB2FUNCS:=.c}
111LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c} 111LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
112.if ${HAVE_LIBGCC_EH} == "no" 112.if ${HAVE_LIBGCC_EH} == "no"
113LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c} 113LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
114LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S} 114LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
115.else 115.else
116LIB2_EH= ${G_LIB2ADDEH:M*.c:T} 116LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
117LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T} 117LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
118 118
119INCSDIR= /usr/include 119INCSDIR= /usr/include
120# originally copied from unwind-*.h 120# originally copied from unwind-*.h
121INCS+= unwind.h 121INCS+= unwind.h
122.endif 122.endif