head 1.9; access; symbols pkgsrc-2015Q1:1.8.0.38 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.36 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.34 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.32 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.30 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.28 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.26 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.24 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.22 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.20 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.18 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.16 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.14 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.12 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.10 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.8 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.6 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.4 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.2 pkgsrc-2010Q3-base:1.8 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.9 date 2015.04.25.10.33.29; author wiz; state dead; branches; next 1.8; commitid CG2XaBpeRQKMwXiy; 1.8 date 2010.10.12.22.57.56; author joerg; state Exp; branches; next 1.7; 1.7 date 2002.08.12.01.53.48; author dmcmahill; state dead; branches; next 1.6; 1.6 date 2002.03.28.10.11.53; author jmc; state Exp; branches; next 1.5; 1.5 date 2002.01.03.20.40.43; author tron; state Exp; branches; next 1.4; 1.4 date 2001.04.27.10.45.23; author skrll; state Exp; branches; next 1.3; 1.3 date 2001.03.01.00.30.34; author jlam; state Exp; branches; next 1.2; 1.2 date 2001.02.28.23.28.09; author hubertf; state Exp; branches; next 1.1; 1.1 date 2000.09.15.23.58.48; author tron; state Exp; branches; next ; desc @@ 1.9 log @Finish move of lang/gcc to lang/gcc2. Let me know if I broke something. @ text @$NetBSD: patch-al,v 1.8 2010/10/12 22:57:56 joerg Exp $ --- gcc/ch/expr.c.orig 2010-10-12 22:47:21.000000000 +0000 +++ gcc/ch/expr.c @@@@ -3490,7 +3490,7 @@@@ compare_records (exp0, exp1) int compare_int_csts (op, val1, val2) - enum tree_code op; + enum chill_tree_code op; tree val1, val2; { int result; @ 1.8 log @At least try to compile with newer GCC. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @pull in most recent patches to gcc-2.95.3 from the netbsd-1-6 branch. Includes fixes for sparc, alpha, and others. Should help in keeping pkgsrc running on 1.5.* systems. The patches which mirror those in the main netbsd source tree have been all put into a single distribution patch file. This makes it much easier to maintain and easier to easily see which patches are specific to pkgsrc. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.6 2002/03/28 10:11:53 jmc Exp $ d3 11 a13 51 --- ../gcc-2.95.3/gcc/config/i386/i386.h.orig 2000/07/26 00:18:23 1.1.1.1 +++ ../gcc-2.95.3/gcc/config/i386/i386.h 2001/06/01 13:31:46 1.2 @@@@ -258,15 +258,15 @@@@ option if the fixed part matches. The actual option name is made by appending `-m' to the specified name. */ #define TARGET_OPTIONS \ -{ { "cpu=", &ix86_cpu_string, "Schedule code for given CPU"}, \ - { "arch=", &ix86_arch_string, "Generate code for given CPU"}, \ - { "reg-alloc=", &i386_reg_alloc_order, "Control allocation order of integer registers" }, \ - { "regparm=", &i386_regparm_string, "Number of registers used to pass integer arguments" }, \ - { "align-loops=", &i386_align_loops_string, "Loop code aligned to this power of 2" }, \ - { "align-jumps=", &i386_align_jumps_string, "Jump targets are aligned to this power of 2" }, \ - { "align-functions=", &i386_align_funcs_string, "Function starts are aligned to this power of 2" }, \ - { "preferred-stack-boundary=", &i386_preferred_stack_boundary_string, "Attempt to keep stack aligned to this power of 2" }, \ - { "branch-cost=", &i386_branch_cost_string, "Branches are this expensive (1-5, arbitrary units)" }, \ +{ { "cpu=", (const char **)&ix86_cpu_string, "Schedule code for given CPU"}, \ + { "arch=", (const char **)&ix86_arch_string, "Generate code for given CPU"}, \ + { "reg-alloc=", (const char **)&i386_reg_alloc_order, "Control allocation order of integer registers" }, \ + { "regparm=", (const char **)&i386_regparm_string, "Number of registers used to pass integer arguments" }, \ + { "align-loops=", (const char **)&i386_align_loops_string, "Loop code aligned to this power of 2" }, \ + { "align-jumps=", (const char **)&i386_align_jumps_string, "Jump targets are aligned to this power of 2" }, \ + { "align-functions=", (const char **)&i386_align_funcs_string, "Function starts are aligned to this power of 2" }, \ + { "preferred-stack-boundary=", (const char **)&i386_preferred_stack_boundary_string, "Attempt to keep stack aligned to this power of 2" }, \ + { "branch-cost=", (const char **)&i386_branch_cost_string, "Branches are this expensive (1-5, arbitrary units)" }, \ SUBTARGET_OPTIONS \ } @@@@ -2773,15 +2773,15 @@@@ #endif /* Variables in i386.c */ -extern char *ix86_cpu_string; /* for -mcpu= */ -extern char *ix86_arch_string; /* for -march= */ -extern char *i386_reg_alloc_order; /* register allocation order */ -extern char *i386_regparm_string; /* # registers to use to pass args */ -extern char *i386_align_loops_string; /* power of two alignment for loops */ -extern char *i386_align_jumps_string; /* power of two alignment for non-loop jumps */ -extern char *i386_align_funcs_string; /* power of two alignment for functions */ +extern char *ix86_cpu_string; /* for -mcpu= */ +extern char *ix86_arch_string; /* for -march= */ +extern char *i386_reg_alloc_order; /* register allocation order */ +extern char *i386_regparm_string; /* # registers to use to pass args */ +extern char *i386_align_loops_string; /* power of two alignment for loops */ +extern char *i386_align_jumps_string; /* power of two alignment for non-loop jumps */ +extern char *i386_align_funcs_string; /* power of two alignment for functions */ extern char *i386_preferred_stack_boundary_string;/* power of two alignment for stack boundary */ -extern char *i386_branch_cost_string; /* values 1-5: see jump.c */ +extern char *i386_branch_cost_string; /* values 1-5: see jump.c */ extern int i386_regparm; /* i386_regparm_string as a number */ extern int i386_align_loops; /* power of two alignment for loops */ extern int i386_align_jumps; /* power of two alignment for non-loop jumps */ @ 1.6 log @Update patch set against a sync of source from gnusrc/dist/toolchain. Not very many overall changes. Main ones include 1. Support for powerpc, arm32 and vax 2. Makefile.gcc can now be included by anything which depends on gcc versions. If the version installed isn't 2.95.3 it'll add itself as a BUILD_DEPENDS. (XXX: any of the makefile's in pkgsrc should be checked and change to use this) 3. Remove special PLIST.NetBSD-sparc as it's no longer needed 4. Change post-extract loop to pick up any arch files from FILESDIR without having to hardcode all the archs 5. Remove arch restrictions as this should work on any arch supported by the main source tree as of 03/28/02 6. Add PKGREVISION as this clearly isn't stock 2.95.3 (it doesn't change gcc --version so version checks won't care). @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update "gcc" package to version 2.95.3. This is a bug fix release of version 2.95.2. This package includes all changes to "gcc" from the new toolchain in NetBSD-current. The only tested (and enabled) platform is "NetBSD-*-i386" so far. @ text @d3 2 a4 2 --- ../gcc-2.95.3/gcc/config/i386/i386.h.orig Sun Apr 25 13:43:49 1999 +++ ../gcc-2.95.3/gcc/config/i386/i386.h Thu Jan 3 20:37:53 2002 @ 1.4 log @Make sure that sjlj exceptions are used everywhere and be consistent with the defines. While I'm here pull across a fix for LIB_SPEC that prevents libc from being linked in when linking a shared library. Fixes pkg/12620 from Takuya SHIOZAKI @ text @d3 51 a53 111 --- ../gcc-2.95.2/gcc/config/netbsd.h.orig Wed Dec 16 20:59:58 1998 +++ ../gcc-2.95.2/gcc/config/netbsd.h @@@@ -48,17 +48,38 @@@@ #define ASM_SPEC " %| %{fpic:-k} %{fPIC:-k -K}" /* Provide a LIB_SPEC appropriate for NetBSD. Just select the appropriate - libc, depending on whether we're doing profiling. */ + libc, depending on whether we're doing profiling; if `-posix' is specified, + link against the appropriate libposix first. Don't include libc when + linking a shared library. */ #undef LIB_SPEC -#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" +#define LIB_SPEC \ + "%{posix:%{!p:%{!pg:-lposix}}%{p:-lposix_p}%{pg:-lposix_p}} \ + %{!shared:%{!symbolic:%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}}}" + +/* Provide a LIBGCC_SPEC appropriate for NetBSD. We also want to exclude + libgcc when -symbolic. */ + +#undef LIBGCC_SPEC +#define LIBGCC_SPEC "%{!shared:%{!symbolic:-lgcc}}" + +/* #ifdef NETBSD_AOUT */ + +/* Provide a STARTFILE_SPEC appropriate for NetBSD a.out. Here we + provide support for the special GCC option -static. */ + +#undef STARTFILE_SPEC +#define STARTFILE_SPEC \ + "%{!shared:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:%{!static:crt0%O%s}%{static:scrt0%O%s}}}} %{shared:c++rt0%O%s}" /* Provide a LINK_SPEC appropriate for NetBSD. Here we provide support for the special GCC options -static, -assert, and -nostdlib. */ #undef LINK_SPEC #define LINK_SPEC \ - "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{R*} %{static:-Bstatic} %{assert*}" + "%{nostdlib:-nostdlib} %{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic}} %{shared:-Bshareable} %{R*} %{assert*}" + +/* #endif NETBSD_AOUT */ /* This defines which switch letters take arguments. */ #undef SWITCH_TAKES_ARG @@@@ -127,6 +148,9 @@@@ entries in an ELF object file under SVR4. These macros also output the starting labels for the relevant functions/objects. */ +/* XXX. This is WRONG for alpha. Needs to be verified on other ELF ports. */ +#ifndef NETBSD_ELF + /* Write the extra assembler code needed to declare a function properly. Some svr4 assemblers need to also have something extra said about the function's return value. We allow for that here. */ @@@@ -207,3 +231,56 @@@@ putc ('\n', FILE); \ } \ } while (0) + +#endif /* ! NETBSD_ELF */ + +/* NetBSD ELF support begins here. */ + +#ifdef NETBSD_ELF + +/* Start with generic ELF definitions. */ +#if !defined(__sparc__) +#include "elfos.h" + +#undef DWARF_DEBUGGING_INFO /* XXX */ +#undef DWARF2_DEBUGGING_INFO /* XXX */ +#endif + +/* Provide a STARTFILE_SPEC appropriate for NetBSD ELF targets. Here we + provide support for the special GCC option -static. On ELF targets, + we also add the crtbegin.o file which provides part of the support + for getting C++ file-scope static objects constructed before entering + `main'. */ + +#undef STARTFILE_SPEC +#define STARTFILE_SPEC \ + "%{!shared: \ + %{pg:gcrt0%O%s} \ + %{!pg: \ + %{p:gcrt0%O%s} \ + %{!p:crt0%O%s}}} \ + %{!shared:crtbegin%O%s} %{shared:crtbeginS%O%s}" + +/* Provide an ENDFILE_SPEC appropriate for NetBSD ELF targets. Here we + add crtend.o, which provides part of the support for getting C++ + file-scope static objects deconstructed after exiting `main'. */ + +#undef ENDFILE_SPEC +#define ENDFILE_SPEC \ + "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" + +/* Provide a LINK_SPEC appropriate for a NetBSD ELF target. */ + +#undef LINK_SPEC +#define LINK_SPEC \ + "%{assert*} \ + %{shared:-shared} \ + %{!shared: \ + -dc -dp \ + %{!nostdlib:%{!r*:%{!e*:-e __start}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \ + %{static:-static}}" + +#endif /* NETBSD_ELF */ @ 1.3 log @Add LIBGCC_SPEC definition taken from gnusrc/gnu/dist/toolchain/gcc/config/netbsd.h @ text @d3 3 a5 3 --- ../gcc-2.95.2/gcc/config/netbsd.h.orig Wed Dec 16 15:59:58 1998 +++ ../gcc-2.95.2/gcc/config/netbsd.h Wed Feb 28 18:41:35 2001 @@@@ -48,17 +48,37 @@@@ d11 2 a12 1 + link against the appropriate libposix first. */ d18 1 a18 1 + %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" d47 1 a47 1 @@@@ -127,6 +147,9 @@@@ d57 1 a57 1 @@@@ -207,3 +230,56 @@@@ @ 1.2 log @Make this pkg work on NetBSD/sparc. Patches contributes by Michael Rauch in PR 12299 @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2000/09/15 23:58:48 tron Exp $ d3 3 a5 3 --- ../gcc-2.95.2/gcc/config/netbsd.h.orig Wed Dec 16 21:59:58 1998 +++ ../gcc-2.95.2/gcc/config/netbsd.h Sat Sep 16 00:17:42 2000 @@@@ -48,17 +48,31 @@@@ d19 6 d46 1 a46 1 @@@@ -127,6 +141,9 @@@@ d56 1 a56 1 @@@@ -207,3 +224,56 @@@@ @ 1.1 log @- Add patches from NetBSD-current to fix build on i386 ELF systems. - Install into "${LOCALBASE}/gcc-2.95.2" to avoid that e.g. "bsd.pkg.mk" picks up the new compiler by accident. - Add a file "${LOCALBASE}/etc/gcc-2.95.2.mk" which makes it possible to use the new "gcc" like this: make MAKECONF=/usr/pkg/etc/gcc-2.95.2.mk @ text @d1 1 a1 1 $NetBSD$ d50 1 a50 1 @@@@ -207,3 +224,54 @@@@ d62 1 d67 1 @