From 65f926e15f513c769bb8731a2d7d89f1e1148e97 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 31 Jan 2005 09:47:34 +0000 Subject: [PATCH] new snapshot, switch to dwarf2 like the src compiler. --- lang/gcc/4.0/Makefile | 4 +- lang/gcc/4.0/distinfo | 8 +- lang/gcc/4.0/patches/patch-gcc_collect2_c | 85 +++++++++++++++++++ lang/gcc/4.0/patches/patch-gcc_config_gcc | 16 ++++ .../patch-gcc_config_i386_openbsdelf_h | 12 +++ 5 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 lang/gcc/4.0/patches/patch-gcc_collect2_c create mode 100644 lang/gcc/4.0/patches/patch-gcc_config_gcc create mode 100644 lang/gcc/4.0/patches/patch-gcc_config_i386_openbsdelf_h diff --git a/lang/gcc/4.0/Makefile b/lang/gcc/4.0/Makefile index 7e996f77af0..88dbdf27c88 100644 --- a/lang/gcc/4.0/Makefile +++ b/lang/gcc/4.0/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2005/01/17 19:20:10 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2005/01/31 09:47:34 espie Exp $ ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax V=4.0.0 -FULL_VERSION=4.0-20050116 +FULL_VERSION=4.0-20050123 MAINTAINER= Marc Espie diff --git a/lang/gcc/4.0/distinfo b/lang/gcc/4.0/distinfo index 15a9db63c06..e095f028df1 100644 --- a/lang/gcc/4.0/distinfo +++ b/lang/gcc/4.0/distinfo @@ -1,8 +1,8 @@ MD5 (gcc/adastrap-i386-3.3.5-1.tgz) = f8c1992077e0b713922e738210dd3674 -MD5 (gcc/gcc-4.0-20050116.tar.bz2) = 38b178b42f41848fbb1a36f46b793cac +MD5 (gcc/gcc-4.0-20050123.tar.bz2) = 57a7ed876e8de3c88e5e85e748051515 RMD160 (gcc/adastrap-i386-3.3.5-1.tgz) = 644b12c337b02ea5c02735f0ea3830081761bf26 -RMD160 (gcc/gcc-4.0-20050116.tar.bz2) = c39aea4b55f4fc4263378372dde0545ecd143823 +RMD160 (gcc/gcc-4.0-20050123.tar.bz2) = 3ae527d31c2b305e91c5879367bc4e5d08418262 SHA1 (gcc/adastrap-i386-3.3.5-1.tgz) = 4c26ff21dcecbc37afa31b8ef63d5cdd7fe65d7e -SHA1 (gcc/gcc-4.0-20050116.tar.bz2) = 4a90b1005411519d31522b46b08460900c0dad37 +SHA1 (gcc/gcc-4.0-20050123.tar.bz2) = 06e6c2b9e042b40e4717804f78b888d6a8738871 SIZE (gcc/adastrap-i386-3.3.5-1.tgz) = 12121161 -SIZE (gcc/gcc-4.0-20050116.tar.bz2) = 28470389 +SIZE (gcc/gcc-4.0-20050123.tar.bz2) = 28469783 diff --git a/lang/gcc/4.0/patches/patch-gcc_collect2_c b/lang/gcc/4.0/patches/patch-gcc_collect2_c new file mode 100644 index 00000000000..ca812b61796 --- /dev/null +++ b/lang/gcc/4.0/patches/patch-gcc_collect2_c @@ -0,0 +1,85 @@ +$OpenBSD: patch-gcc_collect2_c,v 1.4 2005/01/31 09:47:34 espie Exp $ +--- gcc/collect2.c.orig Mon Jan 17 16:23:51 2005 ++++ gcc/collect2.c Mon Jan 17 16:24:43 2005 +@@ -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, (char *)0); + const char *const full_nm_suffix = +- concat (target_machine, "-", nm_suffix, NULL); ++ concat (target_machine, "-", nm_suffix, (char *)0); + const char *const full_gnm_suffix = +- concat (target_machine, "-", gnm_suffix, NULL); ++ concat (target_machine, "-", gnm_suffix, (char *)0); + #ifdef LDD_SUFFIX + const char *const full_ldd_suffix = +- concat (target_machine, "-", ldd_suffix, NULL); ++ concat (target_machine, "-", ldd_suffix, (char *)0); + #endif + const char *const full_strip_suffix = +- concat (target_machine, "-", strip_suffix, NULL); ++ concat (target_machine, "-", strip_suffix, (char *)0); + const char *const full_gstrip_suffix = +- concat (target_machine, "-", gstrip_suffix, NULL); ++ concat (target_machine, "-", gstrip_suffix, (char *)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", (char *)0); + #else + c_file_name = "gcc"; + #endif +@@ -1258,7 +1258,7 @@ main (int argc, char **argv) + + if (exports.first) + { +- char *buf = concat ("-bE:", export_file, NULL); ++ char *buf = concat ("-bE:", export_file, (char *)0); + + *ld1++ = buf; + *ld2++ = buf; +@@ -1423,7 +1423,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, (char *)0); + #else + *ld2++ = LD_INIT_SWITCH; + *ld2++ = initname; +@@ -1438,7 +1438,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, (char *)0); + + #ifndef LD_INIT_SWITCH + add_to_list (&exports, initname); +@@ -1590,7 +1590,7 @@ collect_execute (const char *prog, char + dup2 (redir_handle, STDERR_FILENO); + } + +- pid = pexecute (argv[0], argv, argv[0], NULL, &errmsg_fmt, &errmsg_arg, ++ pid = pexecute (argv[0], argv, argv[0], (char *)0, &errmsg_fmt, &errmsg_arg, + (PEXECUTE_FIRST | PEXECUTE_LAST | PEXECUTE_SEARCH)); + + if (redir) +@@ -1845,8 +1845,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, (char *)0); ++ fininame = concat ("_GLOBAL__FD_", prefix, (char *)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 new file mode 100644 index 00000000000..09650dc0fd5 --- /dev/null +++ b/lang/gcc/4.0/patches/patch-gcc_config_gcc @@ -0,0 +1,16 @@ +$OpenBSD: patch-gcc_config_gcc,v 1.5 2005/01/31 09:47:34 espie Exp $ +--- gcc/config.gcc.orig Mon Jan 17 16:21:57 2005 ++++ gcc/config.gcc Mon Jan 17 16:22:41 2005 +@@ -942,11 +942,10 @@ i[34567]86-*-openbsd2.*|i[34567]86-*open + 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} i386/unix.h i386/att.h dbxelf.h elfos.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 new file mode 100644 index 00000000000..c0389420ed2 --- /dev/null +++ b/lang/gcc/4.0/patches/patch-gcc_config_i386_openbsdelf_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.4 2005/01/31 09:47:34 espie Exp $ +--- gcc/config/i386/openbsdelf.h.orig Sun Jan 30 13:29:53 2005 ++++ gcc/config/i386/openbsdelf.h Sun Jan 30 13:30:22 2005 +@@ -27,6 +27,8 @@ Boston, MA 02111-1307, USA. */ + #undef ASM_COMMENT_START + #define ASM_COMMENT_START "#" + ++#undef DBX_REGISTER_NUMBER ++#define DBX_REGISTER_NUMBER(n) svr4_dbx_register_map[n] + + /* This goes away when the math-emulator is fixed */ + #undef TARGET_DEFAULT