diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-05-13 17:07:46 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-05-13 17:07:46 +0000 |
| commit | c866442bb5e16be2b5323fee961ceb1315393514 (patch) | |
| tree | f12f495081042abe1a40d83bf05d076ff8aa8a17 /gnu/usr.bin/binutils/bfd/pe-arm.c | |
| parent | 99d2ba46f95f9f99286b4c66576c4607669b0e7f (diff) | |
resolve conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/pe-arm.c')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/pe-arm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/usr.bin/binutils/bfd/pe-arm.c b/gnu/usr.bin/binutils/bfd/pe-arm.c index 6c6b6598007..dbb478940b5 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, 1999 Free Software Foundation, Inc. + Copyright 1995, 1996, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PCRELOFFSET true #define COFF_LONG_SECTION_NAMES -#ifndef bfd_arm_allocate_interworking_sections +#ifndef bfd_arm_allocate_interworking_sections #define bfd_arm_allocate_interworking_sections \ bfd_arm_pe_allocate_interworking_sections #define bfd_arm_get_bfd_for_interworking \ @@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define bfd_arm_process_before_allocation \ bfd_arm_pe_process_before_allocation #endif - + #ifdef ARM_WINCE #define TARGET_UNDERSCORE 0 #endif |