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/pe-arm.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/pe-arm.c')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/pe-arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/bfd/pe-arm.c b/gnu/usr.bin/binutils/bfd/pe-arm.c index dbb478940b5..8b5d1c7e101 100644 --- a/gnu/usr.bin/binutils/bfd/pe-arm.c +++ b/gnu/usr.bin/binutils/bfd/pe-arm.c @@ -1,5 +1,5 @@ /* BFD back-end for ARM PECOFF files. - Copyright 1995, 1996, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1995, 1996, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #endif #define COFF_WITH_PE -#define PCRELOFFSET true +#define PCRELOFFSET TRUE #define COFF_LONG_SECTION_NAMES #ifndef bfd_arm_allocate_interworking_sections |