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-h8500.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-h8500.c')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/cpu-h8500.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gnu/usr.bin/binutils/bfd/cpu-h8500.c b/gnu/usr.bin/binutils/bfd/cpu-h8500.c index 7b526ef3389..08fb359868b 100644 --- a/gnu/usr.bin/binutils/bfd/cpu-h8500.c +++ b/gnu/usr.bin/binutils/bfd/cpu-h8500.c @@ -1,5 +1,5 @@ /* BFD library support routines for the H8/500 architecture. - Copyright 1993, 1995, 2000 Free Software Foundation, Inc. + Copyright 1993, 1995, 2000, 2001, 2002 Free Software Foundation, Inc. Hacked by Steve Chamberlain of Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -22,8 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" -#if 0 +static bfd_boolean scan_mach + PARAMS ((const struct bfd_arch_info *, const char *)); +#if 0 /* Relocations for the Z8K @@ -118,15 +120,15 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, } static reloc_howto_type howto_16 - = NEWHOWTO(howto16_callback,"abs16",1,false,false); + = NEWHOWTO (howto16_callback, "abs16", 1, FALSE, FALSE); static reloc_howto_type howto_8 - = NEWHOWTO(howto8_callback,"abs8",0,false,false); + = NEWHOWTO (howto8_callback, "abs8", 0, FALSE, FALSE); static reloc_howto_type howto_8_FFnn - = NEWHOWTO(howto8_FFnn_callback,"ff00+abs8",0,false,false); + = NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, FALSE, FALSE); static reloc_howto_type howto_8_pcrel - = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,false,true); + = NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, FALSE, TRUE); static reloc_howto_type * local_bfd_reloc_type_lookup (arch, code) @@ -147,18 +149,20 @@ local_bfd_reloc_type_lookup (arch, code) } #endif -int bfd_default_scan_num_mach(); - -static boolean +static bfd_boolean scan_mach (info, string) const struct bfd_arch_info *info ATTRIBUTE_UNUSED; const char *string; { - if (strcmp(string,"h8/500") == 0) return true; - if (strcmp(string,"H8/500") == 0) return true; - if (strcmp(string,"h8500") == 0) return true; - if (strcmp(string,"H8500") == 0) return true; - return false; + if (strcmp (string,"h8/500") == 0) + return TRUE; + if (strcmp (string,"H8/500") == 0) + return TRUE; + if (strcmp (string,"h8500") == 0) + return TRUE; + if (strcmp (string,"H8500") == 0) + return TRUE; + return FALSE; } #if 0 /* not used currently */ @@ -186,7 +190,7 @@ const bfd_arch_info_type bfd_h8500_arch = "h8500", /* arch_name */ "h8500", /* printable name */ 1, - true, /* the default machine */ + TRUE, /* the default machine */ bfd_default_compatible, scan_mach, 0, |