MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix formatting.

Browse Source
This commit is contained in:
Nick Clifton 2000-06-27 01:31:59 +00:00
parent a0c0ddf7e8
commit cc040812f5
4 changed files with 113 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2000-06-26 Kazu Hirata <kazu@hxi.com>
* coff-h8300.c: Fix formatting.
* cpu-h8300.c: Likewise.
2000-06-24 Alexandre Oliva <aoliva@redhat.com> 2000-06-24 Alexandre Oliva <aoliva@redhat.com>
* elf32-arm.h (elf32_arm_final_link_relocate): Print `(local)' * elf32-arm.h (elf32_arm_final_link_relocate): Print `(local)'

126
bfd/coff-h8300.c
View File

@ -192,18 +192,18 @@ h8300_coff_link_hash_table_create (abfd)
return &ret->root.root; return &ret->root.root;
} }
/* special handling for H8/300 relocs. /* Special handling for H8/300 relocs.
We only come here for pcrel stuff and return normally if not an -r link. We only come here for pcrel stuff and return normally if not an -r link.
When doing -r, we can't do any arithmetic for the pcrel stuff, because When doing -r, we can't do any arithmetic for the pcrel stuff, because
the code in reloc.c assumes that we can manipulate the targets of the code in reloc.c assumes that we can manipulate the targets of
the pcrel branches. This isn't so, since the H8/300 can do relaxing, the pcrel branches. This isn't so, since the H8/300 can do relaxing,
which means that the gap after the instruction may not be enough to which means that the gap after the instruction may not be enough to
contain the offset required for the branch, so we have to use the only contain the offset required for the branch, so we have to use the only
the addend until the final link */ the addend until the final link. */
static bfd_reloc_status_type static bfd_reloc_status_type
special (abfd, reloc_entry, symbol, data, input_section, output_bfd, special (abfd, reloc_entry, symbol, data, input_section, output_bfd,
error_message) error_message)
bfd *abfd ATTRIBUTE_UNUSED; bfd *abfd ATTRIBUTE_UNUSED;
arelent *reloc_entry ATTRIBUTE_UNUSED; arelent *reloc_entry ATTRIBUTE_UNUSED;
asymbol *symbol ATTRIBUTE_UNUSED; asymbol *symbol ATTRIBUTE_UNUSED;
@ -253,8 +253,7 @@ static reloc_howto_type howto_table[] =
HOWTO (R_JMP_DEL, 0, 0, 8, true, 0, complain_overflow_signed, special, "Deleted jump", false, 0x000000ff, 0x000000ff, true), HOWTO (R_JMP_DEL, 0, 0, 8, true, 0, complain_overflow_signed, special, "Deleted jump", false, 0x000000ff, 0x000000ff, true),
}; };
/* Turn a howto into a reloc number. */
/* Turn a howto into a reloc number */
#define SELECT_RELOC(x,howto) \ #define SELECT_RELOC(x,howto) \
{ x.r_type = select_reloc(howto); } { x.r_type = select_reloc(howto); }
@ -263,16 +262,13 @@ static reloc_howto_type howto_table[] =
#define H8300 1 /* Customize coffcode.h */ #define H8300 1 /* Customize coffcode.h */
#define __A_MAGIC_SET__ #define __A_MAGIC_SET__
/* Code to swap in the reloc. */
/* Code to swap in the reloc */
#define SWAP_IN_RELOC_OFFSET bfd_h_get_32 #define SWAP_IN_RELOC_OFFSET bfd_h_get_32
#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32 #define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \ #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
dst->r_stuff[0] = 'S'; \ dst->r_stuff[0] = 'S'; \
dst->r_stuff[1] = 'C'; dst->r_stuff[1] = 'C';
static int static int
select_reloc (howto) select_reloc (howto)
reloc_howto_type *howto; reloc_howto_type *howto;
@ -280,8 +276,7 @@ select_reloc (howto)
return howto->type; return howto->type;
} }
/* Code to turn a r_type into a howto ptr, uses the above howto table /* Code to turn a r_type into a howto ptr, uses the above howto table. */
*/
static void static void
rtype2howto (internal, dst) rtype2howto (internal, dst)
@ -358,24 +353,21 @@ rtype2howto (internal, dst)
#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry) #define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
/* Perform any necessary magic to the addend in a reloc entry. */
/* Perform any necessary magic to the addend in a reloc entry */
#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \ #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
cache_ptr->addend = ext_reloc.r_offset; cache_ptr->addend = ext_reloc.r_offset;
#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \ #define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
reloc_processing(relent, reloc, symbols, abfd, section) reloc_processing(relent, reloc, symbols, abfd, section)
static void static void
reloc_processing (relent, reloc, symbols, abfd, section) reloc_processing (relent, reloc, symbols, abfd, section)
arelent * relent; arelent *relent;
struct internal_reloc *reloc; struct internal_reloc *reloc;
asymbol ** symbols; asymbol **symbols;
bfd * abfd; bfd *abfd;
asection * section; asection *section;
{ {
relent->address = reloc->r_vaddr; relent->address = reloc->r_vaddr;
rtype2howto (relent, reloc); rtype2howto (relent, reloc);
@ -389,12 +381,12 @@ reloc_processing (relent, reloc, symbols, abfd, section)
relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
} }
relent->addend = reloc->r_offset; relent->addend = reloc->r_offset;
relent->address -= section->vma; relent->address -= section->vma;
/* relent->section = 0;*/ #if 0
relent->section = 0;
#endif
} }
static boolean static boolean
@ -410,7 +402,7 @@ h8300_symbol_address_p (abfd, input_section, address)
/* Search all the symbols for one in INPUT_SECTION with /* Search all the symbols for one in INPUT_SECTION with
address ADDRESS. */ address ADDRESS. */
while (*s) while (*s)
{ {
asymbol *p = *s; asymbol *p = *s;
if (p->section == input_section if (p->section == input_section
@ -419,11 +411,10 @@ h8300_symbol_address_p (abfd, input_section, address)
+ p->value) == address) + p->value) == address)
return true; return true;
s++; s++;
} }
return false; return false;
} }
/* If RELOC represents a relaxable instruction/reloc, change it into /* If RELOC represents a relaxable instruction/reloc, change it into
the relaxed reloc, notify the linker that symbol addresses the relaxed reloc, notify the linker that symbol addresses
have changed (bfd_perform_slip) and return how much the current have changed (bfd_perform_slip) and return how much the current
@ -433,14 +424,14 @@ h8300_symbol_address_p (abfd, input_section, address)
in the howto table. This needs to be fixed. */ in the howto table. This needs to be fixed. */
static int static int
h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info) h8300_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
bfd *abfd; bfd *abfd;
asection *input_section; asection *input_section;
arelent *reloc; arelent *reloc;
unsigned int shrink; unsigned int shrink;
struct bfd_link_info *link_info; struct bfd_link_info *link_info;
{ {
bfd_vma value; bfd_vma value;
bfd_vma dot; bfd_vma dot;
bfd_vma gap; bfd_vma gap;
static asection *last_input_section = NULL; static asection *last_input_section = NULL;
@ -458,13 +449,12 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
/* Only examine the relocs which might be relaxable. */ /* Only examine the relocs which might be relaxable. */
switch (reloc->howto->type) switch (reloc->howto->type)
{ {
/* This is the 16/24 bit absolute branch which could become an 8 bit /* This is the 16/24 bit absolute branch which could become an 8 bit
pc-relative branch. */ pc-relative branch. */
case R_JMP1: case R_JMP1:
case R_JMPL1: case R_JMPL1:
/* Get the address of the target of this branch. */ /* Get the address of the target of this branch. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
/* Get the address of the next instruction (not the reloc). */ /* Get the address of the next instruction (not the reloc). */
dot = (input_section->output_section->vma dot = (input_section->output_section->vma
@ -475,13 +465,12 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
/* Compute the distance from this insn to the branch target. */ /* Compute the distance from this insn to the branch target. */
gap = value - dot; gap = value - dot;
/* If the distance is within -128..+128 inclusive, then we can relax /* If the distance is within -128..+128 inclusive, then we can relax
this jump. +128 is valid since the target will move two bytes this jump. +128 is valid since the target will move two bytes
closer if we do relax this branch. */ closer if we do relax this branch. */
if ((int)gap >= -128 && (int)gap <= 128 ) if ((int)gap >= -128 && (int)gap <= 128 )
{ {
/* It's possible we may be able to eliminate this branch entirely; /* It's possible we may be able to eliminate this branch entirely;
if the previous instruction is a branch around this instruction, if the previous instruction is a branch around this instruction,
and there's no label at this instruction, then we can reverse and there's no label at this instruction, then we can reverse
@ -505,7 +494,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
if (last_value == dot + 2 if (last_value == dot + 2
&& last_reloc->address + 1 == reloc->address && last_reloc->address + 1 == reloc->address
&& ! h8300_symbol_address_p (abfd, input_section, dot - 2)) && !h8300_symbol_address_p (abfd, input_section, dot - 2))
{ {
reloc->howto = howto_table + 19; reloc->howto = howto_table + 19;
last_reloc->howto = howto_table + 18; last_reloc->howto = howto_table + 18;
@ -518,11 +507,11 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
} }
/* Change the reloc type. */ /* Change the reloc type. */
reloc->howto = reloc->howto + 1; reloc->howto = reloc->howto + 1;
/* This shrinks this section by two bytes. */ /* This shrinks this section by two bytes. */
shrink += 2; shrink += 2;
bfd_perform_slip(abfd, 2, input_section, address); bfd_perform_slip (abfd, 2, input_section, address);
} }
break; break;
@ -531,12 +520,12 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
case R_PCRWORD: case R_PCRWORD:
/* Get the address of the target of this branch, add one to the value /* Get the address of the target of this branch, add one to the value
because the addend field in PCrel jumps is off by -1. */ because the addend field in PCrel jumps is off by -1. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section) + 1; value = bfd_coff_reloc16_get_value (reloc, link_info, input_section) + 1;
/* Get the address of the next instruction if we were to relax. */ /* Get the address of the next instruction if we were to relax. */
dot = input_section->output_section->vma + dot = input_section->output_section->vma +
input_section->output_offset + address; input_section->output_offset + address;
/* Compute the distance from this insn to the branch target. */ /* Compute the distance from this insn to the branch target. */
gap = value - dot; gap = value - dot;
@ -550,7 +539,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
/* This shrinks this section by two bytes. */ /* This shrinks this section by two bytes. */
shrink += 2; shrink += 2;
bfd_perform_slip(abfd, 2, input_section, address); bfd_perform_slip (abfd, 2, input_section, address);
} }
break; break;
@ -558,7 +547,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
become an 8 bit absolute address if it's in the right range. */ become an 8 bit absolute address if it's in the right range. */
case R_MOV16B1: case R_MOV16B1:
/* Get the address of the data referenced by this mov.b insn. */ /* Get the address of the data referenced by this mov.b insn. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
/* The address is in 0xff00..0xffff inclusive on the h8300 or /* The address is in 0xff00..0xffff inclusive on the h8300 or
0xffff00..0xffffff inclusive on the h8300h, then we can 0xffff00..0xffffff inclusive on the h8300h, then we can
@ -576,7 +565,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
/* This shrinks this section by two bytes. */ /* This shrinks this section by two bytes. */
shrink += 2; shrink += 2;
bfd_perform_slip(abfd, 2, input_section, address); bfd_perform_slip (abfd, 2, input_section, address);
} }
break; break;
@ -585,7 +574,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
and try to relax it into a 16bit absolute. */ and try to relax it into a 16bit absolute. */
case R_MOV24B1: case R_MOV24B1:
/* Get the address of the data referenced by this mov.b insn. */ /* Get the address of the data referenced by this mov.b insn. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
/* The address is in 0xffff00..0xffffff inclusive on the h8300h, /* The address is in 0xffff00..0xffffff inclusive on the h8300h,
then we can relax this mov.b */ then we can relax this mov.b */
@ -599,7 +588,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
/* This shrinks this section by four bytes. */ /* This shrinks this section by four bytes. */
shrink += 4; shrink += 4;
bfd_perform_slip(abfd, 4, input_section, address); bfd_perform_slip (abfd, 4, input_section, address);
/* Done with this reloc. */ /* Done with this reloc. */
break; break;
@ -612,7 +601,7 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
become an 16 bit absolute address if it's in the right range. */ become an 16 bit absolute address if it's in the right range. */
case R_MOVL1: case R_MOVL1:
/* Get the address of the data referenced by this mov insn. */ /* Get the address of the data referenced by this mov insn. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
/* If this address is in 0x0000..0x7fff inclusive or /* If this address is in 0x0000..0x7fff inclusive or
0xff8000..0xffffff inclusive, then it can be relaxed. */ 0xff8000..0xffffff inclusive, then it can be relaxed. */
@ -623,13 +612,13 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
/* This shrinks this section by two bytes. */ /* This shrinks this section by two bytes. */
shrink += 2; shrink += 2;
bfd_perform_slip(abfd, 2, input_section, address); bfd_perform_slip (abfd, 2, input_section, address);
} }
break; break;
/* No other reloc types represent relaxing opportunities. */ /* No other reloc types represent relaxing opportunities. */
default: default:
break; break;
} }
last_reloc = reloc; last_reloc = reloc;
@ -637,7 +626,6 @@ h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
return shrink; return shrink;
} }
/* Handle relocations for the H8/300, including relocs for relaxed /* Handle relocations for the H8/300, including relocs for relaxed
instructions. instructions.
@ -659,18 +647,17 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
asection *input_section = link_order->u.indirect.section; asection *input_section = link_order->u.indirect.section;
bfd_vma value; bfd_vma value;
bfd_vma dot; bfd_vma dot;
int gap,tmp; int gap, tmp;
switch (reloc->howto->type) switch (reloc->howto->type)
{ {
/* Generic 8bit pc-relative relocation. */ /* Generic 8bit pc-relative relocation. */
case R_PCRBYTE: case R_PCRBYTE:
/* Get the address of the target of this branch. */ /* Get the address of the target of this branch. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
dot = (link_order->offset dot = (link_order->offset
+ dst_address + dst_address
+ link_order->u.indirect.section->output_section->vma); + link_order->u.indirect.section->output_section->vma);
gap = value - dot; gap = value - dot;
@ -698,7 +685,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
/* Generic 16bit pc-relative relocation. */ /* Generic 16bit pc-relative relocation. */
case R_PCRWORD: case R_PCRWORD:
/* Get the address of the target of this branch. */ /* Get the address of the target of this branch. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
/* Get the address of the instruction (not the reloc). */ /* Get the address of the instruction (not the reloc). */
dot = (link_order->offset dot = (link_order->offset
@ -761,7 +748,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
case R_MOV16B1: case R_MOV16B1:
case R_JMP1: case R_JMP1:
case R_RELWORD: case R_RELWORD:
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
bfd_put_16 (abfd, value, data + dst_address); bfd_put_16 (abfd, value, data + dst_address);
dst_address += 2; dst_address += 2;
src_address += 2; src_address += 2;
@ -772,7 +759,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
case R_MOVL1: case R_MOVL1:
case R_RELLONG: case R_RELLONG:
/* Get the address of the target of this branch. */ /* Get the address of the target of this branch. */
value = bfd_coff_reloc16_get_value (reloc, link_info, input_section), value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
bfd_put_32 (abfd, value, data + dst_address); bfd_put_32 (abfd, value, data + dst_address);
dst_address += 4; dst_address += 4;
src_address += 4; src_address += 4;
@ -961,13 +948,13 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
abort (); abort ();
/* Fix up the opcode. */ /* Fix up the opcode. */
switch (data[src_address-1] & 0xf0) switch (data[src_address - 1] & 0xf0)
{ {
case 0x00: case 0x00:
data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x20; data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x20;
break; break;
case 0x80: case 0x80:
data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x30; data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x30;
break; break;
default: default:
abort (); abort ();
@ -986,13 +973,13 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
abort (); abort ();
/* Fix up the opcode. */ /* Fix up the opcode. */
switch (data[src_address-1] & 0xf0) switch (data[src_address - 1] & 0xf0)
{ {
case 0x20: case 0x20:
data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x20; data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x20;
break; break;
case 0xa0: case 0xa0:
data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x30; data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x30;
break; break;
default: default:
abort (); abort ();
@ -1004,10 +991,10 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
case R_BCC_INV: case R_BCC_INV:
/* Get the address of the target of this branch. */ /* Get the address of the target of this branch. */
value = bfd_coff_reloc16_get_value(reloc, link_info, input_section); value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
dot = (link_order->offset dot = (link_order->offset
+ dst_address + dst_address
+ link_order->u.indirect.section->output_section->vma) + 1; + link_order->u.indirect.section->output_section->vma) + 1;
gap = value - dot; gap = value - dot;
@ -1103,7 +1090,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
strcpy (new_name, name); strcpy (new_name, name);
sprintf (new_name + strlen (name), "_%08x", sprintf (new_name + strlen (name), "_%08x",
(int)symbol->section); (int) symbol->section);
name = new_name; name = new_name;
} }
@ -1162,7 +1149,6 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
*dst_ptr = dst_address; *dst_ptr = dst_address;
} }
/* Routine for the h8300 linker. /* Routine for the h8300 linker.
This routine is necessary to handle the special R_MEM_INDIRECT This routine is necessary to handle the special R_MEM_INDIRECT
@ -1175,7 +1161,7 @@ h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
selected static symbols to the bfd linker hash table. */ selected static symbols to the bfd linker hash table. */
static boolean static boolean
h8300_bfd_link_add_symbols(abfd, info) h8300_bfd_link_add_symbols (abfd, info)
bfd *abfd; bfd *abfd;
struct bfd_link_info *info; struct bfd_link_info *info;
{ {
@ -1239,7 +1225,7 @@ h8300_bfd_link_add_symbols(abfd, info)
if (reloc_size <= 0) if (reloc_size <= 0)
continue; continue;
relocs = (arelent **)bfd_malloc ((size_t)reloc_size); relocs = (arelent **) bfd_malloc ((size_t) reloc_size);
if (!relocs) if (!relocs)
return false; return false;
@ -1282,7 +1268,7 @@ h8300_bfd_link_add_symbols(abfd, info)
strcpy (new_name, name); strcpy (new_name, name);
sprintf (new_name + strlen (name), "_%08x", sprintf (new_name + strlen (name), "_%08x",
(int)symbol->section); (int) symbol->section);
name = new_name; name = new_name;
} }
@ -1342,12 +1328,10 @@ h8300_bfd_link_add_symbols(abfd, info)
#define COFF_LONG_FILENAMES #define COFF_LONG_FILENAMES
#include "coffcode.h" #include "coffcode.h"
#undef coff_bfd_get_relocated_section_contents #undef coff_bfd_get_relocated_section_contents
#undef coff_bfd_relax_section #undef coff_bfd_relax_section
#define coff_bfd_get_relocated_section_contents \ #define coff_bfd_get_relocated_section_contents \
bfd_coff_reloc16_get_relocated_section_contents bfd_coff_reloc16_get_relocated_section_contents
#define coff_bfd_relax_section bfd_coff_reloc16_relax_section #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
CREATE_BIG_COFF_TARGET_VEC (h8300coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL) CREATE_BIG_COFF_TARGET_VEC (h8300coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL)

23
bfd/cpu-h8300.c
View File

@ -65,15 +65,14 @@ h8300_scan (info, string)
} }
} }
/* This routine is provided two arch_infos and works out the machine
/* This routine is provided two arch_infos and works out the which would be compatible with both and returns a pointer to its
machine which would be compatible with both and returns a pointer info structure. */
to its info structure */
static const bfd_arch_info_type * static const bfd_arch_info_type *
compatible (in, out) compatible (in, out)
const bfd_arch_info_type * in; const bfd_arch_info_type *in;
const bfd_arch_info_type * out; const bfd_arch_info_type *out;
{ {
/* It's really not a good idea to mix and match modes. */ /* It's really not a good idea to mix and match modes. */
if (in->mach != out->mach) if (in->mach != out->mach)
@ -95,7 +94,9 @@ static const bfd_arch_info_type h8300_info_struct =
true, /* the default machine */ true, /* the default machine */
compatible, compatible,
h8300_scan, h8300_scan,
/* local_bfd_reloc_type_lookup, */ #if 0
local_bfd_reloc_type_lookup,
#endif
0, 0,
}; };
@ -112,7 +113,9 @@ static const bfd_arch_info_type h8300h_info_struct =
false, /* the default machine */ false, /* the default machine */
compatible, compatible,
h8300_scan, h8300_scan,
/* local_bfd_reloc_type_lookup, */ #if 0
local_bfd_reloc_type_lookup,
#endif
&h8300_info_struct, &h8300_info_struct,
}; };
@ -129,6 +132,8 @@ const bfd_arch_info_type bfd_h8300_arch =
false, /* the default machine */ false, /* the default machine */
compatible, compatible,
h8300_scan, h8300_scan,
/* local_bfd_reloc_type_lookup, */ #if 0
local_bfd_reloc_type_lookup,
#endif
&h8300h_info_struct, &h8300h_info_struct,
}; };

78
bfd/po/bfd.pot
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2000-06-18 17:36-0700\n" "POT-Creation-Date: 2000-06-26 18:29-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -360,7 +360,7 @@ msgstr ""
msgid "uncertain calling convention for non-COFF symbol" msgid "uncertain calling convention for non-COFF symbol"
msgstr "" msgstr ""
#: cofflink.c:518 elflink.h:1567 #: cofflink.c:518 elflink.h:1623
#, c-format #, c-format
msgid "Warning: type of symbol `%s' changed from %d to %d in %s" msgid "Warning: type of symbol `%s' changed from %d to %d in %s"
msgstr "" msgstr ""
@ -380,7 +380,7 @@ msgstr ""
msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff" msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
msgstr "" msgstr ""
#: coff-mips.c:875 elf32-mips.c:1406 #: coff-mips.c:875 elf32-mips.c:1405
msgid "GP relative relocation when _gp not defined" msgid "GP relative relocation when _gp not defined"
msgstr "" msgstr ""
@ -641,7 +641,7 @@ msgid "does"
msgstr "" msgstr ""
#. Ignore init flag - it may not be set, despite the flags field containing valid data. #. Ignore init flag - it may not be set, despite the flags field containing valid data.
#: elf32-arm.h:2125 elf32-m68k.c:430 elf32-mips.c:2621 #: elf32-arm.h:2125 elf32-m68k.c:430 elf32-mips.c:2620
#, c-format #, c-format
msgid "private flags = %lx:" msgid "private flags = %lx:"
msgstr "" msgstr ""
@ -753,124 +753,124 @@ msgstr ""
msgid "%s: Unknown relocation type %d\n" msgid "%s: Unknown relocation type %d\n"
msgstr "" msgstr ""
#: elf32-mips.c:1565 #: elf32-mips.c:1564
msgid "32bits gp relative relocation occurs for an external symbol" msgid "32bits gp relative relocation occurs for an external symbol"
msgstr "" msgstr ""
#: elf32-mips.c:1714 #: elf32-mips.c:1713
#, c-format #, c-format
msgid "Linking mips16 objects into %s format is not supported" msgid "Linking mips16 objects into %s format is not supported"
msgstr "" msgstr ""
#: elf32-mips.c:2507 #: elf32-mips.c:2506
#, c-format #, c-format
msgid "%s: linking PIC files with non-PIC files" msgid "%s: linking PIC files with non-PIC files"
msgstr "" msgstr ""
#: elf32-mips.c:2517 #: elf32-mips.c:2516
#, c-format #, c-format
msgid "%s: linking abicalls files with non-abicalls files" msgid "%s: linking abicalls files with non-abicalls files"
msgstr "" msgstr ""
#: elf32-mips.c:2547 #: elf32-mips.c:2546
#, c-format #, c-format
msgid "%s: ISA mismatch (-mips%d) with previous modules (-mips%d)" msgid "%s: ISA mismatch (-mips%d) with previous modules (-mips%d)"
msgstr "" msgstr ""
#: elf32-mips.c:2556 #: elf32-mips.c:2555
#, c-format #, c-format
msgid "%s: ISA mismatch (%d) with previous modules (%d)" msgid "%s: ISA mismatch (%d) with previous modules (%d)"
msgstr "" msgstr ""
#: elf32-mips.c:2579 #: elf32-mips.c:2578
#, c-format #, c-format
msgid "%s: ABI mismatch: linking %s module with previous %s modules" msgid "%s: ABI mismatch: linking %s module with previous %s modules"
msgstr "" msgstr ""
#: elf32-mips.c:2593 elf32-ppc.c:1464 elf64-sparc.c:2957 #: elf32-mips.c:2592 elf32-ppc.c:1464 elf64-sparc.c:2957
#, c-format #, c-format
msgid "%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)" msgid "%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
msgstr "" msgstr ""
#: elf32-mips.c:2624 #: elf32-mips.c:2623
msgid " [abi=O32]" msgid " [abi=O32]"
msgstr "" msgstr ""
#: elf32-mips.c:2626 #: elf32-mips.c:2625
msgid " [abi=O64]" msgid " [abi=O64]"
msgstr "" msgstr ""
#: elf32-mips.c:2628 #: elf32-mips.c:2627
msgid " [abi=EABI32]" msgid " [abi=EABI32]"
msgstr "" msgstr ""
#: elf32-mips.c:2630 #: elf32-mips.c:2629
msgid " [abi=EABI64]" msgid " [abi=EABI64]"
msgstr "" msgstr ""
#: elf32-mips.c:2632 #: elf32-mips.c:2631
msgid " [abi unknown]" msgid " [abi unknown]"
msgstr "" msgstr ""
#: elf32-mips.c:2634 #: elf32-mips.c:2633
msgid " [abi=N32]" msgid " [abi=N32]"
msgstr "" msgstr ""
#: elf32-mips.c:2636 #: elf32-mips.c:2635
msgid " [abi=64]" msgid " [abi=64]"
msgstr "" msgstr ""
#: elf32-mips.c:2638 #: elf32-mips.c:2637
msgid " [no abi set]" msgid " [no abi set]"
msgstr "" msgstr ""
#: elf32-mips.c:2641 #: elf32-mips.c:2640
msgid " [mips1]" msgid " [mips1]"
msgstr "" msgstr ""
#: elf32-mips.c:2643 #: elf32-mips.c:2642
msgid " [mips2]" msgid " [mips2]"
msgstr "" msgstr ""
#: elf32-mips.c:2645 #: elf32-mips.c:2644
msgid " [mips3]" msgid " [mips3]"
msgstr "" msgstr ""
#: elf32-mips.c:2647 #: elf32-mips.c:2646
msgid " [mips4]" msgid " [mips4]"
msgstr "" msgstr ""
#: elf32-mips.c:2649 #: elf32-mips.c:2648
msgid " [unknown ISA]" msgid " [unknown ISA]"
msgstr "" msgstr ""
#: elf32-mips.c:2652 #: elf32-mips.c:2651
msgid " [32bitmode]" msgid " [32bitmode]"
msgstr "" msgstr ""
#: elf32-mips.c:2654 #: elf32-mips.c:2653
msgid " [not 32bitmode]" msgid " [not 32bitmode]"
msgstr "" msgstr ""
#: elf32-mips.c:4257 #: elf32-mips.c:4295
msgid "static procedure (no name)" msgid "static procedure (no name)"
msgstr "" msgstr ""
#: elf32-mips.c:4874 elf64-alpha.c:4367 #: elf32-mips.c:4912 elf64-alpha.c:4367
#, c-format #, c-format
msgid "%s: illegal section name `%s'" msgid "%s: illegal section name `%s'"
msgstr "" msgstr ""
#: elf32-mips.c:5401 #: elf32-mips.c:5457
msgid "not enough GOT space for local GOT entries" msgid "not enough GOT space for local GOT entries"
msgstr "" msgstr ""
#: elf32-mips.c:6495 #: elf32-mips.c:6571
#, c-format #, c-format
msgid "%s: %s+0x%lx: jump to stub routine which is not jal" msgid "%s: %s+0x%lx: jump to stub routine which is not jal"
msgstr "" msgstr ""
#: elf32-mips.c:7523 #: elf32-mips.c:7600
#, c-format #, c-format
msgid "%s: CALL16 reloc at 0x%lx not against global symbol" msgid "%s: CALL16 reloc at 0x%lx not against global symbol"
msgstr "" msgstr ""
@ -1244,37 +1244,37 @@ msgstr ""
msgid "%s: Section %s is already to large to put hole of %ld bytes in" msgid "%s: Section %s is already to large to put hole of %ld bytes in"
msgstr "" msgstr ""
#: elflink.h:1387 #: elflink.h:1443
#, c-format #, c-format
msgid "%s: %s: invalid version %u (max %d)" msgid "%s: %s: invalid version %u (max %d)"
msgstr "" msgstr ""
#: elflink.h:1428 #: elflink.h:1484
#, c-format #, c-format
msgid "%s: %s: invalid needed version %d" msgid "%s: %s: invalid needed version %d"
msgstr "" msgstr ""
#: elflink.h:1545 #: elflink.h:1601
#, c-format #, c-format
msgid "Warning: size of symbol `%s' changed from %lu to %lu in %s" msgid "Warning: size of symbol `%s' changed from %lu to %lu in %s"
msgstr "" msgstr ""
#: elflink.h:1789 #: elflink.h:1845
#, c-format #, c-format
msgid "%s: warning: unexpected redefinition of `%s'" msgid "%s: warning: unexpected redefinition of `%s'"
msgstr "" msgstr ""
#: elflink.h:3496 #: elflink.h:3552
#, c-format #, c-format
msgid "warning: type and size of dynamic symbol `%s' are not defined" msgid "warning: type and size of dynamic symbol `%s' are not defined"
msgstr "" msgstr ""
#: elflink.h:3768 #: elflink.h:3824
#, c-format #, c-format
msgid "%s: undefined versioned symbol name %s" msgid "%s: undefined versioned symbol name %s"
msgstr "" msgstr ""
#: elflink.h:5012 #: elflink.h:5068
#, c-format #, c-format
msgid "%s: could not find output section %s for input section %s" msgid "%s: could not find output section %s for input section %s"
msgstr "" msgstr ""