This commit was manufactured by cvs2svn to create branchoffbyone-20030313-branchpoint

'offbyone-20030313-branch'.

Sprout from kettenis-i386newframe-20030308-branch 2003-03-08 00:00:32 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'kettenis-'
Cherrypick from master 2003-03-13 15:09:29 UTC Nick Clifton <nickc@redhat.com> 'Add New Chinese (simplified) PO file.':
    ChangeLog
    Makefile.in
    Makefile.tpl
    bfd/ChangeLog
    bfd/aout-cris.c
    bfd/aout-encap.c
    bfd/aout-ns32k.c
    bfd/aout-tic30.c
    bfd/bfd-in2.h
    bfd/configure
    bfd/configure.in
    bfd/elf32-mips.c
    bfd/elf32-ppc.c
    bfd/elf64-mips.c
    bfd/elf64-ppc.c
    bfd/elfn32-mips.c
    bfd/elfxx-mips.c
    bfd/elfxx-target.h
    bfd/hp300bsd.c
    bfd/i386aout.c
    bfd/i386dynix.c
    bfd/i386linux.c
    bfd/i386lynx.c
    bfd/i386mach3.c
    bfd/libbfd.h
    bfd/m68k4knetbsd.c
    bfd/m68klinux.c
    bfd/m68klynx.c
    bfd/m68knetbsd.c
    bfd/m88kmach3.c
    bfd/mipsbsd.c
    bfd/newsos3.c
    bfd/po/zh_CN.po
    bfd/reloc.c
    bfd/sparclinux.c
    bfd/sparclynx.c
    bfd/sparcnetbsd.c
    bfd/vaxbsd.c
    bfd/version.h
    bfd/xsym.c
    configure
    configure.in
    gdb/ChangeLog
    gdb/MAINTAINERS
    gdb/alpha-tdep.c
    gdb/arch-utils.c
    gdb/arm-tdep.c
    gdb/avr-tdep.c
    gdb/breakpoint.c
    gdb/cli-out.c
    gdb/config/m68k/tm-delta68.h
    gdb/config/m68k/tm-linux.h
    gdb/config/pa/tm-hppa.h
    gdb/config/rs6000/tm-rs6000.h
    gdb/config/sparc/tm-sparc.h
    gdb/cris-tdep.c
    gdb/d10v-tdep.c
    gdb/doc/ChangeLog
    gdb/doc/gdb.texinfo
    gdb/doc/gdbint.texinfo
    gdb/doublest.c
    gdb/dummy-frame.c
    gdb/eval.c
    gdb/findvar.c
    gdb/frame-unwind.h
    gdb/frame.c
    gdb/frv-tdep.c
    gdb/gdbarch.c
    gdb/gdbarch.h
    gdb/gdbarch.sh
    gdb/h8300-tdep.c
    gdb/hppa-tdep.c
    gdb/i386-interix-tdep.c
    gdb/i386-tdep.c
    gdb/ia64-tdep.c
    gdb/m68hc11-tdep.c
    gdb/m68k-tdep.c
    gdb/mcore-tdep.c
    gdb/mi/ChangeLog
    gdb/mi/mi-out.c
    gdb/minsyms.c
    gdb/mips-tdep.c
    gdb/mn10300-tdep.c
    gdb/ns32k-tdep.c
    gdb/ns32knbsd-nat.c
    gdb/ppc-linux-tdep.c
    gdb/regcache.c
    gdb/regcache.h
    gdb/rs6000-tdep.c
    gdb/s390-tdep.c
    gdb/sentinel-frame.c
    gdb/sh-tdep.c
    gdb/sparc-tdep.c
    gdb/tui/ChangeLog
    gdb/tui/tui-out.c
    gdb/v850-tdep.c
    gdb/valarith.c
    gdb/vax-tdep.c
    gdb/version.in
    gdb/x86-64-tdep.c
    gdb/x86-64-tdep.h
    gdb/xstormy16-tdep.c
    libiberty/ChangeLog
    libiberty/cplus-dem.c
    libiberty/hashtab.c

1 files changed, 1 insertions, 2 deletions

diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 7027b173ca0..4d1e48d7bf4 100644
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -1,5 +1,5 @@
 /* BFD backend for CRIS a.out binaries.
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    functions.  Beware; some of the information there is outdated.  */
 
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 #define N_TXTOFF(x) 32
 #define ENTRY_CAN_BE_ZERO
 #define TEXT_START_ADDR 0