Wed Mar 14 23:24:54 2012 UTC ()
Pass proper configure arguments so that it is happy with GNU tools available
on NetBSD; removes two dependencies.
Unlimit before running tests, reduces test failures.
Add t-crtstuff to tmake_file on NetBSD as well.

gcc46 should work much better now on NetBSD.

All from Kai-Uwe Eckhardt in private mail.

Bump PKGREVISION.


(wiz)
diff -r1.14 -r1.15 pkgsrc/lang/gcc46/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/gcc46/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/lang/gcc46/patches/patch-aa
cvs diff -r1.14 -r1.15 pkgsrc/lang/gcc46/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc46/Attic/Makefile 2012/03/05 15:25:36 1.14
+++ pkgsrc/lang/gcc46/Attic/Makefile 2012/03/14 23:24:54 1.15
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.14 2012/03/05 15:25:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2012/03/14 23:24:54 wiz Exp $
2 2
3DISTNAME= gcc-${GCC_VERSION} 3DISTNAME= gcc-${GCC_VERSION}
4PKGNAME= gcc46-${GCC_VERSION} 4PKGNAME= gcc46-${GCC_VERSION}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} 7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gcc.gnu.org/ 11HOMEPAGE= http://gcc.gnu.org/
11COMMENT= GNU Compiler Collection 4.6 12COMMENT= GNU Compiler Collection 4.6
12LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 13LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= awk:run bash:run chmod gmake:run makeinfo sed:run 17USE_TOOLS+= awk:run bash:run chmod gmake:run makeinfo sed:run
17 18
@@ -66,53 +67,51 @@ REPLACE_BASH+= gcc/testsuite/gcc.test-fr @@ -66,53 +67,51 @@ REPLACE_BASH+= gcc/testsuite/gcc.test-fr
66REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen 67REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
67 68
68 69
69CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} 70CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
70CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 71CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
71CONFIGURE_ARGS+= --enable-shared 72CONFIGURE_ARGS+= --enable-shared
72CONFIGURE_ARGS+= --enable-long-long 73CONFIGURE_ARGS+= --enable-long-long
73CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 74CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
74CONFIGURE_ARGS+= --enable-libssp 75CONFIGURE_ARGS+= --enable-libssp
75CONFIGURE_ARGS+= --enable-threads=posix 76CONFIGURE_ARGS+= --enable-threads=posix
76CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} 77CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
77CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} 78CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
78.if ${OPSYS} == "NetBSD" 79.if ${OPSYS} == "NetBSD"
79.include "../../devel/binutils/buildlink3.mk" 80CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
80.include "../../devel/libelf/buildlink3.mk" 81CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as
81CONFIGURE_ARGS+= --with-ld=${PREFIX}/bin/gnu-ld 
82CONFIGURE_ARGS+= --with-libelf=${PREFIX} 
83MAKE_ENV+= ac_cv_func_clock_gettime=yes 82MAKE_ENV+= ac_cv_func_clock_gettime=yes
84.endif 83.endif
85.if ${OPSYS} == "Linux" 84.if ${OPSYS} == "Linux"
86CONFIGURE_ARGS+= --disable-libquadmath --disable-libquadmath-support 85CONFIGURE_ARGS+= --disable-libquadmath --disable-libquadmath-support
87.endif 86.endif
88 87
89CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} 88CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
90 89
91MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} 90MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
92MAKE_ENV+= SHELL=${CONFIG_SHELL} 91MAKE_ENV+= SHELL=${CONFIG_SHELL}
93MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD} 92MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD}
94 93
95# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 94# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
96# a binary so we need to make sure we give it the installed sed and not 95# a binary so we need to make sure we give it the installed sed and not
97# the tool wrapped one. 96# the tool wrapped one.
98MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 97MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
99MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 98MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
100 99
101CPPFLAGS+= -I${BUILDLINK_DIR}/include 100CPPFLAGS+= -I${BUILDLINK_DIR}/include
102CFLAGS+= -I${BUILDLINK_DIR}/include 101CFLAGS+= -I${BUILDLINK_DIR}/include
103 102
104 103
105# Somone should fix this so it will match the NetBSD system compiler 104# Someone should fix this so it will match the NetBSD system compiler
106#.if ${OPSYS} == "NetBSD" 105#.if ${OPSYS} == "NetBSD"
107#GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF} 106#GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
108#CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q} 107#CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q}
109#MAKE_ENV+= AR=/usr/bin/ar 108#MAKE_ENV+= AR=/usr/bin/ar
110#.endif # NetBSD 109#.endif # NetBSD
111 110
112LIBS.SunOS+= -lgmp 111LIBS.SunOS+= -lgmp
113 112
114pre-configure: 113pre-configure:
115.if ${OPSYS} == "DragonFly" 114.if ${OPSYS} == "DragonFly"
116 ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/gcc/config/dragonfly.h 115 ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/gcc/config/dragonfly.h
117 ${CP} ${FILESDIR}/dragonfly-spec.h ${WRKSRC}/gcc/config/dragonfly-spec.h 116 ${CP} ${FILESDIR}/dragonfly-spec.h ${WRKSRC}/gcc/config/dragonfly-spec.h
118 ${CP} ${FILESDIR}/i386-dragonfly.h ${WRKSRC}/gcc/config/i386/dragonfly.h 117 ${CP} ${FILESDIR}/i386-dragonfly.h ${WRKSRC}/gcc/config/i386/dragonfly.h
@@ -124,27 +123,27 @@ pre-configure: @@ -124,27 +123,27 @@ pre-configure:
124.endif 123.endif
125 124
126do-configure: 125do-configure:
127 ${MKDIR} ${WRKDIR}/obj 126 ${MKDIR} ${WRKDIR}/obj
128 cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS} 127 cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS}
129 128
130do-build: 129do-build:
131 (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} ) 130 (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} )
132 131
133do-test: 132do-test:
134#.if (${MACHINE_GNU_ARCH} == "x86_64") 133#.if (${MACHINE_GNU_ARCH} == "x86_64")
135# (cd ${FILESDIR} && ${CP} netbsd64macro.dfs ${WRKSRC}/gcc/testsuite/ada/acats/support/macro.dfs) 134# (cd ${FILESDIR} && ${CP} netbsd64macro.dfs ${WRKSRC}/gcc/testsuite/ada/acats/support/macro.dfs)
136#.endif 135#.endif
137 (cd ${WRKDIR}/obj && ${GMAKE} -k check) 136 (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${GMAKE} -k check)
138 137
139do-install: 138do-install:
140 (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install DESTDIR=${DESTDIR} \ 139 (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install DESTDIR=${DESTDIR} \
141 && ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || ${LN} -f ${DESTDIR}${GCC_PREFIX}/bin/gcc ${DESTDIR}${GCC_PREFIX}/bin/cc) 140 && ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || ${LN} -f ${DESTDIR}${GCC_PREFIX}/bin/gcc ${DESTDIR}${GCC_PREFIX}/bin/cc)
142 141
143.if ${OPSYS} == "SunOS" && ${OS_VERSION} != "5.11" && !empty(MACHINE_ARCH:M*86*) 142.if ${OPSYS} == "SunOS" && ${OS_VERSION} != "5.11" && !empty(MACHINE_ARCH:M*86*)
144post-install: 143post-install:
145 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 144 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32
146 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 145 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64
147.endif 146.endif
148 147
149GENERATE_PLIST+= \ 148GENERATE_PLIST+= \
150 cd ${DESTDIR}${PREFIX} && ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print \ 149 cd ${DESTDIR}${PREFIX} && ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print \
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc46/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc46/Attic/distinfo 2012/03/05 15:25:36 1.6
+++ pkgsrc/lang/gcc46/Attic/distinfo 2012/03/14 23:24:54 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2012/03/05 15:25:36 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2012/03/14 23:24:54 wiz Exp $
2 2
3SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f 3SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f
4RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 4RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269
5Size (gcc-4.6.3.tar.bz2) = 71999439 bytes 5Size (gcc-4.6.3.tar.bz2) = 71999439 bytes
6SHA1 (patch-aa) = 801b340bb24586c84b09f53161a7aced141ab9d9 6SHA1 (patch-aa) = f125edd8d8acd9751e137db9a8e3aad712dd5ddc
7SHA1 (patch-ab) = f69d2db611aee1d31b7872bbf59d2b651413b3d3 7SHA1 (patch-ab) = f69d2db611aee1d31b7872bbf59d2b651413b3d3
8SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee 8SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
9SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1 9SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1
10SHA1 (patch-af) = fb06bce10adc88d3f6829f41a91f4612a72434fd 10SHA1 (patch-af) = fb06bce10adc88d3f6829f41a91f4612a72434fd
11SHA1 (patch-ag) = 4b82b06880bdccc3f967c8633e957fef4509dbc1 11SHA1 (patch-ag) = 4b82b06880bdccc3f967c8633e957fef4509dbc1
12SHA1 (patch-ah) = 7bddb8424dfcbce3e0cf1d856f851d827b66303c 12SHA1 (patch-ah) = 7bddb8424dfcbce3e0cf1d856f851d827b66303c
13SHA1 (patch-ak) = 3038525af107b6c5ecf91ecb4aa8120c9881fe29 13SHA1 (patch-ak) = 3038525af107b6c5ecf91ecb4aa8120c9881fe29
14SHA1 (patch-al) = affbda7c7e7385425685a905377d7715debd7459 14SHA1 (patch-al) = affbda7c7e7385425685a905377d7715debd7459
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/gcc46/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/gcc46/patches/Attic/patch-aa 2011/05/15 00:09:56 1.1.1.1
+++ pkgsrc/lang/gcc46/patches/Attic/patch-aa 2012/03/14 23:24:54 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-aa,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ 1$NetBSD: patch-aa,v 1.2 2012/03/14 23:24:54 wiz Exp $
2 2
3--- gcc/config.gcc.orig 2011-03-14 06:05:29.000000000 +0000 3--- gcc/config.gcc.orig 2011-07-22 18:44:50.000000000 +0200
4+++ gcc/config.gcc 4+++ gcc/config.gcc 2012-03-13 13:40:05.000000000 +0100
5@@ -560,6 +560,33 @@ case ${target} in 5@@ -561,6 +561,33 @@
6 # need_64bit_hwint=yes # system compiler has this for all arch! 6 # need_64bit_hwint=yes # system compiler has this for all arch!
7 use_gcc_stdint=wrap 7 use_gcc_stdint=wrap
8 ;; 8 ;;
9+*-*-dragonfly*) 9+*-*-dragonfly*)
10+ gas=yes 10+ gas=yes
11+ gnu_ld=yes 11+ gnu_ld=yes
12+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" 12+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
13+ case ${target} in 13+ case ${target} in
14+ *-*-dragonfly1 | *-*-dragonfly[1].*) 14+ *-*-dragonfly1 | *-*-dragonfly[1].*)
15+ tm_defines="${tm_defines} DFBSD_MAJOR=1" ;; 15+ tm_defines="${tm_defines} DFBSD_MAJOR=1" ;;
16+ *-*-dragonfly2 | *-*-dragonfly[2].*) 16+ *-*-dragonfly2 | *-*-dragonfly[2].*)
17+ tm_defines="${tm_defines} DFBSD_MAJOR=2" ;; 17+ tm_defines="${tm_defines} DFBSD_MAJOR=2" ;;
18+ *-*-dragonfly3 | *-*-dragonfly[3].*) 18+ *-*-dragonfly3 | *-*-dragonfly[3].*)
@@ -26,48 +26,49 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/05/15 0 @@ -26,48 +26,49 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/05/15 0
26+ esac 26+ esac
27+ tmake_file="t-slibgcc-elf-ver t-dragonfly" 27+ tmake_file="t-slibgcc-elf-ver t-dragonfly"
28+ case ${enable_threads} in 28+ case ${enable_threads} in
29+ "" | yes | posix) 29+ "" | yes | posix)
30+ thread_file='posix' 30+ thread_file='posix'
31+ tmake_file="${tmake_file} t-dragonfly-thread" 31+ tmake_file="${tmake_file} t-dragonfly-thread"
32+ ;; 32+ ;;
33+ esac 33+ esac
34+ dfbsd_tm_file="${dfbsd_tm_file} dragonfly-spec.h dragonfly.h" 34+ dfbsd_tm_file="${dfbsd_tm_file} dragonfly-spec.h dragonfly.h"
35+ ;; 35+ ;;
36 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu) 36 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
37 extra_options="$extra_options gnu-user.opt" 37 extra_options="$extra_options gnu-user.opt"
38 extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o" 38 extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
39@@ -654,6 +681,7 @@ case ${target} in 39@@ -655,6 +682,7 @@
40 default_use_cxa_atexit=yes 40 default_use_cxa_atexit=yes
41 ;; 41 ;;
42 esac 42 esac
43+ use_gcc_stdint=wrap 43+ use_gcc_stdint=wrap
44 ;; 44 ;;
45 *-*-openbsd*) 45 *-*-openbsd*)
46 tmake_file="t-libc-ok t-openbsd t-libgcc-pic" 46 tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
47@@ -1217,19 +1245,25 @@ x86_64-*-freebsd*) 47@@ -1219,19 +1247,26 @@
48 tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h" 48 tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
49 tmake_file="${tmake_file} i386/t-crtstuff" 49 tmake_file="${tmake_file} i386/t-crtstuff"
50 ;; 50 ;;
51+x86_64-*-dragonfly*) 51+x86_64-*-dragonfly*)
52+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfbsd_tm_file} i386/x86-64.h i386/dragonfly.h i386/dragonfly64.h" 52+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfbsd_tm_file} i386/x86-64.h i386/dragonfly.h i386/dragonfly64.h"
53+ ;; 53+ ;;
54+i[34567]86-*-dragonfly*) 54+i[34567]86-*-dragonfly*)
55+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfbsd_tm_file} i386/dragonfly.h" 55+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfbsd_tm_file} i386/dragonfly.h"
56+ ;; 56+ ;;
57 i[34567]86-*-netbsdelf*) 57 i[34567]86-*-netbsdelf*)
58- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h" 58- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
59+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h" 59+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h"
60 extra_options="${extra_options} netbsd.opt netbsd-elf.opt" 60 extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 61+ tmake_file="${tmake_file} i386/t-crtstuff"
61 ;; 62 ;;
62 i[34567]86-*-netbsd*) 63 i[34567]86-*-netbsd*)
63- tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h" 64- tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h"
64+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h netbsd-stdint.h" 65+ tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h netbsd-stdint.h"
65 extra_options="${extra_options} netbsd.opt" 66 extra_options="${extra_options} netbsd.opt"
66 tmake_file="${tmake_file} t-netbsd" 67 tmake_file="${tmake_file} t-netbsd"
67 extra_parts="" 68 extra_parts=""
68 use_collect2=yes 69 use_collect2=yes
69 ;; 70 ;;
70 x86_64-*-netbsd*) 71 x86_64-*-netbsd*)
71- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h" 72- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
72+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h netbsd-stdint.h" 73+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h netbsd-stdint.h"
73 extra_options="${extra_options} netbsd.opt netbsd-elf.opt" 74 extra_options="${extra_options} netbsd.opt netbsd-elf.opt"