diff options
| author | obrien <obrien@FreeBSD.org> | 2000-01-17 20:27:59 +0800 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-01-17 20:27:59 +0800 |
| commit | 48e2dab45cf2b8c920be21bbabfddf4bf0a33ebc (patch) | |
| tree | b7897ee2c2d001922ddb7f9d0b2367d746c256bf | |
| parent | 672345a9efcdf5740f4159458ff2c6a109173286 (diff) | |
| download | freebsd-ports-graphics-48e2dab45cf2b8c920be21bbabfddf4bf0a33ebc.tar.gz freebsd-ports-graphics-48e2dab45cf2b8c920be21bbabfddf4bf0a33ebc.tar.zst freebsd-ports-graphics-48e2dab45cf2b8c920be21bbabfddf4bf0a33ebc.zip | |
Upgrade to the 2000-01-10 GCC 2.96 development snapshot.
144 files changed, 1512 insertions, 1602 deletions
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc-devel/Makefile +++ b/lang/gcc-devel/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc-devel/distinfo b/lang/gcc-devel/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc-devel/distinfo +++ b/lang/gcc-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc-devel/files/patch-ad b/lang/gcc-devel/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc-devel/files/patch-ad +++ b/lang/gcc-devel/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc-devel/files/patch-af b/lang/gcc-devel/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc-devel/files/patch-af +++ b/lang/gcc-devel/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc-devel/files/patch-ak b/lang/gcc-devel/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc-devel/files/patch-ak +++ b/lang/gcc-devel/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc-devel/files/patch-al b/lang/gcc-devel/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc-devel/files/patch-al +++ b/lang/gcc-devel/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc-devel/files/patch-ar b/lang/gcc-devel/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc-devel/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc-devel/pkg-plist b/lang/gcc-devel/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc-devel/pkg-plist +++ b/lang/gcc-devel/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc-ooo/distinfo +++ b/lang/gcc-ooo/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc-ooo/files/patch-ad b/lang/gcc-ooo/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc-ooo/files/patch-ad +++ b/lang/gcc-ooo/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc-ooo/files/patch-af b/lang/gcc-ooo/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc-ooo/files/patch-af +++ b/lang/gcc-ooo/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc-ooo/files/patch-ak b/lang/gcc-ooo/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc-ooo/files/patch-ak +++ b/lang/gcc-ooo/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc-ooo/files/patch-al b/lang/gcc-ooo/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc-ooo/files/patch-al +++ b/lang/gcc-ooo/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc-ooo/files/patch-ar b/lang/gcc-ooo/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc-ooo/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc-ooo/pkg-plist +++ b/lang/gcc-ooo/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc/files/patch-ad b/lang/gcc/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc/files/patch-ad +++ b/lang/gcc/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc/files/patch-af b/lang/gcc/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc/files/patch-af +++ b/lang/gcc/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc/files/patch-ak b/lang/gcc/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc/files/patch-ak +++ b/lang/gcc/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc/files/patch-al b/lang/gcc/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc/files/patch-al +++ b/lang/gcc/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc/files/patch-ar b/lang/gcc/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc30/Makefile +++ b/lang/gcc30/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc30/distinfo b/lang/gcc30/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc30/distinfo +++ b/lang/gcc30/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc30/files/patch-ad b/lang/gcc30/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc30/files/patch-ad +++ b/lang/gcc30/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc30/files/patch-af b/lang/gcc30/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc30/files/patch-af +++ b/lang/gcc30/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc30/files/patch-ak b/lang/gcc30/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc30/files/patch-ak +++ b/lang/gcc30/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc30/files/patch-al b/lang/gcc30/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc30/files/patch-al +++ b/lang/gcc30/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc30/files/patch-ar b/lang/gcc30/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc30/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc30/pkg-plist +++ b/lang/gcc30/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc31/Makefile +++ b/lang/gcc31/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc31/distinfo +++ b/lang/gcc31/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc31/files/patch-ad b/lang/gcc31/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc31/files/patch-ad +++ b/lang/gcc31/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc31/files/patch-af b/lang/gcc31/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc31/files/patch-af +++ b/lang/gcc31/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc31/files/patch-ak b/lang/gcc31/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc31/files/patch-ak +++ b/lang/gcc31/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc31/files/patch-al b/lang/gcc31/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc31/files/patch-al +++ b/lang/gcc31/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc31/files/patch-ar b/lang/gcc31/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc31/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc31/pkg-plist +++ b/lang/gcc31/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc32/distinfo b/lang/gcc32/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc32/distinfo +++ b/lang/gcc32/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc32/files/patch-ad b/lang/gcc32/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc32/files/patch-ad +++ b/lang/gcc32/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc32/files/patch-af b/lang/gcc32/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc32/files/patch-af +++ b/lang/gcc32/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc32/files/patch-ak b/lang/gcc32/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc32/files/patch-ak +++ b/lang/gcc32/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc32/files/patch-al b/lang/gcc32/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc32/files/patch-al +++ b/lang/gcc32/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc32/files/patch-ar b/lang/gcc32/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc32/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc32/pkg-plist +++ b/lang/gcc32/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc33/distinfo +++ b/lang/gcc33/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc33/files/patch-ad b/lang/gcc33/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc33/files/patch-ad +++ b/lang/gcc33/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc33/files/patch-af b/lang/gcc33/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc33/files/patch-af +++ b/lang/gcc33/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc33/files/patch-ak b/lang/gcc33/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc33/files/patch-ak +++ b/lang/gcc33/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc33/files/patch-al b/lang/gcc33/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc33/files/patch-al +++ b/lang/gcc33/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc33/files/patch-ar b/lang/gcc33/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc33/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc33/pkg-plist +++ b/lang/gcc33/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc34/files/patch-ad b/lang/gcc34/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc34/files/patch-ad +++ b/lang/gcc34/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc34/files/patch-af b/lang/gcc34/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc34/files/patch-af +++ b/lang/gcc34/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc34/files/patch-ak b/lang/gcc34/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc34/files/patch-ak +++ b/lang/gcc34/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc34/files/patch-al b/lang/gcc34/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc34/files/patch-al +++ b/lang/gcc34/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc34/files/patch-ar b/lang/gcc34/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc34/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc34/pkg-plist +++ b/lang/gcc34/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc35/Makefile +++ b/lang/gcc35/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc35/distinfo +++ b/lang/gcc35/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc35/files/patch-ad b/lang/gcc35/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc35/files/patch-ad +++ b/lang/gcc35/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc35/files/patch-af b/lang/gcc35/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc35/files/patch-af +++ b/lang/gcc35/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc35/files/patch-ak b/lang/gcc35/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc35/files/patch-ak +++ b/lang/gcc35/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc35/files/patch-al b/lang/gcc35/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc35/files/patch-al +++ b/lang/gcc35/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc35/files/patch-ar b/lang/gcc35/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc35/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc35/pkg-plist +++ b/lang/gcc35/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc40/files/patch-ad b/lang/gcc40/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc40/files/patch-ad +++ b/lang/gcc40/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc40/files/patch-af b/lang/gcc40/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc40/files/patch-af +++ b/lang/gcc40/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc40/files/patch-ak b/lang/gcc40/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc40/files/patch-ak +++ b/lang/gcc40/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc40/files/patch-al b/lang/gcc40/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc40/files/patch-al +++ b/lang/gcc40/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc40/files/patch-ar b/lang/gcc40/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc40/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc40/pkg-plist +++ b/lang/gcc40/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc41/distinfo +++ b/lang/gcc41/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc41/files/patch-ad b/lang/gcc41/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc41/files/patch-ad +++ b/lang/gcc41/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc41/files/patch-af b/lang/gcc41/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc41/files/patch-af +++ b/lang/gcc41/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc41/files/patch-ak b/lang/gcc41/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc41/files/patch-ak +++ b/lang/gcc41/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc41/files/patch-al b/lang/gcc41/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc41/files/patch-al +++ b/lang/gcc41/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc41/files/patch-ar b/lang/gcc41/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc41/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc41/pkg-plist +++ b/lang/gcc41/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc42/files/patch-ad b/lang/gcc42/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc42/files/patch-ad +++ b/lang/gcc42/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc42/files/patch-af b/lang/gcc42/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc42/files/patch-af +++ b/lang/gcc42/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc42/files/patch-ak b/lang/gcc42/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc42/files/patch-ak +++ b/lang/gcc42/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc42/files/patch-al b/lang/gcc42/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc42/files/patch-al +++ b/lang/gcc42/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc42/files/patch-ar b/lang/gcc42/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc42/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc42/pkg-plist +++ b/lang/gcc42/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc43/distinfo +++ b/lang/gcc43/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc43/files/patch-ad b/lang/gcc43/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc43/files/patch-ad +++ b/lang/gcc43/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc43/files/patch-af b/lang/gcc43/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc43/files/patch-af +++ b/lang/gcc43/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc43/files/patch-ak b/lang/gcc43/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc43/files/patch-ak +++ b/lang/gcc43/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc43/files/patch-al b/lang/gcc43/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc43/files/patch-al +++ b/lang/gcc43/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc43/files/patch-ar b/lang/gcc43/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc43/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc43/pkg-plist +++ b/lang/gcc43/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc44/files/patch-ad b/lang/gcc44/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc44/files/patch-ad +++ b/lang/gcc44/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc44/files/patch-af b/lang/gcc44/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc44/files/patch-af +++ b/lang/gcc44/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc44/files/patch-ak b/lang/gcc44/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc44/files/patch-ak +++ b/lang/gcc44/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc44/files/patch-al b/lang/gcc44/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc44/files/patch-al +++ b/lang/gcc44/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc44/files/patch-ar b/lang/gcc44/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc44/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc44/pkg-plist +++ b/lang/gcc44/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc45/files/patch-ad b/lang/gcc45/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc45/files/patch-ad +++ b/lang/gcc45/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc45/files/patch-af b/lang/gcc45/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc45/files/patch-af +++ b/lang/gcc45/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc45/files/patch-ak b/lang/gcc45/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc45/files/patch-ak +++ b/lang/gcc45/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc45/files/patch-al b/lang/gcc45/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc45/files/patch-al +++ b/lang/gcc45/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc45/files/patch-ar b/lang/gcc45/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc45/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc45/pkg-plist +++ b/lang/gcc45/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc46/files/patch-ad b/lang/gcc46/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc46/files/patch-ad +++ b/lang/gcc46/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc46/files/patch-af b/lang/gcc46/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc46/files/patch-af +++ b/lang/gcc46/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc46/files/patch-ak b/lang/gcc46/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc46/files/patch-ak +++ b/lang/gcc46/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc46/files/patch-al b/lang/gcc46/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc46/files/patch-al +++ b/lang/gcc46/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc46/files/patch-ar b/lang/gcc46/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc46/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc47/files/patch-ad b/lang/gcc47/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc47/files/patch-ad +++ b/lang/gcc47/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc47/files/patch-af b/lang/gcc47/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc47/files/patch-af +++ b/lang/gcc47/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc47/files/patch-ak b/lang/gcc47/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc47/files/patch-ak +++ b/lang/gcc47/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc47/files/patch-al b/lang/gcc47/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc47/files/patch-al +++ b/lang/gcc47/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc47/files/patch-ar b/lang/gcc47/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc47/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc47/pkg-plist +++ b/lang/gcc47/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index efee67e57ea..7e19127dbee 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -7,7 +7,7 @@ # $FreeBSD$ # -SNAPDATE= 1999-11-10 +SNAPDATE= 2000-01-10 SNAPVER= ${SNAPDATE:S/-//g} DISTNAME= gcc-2.96 @@ -62,12 +62,11 @@ MAN1= cccp.1 eg++.1 eg77.1 egcc.1 pre-patch: @${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h @${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h - @${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ - >${WRKSRC}/gcc/config/freebsd.h ) + ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ + ${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index 01e47c5903e..020c4a14328 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,5 +1,5 @@ -MD5 (egcs-core-19991110.tar.gz) = 84f799ff559c69b30746297bbbb025ea -MD5 (egcs-g++-19991110.tar.gz) = ea1c5a9dbb4d76d1d2525580fc725263 -MD5 (egcs-g77-19991110.tar.gz) = 07c65a4f071590b3013f0452cdb0116c -MD5 (egcs-java-19991110.tar.gz) = 2ee9273bc569269998f9ac1e961cac67 -MD5 (egcs-objc-19991110.tar.gz) = d4e71cd48956bf699adc775ee930cd1a +MD5 (egcs-core-20000110.tar.gz) = e47ca05ab5ce7e18ce4a506555d60f81 +MD5 (egcs-g++-20000110.tar.gz) = c19564a16c0c17845d50dc190c5741f9 +MD5 (egcs-g77-20000110.tar.gz) = 35c1df043f600a70b0c2dbb493312af3 +MD5 (egcs-java-20000110.tar.gz) = 126b2a84f69cf771ad68c087e05f0b04 +MD5 (egcs-objc-20000110.tar.gz) = 70bb4f393cb07c706008d310cd5fb506 diff --git a/lang/gcc48/files/patch-ad b/lang/gcc48/files/patch-ad index f8a3b90fdb1..b838666b14f 100644 --- a/lang/gcc48/files/patch-ad +++ b/lang/gcc48/files/patch-ad @@ -1,16 +1,5 @@ --- gcc/config/i386/freebsd-aout.h.orig Tue Jun 1 17:02:37 1999 +++ gcc/config/i386/freebsd-aout.h Mon Jun 14 14:11:20 1999 -@@ -20,6 +20,10 @@ - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+ -+/* Get generic FreeBSD definitions. */ -+#include <freebsd.h> -+ - /* This is tested by i386gas.h. */ - #define YES_UNDERSCORES - @@ -32,12 +36,10 @@ #include "i386/perform.h" diff --git a/lang/gcc48/files/patch-af b/lang/gcc48/files/patch-af index 533a35a9558..c1fbd05ffed 100644 --- a/lang/gcc48/files/patch-af +++ b/lang/gcc48/files/patch-af @@ -1,6 +1,6 @@ ---- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Sat Jul 24 17:59:06 1999 -@@ -135,6 +135,10 @@ +--- gcc/config/i386/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/i386/freebsd.h Wed Dec 15 02:32:20 1999 +@@ -117,6 +117,10 @@ : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \ : (-1)) @@ -11,51 +11,24 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,30 @@ +@@ -140,7 +144,15 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES - - #undef CPP_SPEC --#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+#if TARGET_CPU_DEFAULT == 2 -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}" -+#else -+#define CPP_SPEC "\ -+ %{!maout: -D__ELF__} \ -+ %{munderscores: -D__UNDERSCORES__} \ -+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ -+ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}" -+#endif + +#undef CC1_SPEC +#define CC1_SPEC "\ + %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ + %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" - --/* This defines which switch letters take arguments. On FreeBSD, most of -- the normal cases (defined in gcc.c) apply, and we also have -h* and -- -z* options (for the linker) (comming from svr4). -- We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -- --#undef SWITCH_TAKES_ARG --#define SWITCH_TAKES_ARG(CHAR) \ -- (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ -- || (CHAR) == 'h' \ -- || (CHAR) == 'z' \ -- || (CHAR) == 'R') ++ +#undef ASM_SPEC +#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +198,11 @@ +@@ -149,11 +161,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -72,12 +45,12 @@ /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on the magical crtend.o file (see crtstuff.c) which provides part of -@@ -200,7 +212,7 @@ +@@ -163,7 +175,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s" + "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}" - /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate - libc, depending on whether we're doing profiling or need threads support. + /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to diff --git a/lang/gcc48/files/patch-ak b/lang/gcc48/files/patch-ak index 81bf09754e0..e1804f119d0 100644 --- a/lang/gcc48/files/patch-ak +++ b/lang/gcc48/files/patch-ak @@ -1,6 +1,6 @@ ---- gcc/configure.orig Mon Sep 20 02:59:34 1999 -+++ gcc/configure Sat Sep 25 10:51:55 1999 -@@ -3167,6 +3167,15 @@ +--- gcc/configure.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure Fri Dec 10 09:44:30 1999 +@@ -3440,6 +3440,22 @@ thread_file='posix' fi ;; @@ -11,19 +11,26 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -3772,8 +3781,12 @@ +@@ -4050,8 +4066,12 @@ # Next line turned off because both 386BSD and BSD/386 use GNU ld. # use_collect2=yes ;; - i[34567]86-*-freebsdelf*) -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout) -+ tm_file=i386/freebsd-aout.h ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*) @@ -31,17 +38,13 @@ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -3782,13 +3795,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -4063,10 +4083,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; - i[34567]86-*-freebsd*) -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; i[34567]86-*-netbsd*) diff --git a/lang/gcc48/files/patch-al b/lang/gcc48/files/patch-al index 1c81b9a57bd..3da58f53a51 100644 --- a/lang/gcc48/files/patch-al +++ b/lang/gcc48/files/patch-al @@ -1,6 +1,6 @@ ---- gcc/configure.in.orig Mon Sep 20 02:59:33 1999 -+++ gcc/configure.in Sat Sep 25 10:56:01 1999 -@@ -634,6 +634,15 @@ +--- gcc/configure.in.orig Wed Dec 8 04:30:22 1999 ++++ gcc/configure.in Fri Dec 10 09:44:08 1999 +@@ -626,6 +626,22 @@ thread_file='posix' fi ;; @@ -11,42 +11,45 @@ + tmake_file="t-freebsd alpha/t-crtbe" + xmake_file=none + fixincludes=fixinc.wrap -+ gas=yes gnu_ld=yes ++ gas=yes ++ gnu_ld=yes ++ case x${enable_threads} in ++ xyes | xpthreads | xposix) ++ thread_file='posix' ++ tmake_file="${tmake_file} t-freebsd-thread" ++ ;; ++ esac + ;; alpha*-*-netbsd*) tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h" target_cpu_default="MASK_GAS" -@@ -1274,9 +1283,15 @@ +@@ -1271,9 +1287,15 @@ # use_collect2=yes ;; changequote(,)dnl - i[34567]86-*-freebsdelf*) + i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*) -+changequote([,])dnl -+ tm_file=i386/freebsd-aout.h + changequote([,])dnl +- tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h" ++ tm_file="freebsd.h i386/freebsd-aout.h" + tmake_file=t-freebsd + ;; +changequote(,)dnl + i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*) - changequote([,])dnl -- tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h" ++ changequote([,])dnl + tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" tmake_file=t-freebsd gas=yes -@@ -1285,15 +1300,9 @@ - case x${enable_threads} in - xyes | xpthreads | xposix) - thread_file='posix' -- tmake_file="${tmake_file} t-openbsd-thread" -+ tmake_file="${tmake_file} t-freebsd-thread" +@@ -1285,12 +1307,6 @@ + tmake_file="${tmake_file} t-freebsd-thread" ;; esac - ;; -changequote(,)dnl - i[34567]86-*-freebsd*) -changequote([,])dnl -- tm_file=i386/freebsd.h +- tm_file="i386/freebsd.h i386/perform.h" - tmake_file=t-freebsd ;; changequote(,)dnl diff --git a/lang/gcc48/files/patch-ar b/lang/gcc48/files/patch-ar new file mode 100644 index 00000000000..f2200f115da --- /dev/null +++ b/lang/gcc48/files/patch-ar @@ -0,0 +1,29 @@ +--- gcc/config/freebsd.h.orig Mon Nov 22 22:17:32 1999 ++++ gcc/config/freebsd.h Sat Dec 18 14:42:03 1999 +@@ -48,13 +48,23 @@ + #undef WORD_SWITCH_TAKES_ARG + #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) + ++/* Place spaces around this string. We depend on string splicing to produce ++ the final CPP_PREDEFINES value. */ ++#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) " ++ + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC + option `-posix', and PIC issues. */ + +-#undef CPP_SPEC +-#define CPP_SPEC "%(cpp_cpu) \ ++#define FBSD_CPP_SPEC " \ ++ %(cpp_cpu) \ + %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ +- %{posix:-D_POSIX_SOURCE}" ++ %{posix:-D_POSIX_SOURCE} \ ++ %{!maout: -D__ELF__} \ ++ %{munderscores: -D__UNDERSCORES__} \ ++ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}" ++ ++#undef CPP_SPEC ++#define CPP_SPEC FBSD_CPP_SPEC + + /* Provide a LIB_SPEC appropriate for FreeBSD. Just select the appropriate + libc, depending on whether we're doing profiling or need threads support. diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist index 1ca16caec5f..8b45855df51 100644 --- a/lang/gcc48/pkg-plist +++ b/lang/gcc48/pkg-plist @@ -225,7 +225,6 @@ info/gcc.info-9 @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus @@ -269,15 +268,15 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netkey/keysock.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h +lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/dvdio.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h -lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h |