problems applying rtems gcc patch

[Scott Newell]

Am I looking at the wrong docs again?


http://www.rtems.org/onlinedocs/releases/rtemsdocs-4.6.0pre5/share/rtems/ht
ml/started/started00036.html

I used the download manager at

http://www.rtems.org/down.html

to grab a list of files.  Selected 4.6.0-pre5, M68k target, Cygwin host,
tool source.

Among the files, the gcc source was linked as:
ftp://ftp.rtems.com/pub/rtems/releases/4.6.0pre5/tools/rtems-4.6-gcc3.2.3new
lib1.11.0-1/source/gcc-3.2.3.tar.bz2

and the gcc patch as:
ftp://ftp.rtems.com/pub/rtems/releases/4.6.0pre5/tools/rtems-4.6-gcc3.2.3new
lib1.11.0-1/source/gcc-3.2.3-rtems-20030826.diff


At this point, I've got newlib built and installed, and I'm trying to patch
gcc.
gcc source: /opt/tools/gcc-3.2.3
build directory: /opt/tools/build-gcc
diff is in: /opt/rtems

So, I'm ready to patch, right?
cd /opt/tools/gcc-3.2.3
cat /opt/rtems/gcc-3.2.3-rtems-20030826.diff | patch -p1

No go.  The output:

can't find file to patch at input line 4
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff -uNr /usr1/rtems/work-tools/original/gcc-3.2.3/boehm-gc/configure.in
gcc-3
.2.3/boehm-gc/configure.in
|--- /usr1/rtems/work-tools/original/gcc-3.2.3/boehm-gc/configure.in    Mon
Jan
27 19:44:36 2003
|+++ gcc-3.2.3/boehm-gc/configure.in    Thu Apr 24 08:45:41 2003
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 18
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff -uNr
/usr1/rtems/work-tools/original/gcc-3.2.3/gcc/config/arm/rtems-elf.h
gcc-3.2.3/gcc/config/arm/rtems-elf.h
|--- /usr1/rtems/work-tools/original/gcc-3.2.3/gcc/config/arm/rtems-elf.h
Tue Apr 30 14:58:55 2002
|+++ gcc-3.2.3/gcc/config/arm/rtems-elf.h       Thu Apr 24 08:45:41 2003
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file `gcc-3.2.3/gcc/config/arm/t-rtems'
patch: **** can't rename `g:\temp/po001488' to
`gcc-3.2.3/gcc/config/arm/t-rtems
 :2' : No such file or directory
 

On a hunch, I back up a level to /opt/tools
cat /opt/rtems/gcc-3.2.3-rtems-20030826.diff | patch -p1

patching file `gcc-3.2.3/boehm-gc/configure.in'
patching file `gcc-3.2.3/gcc/config/arm/rtems-elf.h'
patching file `gcc-3.2.3/gcc/config/arm/t-rtems'
patching file `gcc-3.2.3/gcc/config/rtems.h'
patching file `gcc-3.2.3/gcc/config.gcc'
patching file `gcc-3.2.3/gcc/cppdefault.h'
patching file `gcc-3.2.3/libffi/configure.in'
patching file `gcc-3.2.3/libjava/configure.in'
patching file `gcc-3.2.3/libstdc++-v3/config/cpu/i386/bits/atomicity.h'
Hunk #2 FAILED at 32.
1 out of 3 hunks FAILED -- saving rejects to
gcc-3.2.3/libstdc++-v3/config/cpu/i
386/bits/atomicity.h.rej
patching file `gcc-3.2.3/libstdc++-v3/include/bits/locale_facets.tcc'
 
Is this patch failure something I should worry about?

patch --version reports patch 2.5 
under cygwin, uname -r reports 1.5.5(0.94/3/2)

Got to be something silly...what am I doing wrong?


thanks,
newell