Mon Feb 17 21:39:43 2014 UTC ()
Merge gcc-4.8 mknative bits.


(christos)
diff -r1.62 -r1.63 src/tools/gcc/Makefile
diff -r0 -r1.1 src/tools/gcc/mknative-gcc48
diff -r1.10 -r1.11 src/tools/gcc/mknative.common

cvs diff -r1.62 -r1.63 src/tools/gcc/Makefile (expand / switch to unified diff)

--- src/tools/gcc/Makefile 2014/02/16 11:26:31 1.62
+++ src/tools/gcc/Makefile 2014/02/17 21:39:43 1.63
@@ -1,24 +1,35 @@ @@ -1,24 +1,35 @@
1# $NetBSD: Makefile,v 1.62 2014/02/16 11:26:31 skrll Exp $ 1# $NetBSD: Makefile,v 1.63 2014/02/17 21:39:43 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5GCC_LANGUAGES=c c++ objc 5GCC_LANGUAGES=c c++ objc
6MODULE= gcc4 6MODULE= gcc4
7 7
8.if ${HAVE_GCC} == 45 8.if ${HAVE_GCC} == 48
 9CC_FOR_BUILD= ${HOST_CXX:Q}
 10LIB_INTL=
 11MKNATIVE= ${.CURDIR}/mknative-gcc48
 12GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/yagcc/dist
 13.elif ${HAVE_GCC} == 45
9GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist 14GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
 15UNWIND_H=unwind.h
10.endif 16.endif
11 17
 18# Defaults
 19CC_FOR_BUILD?= ${HOST_CC:Q}
 20LIB_INTL?= "LIBS=-lintl"
 21MKNATIVE?= ${.CURDIR}/mknative-gcc
 22
12.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" 23.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
13MULTILIB_ARGS= --enable-multilib 24MULTILIB_ARGS= --enable-multilib
14.else 25.else
15MULTILIB_ARGS= --disable-multilib 26MULTILIB_ARGS= --disable-multilib
16.endif 27.endif
17 28
18.if ${MKSOFTFLOAT} != "no" && ${MACHINE_CPU} != "m68k" 29.if ${MKSOFTFLOAT} != "no" && ${MACHINE_CPU} != "m68k"
19SOFTFLOAT_ARGS= -with-float=soft 30SOFTFLOAT_ARGS= -with-float=soft
20.endif 31.endif
21 32
22COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \ 33COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
23 --enable-long-long \ 34 --enable-long-long \
24 --enable-threads \ 35 --enable-threads \
@@ -26,166 +37,195 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN @@ -26,166 +37,195 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
26 --with-pkgversion="NetBSD nb1 20120916" \ 37 --with-pkgversion="NetBSD nb1 20120916" \
27 --with-system-zlib \ 38 --with-system-zlib \
28 --enable-__cxa_atexit 39 --enable-__cxa_atexit
29.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH}) 40.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
30COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}} 41COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
31.endif 42.endif
32.if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH}) 43.if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH})
33COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}} 44COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
34.endif 45.endif
35 46
36CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} 47CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
37.if ${HAVE_GCC} >= 45 48.if ${HAVE_GCC} >= 45
38CONFIGURE_ARGS+= \ 49CONFIGURE_ARGS+= \
 50 --with-sysroot=${DESTDIR} \
39 --with-mpc=${TOOLDIR} \ 51 --with-mpc=${TOOLDIR} \
40 --with-mpfr=${TOOLDIR} \ 52 --with-mpfr=${TOOLDIR} \
41 --with-gmp=${TOOLDIR} 53 --with-gmp=${TOOLDIR}
42.endif 54.endif
43CONFIGURE_ARGS+= \ 55CONFIGURE_ARGS+= \
44 --disable-nls \ 56 --disable-nls \
45 ${MULTILIB_ARGS} \ 57 ${MULTILIB_ARGS} \
46 ${SOFTFLOAT_ARGS} \ 58 ${SOFTFLOAT_ARGS} \
47 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \ 59 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
48 --enable-languages="${GCC_LANGUAGES}" 60 --enable-languages="${GCC_LANGUAGES}"
49 61
50GCC_CPPFLAGS= -DNETBSD_TOOLS -DTARGET_SYSTEM_ROOT=0 \ 62GCC_CPPFLAGS= -DNETBSD_TOOLS
51 -DTARGET_SYSTEM_ROOT_RELOCATABLE 
52 63
53MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \ 64MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
54 LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \ 65 LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
55 EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \ 66 EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \
56 AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q} 67 AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q}
57 68
58CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \ 69CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \
59 gcc_cv_as_sparc_gotdata_op=no 70 gcc_cv_as_sparc_gotdata_op=no
60 71
61ALL_TARGET= all-gcc 72ALL_TARGET= all-gcc
62INSTALL_TARGET= install-gcc 73INSTALL_TARGET= install-gcc
63 74
64.include "${.CURDIR}/../Makefile.gmakehost" 75.include "${.CURDIR}/../Makefile.gmakehost"
65BUILD_MAKE=${TOOL_GMAKE} 76BUILD_MAKE=${TOOL_GMAKE}
66 77
67# 78#
68# mknative-gcc specific stuff 79# mknative-gcc specific stuff
69# 80#
 81
70MKNATIVE_CONFIG_TARGET_LIBS= \ 82MKNATIVE_CONFIG_TARGET_LIBS= \
71 configure-target-libstdc++-v3 \ 83 configure-target-libstdc++-v3 \
72 configure-target-libobjc 84 configure-target-libobjc
73 85
74.if ${HAVE_GCC} == 45 86.if ${HAVE_GCC} == 48
 87MKNATIVE_CONFIG_TARGET_LIBS += configure-target-libgcc
 88MKNATIVE_TARGET= gcc48
 89MKNATIVE_CONFIG_TARGET_LIBS+= \
 90 configure-target-libgomp
 91.elif ${HAVE_GCC} == 45
75MKNATIVE_TARGET= gcc45 92MKNATIVE_TARGET= gcc45
76MKNATIVE_CONFIG_TARGET_LIBS+= \ 93MKNATIVE_CONFIG_TARGET_LIBS+= \
77 configure-target-libgomp 94 configure-target-libgomp
78.else 95.else
79MKNATIVE_TARGET= gcc4 96MKNATIVE_TARGET= gcc4
80.endif 97.endif
81 98
82BINENV= /usr/bin/env -i 99BINENV= /usr/bin/env -i
83 100
 101
84MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \ 102MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
85 CC_FOR_BUILD=${HOST_CC:Q} \ 103 CC_FOR_BUILD=${CC_FOR_BUILD:Q} \
 104 CXX_FOR_BUILD=${HOST_CXX:Q} \
 105 CFLAGS_FOR_BUILD="-I${TOOLDIR}/include" \
86 CC=${CC:Q}' '${CCADDFLAGS:Q} \ 106 CC=${CC:Q}' '${CCADDFLAGS:Q} \
87 CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \ 107 CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
88 CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \ 108 CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
89 CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \ 109 CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
90 AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \ 110 AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \
91 MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \ 111 MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
92 NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \ 112 NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \
93 XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \ 113 XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
94 LIBS=-lintl \ 114 ${LIB_INTL} \
95 ac_cv_prog_cc_cross=yes \ 115 ac_cv_prog_cc_cross=yes \
96 ac_cv_func_strcoll_works=yes \ 116 ac_cv_func_strcoll_works=yes \
97 ac_cv_func_elf_getshstrndx=no \ 117 ac_cv_func_elf_getshstrndx=no \
98 gcc_cv_func_printf_ptr=yes \ 118 gcc_cv_func_printf_ptr=yes \
99 gcc_cv_libc_provides_ssp=yes \ 119 gcc_cv_libc_provides_ssp=yes \
100 gdb_cv_printf_has_long_double=yes \ 120 gdb_cv_printf_has_long_double=yes \
101 gdb_cv_printf_has_long_long=yes \ 121 gdb_cv_printf_has_long_long=yes \
102 gdb_cv_scanf_has_long_double=yes \ 122 gdb_cv_scanf_has_long_double=yes \
103 gcc_cv_as_sparc_gotdata_op=no 123 gcc_cv_as_sparc_gotdata_op=no
104 124
105.if ${HAVE_GCC} < 45 125.if ${HAVE_GCC} < 45
106GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4 126GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
107.else 127.else
108GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist 128GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
109.endif 129.endif
110 130
111CXXADDFLAGS= --sysroot=${DESTDIR} 131CXXADDFLAGS= --sysroot=${DESTDIR}
112CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include 132CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
113 133
114# NEWCONFIGDIR can be set to a read-write location of the source tree 134# NEWCONFIGDIR can be set to a read-write location of the source tree
115# in case the version being used is not. 135# in case the version being used is not.
116NEWCONFIGDIR?= ${.CURDIR}/../.. 136NEWCONFIGDIR?= ${.CURDIR}/../..
117MKNATIVE?= ${.CURDIR}/mknative-gcc 
118 137
119bootstrap-libgcc: .configure_done 138bootstrap-libgcc: .configure_done
120 @echo 'Creating files needed for libgcc by a native bootstrap build.' 139 @echo 'Creating files needed for libgcc by a native bootstrap build.'
121 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MKNATIVE_TARGET} \ 140 (cd ${.OBJDIR}/build && ${BUILD_COMMAND} configure-target-libgcc)
 141 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MKNATIVE_TARGET}-bootstrap \
122 ${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \ 142 ${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
123 ${MACHINE_GNU_PLATFORM} ${DESTDIR} 143 ${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
 144
 145.if ${HAVE_GCC} == "48"
 146bootstrap-libstdc++: .configure_done
 147 @echo 'Creating files needed for libstdc++ by a native bootstrap build.'
 148 (cd ${.OBJDIR}/build && ${BUILD_COMMAND} configure-target-libstdc++-v3)
 149 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} libstdc++-bootstrap \
 150 ${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
 151 ${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
 152.endif
124 153
125native-gcc: .native/.configure_done 154native-gcc: .native/.configure_done
126 @echo 'Extracting GNU GCC configury for a native toolchain.' 155 @echo 'Extracting GNU GCC configury for a native toolchain.'
127 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \ 156 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
128 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${NETBSDSRCDIR} \ 157 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
129 ${MACHINE_GNU_PLATFORM} ${DESTDIR} 158 ${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
130 159
131NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} 160NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
132.if ${HAVE_GCC} >= 45 161.if ${HAVE_GCC} >= 45
133MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc 162MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc
134MPFR= ${NETBSDSRCDIR}/external/lgpl3/mpfr 163MPFR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
135GMP= ${NETBSDSRCDIR}/external/lgpl3/gmp 164GMP= ${NETBSDSRCDIR}/external/lgpl3/gmp
136MPCOBJ!= cd ${MPC}/lib/libmpc && ${PRINTOBJDIR} 165MPCOBJ!= cd ${MPC}/lib/libmpc && ${PRINTOBJDIR}
137MPFROBJ!= cd ${MPFR}/lib/libmpfr && ${PRINTOBJDIR} 166MPFROBJ!= cd ${MPFR}/lib/libmpfr && ${PRINTOBJDIR}
138GMPOBJ!= cd ${GMP}/lib/libgmp && ${PRINTOBJDIR} 167GMPOBJ!= cd ${GMP}/lib/libgmp && ${PRINTOBJDIR}
139 168
 169GMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
 170
140NATIVE_CONFIGURE_ARGS+= \ 171NATIVE_CONFIGURE_ARGS+= \
141 --with-mpc-lib=${MPCOBJ} \ 172 --with-mpc-lib=${MPCOBJ} \
142 --with-mpfr-lib=${MPFROBJ} \ 173 --with-mpfr-lib=${MPFROBJ} \
143 --with-gmp-lib=${GMPOBJ} \ 174 --with-gmp-lib=${GMPOBJ} \
144 --with-mpc-include=${MPC}/dist/src \ 175 --with-mpc-include=${MPC}/dist/src \
145 --with-mpfr-include=${MPFR}/dist/src \ 176 --with-mpfr-include=${MPFR}/dist/src \
146 --with-gmp-include=${GMP}/lib/libgmp/arch/${MACHINE_ARCH} 177 --with-gmp-include=${GMP}/lib/libgmp/arch/${GMP_MACHINE_ARCH}
147 178
148. if ${MACHINE_ARCH} != "vax" 179. if ${MACHINE_ARCH} != "vax"
149NATIVE_CONFIGURE_ARGS+= --enable-tls 180NATIVE_CONFIGURE_ARGS+= --enable-tls
150. endif 181. endif
 182. if !empty(MACHINE_ARCH:Mearm*)
 183NATIVE_CONFIGURE_ARGS+= --enable-initfini-array
 184. endif
151.endif 185.endif
152NATIVE_CONFIGURE_ARGS+= \ 186NATIVE_CONFIGURE_ARGS+= \
153 --disable-multilib \ 187 --disable-multilib \
154 --disable-symvers \ 188 --disable-symvers \
155 --disable-libstdcxx-pch \ 189 --disable-libstdcxx-pch \
156 --build=`${GCCSRCDIR}/config.guess` \ 190 --build=`${GCCSRCDIR}/config.guess` \
157 --host=${MACHINE_GNU_PLATFORM} 191 --host=${MACHINE_GNU_PLATFORM} \
 192 --with-sysroot=${DESTDIR}
 193MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
158 194
159.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile 195.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
160 mkdir .native 2>/dev/null || true 196 mkdir .native 2>/dev/null || true
161 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 197 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
162 (cd .native && ${MKNATIVE_ENV} \ 198 (cd .native && ${MKNATIVE_ENV} \
163 ${HOST_SH} ${GNUHOSTDIST}/configure \ 199 ${HOST_SH} ${GNUHOSTDIST}/configure \
164 ${NATIVE_CONFIGURE_ARGS}) && \ 200 ${NATIVE_CONFIGURE_ARGS}) && \
165 (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} all-build-libiberty) 201 (${MKENV_BUILD_MAKE} all-build-libiberty) && \
166 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 202 ([ "${HAVE_GCC}" = "48" ] && \
167 (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-gcc configure-libcpp) && \ 203 (${MKENV_BUILD_MAKE} all-libcpp) && \
168 (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-libiberty) && \ 204 (${MKENV_BUILD_MAKE} all-libbacktrace) && \
169 (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-libdecnumber) 205 (${MKENV_BUILD_MAKE} all-libdecnumber) || true)
 206 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 207 (${MKENV_BUILD_MAKE} configure-gcc configure-libcpp) && \
 208 (${MKENV_BUILD_MAKE} configure-libiberty) && \
 209 (${MKENV_BUILD_MAKE} configure-libdecnumber)
170 # edit Makefile so that maybe-all-gcc does not depend on all-gcc any more. 210 # edit Makefile so that maybe-all-gcc does not depend on all-gcc any more.
171 (cd .native && mv Makefile Makefile.config && \ 211 (cd .native && mv Makefile Makefile.config && \
172 ${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \ 212 ${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \
173 -e 's/\(maybe-all-target-libgcc:\) all-target-libgcc/\1/' \ 213 -e 's/\(maybe-all-target-libgcc:\) all-target-libgcc/\1/' \
174 < Makefile.config > Makefile) 214 < Makefile.config > Makefile)
175 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 215 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
176 (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h) 216 (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
177 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 217 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
178 (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h) 218 (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h ${UNWIND_H})
179 (cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so) 219 (cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
180.for _lib in ${MKNATIVE_CONFIG_TARGET_LIBS} 220.for _lib in ${MKNATIVE_CONFIG_TARGET_LIBS}
181 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 221 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
182 (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} \ 222 (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} \
183 ${_lib} \ 223 ${_lib} \
184 ALL_GCC_C= ALL_GCC_CXX= \ 224 ALL_GCC_C= ALL_GCC_CXX= \
185 CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \ 225 CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \
186 CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \ 226 CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
187 RAW_CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \ 227 RAW_CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
188 CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \ 228 CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
189 ac_cv_prog_cc_cross=yes) && \ 229 ac_cv_prog_cc_cross=yes) && \
190 true 230 true
191.endfor 231.endfor

File Added: src/tools/gcc/Attic/mknative-gcc48
#!/bin/sh
#	$NetBSD: mknative-gcc48,v 1.1 2014/02/17 21:39:43 christos Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#

# initialise

_TMPDIR=$2
_TOP=$3
_SRC=$4
_PLATFORM=$5
_DESTDIR=$6
_TOOLDIR=$7
_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ 	]*,,'`
_GNU_DIST=`cd ${_VPATH}; pwd`

if [ -z "$_DESTDIR" ]; then
	echo "\$_DESTDIR is empty" 2>&1
	exit 1
fi

. $_TOP/tools/gcc/mknative.common

# default to GCC 4.1 for now
_OUTDIR="$_TOP/gnu"
_OUTDIRBASE="gnu"

sanitise_includes () {
	sed \
		-e "s,-I$_DESTDIR/usr/include,,g" \
		-e "s,-I$_SRC/external/lgpl3/mpfr/dist/src,,g" \
		-e "s,-I$_SRC/external/lgpl3/mpc/dist/src,,g" \
		-e "s,-I$_SRC/external/lgpl3/gmp/lib/libgmp/arch/[a-z_0-9-]*,,g" \
		-e "s,-I$_TOOLDIR/include,,g" \
		-e "s,-I/usr/include/[^ 	]*,,"
}

##### lib/crtstuff #####

get_crtstuff () {
	_subdir="$1"
	mkdir -p $_OUTDIR/lib/$_subdir/arch

	getvars gcc/Makefile \
		INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS CRTSTUFF_T_CFLAGS_S \
		tm_defines xm_file xm_defines \
		| sanitise_includes \
		| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH.mk
}

##### lib/libg2c #####

get_libg2c () {
	mkdir -p $_OUTDIR/lib/libg2c3/arch/$MACHINE_ARCH

	write_c $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/config.h <$_TMPDIR/$_PLATFORM/libf2c/libU77/config.h
	write_c $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/g2c.h <$_TMPDIR/$_PLATFORM/libf2c/g2c.h

	{
		getvars $_PLATFORM/libf2c/Makefile \
			F2CEXT
		getvars $_PLATFORM/libf2c/libF77/Makefile \
			ALL_CFLAGS OBJS
		getvars $_PLATFORM/libf2c/libI77/Makefile \
			ALL_CFLAGS OBJS | sed 's,=,+=,'
		getvars $_PLATFORM/libf2c/libU77/Makefile \
			ALL_CFLAGS OBJS | sed 's,=,+=,'
	} | write_mk $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/defs.mk
}

##### lib/libgcc #####

get_libgcc () {
	_subdir="$1"
	mkdir -p $_OUTDIR/lib/lib$_subdir/arch

	# DPBIT, FPBIT only used on mn10[23]00, we don't need them.
	# XXX we should probably grab everything Just In Case for
	# the future.

	mkdir -p $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH
	cd $_TMPDIR/$_PLATFORM/libgcc
	{
		getvars $_PLATFORM/libgcc/Makefile \
			INCLUDES LIB2ADD LIB2ADDEH LIB2ADD_ST \
			LIB1ASMFUNCS LIB1ASMSRC \
			LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \
			LIB2FUNCS_EXTRA \
			LIBGCC2_CFLAGS \
			SHLIB_MKMAP SHLIB_MKMAP_OPTS \
			SHLIB_MAPFILES SHLIB_NM_FLAGS
		getvars gcc/Makefile \
			NOEXCEPTION_FLAGS EXTRA_HEADERS
		getlinks config.status libgcc
	}	| sanitise_includes \
		| write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk

	for f in auto-target.h; do
		write_c $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/$f \
		    <$_TMPDIR/$_PLATFORM/libgcc/$f
	done
}

##### lib/libgcov #####

get_libgcov () {
	_subdir="$1"
	_mf="$2"

	mkdir -p $_OUTDIR/lib/lib$_subdir/libgcov/arch/$MACHINE_ARCH

	{
		getvars $_mf \
			LIBGCOV
	} | write_mk $_OUTDIRBASE/lib/lib$_subdir/libgcov/arch/$MACHINE_ARCH/defs.mk

	write_c $_OUTDIRBASE/lib/lib$_subdir/libgcov/arch/$MACHINE_ARCH/gcov-iov.h \
	   <$_TMPDIR/gcc/gcov-iov.h

}

##### lib/libiberty #####

get_gcc_libiberty () {
	_subdir="$1"
	_libibertydir="lib/libiberty"
	mkdir -p $_OUTDIR/$_libibertydir/arch/$MACHINE_ARCH

	getvars libiberty/Makefile \
		ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES \
		| write_mk $_OUTDIRBASE/$_libibertydir/defs.mk

	write_c $_OUTDIRBASE/$_libibertydir/arch/$MACHINE_ARCH/config.h \
		<$_TMPDIR/libiberty/config.h
}

##### lib/libdecnumber #####

get_libdecnumber () {
	_subdir="$1"

	mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
	write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/config.h \
		<$_TMPDIR/libdecnumber/config.h
}

##### lib/libgomp #####

get_libgomp () {
	_subdir="$1"

	mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
		<$_TMPDIR/$_PLATFORM/libgomp/config.h
	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp_f.h \
		<$_TMPDIR/$_PLATFORM/libgomp/libgomp_f.h
	write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp.spec \
		<$_TMPDIR/$_PLATFORM/libgomp/libgomp.spec
	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/omp.h \
		<$_TMPDIR/$_PLATFORM/libgomp/omp.h
}

##### lib/libbacktrace #####

get_libbacktrace () {
	_subdir="$1"

	mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
		<$_TMPDIR/$_subdir/config.h
	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/backtrace-supported.h \
		<$_TMPDIR/$_subdir/backtrace-supported.h
}

##### lib/libobjc #####

get_libobjc () {
	_subdir="$1/arch/$MACHINE_ARCH"
	_options="ALL_OPT_FILES"

	mkdir -p $_OUTDIR/lib/$_subdir

	{
		if [ -n "$_options" ]; then
			getvars gcc/Makefile $_options
		fi
		getvars $_PLATFORM/libobjc/Makefile \
			ALL_CFLAGS INCLUDES OBJC_SOURCE_FILES C_SOURCE_FILES OBJC_H \
			| sed "s,$_GNU_DIST,\${GNUHOSTDIST},g"
		getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
	} | sanitise_includes \
	  | write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk

	write_c $_OUTDIRBASE/lib/$_subdir/config.h \
		<$_TMPDIR/$_PLATFORM/libobjc/config.h
}

##### lib/libstdc++-v3 #####

get_libstdcxx_v3 () {
	_subdir="$1"
	_ver="$2"

	mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH

	_build_headers="c++allocator.h c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr.h"
	_headers1="c_base_headers_extra_install"
	_headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
	_headers1="$_headers1 debug_headers parallel_headers"
	_headers2="host_headers thread_host_headers"
	_pf_headers="profile_headers profile_impl_headers"
	_pb_headers="pb_headers1 pb_headers2 pb_headers3 pb_headers4 pb_headers5 pb_headers6 pb_headers7"

	# build files
	for h in $_build_headers; do
		write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/$h \
			<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/$_PLATFORM/bits/$h
	done

	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
		<$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
	write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/gstdint.h \
		<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h

	{
		# libsupc++
		getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
			sources | sed 's/^G_sources=/G_LIBSUPCXX_SOURCES=/'
		getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
			c_sources | sed 's/^G_c_sources=/G_LIBSUPCXX_C_SOURCES=/'

		# includes
		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
			c_base_headers std_headers | sed -e 's#/[^ 	][^ 	]*/##g' -e 's/\${GNUHOSTDIST}//g'

		# src
		getvars $_PLATFORM/libstdc++-v3/src/Makefile \
			libstdc___la_SOURCES | sed 's/^G_libstdc___la_SOURCES=/G_SRC_SOURCES=/'
		getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
			libc__11convenience_la_SOURCES | sed 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
		getvars $_PLATFORM/libstdc++-v3/src/c++98/Makefile \
			libc__98convenience_la_SOURCES | sed 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/'
		getvars $_PLATFORM/libstdc++-v3/Makefile ATOMICITY_SRCDIR \
			BASIC_FILE_CC CLOCALE_CC CCODECVT_CC CCOLLATE_CC \
			CCTYPE_CC  CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC \
			CPU_OPT_BITS_RANDOM

		# includes
		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
			backward_headers c_base_headers_extra $_headers1 $_pb_headers | \
				sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g'
		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
			bits_headers ext_headers $_headers2 | \
				sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' -e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
			$_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
			BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
		getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
	} | sanitise_includes \
	  | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
}

##### usr.bin/gcc* #####

get_gcc_bootstrap () {
	_subdir="$1"
	mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
	for f in auto-host tm config; do
		write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
	done
}

get_gcc () {
	_subdir="$1"
	mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
	mkdir -p $_OUTDIR/usr.bin/libcpp/arch/$MACHINE_ARCH
	mkdir -p $_OUTDIR/usr.bin/include/arch
	_buildname="BUILD_"
	_libcppsubdir=""
	_extravars="TM_H ALL_OPT_FILES"
	_hconfig_h=""
	_extravars2="tm_file_list build_xm_include_list"
	_extravars3="tm_p_include_list"

	{
		getvars gcc/Makefile \
			${_buildname}EARLY_SUPPORT ${_buildname}ERRORS ${_buildname}PRINT \
			${_buildname}RTL ${_buildname}SUPPORT ${_buildname}VARRAY \
			${_buildname}MD | \
		    sed -e 's#build/errors.o#build-errors.o#g' \
			-e 's#build/print-rtl.o#build-print-rtl.o#g' \
			-e 's#build/rtl.o#build-rtl.o#g' \
			-e 's#build/varray.o#build-varray.o#g' \
			-e 's#build/ggc-none.o#build-ggc-none.o#g' \
			-e 's#build/##g'
		getvars gcc/Makefile \
			ALL_CFLAGS ALL_CPPFLAGS C_AND_OBJC_OBJS C_OBJS CCCP_OBJS \
			GCC_OBJS GCOV_OBJS GXX_OBJS GTM_H PROTO_OBJS ${_extravars1} \
			INCLUDES md_file OBJC_OBJS OBJS out_file version \
			BUILD_PREFIX RTL_H RTL_BASE_H TREE_H ${_hconfig_h} BASIC_BLOCK_H GCC_H \
			GTFILES_SRCDIR GTFILES_FILES_FILES GTFILES_FILES_LANGS \
			GTFILES GTFILES_LANG_DIR_NAMES NOEXCEPTION_FLAGS \
			NATIVE_SYSTEM_HEADER_DIR \
			tm_defines host_xm_file host_xm_defines tm_p_file \
			target_cpu_default ${_extravars} ${_extravars2} \
			lang_specs_files ${_extravars3} \
			common_out_file \
				| sanitise_includes
		getvars gcc/Makefile \
			LIB2ADDEHDEP | sed 's/unwind.inc//'
		getvars gcc/Makefile \
			CXX_OBJS CXX_C_OBJS | sed 's/cp\///g'
		getvars gcc/Makefile \
			F77_OBJS | sed 's/f\///g'
		getvars libcpp/Makefile \
			libcpp_a_OBJS
		getvars gcc/Makefile \
			ENABLE_SHARED
		echo G_SHLIB_LINK="$CC -shared"
		echo G_SHLIB_MULTILIB=.
	} | write_mk $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/defs.mk

	getvars gcc/Makefile \
		EXTRA_HEADERS \
			| write_mk $_OUTDIRBASE/usr.bin/include/arch/$MACHINE_ARCH.mk

	write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
	hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
	for f in $hfiles; do
		write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
		if [ "${MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
		then
			ex <<__EOF__ $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
/configuration_arguments/ s/$//
ya
i
#ifdef _SOFT_FLOAT
.
pu
s/";$/ -with-float=soft";/
a
#else
#endif
.
. m +1
/configure_default_options/ s/{ NULL.*$//
a
#ifdef _SOFT_FLOAT
  { "float", "soft" },
#endif
  { NULL, NULL }
};
.
wq
__EOF__
		fi
	done

	# keep identical
	for f in all-tree.def; do
		cp $_TMPDIR/gcc/$f $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
	done

	# special transforms
	for f in gtyp-input.list; do
		sed -e 's/^.*external\/gpl3\/gcc\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
	done

	# special platforms
	if [ "${MACHINE_ARCH}" = "sh3el" -o "${MACHINE_ARCH}" = "sh3eb" ]; then
		write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/sysroot-suffix.h <$_TMPDIR/gcc/sysroot-suffix.h
	fi
}

##### main #####

case "$1" in
# .mk and .h files for libgcc bootstrap (from host build)

libgcc*-bootstrap)
	_OUTDIR="$_TOP/external/gpl3/gcc"
	_OUTDIRBASE="external/gpl3/gcc"
	get_libgcc gcc
	get_libgcov gcc $_PLATFORM/libgcc/Makefile
	get_crtstuff crtstuff
	get_gcc_bootstrap gcc
	exit 0
	;;

libstdc++-bootstrap)
	_OUTDIR="$_TOP/external/gpl3/gcc"
	_OUTDIRBASE="external/gpl3/gcc"
	get_libstdcxx_v3 libstdc++-v3 gcc
	exit 0
	;;

gcc*)
	_OUTDIR="$_TOP/external/gpl3/gcc"
	_OUTDIRBASE="external/gpl3/gcc"
	get_gcc gcc
	get_libgcc gcc
	get_libgcov gcc $_PLATFORM/libgcc/Makefile
	get_crtstuff crtstuff
	get_gcc_libiberty gcc
	get_libobjc libobjc
	get_libstdcxx_v3 libstdc++-v3 gcc
	get_libdecnumber libdecnumber
	get_libgomp libgomp
	get_libbacktrace libbacktrace
	exit 0
	;;


*)
	echo invalid arguments;
	exit 1
	;;
esac

cvs diff -r1.10 -r1.11 src/tools/gcc/mknative.common (expand / switch to unified diff)

--- src/tools/gcc/mknative.common 2013/10/20 16:00:20 1.10
+++ src/tools/gcc/mknative.common 2014/02/17 21:39:43 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mknative.common,v 1.10 2013/10/20 16:00:20 skrll Exp $ 1# $NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $
2# 2#
3# from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp 3# from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
4# 4#
5# shell-fragment common to all "mknative" scripts 5# shell-fragment common to all "mknative" scripts
6 6
7bomb() 7bomb()
8{ 8{
9 echo >&2 "ABORT: $*" 9 echo >&2 "ABORT: $*"
10 exit 1 10 exit 1
11} 11}
12 12
13# Make sure we can run OK. 13# Make sure we can run OK.
14if [ -x "$MAKE" ]; then 14if [ -x "$MAKE" ]; then
@@ -35,46 +35,56 @@ EOF @@ -35,46 +35,56 @@ EOF
35 ;; 35 ;;
36 *) 36 *)
37 $MAKE -B -f - _x_ <<EOF || bomb "getvars $_mf $* failed" 37 $MAKE -B -f - _x_ <<EOF || bomb "getvars $_mf $* failed"
38_x_: 38_x_:
39.for var in $* 39.for var in $*
40 @echo G_\${var}=\${\${var}:Q} | sed -e 's,\([^\.]\)\./\([a-zA-Z0-9_-]*\.o\),\1\2,g' -e 's,$_VPATH,\$\${GNUHOSTDIST},g' -e 's,$_GNU_DIST,\$\${GNUHOSTDIST},g' 40 @echo G_\${var}=\${\${var}:Q} | sed -e 's,\([^\.]\)\./\([a-zA-Z0-9_-]*\.o\),\1\2,g' -e 's,$_VPATH,\$\${GNUHOSTDIST},g' -e 's,$_GNU_DIST,\$\${GNUHOSTDIST},g'
41.endfor 41.endfor
42.include "$_TMPDIR/$_mf" 42.include "$_TMPDIR/$_mf"
43EOF 43EOF
44 ;; 44 ;;
45 esac 45 esac
46} 46}
47 47
 48# usage: getlinks <config.status> <subdir>
 49#
 50getlinks()
 51{
 52 _cs="$1"; shift
 53 _dir="$1"; shift
 54 echo -n G_CONFIGLINKS=
 55 grep "^config_links=" $_cs | sed -e 's@config_links="\([^"]*\)"@\1@g' -e "s@\([^:]*\):\([^ ]*\)@\${GNUHOSTDIST}/${_dir}/\2 \1 @g"
 56}
 57
48# usage: write_c FILENAME 58# usage: write_c FILENAME
49# 59#
50write_c() 60write_c()
51{ 61{
52 echo '/* This file is automatically generated. DO NOT EDIT! */' >$_TOP/$1.tmp || \ 62 echo '/* This file is automatically generated. DO NOT EDIT! */' >$_TOP/$1.tmp || \
53 bomb "cannot create $1" 63 bomb "cannot create $1"
54 grep '$''NetBSD' $0 | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp 64 grep '$''NetBSD' $0 | sed 's,[ #$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
55 echo '$NetBSD: mknative.common,v 1.10 2013/10/20 16:00:20 skrll Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp 65 echo '$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
56 echo '' >>$_TOP/$1.tmp 66 echo '' >>$_TOP/$1.tmp
57 writefile $1 67 writefile $1
58} 68}
59 69
60# usage: write_mk FILENAME 70# usage: write_mk FILENAME
61# 71#
62write_mk() 72write_mk()
63{ 73{
64 echo '# This file is automatically generated. DO NOT EDIT!' >$_TOP/$1.tmp || \ 74 echo '# This file is automatically generated. DO NOT EDIT!' >$_TOP/$1.tmp || \
65 bomb "cannot create $1" 75 bomb "cannot create $1"
66 grep '$''NetBSD' $0 | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp 76 grep '$''NetBSD' $0 | sed 's,[ #$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
67 echo '$NetBSD: mknative.common,v 1.10 2013/10/20 16:00:20 skrll Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp 77 echo '$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
68 echo '#' >>$_TOP/$1.tmp 78 echo '#' >>$_TOP/$1.tmp
69 writefile $1 79 writefile $1
70} 80}
71 81
72writefile() 82writefile()
73{ 83{
74 sed -e 's,netbsd\(elf\)*1[0-9\.]*\(_\)*[A-Z]*,netbsd\1,' \ 84 sed -e 's,netbsd\(elf\)*1[0-9\.]*\(_\)*[A-Z]*,netbsd\1,' \
75 -e 's,^/\* #undef HAVE_MMAP \*/$,#define HAVE_MMAP 1,' \ 85 -e 's,^/\* #undef HAVE_MMAP \*/$,#define HAVE_MMAP 1,' \
76 >>$_TOP/$1.tmp 86 >>$_TOP/$1.tmp
77 87
78 # Compare new file, sans "generated from" comments and RCS Id, 88 # Compare new file, sans "generated from" comments and RCS Id,
79 # to old file. If they match, don't change anything. 89 # to old file. If they match, don't change anything.
80 rm -f $_TMPDIR/.1 $_TMPDIR/.2 90 rm -f $_TMPDIR/.1 $_TMPDIR/.2