diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 21:54:57 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 21:54:57 +0000 |
commit | 631eeff208608ed7b44459bd6c8ae905bcd7e8b6 (patch) | |
tree | 7be124105a0929655708fbbc134f9c2e3189c3f3 /gnu/usr.bin/binutils/bfd/cpu-i860.c | |
parent | a7c8e0ae4a4b349099d02bc9d56bcf1979c0f0c3 (diff) |
Resolve merge conflicts, adjust method of W^X handing (.sh files)
remove testsuites (not useable) remove mmalloc (not part of new binutils).
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/cpu-i860.c')
-rw-r--r-- | gnu/usr.bin/binutils/bfd/cpu-i860.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/bfd/cpu-i860.c b/gnu/usr.bin/binutils/bfd/cpu-i860.c index 7445e5ffbae..0ee0c5a60bc 100644 --- a/gnu/usr.bin/binutils/bfd/cpu-i860.c +++ b/gnu/usr.bin/binutils/bfd/cpu-i860.c @@ -1,5 +1,5 @@ /* BFD support for the Intel 860 architecture. - Copyright 1992, 1995, 2000 Free Software Foundation, Inc. + Copyright 1992, 1995, 2000, 2002 Free Software Foundation, Inc. Created mostly by substituting "860" for "386" in cpu-i386.c Harry Dolan <dolan@ssd.intel.com>, October 1995 @@ -33,7 +33,7 @@ const bfd_arch_info_type bfd_i860_arch = "i860", /* Architecture name */ "i860", /* Printable name */ 3, /* Section alignment exponent */ - true, /* Is this the default architecture? */ + TRUE, /* Is this the default architecture? */ bfd_default_compatible, bfd_default_scan, 0, /* Next in list */ |