From 1b62287db92780a8e80b9fea7b2597f74134f638 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 17 Jan 2005 19:20:10 +0000 Subject: [PATCH] update to latest snapshot, with basic OpenBSD configuration. go to dwarf2 config. --- lang/gcc/4.0/Makefile | 24 +++- lang/gcc/4.0/distinfo | 12 +- lang/gcc/4.0/patches/patch-gcc_collect2_c | 76 ---------- lang/gcc/4.0/patches/patch-gcc_config_gcc | 35 ----- .../patch-gcc_config_i386_openbsdelf_h | 135 ------------------ .../4.0/patches/patch-gcc_config_openbsd_h | 112 --------------- lang/gcc/4.0/patches/patch-gcc_cp_parser_c | 8 +- lang/gcc/4.0/patches/patch-gcc_gcc_c | 40 +++--- .../4.0/patches/patch-gcc_tree-vectorizer_c | 8 +- lang/gcc/4.0/patches/patch-gcc_varasm_c | 8 +- .../patch-libstdc++-v3_libsupc++_Makefile_in | 10 +- .../patch-libstdc++-v3_src_Makefile_in | 10 +- lang/gcc/4.0/pkg/PLIST-ada | 4 +- lang/gcc/4.0/pkg/PLIST-c++ | 5 +- 14 files changed, 70 insertions(+), 417 deletions(-) delete mode 100644 lang/gcc/4.0/patches/patch-gcc_collect2_c delete mode 100644 lang/gcc/4.0/patches/patch-gcc_config_gcc delete mode 100644 lang/gcc/4.0/patches/patch-gcc_config_i386_openbsdelf_h delete mode 100644 lang/gcc/4.0/patches/patch-gcc_config_openbsd_h diff --git a/lang/gcc/4.0/Makefile b/lang/gcc/4.0/Makefile index d9c7d22e41f..7e996f77af0 100644 --- a/lang/gcc/4.0/Makefile +++ b/lang/gcc/4.0/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.6 2005/01/09 00:54:47 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2005/01/17 19:20:10 espie Exp $ ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax V=4.0.0 -FULL_VERSION=4.0-20050102 +FULL_VERSION=4.0-20050116 MAINTAINER= Marc Espie - MAKE_GXX=Yes MAKE_FORTRAN=Yes MAKE_OBJC=Yes @@ -59,8 +58,11 @@ DISTNAME= gcc-${FULL_VERSION} DISTFILES= ${DISTNAME}.tar.bz2 +#SUPDISTFILES=adastrap-i386-4.0-20050102-1.tgz:0 +SUPDISTFILES=adastrap-i386-3.3.5-1.tgz:0 MASTER_SITES= ${MASTER_SITE_GCC:=snapshots/$(FULL_VERSION)/} +MASTER_SITES0= ftp://quatramaran.ens.fr/pub/espie/ CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/gcc @@ -87,11 +89,19 @@ CONFIGURE_ARGS+=--enable-java-gc=system-boehm .if ${MAKE_ADA:L} == "yes" LANGS:=${LANGS},ada MULTI_PACKAGES+=-ada +#DISTFILES+=adastrap-${MACHINE_ARCH}-4.0-20050102-1.tgz:0 +DISTFILES+=adastrap-${MACHINE_ARCH}-3.3.5-1.tgz:0 +CONFIGURE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind +MAKE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind +CC=${WRKDIR}/bin/egcc + +post-extract: +.for f in egcc gnatbind gnatmake gnatlink + echo "#! /bin/sh" >${WRKDIR}/bin/$f + echo 'GNAT_ROOT=${WRKDIR}/bootstrap GCC_ROOT=${WRKDIR}/bootstrap exec ${WRKDIR}/bootstrap/bin/$f "$$@"' >>${WRKDIR}/bin/$f + chmod a+x ${WRKDIR}/bin/$f +.endfor -CONFIGURE_ENV=ADAC=${LOCALBASE}/bin/egcc GNATBIND=${LOCALBASE}/bin/gnatbind -MAKE_ENV=ADAC=${LOCALBASE}/bin/egcc GNATBIND=${LOCALBASE}/bin/gnatbind -CC=${LOCALBASE}/bin/egcc -#BUILD_DEPENDS+=:gnat-*:lang/egcs/stable,-ada .endif CONFIGURE_ENV+=am_cv_func_iconv=no CONFIGURE_ENV+=ac_cv_prog_CONFIGURED_M4=/usr/bin/m4 diff --git a/lang/gcc/4.0/distinfo b/lang/gcc/4.0/distinfo index 568262ec205..15a9db63c06 100644 --- a/lang/gcc/4.0/distinfo +++ b/lang/gcc/4.0/distinfo @@ -1,4 +1,8 @@ -MD5 (gcc/gcc-4.0-20050102.tar.bz2) = d5bf439e5a0653f503aaf6bf28609e33 -RMD160 (gcc/gcc-4.0-20050102.tar.bz2) = 0d460c1d4b64e300ebbeb7a3f0d5e1a393aa5f69 -SHA1 (gcc/gcc-4.0-20050102.tar.bz2) = c9ad95efa822620ac28850fa079e6486f601dd9d -SIZE (gcc/gcc-4.0-20050102.tar.bz2) = 28408037 +MD5 (gcc/adastrap-i386-3.3.5-1.tgz) = f8c1992077e0b713922e738210dd3674 +MD5 (gcc/gcc-4.0-20050116.tar.bz2) = 38b178b42f41848fbb1a36f46b793cac +RMD160 (gcc/adastrap-i386-3.3.5-1.tgz) = 644b12c337b02ea5c02735f0ea3830081761bf26 +RMD160 (gcc/gcc-4.0-20050116.tar.bz2) = c39aea4b55f4fc4263378372dde0545ecd143823 +SHA1 (gcc/adastrap-i386-3.3.5-1.tgz) = 4c26ff21dcecbc37afa31b8ef63d5cdd7fe65d7e +SHA1 (gcc/gcc-4.0-20050116.tar.bz2) = 4a90b1005411519d31522b46b08460900c0dad37 +SIZE (gcc/adastrap-i386-3.3.5-1.tgz) = 12121161 +SIZE (gcc/gcc-4.0-20050116.tar.bz2) = 28470389 diff --git a/lang/gcc/4.0/patches/patch-gcc_collect2_c b/lang/gcc/4.0/patches/patch-gcc_collect2_c deleted file mode 100644 index 32a297cd63b..00000000000 --- a/lang/gcc/4.0/patches/patch-gcc_collect2_c +++ /dev/null @@ -1,76 +0,0 @@ -$OpenBSD: patch-gcc_collect2_c,v 1.2 2004/11/23 18:17:34 espie Exp $ ---- gcc/collect2.c.orig Tue Nov 9 11:12:15 2004 -+++ gcc/collect2.c Tue Nov 23 12:44:28 2004 -@@ -779,19 +779,19 @@ main (int argc, char **argv) - qualify the program name with the target machine. */ - - const char *const full_ld_suffix = -- concat(target_machine, "-", ld_suffix, NULL); -+ concat(target_machine, "-", ld_suffix, (void *)0); - const char *const full_nm_suffix = -- concat (target_machine, "-", nm_suffix, NULL); -+ concat (target_machine, "-", nm_suffix, (void *)0); - const char *const full_gnm_suffix = -- concat (target_machine, "-", gnm_suffix, NULL); -+ concat (target_machine, "-", gnm_suffix, (void *)0); - #ifdef LDD_SUFFIX - const char *const full_ldd_suffix = -- concat (target_machine, "-", ldd_suffix, NULL); -+ concat (target_machine, "-", ldd_suffix, (void *)0); - #endif - const char *const full_strip_suffix = -- concat (target_machine, "-", strip_suffix, NULL); -+ concat (target_machine, "-", strip_suffix, (void *)0); - const char *const full_gstrip_suffix = -- concat (target_machine, "-", gstrip_suffix, NULL); -+ concat (target_machine, "-", gstrip_suffix, (void *)0); - #else - const char *const full_ld_suffix = ld_suffix; - const char *const full_nm_suffix = nm_suffix; -@@ -981,7 +981,7 @@ main (int argc, char **argv) - if (c_file_name == 0) - { - #ifdef CROSS_COMPILE -- c_file_name = concat (target_machine, "-gcc", NULL); -+ c_file_name = concat (target_machine, "-gcc", (void *)0); - #else - c_file_name = "gcc"; - #endif -@@ -1251,7 +1251,7 @@ main (int argc, char **argv) - - if (exports.first) - { -- char *buf = concat ("-bE:", export_file, NULL); -+ char *buf = concat ("-bE:", export_file, (void *)0); - - *ld1++ = buf; - *ld2++ = buf; -@@ -1416,7 +1416,7 @@ main (int argc, char **argv) - /* Tell the linker that we have initializer and finalizer functions. */ - #ifdef LD_INIT_SWITCH - #ifdef COLLECT_EXPORT_LIST -- *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, NULL); -+ *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, (void *)0); - #else - *ld2++ = LD_INIT_SWITCH; - *ld2++ = initname; -@@ -1431,7 +1431,7 @@ main (int argc, char **argv) - /* If we did not add export flag to link arguments before, add it to - second link phase now. No new exports should have been added. */ - if (! exports.first) -- *ld2++ = concat ("-bE:", export_file, NULL); -+ *ld2++ = concat ("-bE:", export_file, (void *)0); - - #ifndef LD_INIT_SWITCH - add_to_list (&exports, initname); -@@ -1838,8 +1838,8 @@ write_c_file_stat (FILE *stream, const c - notice ("\nwrite_c_file - output name is %s, prefix is %s\n", - output_file, prefix); - -- initname = concat ("_GLOBAL__FI_", prefix, NULL); -- fininame = concat ("_GLOBAL__FD_", prefix, NULL); -+ initname = concat ("_GLOBAL__FI_", prefix, (void *)0); -+ fininame = concat ("_GLOBAL__FD_", prefix, (void *)0); - - free (prefix); - diff --git a/lang/gcc/4.0/patches/patch-gcc_config_gcc b/lang/gcc/4.0/patches/patch-gcc_config_gcc deleted file mode 100644 index 1f3e20a05f7..00000000000 --- a/lang/gcc/4.0/patches/patch-gcc_config_gcc +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-gcc_config_gcc,v 1.3 2005/01/07 17:36:19 espie Exp $ ---- gcc/config.gcc.orig Wed Dec 22 09:41:31 2004 -+++ gcc/config.gcc Fri Jan 7 14:37:09 2005 -@@ -493,6 +493,10 @@ case ${target} in - tmake_file="${tmake_file} t-openbsd-thread" - ;; - esac -+ case ${target} in -+ *-*-openbsd2.*|*-*-openbsd3.[012]) -+ tm_defines="${tm_defines} HAS_LIBC_R=1" ;; -+ esac - ;; - *-*-rtems*) - case ${enable_threads} in -@@ -930,12 +934,19 @@ i[34567]86-*-netbsd*) - x86_64-*-netbsd*) - tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h" - ;; --i[34567]86-*-openbsd*) -+i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123]) - tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h" - # needed to unconfuse gdb - tmake_file="t-libc-ok t-openbsd i386/t-openbsd" - # we need collect2 until our bug is fixed... - use_collect2=yes -+ ;; -+i[34567]86-*-openbsd*) -+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h" -+ tm_file="${tm_file} openbsd.h i386/openbsdelf.h" -+ gas=yes -+ gnu_ld=yes -+ stabs=yes - ;; - i[34567]86-*-coff*) - tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h" diff --git a/lang/gcc/4.0/patches/patch-gcc_config_i386_openbsdelf_h b/lang/gcc/4.0/patches/patch-gcc_config_i386_openbsdelf_h deleted file mode 100644 index 4e2bc05f83e..00000000000 --- a/lang/gcc/4.0/patches/patch-gcc_config_i386_openbsdelf_h +++ /dev/null @@ -1,135 +0,0 @@ -$OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.2 2005/01/04 12:07:18 espie Exp $ ---- gcc/config/i386/openbsdelf.h.orig Mon Jan 3 22:38:27 2005 -+++ gcc/config/i386/openbsdelf.h Tue Jan 4 12:46:14 2005 -@@ -0,0 +1,131 @@ -+ -+/* Configuration for an OpenBSD i386 target. -+ -+ Copyright (C) 1999 Free Software Foundation, Inc. -+ -+This file is part of GNU CC. -+ -+GNU CC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GNU CC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GNU CC; see the file COPYING. If not, write to -+the Free Software Foundation, 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using -+ libraries compiled with the native cc, so undef it. */ -+#undef NO_DOLLAR_IN_LABEL -+ -+/* Override the default comment-starter of "/". */ -+#undef ASM_COMMENT_START -+#define ASM_COMMENT_START "#" -+ -+ -+/* This goes away when the math-emulator is fixed */ -+#undef TARGET_DEFAULT -+#define TARGET_DEFAULT \ -+ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -+ -+/* Run-time target specifications */ -+ -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ OPENBSD_OS_CPP_BUILTINS_ELF(); \ -+ } \ -+ while (0) -+ -+/* As an elf system, we need crtbegin/crtend stuff. */ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC "\ -+ %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \ -+ crtbegin%O%s} %{shared:crtbeginS%O%s}" -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" -+ -+/* Layout of source language data types. */ -+ -+/* This must agree with */ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE BITS_PER_WORD -+ -+/* Assembler format: overall framework. */ -+ -+#undef ASM_APP_ON -+#define ASM_APP_ON "#APP\n" -+ -+#undef ASM_APP_OFF -+#define ASM_APP_OFF "#NO_APP\n" -+ -+#undef SET_ASM_OP -+#define SET_ASM_OP "\t.set\t" -+ -+/* The following macros were originally stolen from i386v4.h. -+ These have to be defined to get PIC code correct. */ -+ -+/* Assembler format: dispatch tables. */ -+ -+/* Assembler format: sections. */ -+ -+/* Stack & calling: aggregate returns. */ -+ -+/* Don't default to pcc-struct-return, because gcc is the only compiler, and -+ we want to retain compatibility with older gcc versions. */ -+#define DEFAULT_PCC_STRUCT_RETURN 0 -+ -+/* Assembler format: alignment output. */ -+ -+#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN -+#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \ -+ if ((LOG) != 0) {\ -+ if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ -+ else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ -+ } -+#endif -+ -+/* Stack & calling: profiling. */ -+ -+/* OpenBSD's profiler recovers all information from the stack pointer. -+ The icky part is not here, but in machine/profile.h. */ -+#undef FUNCTION_PROFILER -+#define FUNCTION_PROFILER(FILE, LABELNO) \ -+ fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE); -+ -+/* Assembler format: exception region output. */ -+ -+/* our configuration still doesn't handle dwarf2 correctly */ -+#define DWARF2_UNWIND_INFO 0 -+ -+/* Assembler format: alignment output. */ -+ -+/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */ -+ -+/* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h. */ -+ -+#undef LINK_SPEC -+#define LINK_SPEC \ -+ "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ -+ %{shared:-shared} %{R*} \ -+ %{static:-Bstatic} \ -+ %{!static:-Bdynamic} \ -+ %{assert*} \ -+ %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}" -+ -+#define OBSD_HAS_CORRECT_SPECS diff --git a/lang/gcc/4.0/patches/patch-gcc_config_openbsd_h b/lang/gcc/4.0/patches/patch-gcc_config_openbsd_h deleted file mode 100644 index 731a96697ba..00000000000 --- a/lang/gcc/4.0/patches/patch-gcc_config_openbsd_h +++ /dev/null @@ -1,112 +0,0 @@ -$OpenBSD: patch-gcc_config_openbsd_h,v 1.4 2005/01/08 16:26:45 espie Exp $ ---- gcc/config/openbsd.h.orig Sun Oct 24 03:42:48 2004 -+++ gcc/config/openbsd.h Sat Jan 8 17:23:30 2005 -@@ -52,29 +52,60 @@ Boston, MA 02111-1307, USA. */ - - #ifdef OPENBSD_NATIVE - --#undef GCC_INCLUDE_DIR --#define GCC_INCLUDE_DIR "/usr/include" -- - /* The compiler is configured with ONLY the gcc/g++ standard headers. */ - #undef INCLUDE_DEFAULTS - #define INCLUDE_DEFAULTS \ - { \ - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ -- { GCC_INCLUDE_DIR, "GCC", 0, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \ -+ { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, \ - { 0, 0, 0, 0 } \ - } - - /* Under OpenBSD, the normal location of the various *crt*.o files is the - /usr/lib directory. */ --#define STANDARD_STARTFILE_PREFIX "/usr/lib/" -+#undef STANDARD_STARTFILE_PREFIX -+#define STANDARD_STARTFILE_PREFIX "/usr/local/lib/" - - #endif - - - /* Controlling the compilation driver. */ -+/* TARGET_OS_CPP_BUILTINS() common to all OpenBSD targets. */ -+#define OPENBSD_OS_CPP_BUILTINS_COMMON() \ -+ do \ -+ { \ -+ builtin_define ("__OpenBSD__"); \ -+ builtin_define ("__unix__"); \ -+ builtin_define ("__ANSI_COMPAT"); \ -+ builtin_assert ("system=unix"); \ -+ builtin_assert ("system=bsd"); \ -+ builtin_assert ("system=OpenBSD"); \ -+ } \ -+ while (0) - -+/* TARGET_OS_CPP_BUILTINS() common to all OpenBSD ELF targets. */ -+#define OPENBSD_OS_CPP_BUILTINS_ELF() \ -+ do \ -+ { \ -+ OPENBSD_OS_CPP_BUILTINS_COMMON(); \ -+ builtin_define ("__ELF__"); \ -+ } \ -+ while (0) -+ -+/* TARGET_OS_CPP_BUILTINS() common to all LP64 OpenBSD targets. */ -+#define OPENBSD_OS_CPP_BUILTINS_LP64() \ -+ do \ -+ { \ -+ builtin_define ("_LP64"); \ -+ builtin_define ("__LP64__"); \ -+ } \ -+ while (0) -+ -+ - /* CPP_SPEC appropriate for OpenBSD. We deal with -posix and -pthread. -- XXX the way threads are handling currently is not very satisfying, -+ XXX the way threads are handled currently is not very satisfying, - since all code must be compiled with -pthread to work. - This two-stage defines makes it easy to pick that for targets that - have subspecs. */ -@@ -84,11 +115,16 @@ Boston, MA 02111-1307, USA. */ - #define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}" - #endif - --/* LIB_SPEC appropriate for OpenBSD. Select the appropriate libc, -- depending on profiling and threads. Basically, -- -lc(_r)?(_p)?, select _r for threads, and _p for p or pg. */ --#define OBSD_LIB_SPEC "%{!shared:-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}}" -+/* LIB_SPEC appropriate for OpenBSD. */ -+#ifdef HAS_LIBC_R -+/* -lc(_r)?(_p)?, select _r for threads, and _p for p or pg. */ -+# define OBSD_LIB_SPEC "%{!shared:-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}}" -+#else -+/* Include -lpthread if -pthread is specified on the command line. */ -+# define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p}}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}" -+#endif - -+ - #ifndef OBSD_HAS_CORRECT_SPECS - - #ifndef OBSD_NO_DYNAMIC_LIBRARIES -@@ -275,3 +311,20 @@ do { \ - as this depends on a few other details as well... */ - #define HANDLE_SYSV_PRAGMA 1 - -+/* Stack is explicitly denied execution rights on OpenBSD platforms. */ -+#define ENABLE_EXECUTE_STACK \ -+extern void __enable_execute_stack (void *); \ -+void \ -+__enable_execute_stack (void *addr) \ -+{ \ -+ long size = getpagesize (); \ -+ long mask = ~(size-1); \ -+ char *page = (char *) (((long) addr) & mask); \ -+ char *end = (char *) ((((long) (addr + TRAMPOLINE_SIZE)) & mask) + size); \ -+ \ -+ if (mprotect (page, end - page, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) \ -+ perror ("mprotect of trampoline code"); \ -+} -+ -+#include -+#include diff --git a/lang/gcc/4.0/patches/patch-gcc_cp_parser_c b/lang/gcc/4.0/patches/patch-gcc_cp_parser_c index 840ab7320a5..4863bc3a9ba 100644 --- a/lang/gcc/4.0/patches/patch-gcc_cp_parser_c +++ b/lang/gcc/4.0/patches/patch-gcc_cp_parser_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gcc_cp_parser_c,v 1.3 2005/01/03 16:23:48 espie Exp $ ---- gcc/cp/parser.c.orig Fri Dec 31 00:29:33 2004 -+++ gcc/cp/parser.c Mon Jan 3 15:47:20 2005 -@@ -15459,7 +15459,7 @@ cp_parser_require (cp_parser* parser, +$OpenBSD: patch-gcc_cp_parser_c,v 1.4 2005/01/17 19:20:10 espie Exp $ +--- gcc/cp/parser.c.orig Thu Jan 6 21:21:13 2005 ++++ gcc/cp/parser.c Mon Jan 17 16:23:20 2005 +@@ -15458,7 +15458,7 @@ cp_parser_require (cp_parser* parser, /* Output the MESSAGE -- unless we're parsing tentatively. */ if (!cp_parser_simulate_error (parser)) { diff --git a/lang/gcc/4.0/patches/patch-gcc_gcc_c b/lang/gcc/4.0/patches/patch-gcc_gcc_c index e380460b138..1e4ae309682 100644 --- a/lang/gcc/4.0/patches/patch-gcc_gcc_c +++ b/lang/gcc/4.0/patches/patch-gcc_gcc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ ---- gcc/gcc.c.orig Thu Dec 16 00:50:26 2004 -+++ gcc/gcc.c Mon Jan 3 15:47:20 2005 -@@ -1299,7 +1299,7 @@ translate_options (int *argcp, const cha +$OpenBSD: patch-gcc_gcc_c,v 1.4 2005/01/17 19:20:10 espie Exp $ +--- gcc/gcc.c.orig Fri Jan 7 02:05:37 2005 ++++ gcc/gcc.c Mon Jan 17 16:23:20 2005 +@@ -1300,7 +1300,7 @@ translate_options (int *argcp, const cha /* Store the translation as one argv elt or as two. */ if (arg != 0 && strchr (arginfo, 'j') != 0) newv[newindex++] = concat (option_map[j].equivalent, arg, @@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ else if (arg != 0) { newv[newindex++] = option_map[j].equivalent; -@@ -1615,7 +1615,7 @@ init_gcc_specs (struct obstack *obstack, +@@ -1616,7 +1616,7 @@ init_gcc_specs (struct obstack *obstack, shared_name, #endif #endif @@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ obstack_grow (obstack, buf, strlen (buf)); free (buf); -@@ -1822,7 +1822,7 @@ set_spec (const char *name, const char * +@@ -1823,7 +1823,7 @@ set_spec (const char *name, const char * old_spec = *(sl->ptr_spec); *(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1])) @@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ : xstrdup (spec)); #ifdef DEBUG_SPECS -@@ -2480,10 +2480,10 @@ find_a_file (struct path_prefix *pprefix +@@ -2481,10 +2481,10 @@ find_a_file (struct path_prefix *pprefix len += len1 > len2 ? len1 : len2; if (multilib_dir) multilib_name = ACONCAT ((multilib_dir, dir_separator_str, name, @@ -41,7 +41,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ } temp = xmalloc (len); -@@ -2642,8 +2642,8 @@ add_sysrooted_prefix (struct path_prefix +@@ -2643,8 +2643,8 @@ add_sysrooted_prefix (struct path_prefix if (target_system_root) { if (target_sysroot_suffix) @@ -52,7 +52,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ /* We have to override this because GCC's notion of sysroot moves along with GCC. */ -@@ -3215,7 +3215,7 @@ process_command (int argc, const char ** +@@ -3216,7 +3216,7 @@ process_command (int argc, const char ** break; new_argv0 = xmemdup (progname, baselen, baselen + concat_length (new_version, new_machine, @@ -61,7 +61,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ strcpy (new_argv0 + baselen, new_machine); strcat (new_argv0, "-gcc-"); strcat (new_argv0, new_version); -@@ -3242,7 +3242,7 @@ process_command (int argc, const char ** +@@ -3243,7 +3243,7 @@ process_command (int argc, const char ** standard_bindir_prefix, standard_libexec_prefix); if (gcc_exec_prefix) @@ -70,7 +70,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ } else gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix, -@@ -3289,7 +3289,7 @@ process_command (int argc, const char ** +@@ -3290,7 +3290,7 @@ process_command (int argc, const char ** { strncpy (nstore, startp, endp - startp); if (endp == startp) @@ -79,7 +79,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ else if (!IS_DIR_SEPARATOR (endp[-1])) { nstore[endp - startp] = DIR_SEPARATOR; -@@ -3323,7 +3323,7 @@ process_command (int argc, const char ** +@@ -3324,7 +3324,7 @@ process_command (int argc, const char ** { strncpy (nstore, startp, endp - startp); if (endp == startp) @@ -88,7 +88,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ else if (!IS_DIR_SEPARATOR (endp[-1])) { nstore[endp - startp] = DIR_SEPARATOR; -@@ -3356,7 +3356,7 @@ process_command (int argc, const char ** +@@ -3357,7 +3357,7 @@ process_command (int argc, const char ** { strncpy (nstore, startp, endp - startp); if (endp == startp) @@ -97,7 +97,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ else if (!IS_DIR_SEPARATOR (endp[-1])) { nstore[endp - startp] = DIR_SEPARATOR; -@@ -3824,7 +3824,7 @@ warranty; not even for MERCHANTABILITY o +@@ -3825,7 +3825,7 @@ warranty; not even for MERCHANTABILITY o PREFIX_PRIORITY_LAST, 1, 0); tooldir_prefix = concat (tooldir_base_prefix, spec_machine, @@ -106,7 +106,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ /* If tooldir is relative, base it on exec_prefixes. A relative tooldir lets us move the installed tree as a unit. -@@ -3839,28 +3839,28 @@ warranty; not even for MERCHANTABILITY o +@@ -3840,28 +3840,28 @@ warranty; not even for MERCHANTABILITY o { char *gcc_exec_tooldir_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str, @@ -141,7 +141,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1); #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS) -@@ -3983,7 +3983,7 @@ warranty; not even for MERCHANTABILITY o +@@ -3984,7 +3984,7 @@ warranty; not even for MERCHANTABILITY o { /* POSIX allows separation of -l and the lib arg; canonicalize by concatenating -l with its arg */ infiles[n_infiles].language = "*"; @@ -150,7 +150,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ } else if (strncmp (argv[i], "-l", 2) == 0) { -@@ -5936,11 +5936,11 @@ is_directory (const char *path1, const c +@@ -5953,11 +5953,11 @@ is_directory (const char *path1, const c if (linker && ((cp - path == 6 && strcmp (path, concat (dir_separator_str, "lib", @@ -164,7 +164,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ return 0; return (stat (path, &st) >= 0 && S_ISDIR (st.st_mode)); -@@ -6124,8 +6124,8 @@ main (int argc, const char **argv) +@@ -6141,8 +6141,8 @@ main (int argc, const char **argv) /* Read specs from a file if there is one. */ machine_suffix = concat (spec_machine, dir_separator_str, @@ -175,7 +175,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, 0); /* Read the specs file unless it is a default one. */ -@@ -6230,12 +6230,12 @@ main (int argc, const char **argv) +@@ -6247,12 +6247,12 @@ main (int argc, const char **argv) if (gcc_exec_prefix) add_prefix (&startfile_prefixes, concat (gcc_exec_prefix, machine_suffix, @@ -190,7 +190,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.3 2005/01/03 16:23:48 espie Exp $ NULL, PREFIX_PRIORITY_LAST, 0, 1); } -@@ -6261,7 +6261,7 @@ main (int argc, const char **argv) +@@ -6278,7 +6278,7 @@ main (int argc, const char **argv) /* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */ if (gcc_exec_prefix) gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str, diff --git a/lang/gcc/4.0/patches/patch-gcc_tree-vectorizer_c b/lang/gcc/4.0/patches/patch-gcc_tree-vectorizer_c index 9a2a48dcfa8..193c5b6c5f5 100644 --- a/lang/gcc/4.0/patches/patch-gcc_tree-vectorizer_c +++ b/lang/gcc/4.0/patches/patch-gcc_tree-vectorizer_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gcc_tree-vectorizer_c,v 1.3 2005/01/03 16:23:48 espie Exp $ ---- gcc/tree-vectorizer.c.orig Sun Jan 2 09:35:34 2005 -+++ gcc/tree-vectorizer.c Mon Jan 3 15:47:20 2005 -@@ -1790,7 +1790,7 @@ vect_get_new_vect_var (tree type, enum v +$OpenBSD: patch-gcc_tree-vectorizer_c,v 1.4 2005/01/17 19:20:10 espie Exp $ +--- gcc/tree-vectorizer.c.orig Mon Jan 10 20:34:35 2005 ++++ gcc/tree-vectorizer.c Mon Jan 17 16:23:21 2005 +@@ -1813,7 +1813,7 @@ vect_get_new_vect_var (tree type, enum v prefix_len = strlen (prefix); if (name) diff --git a/lang/gcc/4.0/patches/patch-gcc_varasm_c b/lang/gcc/4.0/patches/patch-gcc_varasm_c index b6cae1a93c5..d39f50399e8 100644 --- a/lang/gcc/4.0/patches/patch-gcc_varasm_c +++ b/lang/gcc/4.0/patches/patch-gcc_varasm_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gcc_varasm_c,v 1.3 2005/01/03 16:23:48 espie Exp $ ---- gcc/varasm.c.orig Sun Jan 2 08:52:28 2005 -+++ gcc/varasm.c Mon Jan 3 15:47:20 2005 -@@ -1216,7 +1216,7 @@ assemble_start_function (tree decl, cons +$OpenBSD: patch-gcc_varasm_c,v 1.4 2005/01/17 19:20:10 espie Exp $ +--- gcc/varasm.c.orig Sun Jan 16 16:28:16 2005 ++++ gcc/varasm.c Mon Jan 17 16:23:21 2005 +@@ -1217,7 +1217,7 @@ assemble_start_function (tree decl, cons unlikely_text_section_name = NULL; unlikely_section_label = reconcat (unlikely_section_label, diff --git a/lang/gcc/4.0/patches/patch-libstdc++-v3_libsupc++_Makefile_in b/lang/gcc/4.0/patches/patch-libstdc++-v3_libsupc++_Makefile_in index 264affc8d4b..eb2f7e857a2 100644 --- a/lang/gcc/4.0/patches/patch-libstdc++-v3_libsupc++_Makefile_in +++ b/lang/gcc/4.0/patches/patch-libstdc++-v3_libsupc++_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.2 2004/11/23 18:17:34 espie Exp $ ---- libstdc++-v3/libsupc++/Makefile.in.orig Thu Oct 7 00:12:32 2004 -+++ libstdc++-v3/libsupc++/Makefile.in Tue Nov 23 12:44:34 2004 -@@ -298,7 +298,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.3 2005/01/17 19:20:10 espie Exp $ +--- libstdc++-v3/libsupc++/Makefile.in.orig Mon Jan 10 18:07:50 2005 ++++ libstdc++-v3/libsupc++/Makefile.in Mon Jan 17 16:23:21 2005 +@@ -297,7 +297,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) # Need this library to both be part of libstdc++.a, and installed # separately too. # 1) separate libsupc++.la @@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.2 2004/11/23 18:17:34 esp # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a noinst_LTLIBRARIES = libsupc++convenience.la headers = \ -@@ -476,7 +476,7 @@ clean-toolexeclibLTLIBRARIES: +@@ -475,7 +475,7 @@ clean-toolexeclibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done diff --git a/lang/gcc/4.0/patches/patch-libstdc++-v3_src_Makefile_in b/lang/gcc/4.0/patches/patch-libstdc++-v3_src_Makefile_in index 61b07ab8381..47397b826a7 100644 --- a/lang/gcc/4.0/patches/patch-libstdc++-v3_src_Makefile_in +++ b/lang/gcc/4.0/patches/patch-libstdc++-v3_src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2004/11/23 18:17:34 espie Exp $ ---- libstdc++-v3/src/Makefile.in.orig Tue Nov 16 00:33:05 2004 -+++ libstdc++-v3/src/Makefile.in Tue Nov 23 12:44:34 2004 -@@ -275,7 +275,7 @@ WARN_CXXFLAGS = \ +$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2005/01/17 19:20:10 espie Exp $ +--- libstdc++-v3/src/Makefile.in.orig Mon Jan 10 18:07:49 2005 ++++ libstdc++-v3/src/Makefile.in Mon Jan 17 16:23:21 2005 +@@ -274,7 +274,7 @@ WARN_CXXFLAGS = \ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) # Cross compiler support. @@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2004/11/23 18:17:34 espie Exp @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg = # Symbol versioning for shared libraries. -@@ -469,7 +469,7 @@ clean-toolexeclibLTLIBRARIES: +@@ -468,7 +468,7 @@ clean-toolexeclibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done diff --git a/lang/gcc/4.0/pkg/PLIST-ada b/lang/gcc/4.0/pkg/PLIST-ada index c147ff6a198..be2a31ecf2f 100644 --- a/lang/gcc/4.0/pkg/PLIST-ada +++ b/lang/gcc/4.0/pkg/PLIST-ada @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-ada,v 1.1 2005/01/06 19:36:29 espie Exp $ +@comment $OpenBSD: PLIST-ada,v 1.2 2005/01/17 19:20:10 espie Exp $ bin/gnat bin/gnatbind bin/gnatbl @@ -12,8 +12,6 @@ bin/gnatmake bin/gnatname bin/gnatprep bin/gnatxref -bin/gpr2make -bin/gprcmd bin/gprmake @info info/gnat-style.info @info info/gnat_rm.info diff --git a/lang/gcc/4.0/pkg/PLIST-c++ b/lang/gcc/4.0/pkg/PLIST-c++ index 9697c869b74..b7f9f74a850 100644 --- a/lang/gcc/4.0/pkg/PLIST-c++ +++ b/lang/gcc/4.0/pkg/PLIST-c++ @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-c++,v 1.1 2005/01/06 19:36:29 espie Exp $ +@comment $OpenBSD: PLIST-c++,v 1.2 2005/01/17 19:20:10 espie Exp $ bin/ec++ bin/eg++ bin/${CONFIG}-ec++ @@ -162,8 +162,8 @@ include/c++/${V}/ext/ include/c++/${V}/ext/algorithm include/c++/${V}/ext/array_allocator.h include/c++/${V}/ext/bitmap_allocator.h +include/c++/${V}/ext/codecvt_specializations.h include/c++/${V}/ext/debug_allocator.h -include/c++/${V}/ext/enc_filebuf.h include/c++/${V}/ext/functional include/c++/${V}/ext/hash_fun.h include/c++/${V}/ext/hash_map @@ -193,7 +193,6 @@ include/c++/${V}/${CONFIG}/bits/c++allocator.h include/c++/${V}/${CONFIG}/bits/c++config.h include/c++/${V}/${CONFIG}/bits/c++io.h include/c++/${V}/${CONFIG}/bits/c++locale.h -include/c++/${V}/${CONFIG}/bits/codecvt_specializations.h include/c++/${V}/${CONFIG}/bits/ctype_base.h include/c++/${V}/${CONFIG}/bits/ctype_inline.h include/c++/${V}/${CONFIG}/bits/ctype_noninline.h