head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2; locks; strict; comment @# @; 1.3 date 2002.08.12.01.54.25; author dmcmahill; state dead; branches; next 1.2; 1.2 date 2002.03.28.10.11.54; author jmc; state Exp; branches; next 1.1; 1.1 date 2002.01.03.20.40.48; author tron; state Exp; branches; next ; desc @@ 1.3 log @pull in most recent patches to gcc-2.95.3 from the netbsd-1-6 branch. Includes fixes for sparc, alpha, and others. Should help in keeping pkgsrc running on 1.5.* systems. The patches which mirror those in the main netbsd source tree have been all put into a single distribution patch file. This makes it much easier to maintain and easier to easily see which patches are specific to pkgsrc. @ text @$NetBSD: patch-bt,v 1.2 2002/03/28 10:11:54 jmc Exp $ --- ../gcc-2.95.3/gcc/configure.in.orig 2001/04/23 11:58:07 1.1.1.2 +++ ../gcc-2.95.3/gcc/configure.in 2002/03/24 18:05:57 1.18 @@@@ -498,7 +498,9 @@@@ hppa*-*-*) cpu_type=pa ;; - m68000-*-*) +changequote(,)dnl + m680[01]0-*-*) +changequote([,])dnl cpu_type=m68k ;; mips*-*-*) @@@@ -510,6 +512,9 @@@@ pyramid-*-*) cpu_type=pyr ;; + sh*-*-*) + cpu_type=sh + ;; sparc*-*-*) cpu_type=sparc ;; @@@@ -518,11 +523,20 @@@@ tm_file=${cpu_type}/${cpu_type}.h xm_file=${cpu_type}/xm-${cpu_type}.h - # Common parts for linux-gnu and openbsd systems + # Common parts for some multiplatform systems case $machine in *-*-linux-gnu*) xm_defines="HAVE_ATEXIT POSIX BSTRING" ;; + *-*-netbsd*) + case $machine in + *-*-netbsdelf*) tm_file=${cpu_type}/netbsd-elf.h;; + *) tm_file=${cpu_type}/netbsd.h;; + esac + tmake_file="t-libc-ok t-netbsd" + xm_file="${xm_file} xm-netbsd.h" + xmake_file=none + ;; *-*-openbsd*) tm_file=${cpu_type}/openbsd.h tmake_file="t-libc-ok t-openbsd" @@@@ -626,20 +640,15 @@@@ fi ;; alpha*-*-netbsd*) - tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" - tmake_file="alpha/t-crtbe alpha/t-ieee" - extra_parts="crtbegin.o crtend.o" - xmake_file=none + tmake_file="${tmake_file} alpha/t-ieee" gas=yes gnu_ld=yes ;; - alpha*-*-openbsd*) # default x-alpha is only appropriate for dec-osf. target_cpu_default="MASK_GAS" tmake_file="alpha/t-ieee" ;; - alpha*-dec-osf*) if test x$stabs = xyes then @@@@ -742,11 +751,12 @@@@ tm_file=arm/semiaof.h tmake_file=arm/t-semiaof ;; - arm*-*-netbsd*) - tm_file=arm/netbsd.h + arm*-*-netbsdelf*) xm_file="arm/xm-netbsd.h ${xm_file}" - tmake_file="t-netbsd arm/t-netbsd" - use_collect2=yes + gas=yes gnu_ld=yes + ;; + arm*-*-netbsd*) + gas=yes ;; arm*-*-linux-gnuaout*) # ARM GNU/Linux with a.out cpu_type=arm @@@@ -1171,11 +1181,13 @@@@ tmake_file=t-freebsd ;; changequote(,)dnl + i[34567]86-*-netbsdelf*) +changequote([,])dnl + gas=yes gnu_ld=yes + ;; +changequote(,)dnl i[34567]86-*-netbsd*) changequote([,])dnl - tm_file=i386/netbsd.h - tmake_file=t-netbsd - use_collect2=yes ;; changequote(,)dnl i[34567]86-*-openbsd*) @@@@ -2043,12 +2055,21 @@@@ tmake_file=m68k/t-lynx extra_headers=math-68881.h float_format=m68k + ;; + m68*-*-netbsdelf*) + case $machine in + m68010-*) + target_cpu_default="0" + ;; + *) + target_cpu_default="MASK_68020|MASK_68881|MASK_BITFIELD" + ;; + esac + float_format=m68k + gas=yes gnu_ld=yes ;; - m68k*-*-netbsd*) - tm_file=m68k/netbsd.h - tmake_file=t-netbsd + m68*-*-netbsd*) float_format=m68k - use_collect2=yes ;; m68k*-*-openbsd*) float_format=m68k @@@@ -2363,10 +2384,12 @@@@ use_collect2=yes fi ;; - mipsel-*-netbsd* | mips-dec-netbsd*) # Decstation running NetBSD - tm_file=mips/netbsd.h - # On NetBSD, the headers are already okay, except for math.h. - tmake_file=t-netbsd + mipseb*-*-netbsd*) + tmake_file="${tmake_file} mips/t-mipseb" + gas=yes gnu_ld=yes + ;; + mips*-*-netbsd*) + gas=yes gnu_ld=yes ;; mips*-*-linux*) # Linux MIPS, either endian. xmake_file=x-linux @@@@ -2724,11 +2747,6 @@@@ use_collect2=yes ;; ns32k-*-netbsd*) - tm_file=ns32k/netbsd.h - xm_file="ns32k/xm-netbsd.h ${xm_file}" - # On NetBSD, the headers are already okay, except for math.h. - tmake_file=t-netbsd - use_collect2=yes ;; pdp11-*-bsd) tm_file="${tm_file} pdp11/2bsd.h" @@@@ -2753,6 +2771,10 @@@@ romp-*-openbsd*) # Nothing special ;; + powerpc-*-netbsd*) + tmake_file="${tmake_file} rs6000/t-rs6000" + xm_file="rs6000/xm-sysv4.h xm-netbsd.h" + ;; powerpc-*-openbsd*) tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd" ;; @@@@ -3005,6 +3027,13 @@@@ tm_file=sh/elf.h float_format=sh ;; + sh-*-netbsdelf*) + float_format=sh + ;; + shle-*-netbsdelf*) + tm_file="sh/netbsd-elf.h sh/netbsd-elf-little.h" + float_format=sh; + ;; sh-*-rtemself*) tmake_file="sh/t-sh t-rtems" tm_file=sh/rtemself.h @@@@ -3033,10 +3062,12 @@@@ tmake_file=sparc/t-sparcbare tm_file="sparc/aout.h libgloss.h" ;; + sparc-*-netbsdelf*) + tmake_file="${tmake_file} sparc/t-netbsd" + gas=yes gnu_ld=yes + ;; sparc-*-netbsd*) - tm_file=sparc/netbsd.h - tmake_file=t-netbsd - use_collect2=yes + tmake_file="${tmake_file} sparc/t-netbsd" ;; sparc-*-openbsd*) # we need collect2 until our bug is fixed... @@@@ -3228,6 +3259,11 @@@@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" gnu_ld=yes ;; + sparc64-*-netbsd*) + tm_file=sparc/netbsd64.h + xm_file="sparc/xm-sp64.h xm-netbsd.h" + gas=yes gnu_ld=yes + ;; # This hasn't been upgraded to GCC 2. # tahoe-harris-*) # Harris tahoe, using COFF. # tm_file=tahoe/harris.h @@@@ -3275,10 +3311,8 @@@@ float_format=vax ;; vax-*-netbsd*) - tm_file="${tm_file} netbsd.h vax/netbsd.h" - tmake_file=t-netbsd float_format=vax - use_collect2=yes + gas=yes gnu_ld=yes ;; vax-*-openbsd*) tmake_file="${tmake_file} vax/t-openbsd" @@@@ -3569,6 +3603,12 @@@@ esac fi +case $target in + alpha*|sparc64*) + build_xm_file="${build_xm_file} xm-target64.h" + host_xm_file="${host_xm_file} xm-target64.h";; +esac + # Handle cpp installation. if test x$enable_cpp != xno then @@@@ -3655,8 +3695,8 @@@@ /*) realsrcdir=${srcdir};; *) realsrcdir=../${srcdir};; esac - CC=${CC_FOR_BUILD} ${realsrcdir}/configure \ - --target=$target --host=$build --build=$build + CC=${CC_FOR_BUILD} LIBS= ${realsrcdir}/configure \ + --target=$target --host=$build --build=$build || exit 1 # We just finished tests for the build machine, so rename # the file auto-build.h in the gcc directory. @ 1.2 log @Update patch set against a sync of source from gnusrc/dist/toolchain. Not very many overall changes. Main ones include 1. Support for powerpc, arm32 and vax 2. Makefile.gcc can now be included by anything which depends on gcc versions. If the version installed isn't 2.95.3 it'll add itself as a BUILD_DEPENDS. (XXX: any of the makefile's in pkgsrc should be checked and change to use this) 3. Remove special PLIST.NetBSD-sparc as it's no longer needed 4. Change post-extract loop to pick up any arch files from FILESDIR without having to hardcode all the archs 5. Remove arch restrictions as this should work on any arch supported by the main source tree as of 03/28/02 6. Add PKGREVISION as this clearly isn't stock 2.95.3 (it doesn't change gcc --version so version checks won't care). @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update "gcc" package to version 2.95.3. This is a bug fix release of version 2.95.2. This package includes all changes to "gcc" from the new toolchain in NetBSD-current. The only tested (and enabled) platform is "NetBSD-*-i386" so far. @ text @d3 14 a16 3 --- ../gcc-2.95.3/gcc/configure.in.orig Thu Jan 25 15:03:02 2001 +++ ../gcc-2.95.3/gcc/configure.in Thu Jan 3 20:37:55 2002 @@@@ -510,6 +510,9 @@@@ d26 1 a26 1 @@@@ -518,11 +521,20 @@@@ d48 1 a48 1 @@@@ -626,20 +638,15 @@@@ d70 1 a70 1 @@@@ -742,11 +749,11 @@@@ d74 2 d77 3 d82 1 a82 5 arm*-*-netbsd*) - tm_file=arm/netbsd.h - xm_file="arm/xm-netbsd.h ${xm_file}" - tmake_file="t-netbsd arm/t-netbsd" - use_collect2=yes d87 1 a87 1 @@@@ -1171,11 +1178,13 @@@@ d104 2 a105 1 @@@@ -2044,11 +2053,12 @@@@ d108 12 a123 4 + m68*-*-netbsdelf*) + float_format=m68k + gas=yes gnu_ld=yes + ;; d130 1 a130 1 @@@@ -2363,10 +2373,12 @@@@ d147 1 a147 1 @@@@ -2724,11 +2736,6 @@@@ d159 1 a159 1 @@@@ -2753,6 +2760,10 @@@@ d170 1 a170 1 @@@@ -3005,6 +3016,13 @@@@ d184 1 a184 1 @@@@ -3033,10 +3051,12 @@@@ d200 1 a200 1 @@@@ -3228,6 +3248,11 @@@@ d212 1 a212 1 @@@@ -3275,10 +3300,8 @@@@ d224 1 a224 2 @@@@ -3568,6 +3591,12 @@@@ enable_haifa=yes;; d227 1 a227 1 + d233 1 a233 1 d236 12 @