aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog24
-rw-r--r--ld/emultempl/armelf.em274
-rw-r--r--ld/ldlang.c13
-rw-r--r--ld/testsuite/ChangeLog18
-rw-r--r--ld/testsuite/ld-arm/arm-elf.exp76
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-arm-be8.d14
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d16
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-arm.d14
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-arm.s19
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d16
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-thumb-blx.d14
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d16
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-thumb.d16
-rw-r--r--ld/testsuite/ld-arm/farcall-arm-thumb.s20
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d16
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-arm-blx.d14
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d5
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-arm.d19
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-arm.s19
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d16
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d14
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d5
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb-m.d19
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d5
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb.d5
-rw-r--r--ld/testsuite/ld-arm/farcall-thumb-thumb.s19
-rw-r--r--ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d18
-rw-r--r--ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s4
-rw-r--r--ld/testsuite/ld-arm/thumb2-bl-bad.d18
-rw-r--r--ld/testsuite/ld-arm/thumb2-bl-bad.s4
30 files changed, 716 insertions, 34 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 72fd32e..f43f5de 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,27 @@
+2008-05-15 Christophe Lyon <christophe.lyon@st.com>
+
+ * emultempl/armelf.em (build_section_lists): New function.
+ (stub_file): Define.
+ (need_laying_out): Define.
+ (group_size): Define.
+ (hook_stub_info): Define.
+ (hook_in_stub): New function.
+ (elf32_arm_add_stub_section): New function.
+ (gldarm_layout_sections_again): New function.
+ (gld${EMULATION_NAME}_finish): Replace arm_elf_finish(). Generate
+ stubs for long calls if needed.
+ (arm_elf_create_output_section_statements): create stub_file bfd.
+ (arm_for_each_input_file_wrapper): New function.
+ (arm_lang_for_each_input_file): New function.
+ (lang_for_each_input_file): Define.
+ (PARSE_AND_LIST_PROLOGUE): Add option token OPTION_STUBGROUP_SIZE.
+ (PARSE_AND_LIST_LONGOPTS): Add option stub-group-size.
+ (PARSE_AND_LIST_OPTIONS): Add option stub-group-size.
+ (PARSE_AND_LIST_ARGS_CASES): Add OPTION_STUBGROUP_SIZE case.
+ (LDEMUL_FINISH): Update to gld${EMULATION_NAME}_finish.
+ * lang.c (print_input_statement): Skip if bfd has
+ BFD_LINKER_CREATED.
+
2008-05-14 Alan Modra <amodra@bigpond.net.au>
* Makefile.in: Regenerate.
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 29e9902..57842f4 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -27,6 +27,7 @@
test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel"
fragment <<EOF
+#include "ldctor.h"
#include "elf/arm.h"
static char *thumb_entry_symbol = NULL;
@@ -173,13 +174,221 @@ arm_elf_after_allocation (void)
}
}
+/* Fake input file for stubs. */
+static lang_input_statement_type *stub_file;
+
+/* Whether we need to call gldarm_layout_sections_again. */
+static int need_laying_out = 0;
+
+/* Maximum size of a group of input sections that can be handled by
+ one stub section. A value of +/-1 indicates the bfd back-end
+ should use a suitable default size. */
+static bfd_signed_vma group_size = 1;
+
+struct hook_stub_info
+{
+ lang_statement_list_type add;
+ asection *input_section;
+};
+
+/* Traverse the linker tree to find the spot where the stub goes. */
+
+static bfd_boolean
+hook_in_stub (struct hook_stub_info *info, lang_statement_union_type **lp)
+{
+ lang_statement_union_type *l;
+ bfd_boolean ret;
+
+ for (; (l = *lp) != NULL; lp = &l->header.next)
+ {
+ switch (l->header.type)
+ {
+ case lang_constructors_statement_enum:
+ ret = hook_in_stub (info, &constructor_list.head);
+ if (ret)
+ return ret;
+ break;
+
+ case lang_output_section_statement_enum:
+ ret = hook_in_stub (info,
+ &l->output_section_statement.children.head);
+ if (ret)
+ return ret;
+ break;
+
+ case lang_wild_statement_enum:
+ ret = hook_in_stub (info, &l->wild_statement.children.head);
+ if (ret)
+ return ret;
+ break;
+
+ case lang_group_statement_enum:
+ ret = hook_in_stub (info, &l->group_statement.children.head);
+ if (ret)
+ return ret;
+ break;
+
+ case lang_input_section_enum:
+ if (l->input_section.section == info->input_section)
+ {
+ /* We've found our section. Insert the stub immediately
+ before its associated input section. */
+ *lp = info->add.head;
+ *(info->add.tail) = l;
+ return TRUE;
+ }
+ break;
+
+ case lang_data_statement_enum:
+ case lang_reloc_statement_enum:
+ case lang_object_symbols_statement_enum:
+ case lang_output_statement_enum:
+ case lang_target_statement_enum:
+ case lang_input_statement_enum:
+ case lang_assignment_statement_enum:
+ case lang_padding_statement_enum:
+ case lang_address_statement_enum:
+ case lang_fill_statement_enum:
+ break;
+
+ default:
+ FAIL ();
+ break;
+ }
+ }
+ return FALSE;
+}
+
+
+/* Call-back for elf32_arm_size_stubs. */
+
+/* Create a new stub section, and arrange for it to be linked
+ immediately before INPUT_SECTION. */
+
+static asection *
+elf32_arm_add_stub_section (const char *stub_sec_name,
+ asection *input_section)
+{
+ asection *stub_sec;
+ flagword flags;
+ asection *output_section;
+ const char *secname;
+ lang_output_section_statement_type *os;
+ struct hook_stub_info info;
+
+ stub_sec = bfd_make_section_anyway (stub_file->the_bfd, stub_sec_name);
+ if (stub_sec == NULL)
+ goto err_ret;
+
+ flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE
+ | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP);
+ if (!bfd_set_section_flags (stub_file->the_bfd, stub_sec, flags))
+ goto err_ret;
+
+ bfd_set_section_alignment (stub_file->the_bfd, stub_sec, 3);
+
+ output_section = input_section->output_section;
+ secname = bfd_get_section_name (output_section->owner, output_section);
+ os = lang_output_section_find (secname);
+
+ info.input_section = input_section;
+ lang_list_init (&info.add);
+ lang_add_section (&info.add, stub_sec, os);
+
+ if (info.add.head == NULL)
+ goto err_ret;
+
+ if (hook_in_stub (&info, &os->children.head))
+ return stub_sec;
+
+ err_ret:
+ einfo ("%X%P: can not make stub section: %E\n");
+ return NULL;
+}
+
+/* Another call-back for elf_arm_size_stubs. */
+
static void
-arm_elf_finish (void)
+gldarm_layout_sections_again (void)
+{
+ /* If we have changed sizes of the stub sections, then we need
+ to recalculate all the section offsets. This may mean we need to
+ add even more stubs. */
+ gld${EMULATION_NAME}_map_segments (TRUE);
+ need_laying_out = -1;
+}
+
+static void
+build_section_lists (lang_statement_union_type *statement)
+{
+ if (statement->header.type == lang_input_section_enum)
+ {
+ asection *i = statement->input_section.section;
+
+ if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
+ && (i->flags & SEC_EXCLUDE) == 0
+ && i->output_section != NULL
+ && i->output_section->owner == link_info.output_bfd)
+ elf32_arm_next_input_section (& link_info, i);
+ }
+}
+
+static void
+gld${EMULATION_NAME}_finish (void)
{
struct bfd_link_hash_entry * h;
- /* Call the elf32.em routine. */
- gld${EMULATION_NAME}_finish ();
+ /* bfd_elf32_discard_info just plays with debugging sections,
+ ie. doesn't affect any code, so we can delay resizing the
+ sections. It's likely we'll resize everything in the process of
+ adding stubs. */
+ if (bfd_elf_discard_info (link_info.output_bfd, & link_info))
+ need_laying_out = 1;
+
+ /* If generating a relocatable output file, then we don't
+ have to examine the relocs. */
+ if (stub_file != NULL && !link_info.relocatable)
+ {
+ int ret = elf32_arm_setup_section_lists (link_info.output_bfd, & link_info);
+
+ if (ret != 0)
+ {
+ if (ret < 0)
+ {
+ einfo ("%X%P: can not size stub section: %E\n");
+ return;
+ }
+
+ lang_for_each_statement (build_section_lists);
+
+ /* Call into the BFD backend to do the real work. */
+ if (! elf32_arm_size_stubs (link_info.output_bfd,
+ stub_file->the_bfd,
+ & link_info,
+ group_size,
+ & elf32_arm_add_stub_section,
+ & gldarm_layout_sections_again))
+ {
+ einfo ("%X%P: can not size stub section: %E\n");
+ return;
+ }
+ }
+ }
+
+ if (need_laying_out != -1)
+ gld${EMULATION_NAME}_map_segments (need_laying_out);
+
+ if (! link_info.relocatable)
+ {
+ /* Now build the linker stubs. */
+ if (stub_file->the_bfd->sections != NULL)
+ {
+ if (! elf32_arm_build_stubs (& link_info))
+ einfo ("%X%P: can not build stubs: %E\n");
+ }
+ }
+
+ finish_default ();
if (thumb_entry_symbol)
{
@@ -246,8 +455,44 @@ arm_elf_create_output_section_statements (void)
target2_type, fix_v4bx, use_blx,
vfp11_denorm_fix, no_enum_size_warning,
pic_veneer);
+
+ stub_file = lang_add_input_file ("linker stubs",
+ lang_input_file_is_fake_enum,
+ NULL);
+ stub_file->the_bfd = bfd_create ("linker stubs", link_info.output_bfd);
+ if (stub_file->the_bfd == NULL
+ || ! bfd_set_arch_mach (stub_file->the_bfd,
+ bfd_get_arch (link_info.output_bfd),
+ bfd_get_mach (link_info.output_bfd)))
+ {
+ einfo ("%X%P: can not create BFD %E\n");
+ return;
+ }
+
+ stub_file->the_bfd->flags |= BFD_LINKER_CREATED;
+ ldlang_add_file (stub_file);
+}
+
+/* Avoid processing the fake stub_file in vercheck, stat_needed and
+ check_needed routines. */
+
+static void (*real_func) (lang_input_statement_type *);
+
+static void arm_for_each_input_file_wrapper (lang_input_statement_type *l)
+{
+ if (l != stub_file)
+ (*real_func) (l);
}
+static void
+arm_lang_for_each_input_file (void (*func) (lang_input_statement_type *))
+{
+ real_func = func;
+ lang_for_each_input_file (&arm_for_each_input_file_wrapper);
+}
+
+#define lang_for_each_input_file arm_lang_for_each_input_file
+
EOF
# Define some shell vars to insert bits of code into the standard elf
@@ -265,6 +510,7 @@ PARSE_AND_LIST_PROLOGUE='
#define OPTION_NO_ENUM_SIZE_WARNING 309
#define OPTION_PIC_VENEER 310
#define OPTION_FIX_V4BX_INTERWORKING 311
+#define OPTION_STUBGROUP_SIZE 312
'
PARSE_AND_LIST_SHORTOPTS=p
@@ -282,6 +528,7 @@ PARSE_AND_LIST_LONGOPTS='
{ "vfp11-denorm-fix", required_argument, NULL, OPTION_VFP11_DENORM_FIX},
{ "no-enum-size-warning", no_argument, NULL, OPTION_NO_ENUM_SIZE_WARNING},
{ "pic-veneer", no_argument, NULL, OPTION_PIC_VENEER},
+ { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE },
'
PARSE_AND_LIST_OPTIONS='
@@ -297,6 +544,15 @@ PARSE_AND_LIST_OPTIONS='
fprintf (file, _(" --no-enum-size-warning Don'\''t warn about objects with incompatible"
" enum sizes\n"));
fprintf (file, _(" --pic-veneer Always generate PIC interworking veneers\n"));
+ fprintf (file, _("\
+ --stub-group-size=N Maximum size of a group of input sections that can be\n\
+ handled by one stub section. A negative value\n\
+ locates all stubs before their branches (with a\n\
+ group size of -N), while a positive value allows\n\
+ two groups of input sections, one before, and one\n\
+ after each stub section. Values of +/-1 indicate\n\
+ the linker should choose suitable defaults.\n"
+ ));
'
PARSE_AND_LIST_ARGS_CASES='
@@ -354,6 +610,16 @@ PARSE_AND_LIST_ARGS_CASES='
case OPTION_PIC_VENEER:
pic_veneer = 1;
break;
+
+ case OPTION_STUBGROUP_SIZE:
+ {
+ const char *end;
+
+ group_size = bfd_scan_vma (optarg, &end, 0);
+ if (*end)
+ einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
+ }
+ break;
'
# We have our own after_open and before_allocation functions, but they call
@@ -367,4 +633,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=arm_elf_create_output_section_statements
LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
# Call the extra arm-elf function
-LDEMUL_FINISH=arm_elf_finish
+LDEMUL_FINISH=gld${EMULATION_NAME}_finish
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 3c24b66..d3018b2 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -3729,10 +3729,11 @@ print_assignment (lang_assignment_statement_type *assignment,
static void
print_input_statement (lang_input_statement_type *statm)
{
- if (statm->filename != NULL)
- {
- fprintf (config.map_file, "LOAD %s\n", statm->filename);
- }
+ if ((statm->filename != NULL)
+ && ((statm->the_bfd == NULL)
+ ||
+ ((statm->the_bfd->flags & BFD_LINKER_CREATED) == 0)))
+ fprintf (config.map_file, "LOAD %s\n", statm->filename);
}
/* Print all symbols defined in a particular section. This is called
@@ -4185,8 +4186,8 @@ insert_pad (lang_statement_union_type **ptr,
/* Use the existing pad statement. */
}
else if ((pad = *ptr) != NULL
- && pad->header.type == lang_padding_statement_enum
- && pad->padding_statement.output_section == output_section)
+ && pad->header.type == lang_padding_statement_enum
+ && pad->padding_statement.output_section == output_section)
{
/* Use the existing pad statement. */
}
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 5383fbd..ee4105b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2008-05-15 Christophe Lyon <christophe.lyon@st.com>
+
+ * ld-arm/arm-elf.exp (armelftests): Add farcall-arm-arm,
+ farcall-arm-arm-pic-veneer, farcall-arm-arm-be8 farcall-arm-thumb,
+ farcall-arm-thumb-blx, farcall-arm-thumb-pic-veneer,
+ farcall-arm-thumb-blx-pic-veneer, farcall-thumb-thumb,
+ farcall-thumb-thumb-pic-veneer, farcall-thumb-thumb-blx,
+ farcall-thumb-thumb-m, farcall-thumb-thumb-m-pic-veneer,
+ farcall-thumb-thumb-blx-pic-veneer, farcall-thumb-arm,
+ farcall-thumb-arm-pic-veneer, farcall-thumb-arm-blx,
+ farcall-thumb-arm-blx-pic-veneer.
+ Change thumb2-bl-as-thumb1-bad, thumb2-bl-bad.
+ * ld-arm/thumb2-bl-as-thumb1-bad.d: Reflects farcall stub
+ generation.
+ * ld-arm/thumb2-bl-bad.d: Likewise.
+ * ld-arm/thumb2-bl-as-thumb1-bad.s: Update comments.
+ * ld-arm/thumb2-bl-bad.s: Likewise.
+
2008-05-08 Alan Modra <amodra@bigpond.net.au>
* ld-spu/ear.s: Align various sections.
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 7447b7c..0dd64bc 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -1,5 +1,5 @@
# Expect script for various ARM ELF tests.
-# Copyright 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
@@ -177,15 +177,65 @@ set armelftests {
{"callweak" "-static -T arm.ld" "" {callweak.s}
{{objdump -dr callweak.d}}
"callweak"}
- {"ARMv4 interworking" "-static -T arm.ld --fix-v4bx-interworking" "--fix-v4bx -meabi=4" {armv4-bx.s}
- {{objdump -d armv4-bx.d}}
- "armv4-bx"}
- {"MOVW/MOVT and merged sections" "-T arm.ld" "" {movw-merge.s}
- {{objdump -dw movw-merge.d}}
- "movw-merge"}
- {"MOVW/MOVT against shared libraries" "tmpdir/arm-lib.so" "" {arm-app-movw.s}
- {{objdump -Rw arm-app.r}}
- "arm-app-movw"}
+
+ {"ARMv4 interworking" "-static -T arm.ld --fix-v4bx-interworking" "--fix-v4bx -meabi=4" {armv4-bx.s}
+ {{objdump -d armv4-bx.d}}
+ "armv4-bx"}
+ {"MOVW/MOVT and merged sections" "-T arm.ld" "" {movw-merge.s}
+ {{objdump -dw movw-merge.d}}
+ "movw-merge"}
+ {"MOVW/MOVT against shared libraries" "tmpdir/arm-lib.so" "" {arm-app-movw.s}
+ {{objdump -Rw arm-app.r}}
+ "arm-app-movw"}
+ {"Thumb-2-as-Thumb-1 BL" "-Ttext 0x1000 --section-start .foo=0x40100c" "" {thumb2-bl-as-thumb1-bad.s}
+ {{objdump -d thumb2-bl-as-thumb1-bad.d}}
+ "thumb2-bl-as-thumb1-bad"}
+ {"Thumb-2 BL" "-Ttext 0x1000 --section-start .foo=0x100100c" "" {thumb2-bl-bad.s}
+ {{objdump -d thumb2-bl-bad.d}}
+ "thumb2-bl-bad"}
+
+ {"ARM-ARM farcall" "-Ttext 0x1000 --section-start .foo=0x2001020" "" {farcall-arm-arm.s}
+ {{objdump -d farcall-arm-arm.d}}
+ "farcall-arm-arm"}
+ {"ARM-ARM farcall (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001020 --pic-veneer" "" {farcall-arm-arm.s}
+ {{objdump -d farcall-arm-arm-pic-veneer.d}}
+ "farcall-arm-arm-pic-veneer"}
+ {"ARM-ARM farcall (BE8)" "-Ttext 0x1000 --section-start .foo=0x2001020 -EB --be8" "-EB" {farcall-arm-arm.s}
+ {{objdump -d farcall-arm-arm-be8.d}}
+ "farcall-arm-arm-be8"}
+
+ {"ARM-Thumb farcall" "-Ttext 0x1000 --section-start .foo=0x2001014" "" {farcall-arm-thumb.s}
+ {{objdump -d farcall-arm-thumb.d}}
+ "farcall-arm-thumb"}
+ {"ARM-Thumb farcall with BLX" "-Ttext 0x1000 --section-start .foo=0x2001014" "-march=armv5t" {farcall-arm-thumb.s}
+ {{objdump -d farcall-arm-thumb-blx.d}}
+ "farcall-arm-thumb-blx"}
+ {"ARM-Thumb farcall (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001014 --pic-veneer" "" {farcall-arm-thumb.s}
+ {{objdump -d farcall-arm-thumb-pic-veneer.d}}
+ "farcall-arm-thumb-pic-veneer"}
+ {"ARM-Thumb farcall with BLX (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001014 --pic-veneer" "-march=armv5t" {farcall-arm-thumb.s}
+ {{objdump -d farcall-arm-thumb-blx-pic-veneer.d}}
+ "farcall-arm-thumb-blx-pic-veneer"}
+
+ {"Thumb-Thumb farcall with BLX" "-Ttext 0x1000 --section-start .foo=0x2001014" "-march=armv5t" {farcall-thumb-thumb.s}
+ {{objdump -d farcall-thumb-thumb-blx.d}}
+ "farcall-thumb-thumb-blx"}
+ {"Thumb-Thumb farcall M profile" "-Ttext 0x1000 --section-start .foo=0x2001014" "-march=armv7m" {farcall-thumb-thumb.s}
+ {{objdump -d farcall-thumb-thumb-m.d}}
+ "farcall-thumb-thumb-m"}
+ {"Thumb-Thumb farcall with BLX (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001014 --pic-veneer" "-march=armv5t" {farcall-thumb-thumb.s}
+ {{objdump -d farcall-thumb-thumb-blx-pic-veneer.d}}
+ "farcall-thumb-thumb-blx-pic-veneer"}
+
+ {"Thumb-ARM farcall" "-Ttext 0x1000 --section-start .foo=0x2001014" "" {farcall-thumb-arm.s}
+ {{objdump -d farcall-thumb-arm.d}}
+ "farcall-thumb-arm"}
+ {"Thumb-ARM farcall with BLX" "-Ttext 0x1000 --section-start .foo=0x2001014" "-march=armv5t" {farcall-thumb-arm.s}
+ {{objdump -d farcall-thumb-arm-blx.d}}
+ "farcall-thumb-arm-blx"}
+ {"Thumb-ARM farcall with BLX (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001014 --pic-veneer" "-march=armv5t" {farcall-thumb-arm.s}
+ {{objdump -d farcall-thumb-arm-blx-pic-veneer.d}}
+ "farcall-thumb-arm-blx-pic-veneer"}
}
run_ld_link_tests $armelftests
@@ -193,9 +243,11 @@ run_dump_test "group-relocs-alu-bad"
run_dump_test "group-relocs-ldr-bad"
run_dump_test "group-relocs-ldrs-bad"
run_dump_test "group-relocs-ldc-bad"
-run_dump_test "thumb2-bl-as-thumb1-bad"
-run_dump_test "thumb2-bl-bad"
run_dump_test "emit-relocs1"
+run_dump_test "farcall-thumb-thumb"
+run_dump_test "farcall-thumb-thumb-pic-veneer"
+run_dump_test "farcall-thumb-thumb-m-pic-veneer"
+run_dump_test "farcall-thumb-arm-pic-veneer"
# Exclude non-ARM-EABI targets.
diff --git a/ld/testsuite/ld-arm/farcall-arm-arm-be8.d b/ld/testsuite/ld-arm/farcall-arm-arm-be8.d
new file mode 100644
index 0000000..b409517
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-arm-be8.d
@@ -0,0 +1,14 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: 04f01fe5 .*
+ 1004: 02001020 .word 0x02001020
+
+00001008 <_start>:
+ 1008: fcffffeb .*
+Disassembly of section .foo:
+
+02001020 <bar>:
+ 2001020: 1eff2fe1 .*
diff --git a/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d
new file mode 100644
index 0000000..1d0af22
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d
@@ -0,0 +1,16 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: e59fc000 ldr ip, \[pc, #0\] ; 1008 <_start-0x8>
+ 1004: e08ff00c add pc, pc, ip
+ 1008: 02000018 .word 0x02000018
+ 100c: 00000000 .word 0x00000000
+
+00001010 <_start>:
+ 1010: ebfffffa bl 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001020 <bar>:
+ 2001020: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-arm.d b/ld/testsuite/ld-arm/farcall-arm-arm.d
new file mode 100644
index 0000000..3ccb2c4
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-arm.d
@@ -0,0 +1,14 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: e51ff004 ldr pc, \[pc, #-4\] ; 1004 <_start-0x4>
+ 1004: 02001020 .word 0x02001020
+
+00001008 <_start>:
+ 1008: ebfffffc bl 1000 <_start-0x8>
+Disassembly of section .foo:
+
+02001020 <bar>:
+ 2001020: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-arm.s b/ld/testsuite/ld-arm/farcall-arm-arm.s
new file mode 100644
index 0000000..bc77ad3
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-arm.s
@@ -0,0 +1,19 @@
+@ Test to ensure that a ARM to ARM call exceeding 32Mb generates a stub.
+
+ .global _start
+ .syntax unified
+
+@ We will place the section .text at 0x1000.
+
+ .text
+
+_start:
+ bl bar
+
+@ We will place the section .foo at 0x2001020.
+
+ .section .foo, "xa"
+
+bar:
+ bx lr
+
diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
new file mode 100644
index 0000000..3ede5de
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
@@ -0,0 +1,16 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: e59fc000 ldr ip, \[pc, #0\] ; 1008 <_start-0x8>
+ 1004: e08ff00c add pc, pc, ip
+ 1008: 0200000d .word 0x0200000d
+ 100c: 00000000 .word 0x00000000
+
+00001010 <_start>:
+ 1010: ebfffffa bl 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d b/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d
new file mode 100644
index 0000000..86aaf39
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d
@@ -0,0 +1,14 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: e51ff004 ldr pc, \[pc, #-4\] ; 1004 <_start-0x4>
+ 1004: 02001015 .word 0x02001015
+
+00001008 <_start>:
+ 1008: ebfffffc bl 1000 <_start-0x8>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
new file mode 100644
index 0000000..3ede5de
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
@@ -0,0 +1,16 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: e59fc000 ldr ip, \[pc, #0\] ; 1008 <_start-0x8>
+ 1004: e08ff00c add pc, pc, ip
+ 1008: 0200000d .word 0x0200000d
+ 100c: 00000000 .word 0x00000000
+
+00001010 <_start>:
+ 1010: ebfffffa bl 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb.d b/ld/testsuite/ld-arm/farcall-arm-thumb.d
new file mode 100644
index 0000000..c664eff
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-thumb.d
@@ -0,0 +1,16 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: e59fc000 ldr ip, \[pc, #0\] ; 1008 <_start-0x8>
+ 1004: e12fff1c bx ip
+ 1008: 02001015 .word 0x02001015
+ 100c: 00000000 .word 0x00000000
+
+00001010 <_start>:
+ 1010: ebfffffa bl 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb.s b/ld/testsuite/ld-arm/farcall-arm-thumb.s
new file mode 100644
index 0000000..c69f31c
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-arm-thumb.s
@@ -0,0 +1,20 @@
+@ Test to ensure that a ARM to Thumb call exceeding 32Mb generates a stub.
+
+ .global _start
+ .global bar
+ .syntax unified
+
+@ We will place the section .text at 0x1000.
+
+ .text
+
+_start:
+ bl bar
+
+@ We will place the section .foo at 0x2001010.
+
+ .section .foo, "xa"
+ .thumb_func
+bar:
+ bx lr
+
diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d
new file mode 100644
index 0000000..3e0cb39
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d
@@ -0,0 +1,16 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: e59fc000 ldr ip, \[pc, #0\] ; 1008 <_start-0x8>
+ 1004: e08ff00c add pc, pc, ip
+ 1008: 0200000c .word 0x0200000c
+ 100c: 00000000 .word 0x00000000
+
+00001010 <_start>:
+ 1010: f7ff eff6 blx 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d b/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d
new file mode 100644
index 0000000..c4bdd3b
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d
@@ -0,0 +1,14 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: e51ff004 ldr pc, \[pc, #-4\] ; 1004 <_start-0x4>
+ 1004: 02001014 .word 0x02001014
+
+00001008 <_start>:
+ 1008: f7ff effa blx 1000 <_start-0x8>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d
new file mode 100644
index 0000000..932f28a
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d
@@ -0,0 +1,5 @@
+#name: Thumb-Thumb farcall without BLX
+#source: farcall-thumb-thumb.s
+#as: -march=armv4t
+#ld: -Ttext 0x1000 --section-start .foo=0x2001014
+#error: .*\(.text\+0x0\): relocation truncated to fit: R_ARM_THM_CALL against `bar'
diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm.d b/ld/testsuite/ld-arm/farcall-thumb-arm.d
new file mode 100644
index 0000000..90495b8
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-arm.d
@@ -0,0 +1,19 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x18>:
+ 1000: b540 push {r6, lr}
+ 1002: 4e03 ldr r6, \[pc, #12\] \(1010 <_start-0x8>\)
+ 1004: 46fe mov lr, pc
+ 1006: 4730 bx r6
+ 1008: e8bd4040 pop {r6, lr}
+ 100c: e12fff1e bx lr
+ ...
+
+00001018 <_start>:
+ 1018: f7ff eff2 blx 1000 <_start-0x18>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm.s b/ld/testsuite/ld-arm/farcall-thumb-arm.s
new file mode 100644
index 0000000..82cfb95
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-arm.s
@@ -0,0 +1,19 @@
+@ Test to ensure that a Thumb to ARM call exceeding 4Mb generates a stub.
+
+ .global _start
+ .syntax unified
+
+@ We will place the section .text at 0x1000.
+
+ .text
+ .thumb_func
+_start:
+ bl bar
+
+@ We will place the section .foo at 0x2001014.
+
+ .section .foo, "xa"
+
+bar:
+ bx lr
+
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
new file mode 100644
index 0000000..cadb620
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
@@ -0,0 +1,16 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: e59fc000 ldr ip, \[pc, #0\] ; 1008 <_start-0x8>
+ 1004: e08ff00c add pc, pc, ip
+ 1008: 0200000d .word 0x0200000d
+ 100c: 00000000 .word 0x00000000
+
+00001010 <_start>:
+ 1010: f7ff eff6 blx 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
new file mode 100644
index 0000000..11280c9
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
@@ -0,0 +1,14 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: e51ff004 ldr pc, \[pc, #-4\] ; 1004 <_start-0x4>
+ 1004: 02001015 .word 0x02001015
+
+00001008 <_start>:
+ 1008: f7ff effa blx 1000 <_start-0x8>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
new file mode 100644
index 0000000..932f28a
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
@@ -0,0 +1,5 @@
+#name: Thumb-Thumb farcall without BLX
+#source: farcall-thumb-thumb.s
+#as: -march=armv4t
+#ld: -Ttext 0x1000 --section-start .foo=0x2001014
+#error: .*\(.text\+0x0\): relocation truncated to fit: R_ARM_THM_CALL against `bar'
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
new file mode 100644
index 0000000..691d4e0
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
@@ -0,0 +1,19 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x10>:
+ 1000: b540 push {r6, lr}
+ 1002: 4e02 ldr r6, \[pc, #8\] \(100c <_start-0x4>\)
+ 1004: 46fe mov lr, pc
+ 1006: e7fe b.n 1006 <_start-0xa>
+ 1008: bd40 pop {r6, pc}
+ 100a: bf00 nop
+ 100c: 02001015 .word 0x02001015
+
+00001010 <_start>:
+ 1010: f7ff eff6 blx 1000 <_start-0x10>
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
new file mode 100644
index 0000000..932f28a
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
@@ -0,0 +1,5 @@
+#name: Thumb-Thumb farcall without BLX
+#source: farcall-thumb-thumb.s
+#as: -march=armv4t
+#ld: -Ttext 0x1000 --section-start .foo=0x2001014
+#error: .*\(.text\+0x0\): relocation truncated to fit: R_ARM_THM_CALL against `bar'
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb.d b/ld/testsuite/ld-arm/farcall-thumb-thumb.d
new file mode 100644
index 0000000..932f28a
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb.d
@@ -0,0 +1,5 @@
+#name: Thumb-Thumb farcall without BLX
+#source: farcall-thumb-thumb.s
+#as: -march=armv4t
+#ld: -Ttext 0x1000 --section-start .foo=0x2001014
+#error: .*\(.text\+0x0\): relocation truncated to fit: R_ARM_THM_CALL against `bar'
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb.s b/ld/testsuite/ld-arm/farcall-thumb-thumb.s
new file mode 100644
index 0000000..650b1a6
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb.s
@@ -0,0 +1,19 @@
+@ Test to ensure that a Thumb to Thumb call exceeding 4Mb generates a stub.
+
+ .global _start
+ .syntax unified
+
+@ We will place the section .text at 0x1000.
+
+ .text
+ .thumb_func
+_start:
+ bl bar
+
+@ We will place the section .foo at 0x02001014.
+
+ .section .foo, "xa"
+ .thumb_func
+bar:
+ bx lr
+
diff --git a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
index 749b58f..1dfca21 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
@@ -1,4 +1,14 @@
-#name: Thumb-2-as-Thumb-1 BL failure test
-#source: thumb2-bl-as-thumb1-bad.s
-#ld: -Ttext 0x1000 --section-start .foo=0x401004
-#error: .*\(.text\+0x0\): relocation truncated to fit: R_ARM_THM_CALL against `bar'
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: e51ff004 ldr pc, \[pc, #-4\] ; 1004 <_start-0x4>
+ 1004: 0040100d .word 0x0040100d
+
+00001008 <_start>:
+ 1008: f7ff effa blx 1000 <_start-0x8>
+Disassembly of section .foo:
+
+0040100c <bar>:
+ 40100c: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
index dae5d43..13f7f33 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
+++ b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
@@ -1,4 +1,4 @@
-@ Test to ensure that a Thumb-1 BL with a Thumb-2-only offset fails.
+@ Test to ensure that a Thumb-1 BL with a Thumb-2-only offset makes the linker generate a stub.
.arch armv5t
.global _start
@@ -12,7 +12,7 @@
_start:
bl bar
-@ We will place the section .foo at 0x401004.
+@ We will place the section .foo at 0x40100c.
.section .foo, "xa"
.thumb_func
diff --git a/ld/testsuite/ld-arm/thumb2-bl-bad.d b/ld/testsuite/ld-arm/thumb2-bl-bad.d
index 0fc6e04..ea38797 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-bad.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-bad.d
@@ -1,4 +1,14 @@
-#name: Thumb-2 BL failure test
-#source: thumb2-bl-bad.s
-#ld: -Ttext 0x1000 --section-start .foo=0x1001004
-#error: .*\(.text\+0x0\): relocation truncated to fit: R_ARM_THM_CALL against `bar'
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start-0x8>:
+ 1000: e51ff004 ldr pc, \[pc, #-4\] ; 1004 <_start-0x4>
+ 1004: 0100100d .word 0x0100100d
+
+00001008 <_start>:
+ 1008: f7ff effa blx 1000 <_start-0x8>
+Disassembly of section .foo:
+
+0100100c <bar>:
+ 100100c: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/thumb2-bl-bad.s b/ld/testsuite/ld-arm/thumb2-bl-bad.s
index 63e3fe7..7685860 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-bad.s
+++ b/ld/testsuite/ld-arm/thumb2-bl-bad.s
@@ -1,4 +1,4 @@
-@ Test to ensure that a Thumb-2 BL with an oversize offset fails.
+@ Test to ensure that a Thumb-2 BL with an oversize offset makes the linker generate a stub.
.arch armv7
.global _start
@@ -12,7 +12,7 @@
_start:
bl bar
-@ We will place the section .foo at 0x1001004.
+@ We will place the section .foo at 0x100100c.
.section .foo, "xa"
.thumb_func