Re: [MinGW-dvlpr] gcc 3.3 diff

[Earnie B. <ear...@ya...>]

What mail client are you using?  .bz2 extension isn't typed correctly by
Netscape
mail.

Name:                                 gcc-3.3-20020830.diff.bz2
Type:                                  unspecified type
(application/octet-stream)
Encoding:                            base64

Earnie.

Jerry van Dijk wrote:

> Danny Smith writes:
>
>  > It looks like the text in the diff file got garbled - maybe by gzip?
>
> Must be something like that. It's weird, never had such a problem before.
> All other possibilities (like timezone, path) seem unlikely.
>
>  > What shell are you using?
>
> bash 2.03 for mingw, the MKS kornshell otherwise
>
>  > Okay here it is again, same file, decompressed then recompressed using
>  > bz2.
>
> With the same result. I'm attaching the file I got from you.
>
>   ------------------------------------------------------------------------
>                                Name: gcc-3.3-20020830.diff
>    gcc-3.3-20020830.diff       Type: unspecified type (application/octet-stream)
>                            Encoding: base64
>                         Description: gcc-3.3-20020830.diff
>
>   ------------------------------------------------------------------------
>
> can't find file to patch at input line 8
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |Index: gcc/gcc/cfgcleanup.c
> |===================================================================
> |RCS file: /cvs/gcc/gcc/gcc/cfgcleanup.c,v
> |retrieving revision 1.63
> |diff -u -p -r1.63 cfgcleanup.c
> |--- gcc/gcc/cfgcleanup.c       5 Aug 2002 18:46:32 -0000       1.63
> |+++ gcc/gcc/cfgcleanup.c       30 Aug 2002 04:42:29 -0000
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> 1 out of 1 hunk ignored
> can't find file to patch at input line 63
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> | @@ try_crossjump_to_edge (mode, e1, e2)
> |
> |   if (GET_CODE (newpos1) == NOTE)
> |     newpos1 = NEXT_INSN (newpos1);
> |-  last = src1->end;
> |
> |-  /* Emit the jump insn.  */
> |-  label = block_label (redirect_to);
> |-  emit_jump_insn_after (gen_jump (label), src1->end);
> |-  JUMP_LABEL (src1->end) = label;
> |-  LABEL_NUSES (label)++;
> |-
> |-  /* Delete the now unreachable instructions.  */
> |-  delete_insn_chain (newpos1, last);
> |-
> |-  /* Make sure there is a barrier after the new jump.  */
> |-  last = next_nonnote_insn (src1->end);
> |-  if (!last || GET_CODE (last) != BARRIER)
> |-    emit_barrier_after (src1->end);
> |-
> |-  /* Update CFG.  */
> |-  while (src1->succ)
> |-    remove_edge (src1->succ);
> |-  make_single_succ_edge (src1, redirect_to, 0);
> |+  redirect_from = split_block (src1, PREV_INSN (newpos1))->src;
> |+  to_remove = redirect_from->succ->dest;
> |
> |-  update_forwarder_flag (src1);
> |+  redirect_edge_and_branch_force (redirect_from->succ, redirect_to);
> |+  flow_delete_block (to_remove);
> |+
> |+  update_forwarder_flag (redirect_from);
> |
> |   return true;
> | }
> |Index: gcc/gcc/config.gcc
> |===================================================================
> |RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
> |retrieving revision 1.242
> |diff -u -p -r1.242 config.gcc
> |--- gcc/gcc/config.gcc 28 Aug 2002 05:23:42 -0000      1.242
> |+++ gcc/gcc/config.gcc 30 Aug 2002 04:42:34 -0000
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> 1 out of 1 hunk ignored
> missing header for unified diff at line 79 of patch
> can't find file to patch at input line 79
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |file=i386/xm-mingw32.h
> |       tmake_file="i386/t-cygwin i386/t-mingw32"
> |       extra_objs=winnt.o
> |+      extra_parts="crtbegin.o crtend.o"
> |+      target_cpu_default=TARGET_CPU_DEFAULT_pentiumpro
> |       if test x$enable_threads = xyes; then
> |               thread_file='win32'
> |       fi
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> 1 out of 1 hunk ignored
> can't find file to patch at input line 95
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |tstuff.c
> |===================================================================
> |RCS file: /cvs/gcc/gcc/gcc/crtstuff.c,v
> |retrieving revision 1.56
> |diff -u -p -r1.56 crtstuff.c
> |--- gcc/gcc/crtstuff.c 4 Jun 2002 02:55:28 -0000       1.56
> |+++ gcc/gcc/crtstuff.c 30 Aug 2002 04:42:36 -0000
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> 1 out of 1 hunk ignored
> missing header for unified diff at line 114 of patch
> can't find file to patch at input line 114
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |@@ __do_global_ctors (void)
> | #error "One of CRT_BEGIN or CRT_END must be defined."
> | #endif
> |
> |-#else  /* OBJECT_FORMAT_MACHO */
> |+#elif defined OBJECT_FORMAT_MACHO
> |
> | /* For Mach-O format executables, we assume that the system's runtime is
> |    smart enough to handle constructors and destructors, but doesn't have
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> patch: **** malformed patch at line 119: GW32__ || __CYGWIN__ */
>
> --
> --  Jerry van Dijk   | email: jv...@at...
> --  Leiden, Holland  | web:   users.ncrvnet.nl/gmvdijk