bfd/

* bfd-in.h (bfd_elf32_arm_set_target_relocs): Add prototype.
	(bfd_elf32_arm_process_before_allocation): Update prototype.
	* bfd-in2.h: Regenerate.
	* bfd/elf32-arm.h (elf32_arm_link_hash_table): Add target2_reloc.
	(elf32_arm_link_hash_table_create): Set it.
	(bfd_elf32_arm_process_before_allocation): Remove target1_is_rel.
	(bfd_elf32_arm_set_target_relocs): New function.
	(arm_real_reloc_type): New function.
	(elf32_arm_final_link_relocate): Use it.  Handle R_ARM_PREL31 and
	R_ARM_GOT_PREL.  Remove R_ARM_TARGET1.
	(elf32_arm_gc_sweep_hook): Ditto.
	(elf32_arm_check_relocs): Ditto.
	(elf32_arm_relocate_section): Handle R_ARM_GOT_PREL.
	* elfarm-nabi.c (elf32_arm_howto_table): Add R_ARM_PREL31 and
	R_ARM_GOT_TARGET2.
	(elf32_arm_got_prel): New variable.
	(elf32_arm_howto_from_type): New function.
	(elf32_arm_info_to_howto): Use it.
	(elf32_arm_reloc_map): Add BFD_RELOC_ARM_PREL31 and
	BFD_RELOC_ARM_TARGET2.
	* libbfd.h: Regenerate.
	* reloc.c: Add BFD_RELOC_ARM_TARGET2 and BFD_RELOC_ARM_PREL31.
gas/
	* config/tc-arm.c (s_arm_rel31): New funciton.
	(md_pseudo_table): Add .rel31.
	(md_apply_fix3): Handle BFD_RELOC_ARM_TARGET2,
	BFD_RELOC_32_PCREL and BFD_RELOC_ARM_PREL31.
	(tc_gen_reloc): Handle BFD_RELOC_ARM_PREL31 and BFD_RELOC_ARM_TARGET2.
	(arm_fix_adjustable): Return 0 for BFD_RELOC_ARM_TARGET2.
	(arm_parse_reloc): Add (target2).
gas/testsuite/
	* gas/arm/pic.s: Add (target2).
	* gas/arm/pic.d: Ditto.
include/
	* elf/arm.h: Remove R_ARM_STKCHK and R_ARM_THM_STKCHK.
	Add R_ARM_TARGET2, R_ARM_PREL31, R_ARM_GOT_ABS, R_ARM_GOT_PREL,
	R_ARM_GOT_BREL12, R_ARM_GOTOFF12 and R_ARM_GOTRELAX.
ld/
	* ld.texinfo: Rename arm-specific section.  Document --target*
	* emulparams/armelf_fbsd.sh: Set TARGET2_TYPE.
	* emulparams/armelf_linux.sh: Ditto.
	* emulparams/armelf_nbsd.sh: Ditto.
	* emultempl/armelf.em: Set default for TARGET2_TYPE.
	(target2_type): New variable.
	(arm_elf_before_allocation): Don't pass target1_type.
	(arm_elf_create_output_section_statements): New function.
	(PARSE_AND_LIST_PROLOGUE): Add OPTION_TARGET2.
	(PARSE_AND_LIST_LONGOPTS, PARSE_AND_LIST_OPTIONS): Add --target=.
	(PARSE_AND_LIST_ARGS_CASES): Handle OPTION_TARGET2.
	(LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS): Set.
	* emultempl/armelf_oabi.em (_before_allocation): Remove extra
	argument to bfd_elf32_arm_process_before_allocation.
ld/testsuite/
	* ld-arm/arm-target1-{abs,rel}.d}: New files.
	* ld-arm/arm-target1.s: New file.
	* ld-arm/arm-target2-{,got-}rel.d: New files.
	* ld-arm/arm-target2.s: New file.
	* ld-arm/arm-rel31.d: New files.
	* ld-arm/arm-rel31.s: New files.
	* ld-arm/arm.ld: New file.
	* ld-arm/arm-elf.exp: Add new tests.

ld/ChangeLog

@@ -1,3 +1,20 @@
+2004-09-17  Paul Brook  <paul@codesourcery.com>
+
+	* ld.texinfo: Rename arm-specific section.  Document --target*
+	* emulparams/armelf_fbsd.sh: Set TARGET2_TYPE.
+	* emulparams/armelf_linux.sh: Ditto.
+	* emulparams/armelf_nbsd.sh: Ditto.
+	* emultempl/armelf.em: Set default for TARGET2_TYPE.
+	(target2_type): New variable.
+	(arm_elf_before_allocation): Don't pass target1_type.
+	(arm_elf_create_output_section_statements): New function.
+	(PARSE_AND_LIST_PROLOGUE): Add OPTION_TARGET2.
+	(PARSE_AND_LIST_LONGOPTS, PARSE_AND_LIST_OPTIONS): Add --target=.
+	(PARSE_AND_LIST_ARGS_CASES): Handle OPTION_TARGET2.
+	(LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS): Set.
+	* emultempl/armelf_oabi.em (_before_allocation): Remove extra
+	argument to bfd_elf32_arm_process_before_allocation.
+
 2004-09-17  Alan Modra  <amodra@bigpond.net.au>
 
 	* ldexp.c (fold_name): Update u.undef.next refs.

ld/emulparams/armelf_fbsd.sh

@@ -1,2 +1,3 @@
 . ${srcdir}/emulparams/armelf.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
+TARGET2_TYPE=got-rel

ld/emulparams/armelf_linux.sh

@@ -16,6 +16,7 @@ OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
 OTHER_SECTIONS='.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }'
 
 TEXT_START_ADDR=0x00008000
+TARGET2_TYPE=got-rel
 
 # ARM does not support .s* sections.
 NO_SMALL_DATA=yes

ld/emulparams/armelf_nbsd.sh

@@ -1,6 +1,7 @@
 . ${srcdir}/emulparams/armelf.sh
 MAXPAGESIZE=0x8000
 TEXT_START_ADDR=0x00008000
+TARGET2_TYPE=got-rel
 
 unset STACK_ADDR
 unset EMBEDDED

ld/emultempl/armelf.em

@@ -22,6 +22,7 @@
 # This file is sourced from elf32.em, and defines extra arm-elf
 # specific routines.
 #
+test -z $TARGET2_TYPE && TARGET2_TYPE="rel"
 cat >>e${EMULATION_NAME}.c <<EOF
 
 static int no_pipeline_knowledge = 0;
@@ -29,6 +30,7 @@ static char *thumb_entry_symbol = NULL;
 static bfd *bfd_for_interwork;
 static int byteswap_code = 0;
 static int target1_is_rel = 0${TARGET1_IS_REL};
+static char *target2_type = "${TARGET2_TYPE}";
 
 static void
 gld${EMULATION_NAME}_before_parse (void)
@@ -121,8 +123,7 @@ arm_elf_before_allocation (void)
       {
 	if (!bfd_elf32_arm_process_before_allocation (is->the_bfd, & link_info,
 						      no_pipeline_knowledge,
-						      byteswap_code,
-						      target1_is_rel))
+						      byteswap_code))
 	  {
 	    /* xgettext:c-format */
 	    einfo (_("Errors encountered processing file %s"), is->filename);
@@ -182,6 +183,14 @@ arm_elf_finish (void)
 	   thumb_entry_symbol);
 }
 
+/* This is a convenitent point to tell BFD about target specific flags.
+   After the output has been created, but before inputs are read.  */
+static void
+arm_elf_create_output_section_statements (void)
+{
+  bfd_elf32_arm_set_target_relocs (&link_info, target1_is_rel, target2_type);
+}
+
 EOF
 
 # Define some shell vars to insert bits of code into the standard elf
@@ -192,6 +201,7 @@ PARSE_AND_LIST_PROLOGUE='
 #define OPTION_BE8			302
 #define OPTION_TARGET1_REL		303
 #define OPTION_TARGET1_ABS		304
+#define OPTION_TARGET2			305
 '
 
 PARSE_AND_LIST_SHORTOPTS=p
@@ -202,14 +212,16 @@ PARSE_AND_LIST_LONGOPTS='
   { "be8", no_argument, NULL, OPTION_BE8},
   { "target1-rel", no_argument, NULL, OPTION_TARGET1_REL},
   { "target1-abs", no_argument, NULL, OPTION_TARGET1_ABS},
+  { "target2", required_argument, NULL, OPTION_TARGET2},
 '
 
 PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("  -p --no-pipeline-knowledge  Stop the linker knowing about the pipeline length\n"));
   fprintf (file, _("     --thumb-entry=<sym>      Set the entry point to be Thumb symbol <sym>\n"));
   fprintf (file, _("     --be8                    Oputput BE8 format image\n"));
-  fprintf (file, _("     --target1-rel            Interpret R_ARM_TARGET1 as R_ARM_REL32\n"));
-  fprintf (file, _("     --target1-abs            Interpret R_ARM_TARGET1 as R_ARM_ABS32\n"));
+  fprintf (file, _("     --target1=rel            Interpret R_ARM_TARGET1 as R_ARM_REL32\n"));
+  fprintf (file, _("     --target1=abs            Interpret R_ARM_TARGET1 as R_ARM_ABS32\n"));
+  fprintf (file, _("     --target2=<type>         Specify definition of R_ARM_TARGET2\n"));
 '
 
 PARSE_AND_LIST_ARGS_CASES='
@@ -232,12 +244,17 @@ PARSE_AND_LIST_ARGS_CASES='
     case OPTION_TARGET1_ABS:
       target1_is_rel = 0;
       break;
+
+    case OPTION_TARGET2:
+      target2_type = optarg;
+      break;
 '
 
 # We have our own after_open and before_allocation functions, but they call
 # the standard routines, so give them a different name.
 LDEMUL_AFTER_OPEN=arm_elf_after_open
 LDEMUL_BEFORE_ALLOCATION=arm_elf_before_allocation
+LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=arm_elf_create_output_section_statements
 
 # Replace the elf before_parse function with our own.
 LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse

ld/emultempl/armelf_oabi.em

@@ -69,7 +69,7 @@ gld${EMULATION_NAME}_before_allocation (void)
     LANG_FOR_EACH_INPUT_STATEMENT (is)
       {
 	if (!bfd_elf32_arm_process_before_allocation (is->the_bfd, &link_info,
-						      0, 0, 0))
+						      0, 0))
 	  {
 	    /* xgettext:c-format */
 	    einfo (_("Errors encountered processing file %s"), is->filename);

ld/ld.texinfo

@@ -4877,7 +4877,7 @@ point to the function trampoline.
 @end ifset
 
 @node ARM
-@section @command{ld}'s Support for Interworking Between ARM and Thumb Code
+@section @command{ld} and the ARM family
 
 @cindex ARM interworking support
 @kindex --support-old-code
@@ -4907,6 +4907,26 @@ The @samp{--be8} switch instructs @command{ld} to generate BE8 format
 executables.  This option is only valid when linking big-endian objects.
 The resulting image will contain big-endian data and little-endian code.
 
+@cindex TARGET1
+@kindex --target1-rel
+@kindex --target1-abs
+The @samp{R_ARM_TARGET1} relocation is typically used for entries in the
+@samp{.init_array} section.  It is interpreted as either @samp{R_ARM_REL32}
+or @samp{R_ARM_ABS32}, depending on the target.  The @samp{--target1-rel}
+and @samp{--target1-abs} switches override the default.
+
+@cindex TARGET2
+@kindex --target2=@var{type}
+The @samp{--target2=type} switch overrides the default definition of the
+@samp{R_ARM_TARGET2} relocation.  Valid values for @samp{type}, their
+meanings, and target defaults are as follows:
+@table @samp
+@item rel
+@samp{R_ARM_REL32} (arm*-*-symbianelf, arm*-*-elf, arm*-*-eabi)
+@item got-rel
+@samp{R_ARM_GOT_PREL} (arm*-*-linux, arm*-*-*bsd)
+@end table
+
 @ifclear GENERIC
 @lowersections
 @end ifclear

ld/testsuite/ChangeLog

@@ -1,3 +1,14 @@
+2004-09-17  Paul Brook  <paul@codesourcery.com>
+
+	* ld-arm/arm-target1-{abs,rel}.d}: New files.
+	* ld-arm/arm-target1.s: New file.
+	* ld-arm/arm-target2-{,got-}rel.d: New files.
+	* ld-arm/arm-target2.s: New file.
+	* ld-arm/arm-rel31.d: New files.
+	* ld-arm/arm-rel31.s: New files.
+	* ld-arm/arm.ld: New file.
+	* ld-arm/arm-elf.exp: Add new tests.
+
 2004-09-07  Hans-Peter Nilsson  <hp@axis.com>
 
 	* ld-cris/hiddef1.d, ld-cris/hiddef1.s, ld-cris/hidrefgotplt1.s:

ld/testsuite/ld-arm/arm-elf.exp

@@ -47,6 +47,21 @@ set armelftests {
     {"Non-pcrel function reference" "tmpdir/arm-lib.so" "" {arm-app-abs32.s}
      {{objdump -fdw arm-app-abs32.d} {objdump -Rw arm-app-abs32.r}}
      "arm-app-abs32"}
+    {"target1-abs" "-static --target1-abs -T arm.ld" "" {arm-target1.s}
+     {{objdump -s arm-target1-abs.d}}
+     "arm-target1-abs"}
+    {"target1-rel" "-static --target1-rel -T arm.ld" "" {arm-target1.s}
+     {{objdump -s arm-target1-rel.d}}
+     "arm-target1-rel"}
+    {"target2-rel" "-static --target2=rel -T arm.ld" "" {arm-target2.s}
+     {{objdump -s arm-target2-rel.d}}
+     "arm-target2-rel"}
+    {"target2-got-rel" "-static --target2=got-rel -T arm.ld" "" {arm-target2.s}
+     {{objdump -s arm-target2-got-rel.d}}
+     "arm-target2-got-rel"}
+    {"arm-rel31" "-static -T arm.ld" "" {arm-rel31.s}
+     {{objdump -s arm-rel31.d}}
+     "arm-rel31"}
 }
 
 run_ld_link_tests $armelftests

ld/testsuite/ld-arm/arm-rel31.d

@@ -0,0 +1,5 @@
+
+.*:     file format.*
+
+Contents of section .text:
+ 8000 (10000000 fcffff7f 08000080 f4ffffff|00000010 7ffffffc 80000008 fffffff4) .*

ld/testsuite/ld-arm/arm-rel31.s

@@ -0,0 +1,11 @@
+# Test the R_ARM_REL31 relocation
+	.section .before
+	.global _start
+_start:
+	.text
+	.rel31 0, foo
+	.rel31 0, _start
+	.rel31 1, foo
+	.rel31 1, _start
+	.section .after
+foo:

ld/testsuite/ld-arm/arm-target1-abs.d

@@ -0,0 +1,5 @@
+
+.*:     file format.*
+
+Contents of section .text:
+ 8000 (04800000|00008004) .*

ld/testsuite/ld-arm/arm-target1-rel.d

@@ -0,0 +1,5 @@
+
+.*:     file format .*
+
+Contents of section .text:
+ 8000 (04000000|00000004) .*

ld/testsuite/ld-arm/arm-target1.s

@@ -0,0 +1,6 @@
+# Test the R_ARM_TARGET1 relocation
+	.text
+	.global _start
+_start:
+	.word foo(target1)
+foo:

ld/testsuite/ld-arm/arm-target2-got-rel.d

@@ -0,0 +1,7 @@
+
+.*:     file format.*
+
+Contents of section .text:
+ 8000 (00100000|00001000) .*
+Contents of section .got:
+ 9000 (04800000|00008004) .*

ld/testsuite/ld-arm/arm-target2-rel.d

@@ -0,0 +1,5 @@
+
+.*:     file format.*
+
+Contents of section .text:
+ 8000 (04000000|00000004) .*

ld/testsuite/ld-arm/arm-target2.s

@@ -0,0 +1,6 @@
+# Test the R_ARM_TARGET2 relocation
+	.text
+	.global _start
+_start:
+	.word foo(target2)
+foo:

ld/testsuite/ld-arm/arm.ld

@@ -0,0 +1,16 @@
+/* Script for ld testsuite */
+OUTPUT_ARCH(arm)
+ENTRY(_start)
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = 0x8000); . = 0x8000;
+  .text           :
+  {
+    *(.before)
+    *(.text)
+    *(.after)
+  } =0
+  . = 0x9000;
+  .got            : { *(.got) *(.got.plt)}
+}