/* BFD back-end for ARM COFF files.
- Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+ Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+ Free Software Foundation, Inc.
Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
#include "libcoff.h"
+/* Macros for manipulation the bits in the flags field of the coff data
+ structure. */
#define APCS_26_FLAG( abfd ) (coff_data (abfd)->flags & F_APCS_26)
#define APCS_FLOAT_FLAG( abfd ) (coff_data (abfd)->flags & F_APCS_FLOAT)
#define PIC_FLAG( abfd ) (coff_data (abfd)->flags & F_PIC)
#define SET_INTERWORK_FLAG( abfd, flg ) (coff_data (abfd)->flags = \
(coff_data (abfd)->flags & ~ F_INTERWORK) \
| (flg | F_INTERWORK_SET))
+
+typedef enum {bunknown, b9, b12, b23} thumb_pcrel_branchtype;
+/* some typedefs for holding instructions */
+typedef unsigned long int insn32;
+typedef unsigned short int insn16;
+ /* Forward declarations for stupid compilers. */
static boolean coff_arm_relocate_section
PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
struct internal_reloc *, struct internal_syment *, asection **));
-
-static bfd_reloc_status_type
-aoutarm_fix_pcrel_26_done PARAMS ((bfd *, arelent *, asymbol *, PTR,
- asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-aoutarm_fix_pcrel_26 PARAMS ((bfd *, arelent *, asymbol *, PTR,
- asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_23 PARAMS ((bfd *, arelent *, asymbol *, PTR,
- asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_12 PARAMS ((bfd *, arelent *, asymbol *, PTR,
- asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_9 PARAMS ((bfd *, arelent *, asymbol *, PTR,
- asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-coff_arm_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *,
- char **));
-
-static boolean
-coff_arm_adjust_symndx PARAMS ((bfd *, struct bfd_link_info *, bfd *,
- asection *, struct internal_reloc *,
- boolean *));
+static bfd_reloc_status_type aoutarm_fix_pcrel_26_done
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type aoutarm_fix_pcrel_26
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type coff_thumb_pcrel_23
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type coff_thumb_pcrel_12
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type coff_thumb_pcrel_9
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type coff_arm_reloc
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static boolean coff_arm_adjust_symndx
+ PARAMS ((bfd *, struct bfd_link_info *, bfd *,
+ asection *, struct internal_reloc *, boolean *));
+static reloc_howto_type * coff_arm_rtype_to_howto
+ PARAMS ((bfd *, asection *, struct internal_reloc *,
+ struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
+static bfd_reloc_status_type coff_thumb_pcrel_common
+ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **,
+ thumb_pcrel_branchtype));
+static CONST struct reloc_howto_struct * coff_arm_reloc_type_lookup
+ PARAMS ((bfd *, bfd_reloc_code_real_type));
+static struct bfd_link_hash_table * coff_arm_link_hash_table_create
+ PARAMS ((bfd *));
+static insn32 insert_thumb_branch
+ PARAMS ((insn32, int));
+static struct coff_link_hash_entry * find_thumb_glue
+ PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
+static struct coff_link_hash_entry * find_arm_glue
+ PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
+#ifndef COFF_IMAGE_WITH_PE
+static void record_arm_to_thumb_glue
+ PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
+static void record_thumb_to_arm_glue
+ PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
+#endif
+static boolean coff_arm_merge_private_bfd_data
+ PARAMS ((bfd *, bfd *));
+static boolean coff_arm_print_private_bfd_data
+ PARAMS ((bfd *, PTR));
+static boolean _bfd_coff_arm_set_private_flags
+ PARAMS ((bfd *, flagword));
+static boolean coff_arm_copy_private_bfd_data
+ PARAMS ((bfd *, bfd *));
+static boolean coff_arm_is_local_label_name
+ PARAMS ((bfd *, const char *));
+static boolean coff_arm_link_output_has_begun
+ PARAMS ((bfd *, struct coff_final_link_info *));
+static boolean coff_arm_final_link_postscript
+ PARAMS ((bfd *, struct coff_final_link_info *));
/* The linker script knows the section names for placement.
The entry_names are used to do simple name mangling on the stubs.
error_message)
bfd *abfd;
arelent *reloc_entry;
- asymbol *symbol;
+ asymbol *symbol ATTRIBUTE_UNUSED;
PTR data;
- asection *input_section;
+ asection *input_section ATTRIBUTE_UNUSED;
bfd *output_bfd;
- char **error_message;
+ char **error_message ATTRIBUTE_UNUSED;
{
symvalue diff;
if (output_bfd == (bfd *) NULL)
return bfd_reloc_continue;
}
+/* If USER_LABEL_PREFIX is defined as "_" (see coff_arm_is_local_label_name()
+ in this file), then TARGET_UNDERSCORE should be defined, otherwise it
+ should not. */
+#ifndef TARGET_UNDERSCORE
#define TARGET_UNDERSCORE '_'
+#endif
#ifndef PCRELOFFSET
#define PCRELOFFSET true
24,
false,
0,
- complain_overflow_signed,
+ complain_overflow_dont,
aoutarm_fix_pcrel_26_done,
"ARM_26D",
true,
0x0,
false),
/* 8 is unused */
- {-1},
+ EMPTY_HOWTO (-1),
HOWTO( ARM_NEG16,
0,
-1,
0x07ff07ff,
PCRELOFFSET),
};
+
#ifdef COFF_WITH_PE
/* Return true if this relocation should
appear in the output .reloc section. */
-static boolean in_reloc_p (abfd, howto)
- bfd * abfd;
- reloc_howto_type *howto;
+static boolean
+in_reloc_p (abfd, howto)
+ bfd * abfd ATTRIBUTE_UNUSED;
+ reloc_howto_type * howto;
{
- return !howto->pc_relative && howto->type != 11;
+ return !howto->pc_relative && howto->type != ARM_RVA32;
}
#endif
static reloc_howto_type *
coff_arm_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
- bfd *abfd;
+ bfd *abfd ATTRIBUTE_UNUSED;
asection *sec;
struct internal_reloc *rel;
- struct coff_link_hash_entry *h;
- struct internal_syment *sym;
+ struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
+ struct internal_syment *sym ATTRIBUTE_UNUSED;
bfd_vma *addendp;
{
reloc_howto_type *howto;
*addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
}
- /* The relocation_section function will skip pcrel_offset relocs
- when doing a relocateable link. However, we want to convert
- ARM26 to ARM26D relocs if possible. We return a fake howto in
- this case without pcrel_offset set, and adjust the addend to
- compensate. */
- if (rel->r_type == ARM_26
- && h != NULL
- && (h->root.type == bfd_link_hash_defined
- || h->root.type == bfd_link_hash_defweak)
- && h->root.u.def.section->output_section == sec->output_section)
- {
- static reloc_howto_type fake_arm26_reloc =
- HOWTO (ARM_26,
- 2,
- 2,
- 24,
- true,
- 0,
- complain_overflow_signed,
- aoutarm_fix_pcrel_26 ,
- "ARM_26",
- false,
- 0x00ffffff,
- 0x00ffffff,
- false);
-
- *addendp -= rel->r_vaddr - sec->vma;
- return & fake_arm26_reloc;
- }
-
return howto;
}
static bfd_reloc_status_type
aoutarm_fix_pcrel_26_done (abfd, reloc_entry, symbol, data, input_section,
output_bfd, error_message)
- bfd *abfd;
- arelent *reloc_entry;
- asymbol *symbol;
- PTR data;
- asection *input_section;
- bfd *output_bfd;
- char **error_message;
+ bfd *abfd ATTRIBUTE_UNUSED;
+ arelent *reloc_entry ATTRIBUTE_UNUSED;
+ asymbol *symbol ATTRIBUTE_UNUSED;
+ PTR data ATTRIBUTE_UNUSED;
+ asection *input_section ATTRIBUTE_UNUSED;
+ bfd *output_bfd ATTRIBUTE_UNUSED;
+ char **error_message ATTRIBUTE_UNUSED;
{
/* This is dead simple at present. */
return bfd_reloc_ok;
PTR data;
asection *input_section;
bfd *output_bfd;
- char **error_message;
+ char **error_message ATTRIBUTE_UNUSED;
{
bfd_vma relocation;
bfd_size_type addr = reloc_entry->address;
/* Check for overflow */
if (relocation & 0x02000000)
{
- if ((relocation & ~0x03ffffff) != ~0x03ffffff)
+ if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
flag = bfd_reloc_overflow;
}
else if (relocation & ~0x03ffffff)
return flag;
}
-typedef enum {bunknown, b9, b12, b23} thumb_pcrel_branchtype;
-
static bfd_reloc_status_type
coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section,
output_bfd, error_message, btype)
PTR data;
asection *input_section;
bfd *output_bfd;
- char **error_message;
+ char **error_message ATTRIBUTE_UNUSED;
thumb_pcrel_branchtype btype;
{
- bfd_vma relocation;
+ bfd_vma relocation = 0;
bfd_size_type addr = reloc_entry->address;
long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
bfd_reloc_status_type flag = bfd_reloc_ok;
else
relocation = ((target & 0x7ff) << 12) | ((target & 0x07ff0000) >> 15);
break;
+
+ default:
+ abort ();
}
relocation = (relocation ^ signbit) - signbit; /* Sign extend */
else
target |= ((relocation & 0xffe) << 15) | ((relocation >> 12) & 0x7ff);
break;
+
+ default:
+ abort ();
}
bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
static CONST struct reloc_howto_struct *
-arm_reloc_type_lookup(abfd,code)
- bfd *abfd;
+coff_arm_reloc_type_lookup (abfd, code)
+ bfd * abfd;
bfd_reloc_code_real_type code;
{
#define ASTD(i,j) case i: return &aoutarm_std_reloc_howto[j]
}
}
-
-#define coff_bfd_reloc_type_lookup arm_reloc_type_lookup
-
#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
#define COFF_PAGE_SIZE 0x1000
/* Turn a howto into a reloc nunmber */
#define BADMAG(x) ARMBADMAG(x)
#define ARM 1 /* Customize coffcode.h */
-/* The set of global variables that mark the total size of each kind
- of glue required. */
-static long int global_thumb_glue_size = 0;
-static long int global_arm_glue_size = 0;
+/* Extend the coff_link_hash_table structure with a few ARM specific fields.
+ This allows us to store global data here without actually creating any
+ global variables, which is a no-no in the BFD world. */
+struct coff_arm_link_hash_table
+{
+ /* The original coff_link_hash_table structure. MUST be first field. */
+ struct coff_link_hash_table root;
+
+ /* The size in bytes of the section containg the Thumb-to-ARM glue. */
+ long int thumb_glue_size;
+
+ /* The size in bytes of the section containg the ARM-to-Thumb glue. */
+ long int arm_glue_size;
-static bfd * bfd_of_glue_owner = NULL;
+ /* An arbitary input BFD chosen to hold the glue sections. */
+ bfd * bfd_of_glue_owner;
-/* some typedefs for holding instructions */
-typedef unsigned long int insn32;
-typedef unsigned short int insn16;
+ /* Support interworking with old, non-interworking aware ARM code. */
+ int support_old_code;
+};
+
+/* Get the ARM coff linker hash table from a link_info structure. */
+#define coff_arm_hash_table(info) \
+ ((struct coff_arm_link_hash_table *) ((info)->hash))
+
+/* Create an ARM coff linker hash table. */
+
+static struct bfd_link_hash_table *
+coff_arm_link_hash_table_create (abfd)
+ bfd * abfd;
+{
+ struct coff_arm_link_hash_table * ret;
+
+ ret = ((struct coff_arm_link_hash_table *)
+ bfd_alloc (abfd, sizeof (struct coff_arm_link_hash_table)));
+ if (ret == (struct coff_arm_link_hash_table *) NULL)
+ return NULL;
+
+ if (! _bfd_coff_link_hash_table_init
+ (& ret->root, abfd, _bfd_coff_link_hash_newfunc))
+ {
+ bfd_release (abfd, ret);
+ return (struct bfd_link_hash_table *) NULL;
+ }
+
+ ret->thumb_glue_size = 0;
+ ret->arm_glue_size = 0;
+ ret->bfd_of_glue_owner = NULL;
+
+ return & ret->root.root;
+}
+static void
+arm_emit_base_file_entry (info, output_bfd, input_section, reloc_offset)
+ struct bfd_link_info *info;
+ bfd *output_bfd;
+ asection *input_section;
+ bfd_vma reloc_offset;
+{
+ bfd_vma addr = reloc_offset
+ - input_section->vma
+ + input_section->output_offset
+ + input_section->output_section->vma;
+
+ if (coff_data(output_bfd)->pe)
+ addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
+ fwrite (&addr, 1, sizeof (addr), (FILE *) info->base_file);
+
+}
\f
/* The thumb form of a long branch is a bit finicky, because the offset
encoding is split over two fields, each in it's own instruction. They
rel_off >>= 1; /* half word aligned address */
low_bits = rel_off & 0x000007FF; /* the bottom 11 bits */
- high_bits = ( rel_off >> 11 ) & 0x000007FF; /* the top 11 bits */
+ high_bits = (rel_off >> 11) & 0x000007FF; /* the top 11 bits */
if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;
static struct coff_link_hash_entry *
find_thumb_glue (info, name, input_bfd)
struct bfd_link_info * info;
- char * name;
+ CONST char * name;
bfd * input_bfd;
{
- char * tmp_name = 0;
- struct coff_link_hash_entry * myh = 0;
+ char * tmp_name;
+ struct coff_link_hash_entry * myh;
tmp_name = ((char *)
- bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME)));
+ bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1));
BFD_ASSERT (tmp_name);
sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
- myh = coff_link_hash_lookup (coff_hash_table (info),
- tmp_name,
- false, false, true);
+ myh = coff_link_hash_lookup
+ (coff_hash_table (info), tmp_name, false, false, true);
+
if (myh == NULL)
- {
- _bfd_error_handler ("%s: unable to find THUMB glue '%s' for `%s'",
- bfd_get_filename (input_bfd), tmp_name, name);
- }
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%s: unable to find THUMB glue '%s' for `%s'"),
+ bfd_get_filename (input_bfd), tmp_name, name);
free (tmp_name);
static struct coff_link_hash_entry *
find_arm_glue (info, name, input_bfd)
struct bfd_link_info * info;
- char * name;
+ CONST char * name;
bfd * input_bfd;
{
- char *tmp_name = 0;
- struct coff_link_hash_entry *myh = 0;
+ char * tmp_name;
+ struct coff_link_hash_entry * myh;
tmp_name = ((char *)
- bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME)));
+ bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
BFD_ASSERT (tmp_name);
sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
- myh = coff_link_hash_lookup (coff_hash_table (info),
- tmp_name,
- false, false, true);
+ myh = coff_link_hash_lookup
+ (coff_hash_table (info), tmp_name, false, false, true);
if (myh == NULL)
- {
- _bfd_error_handler ("%s: unable to find ARM glue '%s' for `%s'",
- bfd_get_filename (input_bfd), tmp_name, name);
- }
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%s: unable to find ARM glue '%s' for `%s'"),
+ bfd_get_filename (input_bfd), tmp_name, name);
free (tmp_name);
bx r12
__func_addr:
.word func @ behave as if you saw a ARM_32 reloc
-
- ldr ip,8 <__func_addr> e59fc000
- bx ip e12fff1c
- .word func 00000001
-
*/
#define ARM2THUMB_GLUE_SIZE 12
-static const insn32
- a2t1_ldr_insn = 0xe59fc000,
- a2t2_bx_r12_insn = 0xe12fff1c,
- a2t3_func_addr_insn = 0x00000001;
+static const insn32 a2t1_ldr_insn = 0xe59fc000;
+static const insn32 a2t2_bx_r12_insn = 0xe12fff1c;
+static const insn32 a2t3_func_addr_insn = 0x00000001;
/*
- Thumb->ARM:
-
- .thumb
- .align 2
- __func_from_thumb:
- bx pc
- nop
- .arm
- __func_change_to_arm:
- b func
-
-
- bx pc 4778
- nop 0000
- b func eafffffe
-
+ Thumb->ARM: Thumb->(non-interworking aware) ARM
+
+ .thumb .thumb
+ .align 2 .align 2
+ __func_from_thumb: __func_from_thumb:
+ bx pc push {r6, lr}
+ nop ldr r6, __func_addr
+ .arm mov lr, pc
+ __func_change_to_arm: bx r6
+ b func .arm
+ __func_back_to_thumb:
+ ldmia r13! {r6, lr}
+ bx lr
+ __func_addr:
+ .word func
*/
-#define THUMB2ARM_GLUE_SIZE 8
-static const insn16
- t2a1_bx_pc_insn = 0x4778,
- t2a2_noop_insn = 0x46c0;
-static const insn32
- t2a3_b_insn = 0xea000000;
+#define THUMB2ARM_GLUE_SIZE (globals->support_old_code ? 20 : 8)
+static const insn16 t2a1_bx_pc_insn = 0x4778;
+static const insn16 t2a2_noop_insn = 0x46c0;
+static const insn32 t2a3_b_insn = 0xea000000;
+
+static const insn16 t2a1_push_insn = 0xb540;
+static const insn16 t2a2_ldr_insn = 0x4e03;
+static const insn16 t2a3_mov_insn = 0x46fe;
+static const insn16 t2a4_bx_insn = 0x4730;
+static const insn32 t2a5_pop_insn = 0xe8bd4040;
+static const insn32 t2a6_bx_insn = 0xe12fff1e;
/* TODO:
We should really create new local (static) symbols in destination
for (; rel < relend; rel++)
{
- int done = 0;
- long symndx;
- struct coff_link_hash_entry *h;
- struct internal_syment *sym;
- bfd_vma addend;
- bfd_vma val;
- reloc_howto_type *howto;
- bfd_reloc_status_type rstat;
- bfd_vma h_val;
+ int done = 0;
+ long symndx;
+ struct coff_link_hash_entry * h;
+ struct internal_syment * sym;
+ bfd_vma addend;
+ bfd_vma val;
+ reloc_howto_type * howto;
+ bfd_reloc_status_type rstat;
+ bfd_vma h_val;
symndx = rel->r_symndx;
addend = 0;
- howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
+ howto = coff_rtype_to_howto (input_bfd, input_section, rel, h,
sym, &addend);
if (howto == NULL)
return false;
+ /* The relocation_section function will skip pcrel_offset relocs
+ when doing a relocateable link. However, we want to convert
+ ARM26 to ARM26D relocs if possible. We return a fake howto in
+ this case without pcrel_offset set, and adjust the addend to
+ compensate. */
+ if (rel->r_type == ARM_26
+ && h != NULL
+ && info->relocateable
+ && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak)
+ && h->root.u.def.section->output_section == input_section->output_section)
+ {
+ static reloc_howto_type fake_arm26_reloc =
+ HOWTO (ARM_26,
+ 2,
+ 2,
+ 24,
+ true,
+ 0,
+ complain_overflow_signed,
+ aoutarm_fix_pcrel_26 ,
+ "ARM_26",
+ false,
+ 0x00ffffff,
+ 0x00ffffff,
+ false);
+
+ addend -= rel->r_vaddr - input_section->vma;
+ howto = &fake_arm26_reloc;
+ }
+
/* If we are doing a relocateable link, then we can just ignore
a PC relative reloc that is pcrel_offset. It will already
have the correct value. If this is not a relocateable link,
addend += sym->n_value;
}
- /* If we are doing a relocateable link, then we can just ignore
- a PC relative reloc that is pcrel_offset. It will already
- have the correct value. */
- if (info->relocateable
- && howto->pc_relative
- && howto->pcrel_offset)
- continue;
-
val = 0;
if (h == NULL)
&& ( h->root.type == bfd_link_hash_defined
|| h->root.type == bfd_link_hash_defweak))
{
- asection * sec;
asection * h_sec = h->root.u.def.section;
const char * name = h->root.root.string;
|| h->class == C_THUMBEXTFUNC)
{
/* Arm code calling a Thumb function */
- signed long int final_disp;
- unsigned long int tmp;
- long int my_offset;
- long int offset;
- asection * s = 0;
- unsigned long int return_address;
- long int ret_offset;
- long int disp;
- struct coff_link_hash_entry * myh;
-
+ unsigned long int tmp;
+ long int my_offset;
+ asection * s;
+ long int ret_offset;
+ struct coff_link_hash_entry * myh;
+ struct coff_arm_link_hash_table * globals;
+
myh = find_arm_glue (info, name, input_bfd);
if (myh == NULL)
return false;
- my_offset = myh->root.u.def.value;
+ globals = coff_arm_hash_table (info);
- s = bfd_get_section_by_name (bfd_of_glue_owner,
+ BFD_ASSERT (globals != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+ my_offset = myh->root.u.def.value;
+
+ s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
ARM2THUMB_GLUE_SECTION_NAME);
BFD_ASSERT (s != NULL);
BFD_ASSERT (s->contents != NULL);
+ BFD_ASSERT (s->output_section != NULL);
if ((my_offset & 0x01) == 0x01)
{
&& ! INTERWORK_FLAG (h_sec->owner))
{
_bfd_error_handler
- ("%s(%s): warning: interworking not enabled.",
+ /* xgettext:c-format */
+ (_("%s(%s): warning: interworking not enabled."),
bfd_get_filename (h_sec->owner), name);
_bfd_error_handler
- (" first occurrence: %s: arm call to thumb",
+ /* xgettext:c-format */
+ (_(" first occurrence: %s: arm call to thumb"),
bfd_get_filename (input_bfd));
}
-
+
--my_offset;
myh->root.u.def.value = my_offset;
- bfd_put_32 (output_bfd, a2t1_ldr_insn, s->contents + my_offset);
+ bfd_put_32 (output_bfd, a2t1_ldr_insn,
+ s->contents + my_offset);
- bfd_put_32 (output_bfd, a2t2_bx_r12_insn, s->contents + my_offset + 4);
+ bfd_put_32 (output_bfd, a2t2_bx_r12_insn,
+ s->contents + my_offset + 4);
/* It's a thumb address. Add the low order bit. */
- bfd_put_32 (output_bfd, h_val | a2t3_func_addr_insn, s->contents + my_offset + 8);
+ bfd_put_32 (output_bfd, h_val | a2t3_func_addr_insn,
+ s->contents + my_offset + 8);
+
+ if (info->base_file)
+ arm_emit_base_file_entry (info, output_bfd, s,
+ my_offset + 8);
+
}
- BFD_ASSERT (my_offset <= global_arm_glue_size);
+ BFD_ASSERT (my_offset <= globals->arm_glue_size);
- tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr - input_section->vma);
+ tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr
+ - input_section->vma);
tmp = tmp & 0xFF000000;
-
+
/* Somehow these are both 4 too far, so subtract 8. */
ret_offset =
s->output_offset
tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
- bfd_put_32 (output_bfd, tmp, contents + rel->r_vaddr - input_section->vma);
-
+ bfd_put_32 (output_bfd, tmp, contents + rel->r_vaddr
+ - input_section->vma);
done = 1;
}
}
|| h->class == C_LABEL)
{
/* Thumb code calling an ARM function */
- unsigned long int return_address;
- signed long int final_disp;
- asection * s = 0;
- long int my_offset;
- unsigned long int tmp;
- long int ret_offset;
- struct coff_link_hash_entry * myh;
+ asection * s = 0;
+ long int my_offset;
+ unsigned long int tmp;
+ long int ret_offset;
+ struct coff_link_hash_entry * myh;
+ struct coff_arm_link_hash_table * globals;
myh = find_thumb_glue (info, name, input_bfd);
if (myh == NULL)
return false;
+ globals = coff_arm_hash_table (info);
+
+ BFD_ASSERT (globals != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
my_offset = myh->root.u.def.value;
- s = bfd_get_section_by_name (bfd_of_glue_owner,
+ s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
THUMB2ARM_GLUE_SECTION_NAME);
BFD_ASSERT (s != NULL);
BFD_ASSERT (s->contents != NULL);
+ BFD_ASSERT (s->output_section != NULL);
if ((my_offset & 0x01) == 0x01)
{
if (h_sec->owner != NULL
&& INTERWORK_SET (h_sec->owner)
- && ! INTERWORK_FLAG (h_sec->owner))
+ && ! INTERWORK_FLAG (h_sec->owner)
+ && ! globals->support_old_code)
{
_bfd_error_handler
- ("%s(%s): warning: interworking not enabled.",
+ /* xgettext:c-format */
+ (_("%s(%s): warning: interworking not enabled."),
bfd_get_filename (h_sec->owner), name);
_bfd_error_handler
- (" first occurrence: %s: thumb call to arm",
+ /* xgettext:c-format */
+ (_(" first occurrence: %s: thumb call to arm"),
bfd_get_filename (input_bfd));
+ _bfd_error_handler
+ (_(" consider relinking with --support-old-code enabled"));
}
+
-- my_offset;
myh->root.u.def.value = my_offset;
- bfd_put_16 (output_bfd, t2a1_bx_pc_insn,
- s->contents + my_offset);
+ if (globals->support_old_code)
+ {
+ bfd_put_16 (output_bfd, t2a1_push_insn,
+ s->contents + my_offset);
+
+ bfd_put_16 (output_bfd, t2a2_ldr_insn,
+ s->contents + my_offset + 2);
+
+ bfd_put_16 (output_bfd, t2a3_mov_insn,
+ s->contents + my_offset + 4);
+
+ bfd_put_16 (output_bfd, t2a4_bx_insn,
+ s->contents + my_offset + 6);
+
+ bfd_put_32 (output_bfd, t2a5_pop_insn,
+ s->contents + my_offset + 8);
+
+ bfd_put_32 (output_bfd, t2a6_bx_insn,
+ s->contents + my_offset + 12);
+
+ /* Store the address of the function in the last word of the stub. */
+ bfd_put_32 (output_bfd, h_val,
+ s->contents + my_offset + 16);
+
+ if (info->base_file)
+ arm_emit_base_file_entry (info, output_bfd, s, my_offset + 16);
+ }
+ else
+ {
+ bfd_put_16 (output_bfd, t2a1_bx_pc_insn,
+ s->contents + my_offset);
- bfd_put_16 (output_bfd, t2a2_noop_insn,
- s->contents + my_offset + 2);
+ bfd_put_16 (output_bfd, t2a2_noop_insn,
+ s->contents + my_offset + 2);
- ret_offset =
- ((signed)h_val) - /* Address of destination of the stub */
- ((signed)(s->output_offset /* Offset from the start of the current section to the start of the stubs. */
- + my_offset /* Offset of the start of this stub from the start of the stubs. */
- + s->output_section->vma) /* Address of the start of the current section. */
- + 4 /* The branch instruction is 4 bytes into the stub. */
- + 8); /* ARM branches work from the pc of the instruction + 8. */
-
- bfd_put_32 (output_bfd,
- t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
- s->contents + my_offset + 4);
+ ret_offset =
+ ((bfd_signed_vma) h_val) /* Address of destination of the stub */
+ - ((bfd_signed_vma)
+ (s->output_offset /* Offset from the start of the current section to the start of the stubs. */
+ + my_offset /* Offset of the start of this stub from the start of the stubs. */
+ + s->output_section->vma) /* Address of the start of the current section. */
+ + 4 /* The branch instruction is 4 bytes into the stub. */
+ + 8); /* ARM branches work from the pc of the instruction + 8. */
+
+ bfd_put_32 (output_bfd,
+ t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
+ s->contents + my_offset + 4);
+
+ }
}
- BFD_ASSERT (my_offset <= global_thumb_glue_size);
+ BFD_ASSERT (my_offset <= globals->thumb_glue_size);
- /* Now go back and fix up the original bl insn to point here. */
+ /* Now go back and fix up the original BL insn to point
+ to here. */
ret_offset =
s->output_offset
+ my_offset
+ rel->r_vaddr)
-4;
- tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr - input_section->vma);
+ tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr
+ - input_section->vma);
bfd_put_32 (output_bfd,
insert_thumb_branch (tmp, ret_offset),
- contents + rel->r_vaddr - input_section->vma);
+ contents + rel->r_vaddr
+ - input_section->vma);
done = 1;
}
{
/* Emit a reloc if the backend thinks it needs it. */
if (sym && pe_data(output_bfd)->in_reloc_p(output_bfd, howto))
- {
- /* relocation to a symbol in a section which
- isn't absolute - we output the address here
- to a file */
- bfd_vma addr = rel->r_vaddr
- - input_section->vma
- + input_section->output_offset
- + input_section->output_section->vma;
- if (coff_data(output_bfd)->pe)
- addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
- /* FIXME: Shouldn't 4 be sizeof (addr)? */
- fwrite (&addr, 1,4, (FILE *) info->base_file);
- }
+ arm_emit_base_file_entry (info, output_bfd, input_section, rel->r_vaddr);
}
#if 1 /* THUMBEXTENSION */
if (done)
- ;
+ rstat = bfd_reloc_ok;
/* Only perform this fix during the final link, not a relocatable link. nickc@cygnus.com */
else if (! info->relocateable
&& howto->type == ARM_THUMB23)
bfd_vma address = rel->r_vaddr - input_section->vma;
if (address > input_section->_raw_size)
- rstat = bfd_reloc_outofrange;
+ rstat = bfd_reloc_outofrange;
else
{
bfd_vma relocation = val + addend;
Probably not, but it works, and if it works it don't need fixing! nickc@cygnus.com */
/* Only perform this fix during the final link, not a relocatable link. nickc@cygnus.com */
if (! info->relocateable
- && rel->r_type == ARM_32)
+ && (rel->r_type == ARM_32 || rel->r_type == ARM_RVA32))
{
/* Determine if we need to set the bottom bit of a relocated address
because the address is the address of a Thumb code symbol. */
break;
case bfd_reloc_outofrange:
(*_bfd_error_handler)
- ("%s: bad reloc address 0x%lx in section `%s'",
+ (_("%s: bad reloc address 0x%lx in section `%s'"),
bfd_get_filename (input_bfd),
(unsigned long) rel->r_vaddr,
bfd_get_section_name (input_bfd, input_section));
return true;
}
-#if defined COFF_IMAGE_WITH_PE || ! defined COFF_WITH_PE
+#ifndef COFF_IMAGE_WITH_PE
+
boolean
-arm_allocate_interworking_sections (info)
- struct bfd_link_info *info;
+bfd_arm_allocate_interworking_sections (info)
+ struct bfd_link_info * info;
{
- asection * s;
- bfd_byte * foo;
+ asection * s;
+ bfd_byte * foo;
+ struct coff_arm_link_hash_table * globals;
#if 0
- static char test_char = '1';
+ static char test_char = '1';
#endif
- if (global_arm_glue_size != 0)
+ globals = coff_arm_hash_table (info);
+
+ BFD_ASSERT (globals != NULL);
+
+ if (globals->arm_glue_size != 0)
{
- BFD_ASSERT (bfd_of_glue_owner != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
- s = bfd_get_section_by_name (bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
+ s = bfd_get_section_by_name
+ (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
BFD_ASSERT (s != NULL);
- foo = (bfd_byte *) bfd_alloc (bfd_of_glue_owner, global_arm_glue_size);
+ foo = (bfd_byte *) bfd_alloc
+ (globals->bfd_of_glue_owner, globals->arm_glue_size);
#if 0
- memset (foo, test_char, global_arm_glue_size);
+ memset (foo, test_char, globals->arm_glue_size);
#endif
- s->_raw_size = s->_cooked_size = global_arm_glue_size;
+ s->_raw_size = s->_cooked_size = globals->arm_glue_size;
s->contents = foo;
}
- if (global_thumb_glue_size != 0)
+ if (globals->thumb_glue_size != 0)
{
- BFD_ASSERT (bfd_of_glue_owner != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
- s = bfd_get_section_by_name (bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
+ s = bfd_get_section_by_name
+ (globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
BFD_ASSERT (s != NULL);
- foo = (bfd_byte *) bfd_alloc (bfd_of_glue_owner, global_thumb_glue_size);
+ foo = (bfd_byte *) bfd_alloc
+ (globals->bfd_of_glue_owner, globals->thumb_glue_size);
#if 0
- memset (foo, test_char, global_thumb_glue_size);
+ memset (foo, test_char, globals->thumb_glue_size);
#endif
- s->_raw_size = s->_cooked_size = global_thumb_glue_size;
+ s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
s->contents = foo;
}
struct bfd_link_info * info;
struct coff_link_hash_entry * h;
{
- const char * name = h->root.root.string;
- register asection * s;
- char * tmp_name;
- struct coff_link_hash_entry * myh;
+ const char * name = h->root.root.string;
+ register asection * s;
+ char * tmp_name;
+ struct coff_link_hash_entry * myh;
+ struct coff_arm_link_hash_table * globals;
+ globals = coff_arm_hash_table (info);
- BFD_ASSERT (bfd_of_glue_owner != NULL);
+ BFD_ASSERT (globals != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
- s = bfd_get_section_by_name (bfd_of_glue_owner,
- ARM2THUMB_GLUE_SECTION_NAME);
+ s = bfd_get_section_by_name
+ (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
BFD_ASSERT (s != NULL);
tmp_name = ((char *)
- bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME)));
+ bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
BFD_ASSERT (tmp_name);
sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
- myh = coff_link_hash_lookup (coff_hash_table (info),
- tmp_name,
- false, false, true);
+ myh = coff_link_hash_lookup
+ (coff_hash_table (info), tmp_name, false, false, true);
if (myh != NULL)
{
return; /* we've already seen this guy */
}
-
- /* The only trick here is using global_arm_glue_size as the value. Even
+ /* The only trick here is using globals->arm_glue_size as the value. Even
though the section isn't allocated yet, this is where we will be putting
it. */
- bfd_coff_link_add_one_symbol (info, bfd_of_glue_owner, tmp_name,
- BSF_EXPORT | BSF_GLOBAL,
- s, global_arm_glue_size + 1,
+ bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
+ BSF_GLOBAL,
+ s, globals->arm_glue_size + 1,
NULL, true, false,
(struct bfd_link_hash_entry **) & myh);
- global_arm_glue_size += ARM2THUMB_GLUE_SIZE;
-
free (tmp_name);
+
+ globals->arm_glue_size += ARM2THUMB_GLUE_SIZE;
return;
}
struct bfd_link_info * info;
struct coff_link_hash_entry * h;
{
- const char * name = h->root.root.string;
- register asection * s;
- char * tmp_name;
- struct coff_link_hash_entry * myh;
+ const char * name = h->root.root.string;
+ register asection * s;
+ char * tmp_name;
+ struct coff_link_hash_entry * myh;
+ struct coff_arm_link_hash_table * globals;
- BFD_ASSERT (bfd_of_glue_owner != NULL);
+
+ globals = coff_arm_hash_table (info);
+
+ BFD_ASSERT (globals != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
- s = bfd_get_section_by_name (bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
+ s = bfd_get_section_by_name
+ (globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
BFD_ASSERT (s != NULL);
- tmp_name = (char *) bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME));
+ tmp_name = (char *) bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
BFD_ASSERT (tmp_name);
sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
- myh = coff_link_hash_lookup (coff_hash_table (info),
- tmp_name,
- false, false, true);
+ myh = coff_link_hash_lookup
+ (coff_hash_table (info), tmp_name, false, false, true);
if (myh != NULL)
{
return; /* we've already seen this guy */
}
- bfd_coff_link_add_one_symbol (info, bfd_of_glue_owner, tmp_name,
- BSF_LOCAL, s, global_thumb_glue_size + 1,
+ bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
+ BSF_GLOBAL, s, globals->thumb_glue_size + 1,
NULL, true, false,
(struct bfd_link_hash_entry **) & myh);
free (tmp_name);
+ /* Allocate another symbol to mark where we switch to arm mode. */
+
#define CHANGE_TO_ARM "__%s_change_to_arm"
+#define BACK_FROM_ARM "__%s_back_from_arm"
+
+ tmp_name = (char *) bfd_malloc (strlen (name) + strlen (CHANGE_TO_ARM) + 1);
- tmp_name = ((char *)
- bfd_malloc (strlen (name) + strlen (CHANGE_TO_ARM)));
-
BFD_ASSERT (tmp_name);
-
- sprintf (tmp_name, CHANGE_TO_ARM, name);
+
+ sprintf (tmp_name, globals->support_old_code ? BACK_FROM_ARM : CHANGE_TO_ARM, name);
myh = NULL;
-
- /* Now allocate another symbol to switch back to arm mode. */
- bfd_coff_link_add_one_symbol (info, bfd_of_glue_owner, tmp_name,
- BSF_LOCAL, s, global_thumb_glue_size + 4,
+
+ bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
+ BSF_LOCAL, s, globals->thumb_glue_size
+ + (globals->support_old_code ? 8 : 4),
NULL, true, false,
(struct bfd_link_hash_entry **) & myh);
free (tmp_name);
-
- global_thumb_glue_size += THUMB2ARM_GLUE_SIZE;
+
+ globals->thumb_glue_size += THUMB2ARM_GLUE_SIZE;
return;
}
+/* Select a BFD to be used to hold the sections used by the glue code.
+ This function is called from the linker scripts in ld/emultempl/
+ {armcoff/pe}.em */
+
+boolean
+bfd_arm_get_bfd_for_interworking (abfd, info)
+ bfd * abfd;
+ struct bfd_link_info * info;
+{
+ struct coff_arm_link_hash_table * globals;
+ flagword flags;
+ asection * sec;
+
+ /* If we are only performing a partial link do not bother
+ getting a bfd to hold the glue. */
+ if (info->relocateable)
+ return true;
+
+ globals = coff_arm_hash_table (info);
+
+ BFD_ASSERT (globals != NULL);
+
+ if (globals->bfd_of_glue_owner != NULL)
+ return true;
+
+ sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
+
+ if (sec == NULL)
+ {
+ flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+ sec = bfd_make_section (abfd, ARM2THUMB_GLUE_SECTION_NAME);
+
+ if (sec == NULL
+ || ! bfd_set_section_flags (abfd, sec, flags)
+ || ! bfd_set_section_alignment (abfd, sec, 2))
+ return false;
+ }
+
+ sec = bfd_get_section_by_name (abfd, THUMB2ARM_GLUE_SECTION_NAME);
+
+ if (sec == NULL)
+ {
+ flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+ sec = bfd_make_section (abfd, THUMB2ARM_GLUE_SECTION_NAME);
+
+ if (sec == NULL
+ || ! bfd_set_section_flags (abfd, sec, flags)
+ || ! bfd_set_section_alignment (abfd, sec, 2))
+ return false;
+ }
+
+ /* Save the bfd for later use. */
+ globals->bfd_of_glue_owner = abfd;
+
+ return true;
+}
+
boolean
-arm_process_before_allocation (abfd, info)
+bfd_arm_process_before_allocation (abfd, info, support_old_code)
bfd * abfd;
struct bfd_link_info * info;
+ int support_old_code;
{
asection * sec;
+ struct coff_arm_link_hash_table * globals;
/* If we are only performing a partial link do not bother
to construct any glue. */
_bfd_coff_get_external_symbols (abfd);
+ globals = coff_arm_hash_table (info);
+
+ BFD_ASSERT (globals != NULL);
+ BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+ globals->support_old_code = support_old_code;
+
/* Rummage around all the relocs and map the glue vectors. */
sec = abfd->sections;
symndx = rel->r_symndx;
- /* If the relocation is not against a symbol it cannot concern us. */
+ /* If the relocation is not against a symbol it cannot concern us. */
if (symndx == -1)
continue;
return true;
}
-#endif /* COFF_IMAGE_WITH_PE or not COFF_WITH_PE */
-#define coff_relocate_section coff_arm_relocate_section
+#endif /* ! defined (COFF_IMAGE_WITH_PE) */
+
+#define coff_bfd_reloc_type_lookup coff_arm_reloc_type_lookup
+#define coff_relocate_section coff_arm_relocate_section
+#define coff_bfd_is_local_label_name coff_arm_is_local_label_name
+#define coff_adjust_symndx coff_arm_adjust_symndx
+#define coff_link_output_has_begun coff_arm_link_output_has_begun
+#define coff_final_link_postscript coff_arm_final_link_postscript
+#define coff_bfd_merge_private_bfd_data coff_arm_merge_private_bfd_data
+#define coff_bfd_print_private_bfd_data coff_arm_print_private_bfd_data
+#define coff_bfd_set_private_flags _bfd_coff_arm_set_private_flags
+#define coff_bfd_copy_private_bfd_data coff_arm_copy_private_bfd_data
+#define coff_bfd_link_hash_table_create coff_arm_link_hash_table_create
+
/* When doing a relocateable link, we want to convert ARM26 relocs
into ARM26D relocs. */
static boolean
coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
- bfd *obfd;
- struct bfd_link_info *info;
+ bfd *obfd ATTRIBUTE_UNUSED;
+ struct bfd_link_info *info ATTRIBUTE_UNUSED;
bfd *ibfd;
asection *sec;
struct internal_reloc *irel;
return true;
}
-#if defined COFF_IMAGE_WITH_PE || ! defined COFF_WITH_PE
/* Called when merging the private data areas of two BFDs.
This is important as it allows us to detect if we are
attempting to merge binaries compiled for different ARM
targets, eg different CPUs or differents APCS's. */
-boolean
-coff_arm_bfd_merge_private_bfd_data (ibfd, obfd)
+static boolean
+coff_arm_merge_private_bfd_data (ibfd, obfd)
bfd * ibfd;
bfd * obfd;
{
/* If the two formats are different we cannot merge anything.
This is not an error, since it is permissable to change the
input and output formats. */
- if (ibfd->xvec != obfd->xvec)
+ if ( ibfd->xvec->flavour != bfd_target_coff_flavour
+ || obfd->xvec->flavour != bfd_target_coff_flavour)
return true;
-
+
/* Verify that the APCS is the same for the two BFDs */
if (APCS_SET (ibfd))
{
if (APCS_26_FLAG (obfd) != APCS_26_FLAG (ibfd))
{
_bfd_error_handler
- ("%s: ERROR: compiled for APCS-%d whereas target %s uses APCS-%d",
+ /* xgettext: c-format */
+ (_("%s: ERROR: compiled for APCS-%d whereas target %s uses APCS-%d"),
bfd_get_filename (ibfd), APCS_26_FLAG (ibfd) ? 26 : 32,
bfd_get_filename (obfd), APCS_26_FLAG (obfd) ? 26 : 32
);
if (APCS_FLOAT_FLAG (obfd) != APCS_FLOAT_FLAG (ibfd))
{
- _bfd_error_handler
- ("%s: ERROR: passes floats in %s registers whereas target %s uses %s registers",
- bfd_get_filename (ibfd), APCS_FLOAT_FLAG (ibfd) ? "float" : "integer",
- bfd_get_filename (obfd), APCS_FLOAT_FLAG (obfd) ? "float" : "integer"
- );
+ const char *msg;
+
+ if (APCS_FLOAT_FLAG (ibfd))
+ /* xgettext: c-format */
+ msg = _("%s: ERROR: passes floats in float registers whereas target %s uses integer registers");
+ else
+ /* xgettext: c-format */
+ msg = _("%s: ERROR: passes floats in integer registers whereas target %s uses float registers");
+
+ _bfd_error_handler (msg, bfd_get_filename (ibfd),
+ bfd_get_filename (obfd));
bfd_set_error (bfd_error_wrong_format);
return false;
if (PIC_FLAG (obfd) != PIC_FLAG (ibfd))
{
- _bfd_error_handler
- ("%s: ERROR: compiled as %s code, whereas target %s is %s",
- bfd_get_filename (ibfd), PIC_FLAG (ibfd) ? "position independent" : "absoluste position",
- bfd_get_filename (obfd), PIC_FLAG (obfd) ? "position independent" : "absoluste position"
- );
+ const char * msg;
+
+ if (PIC_FLAG (ibfd))
+ /* xgettext: c-format */
+ msg = _("%s: ERROR: compiled as position independent code, whereas target %s is absolute position");
+ else
+ /* xgettext: c-format */
+ msg = _("%s: ERROR: compiled as absolute position code, whereas target %s is position independent");
+ _bfd_error_handler (msg, bfd_get_filename (ibfd),
+ bfd_get_filename (obfd));
bfd_set_error (bfd_error_wrong_format);
return false;
bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
}
}
-
+
/* Check the interworking support. */
if (INTERWORK_SET (ibfd))
{
/* If the src and dest differ in their interworking issue a warning. */
if (INTERWORK_FLAG (obfd) != INTERWORK_FLAG (ibfd))
{
- _bfd_error_handler
- ("Warning: input file %s %s interworking, whereas %s does%s",
- bfd_get_filename (ibfd),
- INTERWORK_FLAG (ibfd) ? "supports" : "does not support",
- bfd_get_filename (obfd),
- INTERWORK_FLAG (obfd) ? "." : " not."
- );
+ const char * msg;
+
+ if (INTERWORK_FLAG (ibfd))
+ /* xgettext: c-format */
+ msg = _("Warning: input file %s supports interworking, whereas %s does not.");
+ else
+ /* xgettext: c-format */
+ msg = _("Warning: input file %s does not support interworking, whereas %s does.");
+
+ _bfd_error_handler (msg, bfd_get_filename (ibfd),
+ bfd_get_filename (obfd));
}
}
else
/* Display the flags field. */
static boolean
-coff_arm_bfd_print_private_bfd_data (abfd, ptr)
+coff_arm_print_private_bfd_data (abfd, ptr)
bfd * abfd;
PTR ptr;
{
FILE * file = (FILE *) ptr;
- BFD_ASSERT (abfd != NULL && ptr != NULL)
+ BFD_ASSERT (abfd != NULL && ptr != NULL);
- fprintf (file, "private flags = %x", coff_data (abfd)->flags);
+ /* xgettext:c-format */
+ fprintf (file, _("private flags = %x:"), coff_data (abfd)->flags);
if (APCS_SET (abfd))
- fprintf (file, ": [APCS-%d] [floats passed in %s registers] [%s]",
- APCS_26_FLAG (abfd) ? 26 : 32,
- APCS_FLOAT_FLAG (abfd) ? "float" : "integer",
- PIC_FLAG (abfd) ? "position independent" : "absolute position"
- );
+ {
+ /* xgettext: APCS is ARM Prodecure Call Standard, it should not be translated. */
+ fprintf (file, " [APCS-%d]", APCS_26_FLAG (abfd) ? 26 : 32);
+
+ if (APCS_FLOAT_FLAG (abfd))
+ fprintf (file, _(" [floats passed in float registers]"));
+ else
+ fprintf (file, _(" [floats passed in integer registers]"));
+
+ if (PIC_FLAG (abfd))
+ fprintf (file, _(" [position independent]"));
+ else
+ fprintf (file, _(" [absolute position]"));
+ }
- if (INTERWORK_SET (abfd))
- fprintf (file, ": [interworking %ssupported]",
- INTERWORK_FLAG (abfd) ? "" : "not " );
+ if (! INTERWORK_SET (abfd))
+ fprintf (file, _(" [interworking flag not initialised]"));
+ else if (INTERWORK_FLAG (abfd))
+ fprintf (file, _(" [interworking supported]"));
+ else
+ fprintf (file, _(" [interworking not supported]"));
fputc ('\n', file);
/* Copies the given flags into the coff_tdata.flags field.
Typically these flags come from the f_flags[] field of
the COFF filehdr structure, which contains important,
- target specific information. */
+ target specific information.
+ Note: Although this function is static, it is explicitly
+ called from both coffcode.h and peicode.h. */
-boolean
-coff_arm_bfd_set_private_flags (abfd, flags)
+static boolean
+_bfd_coff_arm_set_private_flags (abfd, flags)
bfd * abfd;
flagword flags;
{
- int flag;
+ flagword flag;
BFD_ASSERT (abfd != NULL);
flag = (flags & F_APCS26) ? F_APCS_26 : 0;
- /* Make sure that the APCS field has not been initialised to the opposite value. */
+ /* Make sure that the APCS field has not been initialised to the opposite
+ value. */
if (APCS_SET (abfd)
&& ( (APCS_26_FLAG (abfd) != flag)
|| (APCS_FLOAT_FLAG (abfd) != (flags & F_APCS_FLOAT))
flag = (flags & F_INTERWORK);
- /* If either the flags or the BFD do support interworking then do not set the interworking flag. */
+ /* If the BFD has already had its interworking flag set, but it
+ is different from the value that we have been asked to set,
+ then assume that that merged code will not support interworking
+ and set the flag accordingly. */
if (INTERWORK_SET (abfd) && (INTERWORK_FLAG (abfd) != flag))
- flag = 0;
+ {
+ if (flag)
+ /* xgettext: c-format */
+ _bfd_error_handler (_("Warning: Not setting interworking flag of %s, since it has already been specified as non-interworking"),
+ bfd_get_filename (abfd));
+ else
+ /* xgettext: c-format */
+ _bfd_error_handler (_("Warning: Clearing the interworking flag of %s due to outside request"),
+ bfd_get_filename (abfd));
+ flag = 0;
+ }
SET_INTERWORK_FLAG (abfd, flag);
from one instance of a BFD to another. */
static boolean
-coff_arm_bfd_copy_private_bfd_data (src, dest)
+coff_arm_copy_private_bfd_data (src, dest)
bfd * src;
bfd * dest;
{
BFD_ASSERT (src != NULL && dest != NULL);
-
+
if (src == dest)
return true;
- /* If the destination is not in the same format as the source, do not do the copy. */
+ /* If the destination is not in the same format as the source, do not do
+ the copy. */
if (src->xvec != dest->xvec)
return true;
return false;
}
else
- SET_APCS_FLAGS (dest, APCS_26_FLAG (src) | APCS_FLOAT_FLAG (src) | PIC_FLAG (src));
+ SET_APCS_FLAGS (dest, APCS_26_FLAG (src) | APCS_FLOAT_FLAG (src)
+ | PIC_FLAG (src));
}
if (INTERWORK_SET (src))
{
if (INTERWORK_SET (dest))
{
- /* If the src and dest have different interworking flags then turn off the interworking bit. */
+ /* If the src and dest have different interworking flags then turn
+ off the interworking bit. */
if (INTERWORK_FLAG (dest) != INTERWORK_FLAG (src))
- SET_INTERWORK_FLAG (dest, 0);
+ {
+ if (INTERWORK_FLAG (dest))
+ {
+ /* xgettext:c-format */
+ _bfd_error_handler (("Warning: Clearing the interworking bit of %s, because the non-interworking code in %s has been copied into it"),
+ bfd_get_filename (dest),
+ bfd_get_filename (src));
+ }
+
+ SET_INTERWORK_FLAG (dest, 0);
+ }
}
else
{
return true;
}
-#endif /* COFF_IMAGE_WITH_PE or not COFF_WITH_PE */
/* Note: the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
- *must* match the definitions on gcc/config/arm/semi.h. */
+ *must* match the definitions in gcc/config/arm/coff.h and semi.h */
#define LOCAL_LABEL_PREFIX "."
+#ifndef USER_LABEL_PREFIX
#define USER_LABEL_PREFIX "_"
+#endif
static boolean
coff_arm_is_local_label_name (abfd, name)
- bfd * abfd;
+ bfd * abfd ATTRIBUTE_UNUSED;
const char * name;
{
#ifdef LOCAL_LABEL_PREFIX
}
#endif
- /* devo/gcc/config/dbxcoff.h defines ASM_OUTPUT_SOURCE_LINE to generate local line numbers as .LM<number>, so treat these as local. */
+ /* devo/gcc/config/dbxcoff.h defines ASM_OUTPUT_SOURCE_LINE to generate
+ local line numbers as .LM<number>, so treat these as local. */
switch (name[0])
{
case 'L': return true;
case '.': return (name[1] == 'L' && name[2] == 'M') ? true : false;
- default: return false; /* Cannot make our minds up - default to false so that it will not be stripped by accident. */
+ default: return false; /* Cannot make our minds up - default to
+ false so that it will not be stripped
+ by accident. */
}
}
-#define coff_bfd_is_local_label_name coff_arm_is_local_label_name
-#define coff_adjust_symndx coff_arm_adjust_symndx
-
-#define coff_link_output_has_begun coff_arm_link_output_has_begun
-#define coff_final_link_postscript coff_arm_final_link_postscript
-#define coff_bfd_merge_private_bfd_data coff_arm_bfd_merge_private_bfd_data
-#define coff_bfd_print_private_bfd_data coff_arm_bfd_print_private_bfd_data
-#define coff_bfd_set_private_flags coff_arm_bfd_set_private_flags
-#define coff_bfd_copy_private_bfd_data coff_arm_bfd_copy_private_bfd_data
-
-extern boolean coff_arm_final_link_postscript ();
-extern boolean coff_arm_bfd_set_private_flags ();
-extern boolean coff_arm_bfd_merge_private_bfd_data ();
-extern boolean coff_arm_link_output_has_begun ();
-
-#if defined COFF_IMAGE_WITH_PE || ! defined COFF_WITH_PE
/* This piece of machinery exists only to guarantee that the bfd that holds
the glue section is written last.
krk@cygnus.com */
-boolean
-coff_arm_link_output_has_begun (sub)
+static boolean
+coff_arm_link_output_has_begun (sub, info)
bfd * sub;
+ struct coff_final_link_info * info;
{
- return (sub->output_has_begun || sub == bfd_of_glue_owner);
+ return (sub->output_has_begun
+ || sub == coff_arm_hash_table (info->info)->bfd_of_glue_owner);
}
-boolean
+static boolean
coff_arm_final_link_postscript (abfd, pfinfo)
- bfd * abfd;
+ bfd * abfd ATTRIBUTE_UNUSED;
struct coff_final_link_info * pfinfo;
{
- if (bfd_of_glue_owner != NULL)
+ struct coff_arm_link_hash_table * globals;
+
+ globals = coff_arm_hash_table (pfinfo->info);
+
+ BFD_ASSERT (globals != NULL);
+
+ if (globals->bfd_of_glue_owner != NULL)
{
- if (! _bfd_coff_link_input_bfd (pfinfo, bfd_of_glue_owner))
+ if (! _bfd_coff_link_input_bfd (pfinfo, globals->bfd_of_glue_owner))
return false;
- bfd_of_glue_owner->output_has_begun = true;
+
+ globals->bfd_of_glue_owner->output_has_begun = true;
}
+
return true;
}
-#endif /* COFF_IMAGE_WITH_PE or not COFF_WITH_PE */
+#if 0
#define coff_SWAP_sym_in arm_bfd_coff_swap_sym_in
static void coff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
return;
}
+#endif
#include "coffcode.h"
projects / deliverable / binutils-gdb.git / blobdiff