bfd:

	* Makefile.am (ALL_MACHINES): Add cpu-epiphany.lo .
	(ALL_MACHINES_CFILES): Add cpu-epiphany.c .
	(BFD32_BACKENDS): Add elf32-epiphany.lo .
	(BFD32_BACKENDS_CFILES): Add elf32-epiphany.c .
	* Makefile.in, bfd-in2.h, configure, libbfd.h: Regenerate.
	* archures.c (bfd_arch_epiphany): Add.
	(bfd_mach_epiphany16, bfd_mach_epiphany32): Define.
	(bfd_epiphany_arch): Declare.
	(bfd_archures_list): Add &bfd_epiphany_arch.
	* config.bfd (epiphany-*-elf): New target case.
	* configure.in (bfd_elf32_epiphany_vec): New target vector case.
	* reloc.c (BFD_RELOC_EPIPHANY_SIMM8): New relocation.
	(BFD_RELOC_EPIPHANY_SIMM24, BFD_RELOC_EPIPHANY_HIGH): Likewise.
	(BFD_RELOC_EPIPHANY_LOW, BFD_RELOC_EPIPHANY_SIMM11): Likewise.
	(BFD_RELOC_EPIPHANY_IMM11, BFD_RELOC_EPIPHANY_IMM8): Likewise.
	* targets.c (bfd_elf32_epiphany_vec): Declare.
	(_bfd_target_vector): Add bfd_elf32_epiphany_vec.
	* po/SRC-POTFILES.in, po/bfd.pot: Regenerate.
	* cpu-epiphany.c, elf32-epiphany.c: New files.
binutils:
	* readelf.c (include "elf/epiphany.h")
	(guess_is_rela, dump_relocation): Handle EM_ADAPTEVA_EPIPHANY.
	(get_machine_name, is_32bit_abs_reloc, is_32bit_pcrel_reloc): Likewise.
	(is_16bit_abs_reloc, is_none_reloc): Likewise.
	* po/binutils.pot: Regenerate.
cpu:
	* cpu/epiphany.cpu, cpu/epiphany.opc: New files.
gas:
	* NEWS: Mention addition of Adapteva Epiphany support.
	* config/tc-epiphany.c, config/tc-epiphany.h: New files.
	* Makefile.am (TARGET_CPU_CFILES): Add config/tc-epiphany.c .
	(TARGET_CPU_HFILES): Add config/tc-epiphany.h .
	* Makefile.in, configure, doc/Makefile.in, po/POTFILES.in: Regenerate.
	* configure.in: Also set using_cgen for epiphany.
	* configure.tgt: Handle epiphany.
	* doc/Makefile.am (CPU_DOCS): Add c-epiphany.texi .
	* doc/all.texi: Set EPIPHANY.
	* doc/as.texinfo: Add EPIPHANY-specific text.
	* doc/c-epiphany.texi: New file.
	* po/gas.pot: Regenerate.
gas/testsuite:
	* gas/epiphany: New directory.
include:
	* dis-asm.h (print_insn_epiphany): Declare.
	* elf/epiphany.h: New file.
	* elf/common.h (EM_ADAPTEVA_EPIPHANY): Define.
ld:
	* NEWS: Mention addition of Adapteva Epiphany support.
	* Makefile.am (ALL_EMULATION_SOURCES): Add eelf32epiphany.c .
	(eelf32epiphany.c): New rule.
	* Makefile.in: Regenerate.
	* configure.tgt: Handle epiphany-*-elf.
	* po/ld.pot: Regenerate.
	* testsuite/ld-srec/srec.exp: xfail epiphany.
	* emulparams/elf32epiphany.sh: New file.
opcodes:
	* Makefile.am (HFILES): Add epiphany-desc.h and epiphany-opc.h .
	(TARGET_LIBOPCODES_CFILES): Add  epiphany-asm.c, epiphany-desc.c,
	epiphany-dis.c, epiphany-ibld.c and epiphany-opc.c .
	(CLEANFILES): Add stamp-epiphany.
	(EPIPHANY_DEPS): Set.  Make CGEN-generated Epiphany files depend on it.
	(stamp-epiphany): New rule.
	* Makefile.in, configure, po/POTFILES.in, po/opcodes.pot: Regenerate.
	* configure.in: Handle bfd_epiphany_arch.
	* disassemble.c (ARCH_epiphany): Define.
	(disassembler): Handle bfd_arch_epiphany.
	* epiphany-asm.c, epiphany-desc.c, epiphany-desc.h: New files.
	* epiphany-dis.c, epiphany-ibld.c, epiphany-opc.c: Likewise.
	* epiphany-opc.h: Likewise.

10 files changed, 458 insertions, 376 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5cce1a9..95565b8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* NEWS: Mention addition of Adapteva Epiphany support.
+	* Makefile.am (ALL_EMULATION_SOURCES): Add eelf32epiphany.c .
+	(eelf32epiphany.c): New rule.
+	* configure.tgt: Handle epiphany-*-elf.
+	* emulparams/elf32epiphany.sh: New file.
+	* Makefile.in: Regenerate.
+	* po/ld.pot: Regenerate.
+
 2011-10-24  Nick Clifton  <nickc@redhat.com>
 
 	* po/ja.po: Updated Japanese translation.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 5ae86ba..cb788da 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -211,6 +211,7 @@ ALL_EMULATION_SOURCES = \
 	eelf32ebmipvxworks.c \
 	eelf32elmip.c \
 	eelf32elmipvxworks.c \
+	eelf32epiphany.c \
 	eelf32fr30.c \
 	eelf32frv.c \
 	eelf32frvfd.c \
@@ -990,6 +991,9 @@ eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
+eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
+  $(ELF_DEPS) ${GEN_DEPENDS}
+	${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
diff --git a/ld/Makefile.in b/ld/Makefile.in
index f062b92..151aaee 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -517,6 +517,7 @@ ALL_EMULATION_SOURCES = \
 	eelf32ebmipvxworks.c \
 	eelf32elmip.c \
 	eelf32elmipvxworks.c \
+	eelf32epiphany.c \
 	eelf32fr30.c \
 	eelf32frv.c \
 	eelf32frvfd.c \
@@ -1117,6 +1118,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ebmipvxworks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32elmip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32elmipvxworks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32epiphany.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32fr30.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32frv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32frvfd.Po@am__quote@
@@ -2443,6 +2445,9 @@ eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
+eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
+  $(ELF_DEPS) ${GEN_DEPENDS}
+	${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
diff --git a/ld/NEWS b/ld/NEWS
index 62406b4..bb1f361 100644
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -1,18 +1,20 @@
 -*- text -*-
 
+* Add support for the Adapteva EPIPHANY architecture.
+
 Changes in 2.22:
 
 * --copy-dt-needed-entries is no longer enabled by default.  Instead
   --no-copy-dt-needed-entries is the default.
 
 * INPUT_SECTION_FLAGS has been added to the linker script language
-to allow selection of input sections by section header section flags.
+  to allow selection of input sections by section header section flags.
 
 * Add support for the Tilera TILEPRO and TILE-Gx architectures.
 
 * Added SORT_BY_INIT_PRIORITY to the linker script language to permit
-sorting sections by numerical value of the GCC init_priority attribute
-encoded in the section name.
+  sorting sections by numerical value of the GCC init_priority attribute
+  encoded in the section name.
 
 Changes in 2.21:
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 23cf347..02f5f76 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -137,6 +137,8 @@ d30v-*-*)		targ_emul=d30velf; targ_extra_emuls="d30v_e d30v_o"
 			;;
 dlx-*-elf*)		targ_emul=elf32_dlx
 			;;
+epiphany-*-elf)		targ_emul=elf32epiphany
+			;;
 fido*-*-elf*)		targ_emul=m68kelf ;;
 fr30-*-*)		targ_emul=elf32fr30
 			;;
diff --git a/ld/emulparams/elf32epiphany.sh b/ld/emulparams/elf32epiphany.sh
new file mode 100644
index 0000000..fd24012
--- /dev/null
+++ b/ld/emulparams/elf32epiphany.sh
@@ -0,0 +1,42 @@
+TEMPLATE_NAME=elf32
+MACHINE=
+SCRIPT_NAME=elf
+OUTPUT_FORMAT="elf32-epiphany"
+NO_REL_RELOCS=yes
+# See also `include/elf/epiphany.h'
+
+MMR_ADDR=0x00000000
+MMR_LEN=0x100
+
+#RESERVED_ADDR=0x00000100
+#RESERVED_LEN=8128
+
+IVT_ADDR=0x00000000
+IVT_LEN=0x040
+
+# ??? This fails: 'Not enough room for program headers, try linking with -N'
+#TEXT_START_ADDR=0x00000040
+
+#The following two lines would allow small to medium sized programs
+#to run in the first 1 MB.
+#TEXT_START_ADDR=0x00000060
+#EXECUTABLE_SYMBOLS='PROVIDE (___bss_start = __bss_start); PROVIDE (___heap_start = end); PROVIDE (___heap_end = (0x0c0000)); PROVIDE (___stack = (0x0ffff0));'
+
+TEXT_START_ADDR='DEFINED (___text_start) ? ___text_start : 0x80000000'
+EXECUTABLE_SYMBOLS='PROVIDE (___bss_start = __bss_start); PROVIDE (___heap_start = end); PROVIDE (___heap_end = (0x81800000)); PROVIDE (___stack = (0x81fffff0));'
+
+#Smuggle an alignemnt directive in here so that .bss is aligned.
+OTHER_SDATA_SECTIONS='. = ALIGN(8);'
+
+
+ARCH=epiphany
+ENTRY=_start
+EMBEDDED=yes
+ELFSIZE=32
+ALIGNMENT=8
+#MAXPAGESIZE=8192
+MAXPAGESIZE=1
+WRITABLE_RODATA=
+#OTHER_RELOCATING_SECTIONS=
+#OTHER_READONLY_SECTIONS=
+#OTHER_READWRITE_SECTIONS=
diff --git a/ld/po/ld.pot b/ld/po/ld.pot
index ef25380..790cfdd 100644
--- a/ld/po/ld.pot
+++ b/ld/po/ld.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
+"POT-Creation-Date: 2011-10-25 11:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,11 +33,11 @@ msgstr ""
 msgid "Errors encountered processing file %s"
 msgstr ""
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1813
+#: emultempl/armcoff.em:192 emultempl/pe.em:1812
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr ""
 
-#: emultempl/armcoff.em:197 emultempl/pe.em:1818
+#: emultempl/armcoff.em:197 emultempl/pe.em:1817
 msgid "%P: warning: cannot find thumb start symbol %s\n"
 msgstr ""
 
@@ -428,28 +428,28 @@ msgid ""
 "symbols from auto-imported DLLs.\n"
 msgstr ""
 
-#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
-#: pe-dll.c:1352
+#: emultempl/pe.em:1160 emultempl/pe.em:1366 emultempl/pe.em:1573 ldcref.c:490
+#: ldcref.c:588 ldmain.c:1158 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1254
+#: pe-dll.c:1349
 msgid "%B%F: could not read symbols: %E\n"
 msgstr ""
 
-#: emultempl/pe.em:1243
+#: emultempl/pe.em:1242
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
 msgstr ""
 
-#: emultempl/pe.em:1617
+#: emultempl/pe.em:1616
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr ""
 
-#: emultempl/pe.em:1640
+#: emultempl/pe.em:1639
 #, c-format
 msgid "Errors encountered processing file %s for interworking\n"
 msgstr ""
 
-#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
-#: ldmain.c:1160
+#: emultempl/pe.em:1701 ldexp.c:581 ldlang.c:3458 ldlang.c:6992 ldlang.c:7023
+#: ldmain.c:1103
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr ""
 
@@ -491,7 +491,7 @@ msgstr ""
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr ""
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
+#: ldcref.c:650 ldcref.c:657 ldmain.c:1192 ldmain.c:1199
 msgid "%B%F: could not read relocs: %E\n"
 msgstr ""
 
@@ -672,35 +672,35 @@ msgstr ""
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr ""
 
-#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
+#: ldlang.c:1221 ldlang.c:1263 ldlang.c:3143
 msgid "%P%F: can not create hash table: %E\n"
 msgstr ""
 
-#: ldlang.c:1310
+#: ldlang.c:1314
 msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
 msgstr ""
 
-#: ldlang.c:1316
+#: ldlang.c:1320
 msgid "%P:%S: warning: memory region `%s' not declared\n"
 msgstr ""
 
-#: ldlang.c:1350
+#: ldlang.c:1354
 msgid "%F%P:%S: error: alias for default memory region\n"
 msgstr ""
 
-#: ldlang.c:1361
+#: ldlang.c:1365
 msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
 msgstr ""
 
-#: ldlang.c:1368
+#: ldlang.c:1372
 msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
 msgstr ""
 
-#: ldlang.c:1420 ldlang.c:1459
+#: ldlang.c:1424 ldlang.c:1463
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr ""
 
-#: ldlang.c:2021
+#: ldlang.c:2025
 #, c-format
 msgid ""
 "\n"
@@ -708,30 +708,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ldlang.c:2029
+#: ldlang.c:2033
 msgid ""
 "\n"
 "Memory Configuration\n"
 "\n"
 msgstr ""
 
-#: ldlang.c:2031
+#: ldlang.c:2035
 msgid "Name"
 msgstr ""
 
-#: ldlang.c:2031
+#: ldlang.c:2035
 msgid "Origin"
 msgstr ""
 
-#: ldlang.c:2031
+#: ldlang.c:2035
 msgid "Length"
 msgstr ""
 
-#: ldlang.c:2031
+#: ldlang.c:2035
 msgid "Attributes"
 msgstr ""
 
-#: ldlang.c:2071
+#: ldlang.c:2075
 #, c-format
 msgid ""
 "\n"
@@ -739,259 +739,259 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ldlang.c:2140
+#: ldlang.c:2141
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr ""
 
-#: ldlang.c:2149
+#: ldlang.c:2150
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr ""
 
-#: ldlang.c:2702
+#: ldlang.c:2728
 msgid "%B: file not recognized: %E\n"
 msgstr ""
 
-#: ldlang.c:2703
+#: ldlang.c:2729
 msgid "%B: matching formats:"
 msgstr ""
 
-#: ldlang.c:2710
+#: ldlang.c:2736
 msgid "%F%B: file not recognized: %E\n"
 msgstr ""
 
-#: ldlang.c:2781
+#: ldlang.c:2810
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr ""
 
-#: ldlang.c:2796 ldlang.c:2810
+#: ldlang.c:2825 ldlang.c:2839
 msgid "%F%B: could not read symbols: %E\n"
 msgstr ""
 
-#: ldlang.c:3084
+#: ldlang.c:3113
 msgid ""
 "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr ""
 
-#: ldlang.c:3098
+#: ldlang.c:3127
 msgid "%P%F: target %s not found\n"
 msgstr ""
 
-#: ldlang.c:3100
+#: ldlang.c:3129
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr ""
 
-#: ldlang.c:3106
+#: ldlang.c:3135
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr ""
 
-#: ldlang.c:3110
+#: ldlang.c:3139
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr ""
 
-#: ldlang.c:3267
+#: ldlang.c:3309
 msgid "%P: warning: %s contains output sections; did you forget -T?\n"
 msgstr ""
 
-#: ldlang.c:3308
+#: ldlang.c:3350
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr ""
 
-#: ldlang.c:3326
+#: ldlang.c:3368
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr ""
 
-#: ldlang.c:3722
+#: ldlang.c:3764
 msgid "%F%P: %s not found for insert\n"
 msgstr ""
 
-#: ldlang.c:3937
+#: ldlang.c:3979
 msgid " load address 0x%V"
 msgstr ""
 
-#: ldlang.c:4212
+#: ldlang.c:4254
 msgid "%W (size before relaxing)\n"
 msgstr ""
 
-#: ldlang.c:4303
+#: ldlang.c:4345
 #, c-format
 msgid "Address of section %s set to "
 msgstr ""
 
-#: ldlang.c:4456
+#: ldlang.c:4498
 #, c-format
 msgid "Fail with %d\n"
 msgstr ""
 
-#: ldlang.c:4743
+#: ldlang.c:4785
 msgid ""
 "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
 msgstr ""
 
-#: ldlang.c:4759
+#: ldlang.c:4801
 msgid "%X%P: region `%s' overflowed by %ld bytes\n"
 msgstr ""
 
-#: ldlang.c:4782
+#: ldlang.c:4824
 msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
 msgstr ""
 
-#: ldlang.c:4793
+#: ldlang.c:4835
 msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
 msgstr ""
 
-#: ldlang.c:4850
+#: ldlang.c:4892
 #, c-format
 msgid ""
 "%F%S: non constant or forward reference address expression for section %s\n"
 msgstr ""
 
-#: ldlang.c:4875
+#: ldlang.c:4917
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr ""
 
-#: ldlang.c:4932
+#: ldlang.c:4974
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
 msgstr ""
 
-#: ldlang.c:4937
+#: ldlang.c:4979
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr ""
 
-#: ldlang.c:4959
+#: ldlang.c:5001
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr ""
 
-#: ldlang.c:5036
+#: ldlang.c:5078
 msgid "%P: warning: dot moved backwards before `%s'\n"
 msgstr ""
 
-#: ldlang.c:5202
+#: ldlang.c:5244
 msgid "%P%F: can't relax section: %E\n"
 msgstr ""
 
-#: ldlang.c:5531
+#: ldlang.c:5573
 msgid "%F%P: invalid data statement\n"
 msgstr ""
 
-#: ldlang.c:5564
+#: ldlang.c:5606
 msgid "%F%P: invalid reloc statement\n"
 msgstr ""
 
-#: ldlang.c:5683
+#: ldlang.c:5725
 msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
 msgstr ""
 
-#: ldlang.c:5708
+#: ldlang.c:5750
 msgid "%P%F:%s: can't set start address\n"
 msgstr ""
 
-#: ldlang.c:5721 ldlang.c:5740
+#: ldlang.c:5763 ldlang.c:5782
 msgid "%P%F: can't set start address\n"
 msgstr ""
 
-#: ldlang.c:5733
+#: ldlang.c:5775
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr ""
 
-#: ldlang.c:5745
+#: ldlang.c:5787
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr ""
 
-#: ldlang.c:5800
+#: ldlang.c:5842
 msgid ""
 "%P%F: Relocatable linking with relocations from format %s (%B) to format %s "
 "(%B) is not supported\n"
 msgstr ""
 
-#: ldlang.c:5810
+#: ldlang.c:5852
 msgid ""
 "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
 msgstr ""
 
-#: ldlang.c:5832
+#: ldlang.c:5874
 msgid "%P%X: failed to merge target specific data of file %B\n"
 msgstr ""
 
-#: ldlang.c:5903
+#: ldlang.c:5945
 msgid "%P%F: Could not define common symbol `%T': %E\n"
 msgstr ""
 
-#: ldlang.c:5915
+#: ldlang.c:5957
 msgid ""
 "\n"
 "Allocating common symbols\n"
 msgstr ""
 
-#: ldlang.c:5916
+#: ldlang.c:5958
 msgid ""
 "Common symbol       size              file\n"
 "\n"
 msgstr ""
 
-#: ldlang.c:6062
+#: ldlang.c:6104
 msgid "%P%F: invalid syntax in flags\n"
 msgstr ""
 
-#: ldlang.c:6524
+#: ldlang.c:6566
 msgid "%P%F: Failed to create hash table\n"
 msgstr ""
 
-#: ldlang.c:6547
+#: ldlang.c:6589
 msgid "%P%F: %s: plugin reported error after all symbols read\n"
 msgstr ""
 
-#: ldlang.c:6860
+#: ldlang.c:6905
 msgid "%P%F: multiple STARTUP files\n"
 msgstr ""
 
-#: ldlang.c:6906
+#: ldlang.c:6951
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr ""
 
-#: ldlang.c:7093
+#: ldlang.c:7138
 msgid ""
 "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack "
 "them\n"
 msgstr ""
 
-#: ldlang.c:7165
+#: ldlang.c:7210
 msgid "%F%P: no sections assigned to phdrs\n"
 msgstr ""
 
-#: ldlang.c:7203
+#: ldlang.c:7248
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr ""
 
-#: ldlang.c:7223
+#: ldlang.c:7268
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr ""
 
-#: ldlang.c:7636
+#: ldlang.c:7677
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr ""
 
-#: ldlang.c:7781
+#: ldlang.c:7822
 msgid ""
 "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr ""
 
-#: ldlang.c:7790
+#: ldlang.c:7831
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr ""
 
-#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
+#: ldlang.c:7852 ldlang.c:7861 ldlang.c:7879 ldlang.c:7889
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr ""
 
-#: ldlang.c:7888
+#: ldlang.c:7929
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr ""
 
-#: ldlang.c:7911
+#: ldlang.c:7952
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr ""
 
-#: ldlang.c:8035
+#: ldlang.c:8076
 msgid "%X%P: unknown feature `%s'\n"
 msgstr ""
 
@@ -999,232 +999,224 @@ msgstr ""
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr ""
 
-#: ldmain.c:307
-msgid "%P%F: -r and -shared may not be used together\n"
-msgstr ""
-
-#: ldmain.c:350
-msgid "%P%F: -F may not be used without -shared\n"
-msgstr ""
-
-#: ldmain.c:352
-msgid "%P%F: -f may not be used without -shared\n"
+#: ldmain.c:303 lexsup.c:1071
+msgid "%P%F: %s: error loading plugin\n"
 msgstr ""
 
-#: ldmain.c:400
+#: ldmain.c:340
 msgid "using external linker script:"
 msgstr ""
 
-#: ldmain.c:402
+#: ldmain.c:342
 msgid "using internal linker script:"
 msgstr ""
 
-#: ldmain.c:436
+#: ldmain.c:379
 msgid "%P%F: no input files\n"
 msgstr ""
 
-#: ldmain.c:440
+#: ldmain.c:383
 msgid "%P: mode %s\n"
 msgstr ""
 
-#: ldmain.c:456
+#: ldmain.c:399
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr ""
 
-#: ldmain.c:488
+#: ldmain.c:431
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr ""
 
-#: ldmain.c:497
+#: ldmain.c:440
 msgid "%F%B: final close failed: %E\n"
 msgstr ""
 
-#: ldmain.c:523
+#: ldmain.c:466
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr ""
 
-#: ldmain.c:526
+#: ldmain.c:469
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr ""
 
-#: ldmain.c:533
+#: ldmain.c:476
 msgid "%P: Error writing file `%s'\n"
 msgstr ""
 
-#: ldmain.c:538 pe-dll.c:1733
+#: ldmain.c:481 pe-dll.c:1739
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr ""
 
-#: ldmain.c:555
+#: ldmain.c:498
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr ""
 
-#: ldmain.c:558
+#: ldmain.c:501
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr ""
 
-#: ldmain.c:642
+#: ldmain.c:585
 msgid "%P%F: missing argument to -m\n"
 msgstr ""
 
-#: ldmain.c:690 ldmain.c:710 ldmain.c:742
+#: ldmain.c:633 ldmain.c:653 ldmain.c:685
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr ""
 
-#: ldmain.c:694 ldmain.c:714
+#: ldmain.c:637 ldmain.c:657
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldmain.c:728
+#: ldmain.c:671
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr ""
 
-#: ldmain.c:772
+#: ldmain.c:715
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr ""
 
-#: ldmain.c:777
+#: ldmain.c:720
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr ""
 
-#: ldmain.c:877
+#: ldmain.c:820
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
 "\n"
 msgstr ""
 
-#: ldmain.c:983
+#: ldmain.c:926
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr ""
 
-#: ldmain.c:986
+#: ldmain.c:929
 msgid "%D: first defined here\n"
 msgstr ""
 
-#: ldmain.c:990
+#: ldmain.c:933
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr ""
 
-#: ldmain.c:1044
+#: ldmain.c:987
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr ""
 
-#: ldmain.c:1047
+#: ldmain.c:990
 msgid "%B: warning: common is here\n"
 msgstr ""
 
-#: ldmain.c:1054
+#: ldmain.c:997
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr ""
 
-#: ldmain.c:1057
+#: ldmain.c:1000
 msgid "%B: warning: defined here\n"
 msgstr ""
 
-#: ldmain.c:1064
+#: ldmain.c:1007
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr ""
 
-#: ldmain.c:1067
+#: ldmain.c:1010
 msgid "%B: warning: larger common is here\n"
 msgstr ""
 
-#: ldmain.c:1071
+#: ldmain.c:1014
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr ""
 
-#: ldmain.c:1074
+#: ldmain.c:1017
 msgid "%B: warning: smaller common is here\n"
 msgstr ""
 
-#: ldmain.c:1078
+#: ldmain.c:1021
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr ""
 
-#: ldmain.c:1080
+#: ldmain.c:1023
 msgid "%B: warning: previous common is here\n"
 msgstr ""
 
-#: ldmain.c:1100 ldmain.c:1138
+#: ldmain.c:1043 ldmain.c:1081
 msgid "%P: warning: global constructor %s used\n"
 msgstr ""
 
-#: ldmain.c:1148
+#: ldmain.c:1091
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr ""
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
+#: ldmain.c:1145 ldmain.c:1147 ldmain.c:1149 ldmain.c:1167 ldmain.c:1212
 msgid "warning: "
 msgstr ""
 
-#: ldmain.c:1305
+#: ldmain.c:1248
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr ""
 
-#: ldmain.c:1312
+#: ldmain.c:1255
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldmain.c:1333
+#: ldmain.c:1276
 msgid "%X%C: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1336
+#: ldmain.c:1279
 msgid "%C: warning: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1342
+#: ldmain.c:1285
 msgid "%X%D: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1345
+#: ldmain.c:1288
 msgid "%D: warning: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1356
+#: ldmain.c:1299
 msgid "%X%B: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1359
+#: ldmain.c:1302
 msgid "%B: warning: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1365
+#: ldmain.c:1308
 msgid "%X%B: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1368
+#: ldmain.c:1311
 msgid "%B: warning: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1407
+#: ldmain.c:1350
 msgid " additional relocation overflows omitted from the output\n"
 msgstr ""
 
-#: ldmain.c:1420
+#: ldmain.c:1363
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
 msgstr ""
 
-#: ldmain.c:1425
+#: ldmain.c:1368
 msgid ""
 " relocation truncated to fit: %s against symbol `%T' defined in %A section "
 "in %B"
 msgstr ""
 
-#: ldmain.c:1437
+#: ldmain.c:1380
 msgid " relocation truncated to fit: %s against `%T'"
 msgstr ""
 
-#: ldmain.c:1454
+#: ldmain.c:1397
 msgid "%X%H: dangerous relocation: %s\n"
 msgstr ""
 
-#: ldmain.c:1469
+#: ldmain.c:1412
 msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
 msgstr ""
 
@@ -1304,589 +1296,593 @@ msgstr ""
 msgid "%F%P: final link failed: %E\n"
 msgstr ""
 
-#: lexsup.c:219 lexsup.c:373
+#: lexsup.c:220 lexsup.c:374
 msgid "KEYWORD"
 msgstr ""
 
-#: lexsup.c:219
+#: lexsup.c:220
 msgid "Shared library control for HP/UX compatibility"
 msgstr ""
 
-#: lexsup.c:222
+#: lexsup.c:223
 msgid "ARCH"
 msgstr ""
 
-#: lexsup.c:222
+#: lexsup.c:223
 msgid "Set architecture"
 msgstr ""
 
-#: lexsup.c:224 lexsup.c:492
+#: lexsup.c:225 lexsup.c:493
 msgid "TARGET"
 msgstr ""
 
-#: lexsup.c:224
+#: lexsup.c:225
 msgid "Specify target for following input files"
 msgstr ""
 
-#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
-#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
+#: lexsup.c:228 lexsup.c:279 lexsup.c:303 lexsup.c:316 lexsup.c:318
+#: lexsup.c:447 lexsup.c:509 lexsup.c:572 lexsup.c:585
 msgid "FILE"
 msgstr ""
 
-#: lexsup.c:227
+#: lexsup.c:228
 msgid "Read MRI format linker script"
 msgstr ""
 
-#: lexsup.c:229
+#: lexsup.c:230
 msgid "Force common symbols to be defined"
 msgstr ""
 
-#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
+#: lexsup.c:234 lexsup.c:553 lexsup.c:555 lexsup.c:557 lexsup.c:559
 msgid "ADDRESS"
 msgstr ""
 
-#: lexsup.c:233
+#: lexsup.c:234
 msgid "Set start address"
 msgstr ""
 
-#: lexsup.c:235
+#: lexsup.c:236
 msgid "Export all dynamic symbols"
 msgstr ""
 
-#: lexsup.c:237
+#: lexsup.c:238
 msgid "Undo the effect of --export-dynamic"
 msgstr ""
 
-#: lexsup.c:239
+#: lexsup.c:240
 msgid "Link big-endian objects"
 msgstr ""
 
-#: lexsup.c:241
+#: lexsup.c:242
 msgid "Link little-endian objects"
 msgstr ""
 
-#: lexsup.c:243 lexsup.c:246
+#: lexsup.c:244 lexsup.c:247
 msgid "SHLIB"
 msgstr ""
 
-#: lexsup.c:243
+#: lexsup.c:244
 msgid "Auxiliary filter for shared object symbol table"
 msgstr ""
 
-#: lexsup.c:246
+#: lexsup.c:247
 msgid "Filter for shared object symbol table"
 msgstr ""
 
-#: lexsup.c:249
+#: lexsup.c:250
 msgid "Ignored"
 msgstr ""
 
-#: lexsup.c:251
+#: lexsup.c:252
 msgid "SIZE"
 msgstr ""
 
-#: lexsup.c:251
+#: lexsup.c:252
 msgid "Small data size (if no size, same as --shared)"
 msgstr ""
 
-#: lexsup.c:254
+#: lexsup.c:255
 msgid "FILENAME"
 msgstr ""
 
-#: lexsup.c:254
+#: lexsup.c:255
 msgid "Set internal name of shared library"
 msgstr ""
 
-#: lexsup.c:256
+#: lexsup.c:257
 msgid "PROGRAM"
 msgstr ""
 
-#: lexsup.c:256
+#: lexsup.c:257
 msgid "Set PROGRAM as the dynamic linker to use"
 msgstr ""
 
-#: lexsup.c:259
+#: lexsup.c:260
 msgid "LIBNAME"
 msgstr ""
 
-#: lexsup.c:259
+#: lexsup.c:260
 msgid "Search for library LIBNAME"
 msgstr ""
 
-#: lexsup.c:261
+#: lexsup.c:262
 msgid "DIRECTORY"
 msgstr ""
 
-#: lexsup.c:261
+#: lexsup.c:262
 msgid "Add DIRECTORY to library search path"
 msgstr ""
 
-#: lexsup.c:264
+#: lexsup.c:265
 msgid "Override the default sysroot location"
 msgstr ""
 
-#: lexsup.c:266
+#: lexsup.c:267
 msgid "EMULATION"
 msgstr ""
 
-#: lexsup.c:266
+#: lexsup.c:267
 msgid "Set emulation"
 msgstr ""
 
-#: lexsup.c:268
+#: lexsup.c:269
 msgid "Print map file on standard output"
 msgstr ""
 
-#: lexsup.c:270
+#: lexsup.c:271
 msgid "Do not page align data"
 msgstr ""
 
-#: lexsup.c:272
+#: lexsup.c:273
 msgid "Do not page align data, do not make text readonly"
 msgstr ""
 
-#: lexsup.c:275
+#: lexsup.c:276
 msgid "Page align data, make text readonly"
 msgstr ""
 
-#: lexsup.c:278
+#: lexsup.c:279
 msgid "Set output file name"
 msgstr ""
 
-#: lexsup.c:280
+#: lexsup.c:281
 msgid "Optimize output file"
 msgstr ""
 
-#: lexsup.c:283
+#: lexsup.c:284
 msgid "PLUGIN"
 msgstr ""
 
-#: lexsup.c:283
+#: lexsup.c:284
 msgid "Load named plugin"
 msgstr ""
 
-#: lexsup.c:285
+#: lexsup.c:286
 msgid "ARG"
 msgstr ""
 
-#: lexsup.c:285
+#: lexsup.c:286
 msgid "Send arg to last-loaded plugin"
 msgstr ""
 
-#: lexsup.c:287 lexsup.c:290
+#: lexsup.c:288 lexsup.c:291
 msgid "Ignored for GCC LTO option compatibility"
 msgstr ""
 
-#: lexsup.c:294
+#: lexsup.c:295
 msgid "Ignored for SVR4 compatibility"
 msgstr ""
 
-#: lexsup.c:298
+#: lexsup.c:299
 msgid "Generate relocatable output"
 msgstr ""
 
-#: lexsup.c:302
+#: lexsup.c:303
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr ""
 
-#: lexsup.c:305
+#: lexsup.c:306
 msgid "Strip all symbols"
 msgstr ""
 
-#: lexsup.c:307
+#: lexsup.c:308
 msgid "Strip debugging symbols"
 msgstr ""
 
-#: lexsup.c:309
+#: lexsup.c:310
 msgid "Strip symbols in discarded sections"
 msgstr ""
 
-#: lexsup.c:311
+#: lexsup.c:312
 msgid "Do not strip symbols in discarded sections"
 msgstr ""
 
-#: lexsup.c:313
+#: lexsup.c:314
 msgid "Trace file opens"
 msgstr ""
 
-#: lexsup.c:315
+#: lexsup.c:316
 msgid "Read linker script"
 msgstr ""
 
-#: lexsup.c:317
+#: lexsup.c:318
 msgid "Read default linker script"
 msgstr ""
 
-#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
-#: lexsup.c:572 lexsup.c:611
+#: lexsup.c:322 lexsup.c:340 lexsup.c:424 lexsup.c:445 lexsup.c:546
+#: lexsup.c:575 lexsup.c:614
 msgid "SYMBOL"
 msgstr ""
 
-#: lexsup.c:321
+#: lexsup.c:322
 msgid "Start with undefined reference to SYMBOL"
 msgstr ""
 
-#: lexsup.c:324
+#: lexsup.c:325
 msgid "[=SECTION]"
 msgstr ""
 
-#: lexsup.c:325
+#: lexsup.c:326
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr ""
 
-#: lexsup.c:327
+#: lexsup.c:328
 msgid "Build global constructor/destructor tables"
 msgstr ""
 
-#: lexsup.c:329
+#: lexsup.c:330
 msgid "Print version information"
 msgstr ""
 
-#: lexsup.c:331
+#: lexsup.c:332
 msgid "Print version and emulation information"
 msgstr ""
 
-#: lexsup.c:333
+#: lexsup.c:334
 msgid "Discard all local symbols"
 msgstr ""
 
-#: lexsup.c:335
+#: lexsup.c:336
 msgid "Discard temporary local symbols (default)"
 msgstr ""
 
-#: lexsup.c:337
+#: lexsup.c:338
 msgid "Don't discard any local symbols"
 msgstr ""
 
-#: lexsup.c:339
+#: lexsup.c:340
 msgid "Trace mentions of SYMBOL"
 msgstr ""
 
-#: lexsup.c:341 lexsup.c:508 lexsup.c:510
+#: lexsup.c:342 lexsup.c:511 lexsup.c:513
 msgid "PATH"
 msgstr ""
 
-#: lexsup.c:341
+#: lexsup.c:342
 msgid "Default search path for Solaris compatibility"
 msgstr ""
 
-#: lexsup.c:344
+#: lexsup.c:345
 msgid "Start a group"
 msgstr ""
 
-#: lexsup.c:346
+#: lexsup.c:347
 msgid "End a group"
 msgstr ""
 
-#: lexsup.c:350
+#: lexsup.c:351
 msgid "Accept input files whose architecture cannot be determined"
 msgstr ""
 
-#: lexsup.c:354
+#: lexsup.c:355
 msgid "Reject input files whose architecture is unknown"
 msgstr ""
 
-#: lexsup.c:366
+#: lexsup.c:367
 msgid "Only set DT_NEEDED for following dynamic libs if used"
 msgstr ""
 
-#: lexsup.c:369
+#: lexsup.c:370
 msgid ""
 "Always set DT_NEEDED for dynamic libraries mentioned on\n"
 "                                the command line"
 msgstr ""
 
-#: lexsup.c:373
+#: lexsup.c:374
 msgid "Ignored for SunOS compatibility"
 msgstr ""
 
-#: lexsup.c:375
+#: lexsup.c:376
 msgid "Link against shared libraries"
 msgstr ""
 
-#: lexsup.c:381
+#: lexsup.c:382
 msgid "Do not link against shared libraries"
 msgstr ""
 
-#: lexsup.c:389
+#: lexsup.c:390
 msgid "Bind global references locally"
 msgstr ""
 
-#: lexsup.c:391
+#: lexsup.c:392
 msgid "Bind global function references locally"
 msgstr ""
 
-#: lexsup.c:393
+#: lexsup.c:394
 msgid "Check section addresses for overlaps (default)"
 msgstr ""
 
-#: lexsup.c:396
+#: lexsup.c:397
 msgid "Do not check section addresses for overlaps"
 msgstr ""
 
-#: lexsup.c:400
+#: lexsup.c:401
 msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr ""
 
-#: lexsup.c:404
+#: lexsup.c:405
 msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr ""
 
-#: lexsup.c:408
+#: lexsup.c:409
 msgid "Output cross reference table"
 msgstr ""
 
-#: lexsup.c:410
+#: lexsup.c:411
 msgid "SYMBOL=EXPRESSION"
 msgstr ""
 
-#: lexsup.c:410
+#: lexsup.c:411
 msgid "Define a symbol"
 msgstr ""
 
-#: lexsup.c:412
+#: lexsup.c:413
 msgid "[=STYLE]"
 msgstr ""
 
-#: lexsup.c:412
+#: lexsup.c:413
 msgid "Demangle symbol names [using STYLE]"
 msgstr ""
 
-#: lexsup.c:415
+#: lexsup.c:416
 msgid "Generate embedded relocs"
 msgstr ""
 
-#: lexsup.c:417
+#: lexsup.c:418
 msgid "Treat warnings as errors"
 msgstr ""
 
-#: lexsup.c:420
+#: lexsup.c:421
 msgid "Do not treat warnings as errors (default)"
 msgstr ""
 
-#: lexsup.c:423
+#: lexsup.c:424
 msgid "Call SYMBOL at unload-time"
 msgstr ""
 
-#: lexsup.c:425
+#: lexsup.c:426
 msgid "Force generation of file with .exe suffix"
 msgstr ""
 
-#: lexsup.c:427
+#: lexsup.c:428
 msgid "Remove unused sections (on some targets)"
 msgstr ""
 
-#: lexsup.c:430
+#: lexsup.c:431
 msgid "Don't remove unused sections (default)"
 msgstr ""
 
-#: lexsup.c:433
+#: lexsup.c:434
 msgid "List removed unused sections on stderr"
 msgstr ""
 
-#: lexsup.c:436
+#: lexsup.c:437
 msgid "Do not list removed unused sections"
 msgstr ""
 
-#: lexsup.c:439
+#: lexsup.c:440
 msgid "Set default hash table size close to <NUMBER>"
 msgstr ""
 
-#: lexsup.c:442
+#: lexsup.c:443
 msgid "Print option help"
 msgstr ""
 
-#: lexsup.c:444
+#: lexsup.c:445
 msgid "Call SYMBOL at load-time"
 msgstr ""
 
-#: lexsup.c:446
+#: lexsup.c:447
 msgid "Write a map file"
 msgstr ""
 
-#: lexsup.c:448
+#: lexsup.c:449
 msgid "Do not define Common storage"
 msgstr ""
 
-#: lexsup.c:450
+#: lexsup.c:451
 msgid "Do not demangle symbol names"
 msgstr ""
 
-#: lexsup.c:452
+#: lexsup.c:453
 msgid "Use less memory and more disk I/O"
 msgstr ""
 
-#: lexsup.c:454
+#: lexsup.c:455
 msgid "Do not allow unresolved references in object files"
 msgstr ""
 
-#: lexsup.c:457
+#: lexsup.c:458
 msgid "Allow unresolved references in shared libraries"
 msgstr ""
 
-#: lexsup.c:461
+#: lexsup.c:462
 msgid "Do not allow unresolved references in shared libs"
 msgstr ""
 
-#: lexsup.c:465
+#: lexsup.c:466
 msgid "Allow multiple definitions"
 msgstr ""
 
-#: lexsup.c:467
+#: lexsup.c:468
 msgid "Disallow undefined version"
 msgstr ""
 
-#: lexsup.c:469
+#: lexsup.c:470
 msgid "Create default symbol version"
 msgstr ""
 
-#: lexsup.c:472
+#: lexsup.c:473
 msgid "Create default symbol version for imported symbols"
 msgstr ""
 
-#: lexsup.c:475
+#: lexsup.c:476
 msgid "Don't warn about mismatched input files"
 msgstr ""
 
-#: lexsup.c:478
+#: lexsup.c:479
 msgid "Don't warn on finding an incompatible library"
 msgstr ""
 
-#: lexsup.c:481
+#: lexsup.c:482
 msgid "Turn off --whole-archive"
 msgstr ""
 
-#: lexsup.c:483
+#: lexsup.c:484
 msgid "Create an output file even if errors occur"
 msgstr ""
 
-#: lexsup.c:488
+#: lexsup.c:489
 msgid ""
 "Only use library directories specified on\n"
 "                                the command line"
 msgstr ""
 
-#: lexsup.c:492
+#: lexsup.c:493
 msgid "Specify target of output file"
 msgstr ""
 
-#: lexsup.c:495
-msgid "Ignored for Linux compatibility"
+#: lexsup.c:496
+msgid "Print default output format"
 msgstr ""
 
 #: lexsup.c:498
-msgid "Reduce memory overheads, possibly taking much longer"
+msgid "Ignored for Linux compatibility"
 msgstr ""
 
 #: lexsup.c:501
+msgid "Reduce memory overheads, possibly taking much longer"
+msgstr ""
+
+#: lexsup.c:504
 msgid "Reduce code size by using target specific optimizations"
 msgstr ""
 
-#: lexsup.c:503
+#: lexsup.c:506
 msgid "Do not use relaxation techniques to reduce code size"
 msgstr ""
 
-#: lexsup.c:506
+#: lexsup.c:509
 msgid "Keep only symbols listed in FILE"
 msgstr ""
 
-#: lexsup.c:508
+#: lexsup.c:511
 msgid "Set runtime shared library search path"
 msgstr ""
 
-#: lexsup.c:510
+#: lexsup.c:513
 msgid "Set link time shared library search path"
 msgstr ""
 
-#: lexsup.c:513
+#: lexsup.c:516
 msgid "Create a shared library"
 msgstr ""
 
-#: lexsup.c:517
+#: lexsup.c:520
 msgid "Create a position independent executable"
 msgstr ""
 
-#: lexsup.c:521
+#: lexsup.c:524
 msgid "[=ascending|descending]"
 msgstr ""
 
-#: lexsup.c:522
+#: lexsup.c:525
 msgid "Sort common symbols by alignment [in specified order]"
 msgstr ""
 
-#: lexsup.c:527
+#: lexsup.c:530
 msgid "name|alignment"
 msgstr ""
 
-#: lexsup.c:528
+#: lexsup.c:531
 msgid "Sort sections by name or maximum alignment"
 msgstr ""
 
-#: lexsup.c:530
+#: lexsup.c:533
 msgid "COUNT"
 msgstr ""
 
-#: lexsup.c:530
+#: lexsup.c:533
 msgid "How many tags to reserve in .dynamic section"
 msgstr ""
 
-#: lexsup.c:533
+#: lexsup.c:536
 msgid "[=SIZE]"
 msgstr ""
 
-#: lexsup.c:533
+#: lexsup.c:536
 msgid "Split output sections every SIZE octets"
 msgstr ""
 
-#: lexsup.c:536
+#: lexsup.c:539
 msgid "[=COUNT]"
 msgstr ""
 
-#: lexsup.c:536
+#: lexsup.c:539
 msgid "Split output sections every COUNT relocs"
 msgstr ""
 
-#: lexsup.c:539
+#: lexsup.c:542
 msgid "Print memory usage statistics"
 msgstr ""
 
-#: lexsup.c:541
+#: lexsup.c:544
 msgid "Display target specific options"
 msgstr ""
 
-#: lexsup.c:543
+#: lexsup.c:546
 msgid "Do task level linking"
 msgstr ""
 
-#: lexsup.c:545
+#: lexsup.c:548
 msgid "Use same format as native linker"
 msgstr ""
 
-#: lexsup.c:547
+#: lexsup.c:550
 msgid "SECTION=ADDRESS"
 msgstr ""
 
-#: lexsup.c:547
+#: lexsup.c:550
 msgid "Set address of named section"
 msgstr ""
 
-#: lexsup.c:550
+#: lexsup.c:553
 msgid "Set address of .bss section"
 msgstr ""
 
-#: lexsup.c:552
+#: lexsup.c:555
 msgid "Set address of .data section"
 msgstr ""
 
-#: lexsup.c:554
+#: lexsup.c:557
 msgid "Set address of .text section"
 msgstr ""
 
-#: lexsup.c:556
+#: lexsup.c:559
 msgid "Set address of text segment"
 msgstr ""
 
-#: lexsup.c:559
+#: lexsup.c:562
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
 "                                ignore-all, report-all, ignore-in-object-"
@@ -1894,117 +1890,113 @@ msgid ""
 "                                ignore-in-shared-libs"
 msgstr ""
 
-#: lexsup.c:564
+#: lexsup.c:567
 msgid "[=NUMBER]"
 msgstr ""
 
-#: lexsup.c:565
+#: lexsup.c:568
 msgid "Output lots of information during link"
 msgstr ""
 
-#: lexsup.c:569
+#: lexsup.c:572
 msgid "Read version information script"
 msgstr ""
 
-#: lexsup.c:572
+#: lexsup.c:575
 msgid ""
 "Take export symbols list from .exports, using\n"
 "                                SYMBOL as the version."
 msgstr ""
 
-#: lexsup.c:576
+#: lexsup.c:579
 msgid "Add data symbols to dynamic list"
 msgstr ""
 
-#: lexsup.c:578
+#: lexsup.c:581
 msgid "Use C++ operator new/delete dynamic list"
 msgstr ""
 
-#: lexsup.c:580
+#: lexsup.c:583
 msgid "Use C++ typeinfo dynamic list"
 msgstr ""
 
-#: lexsup.c:582
+#: lexsup.c:585
 msgid "Read dynamic list"
 msgstr ""
 
-#: lexsup.c:584
+#: lexsup.c:587
 msgid "Warn about duplicate common symbols"
 msgstr ""
 
-#: lexsup.c:586
+#: lexsup.c:589
 msgid "Warn if global constructors/destructors are seen"
 msgstr ""
 
-#: lexsup.c:589
+#: lexsup.c:592
 msgid "Warn if the multiple GP values are used"
 msgstr ""
 
-#: lexsup.c:591
+#: lexsup.c:594
 msgid "Warn only once per undefined symbol"
 msgstr ""
 
-#: lexsup.c:593
+#: lexsup.c:596
 msgid "Warn if start of section changes due to alignment"
 msgstr ""
 
-#: lexsup.c:596
+#: lexsup.c:599
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr ""
 
-#: lexsup.c:599
+#: lexsup.c:602
 msgid "Warn if an object has alternate ELF machine code"
 msgstr ""
 
-#: lexsup.c:603
+#: lexsup.c:606
 msgid "Report unresolved symbols as warnings"
 msgstr ""
 
-#: lexsup.c:606
+#: lexsup.c:609
 msgid "Report unresolved symbols as errors"
 msgstr ""
 
-#: lexsup.c:608
+#: lexsup.c:611
 msgid "Include all objects from following archives"
 msgstr ""
 
-#: lexsup.c:611
+#: lexsup.c:614
 msgid "Use wrapper functions for SYMBOL"
 msgstr ""
 
-#: lexsup.c:760
+#: lexsup.c:763
 msgid "%P: unrecognized option '%s'\n"
 msgstr ""
 
-#: lexsup.c:764
+#: lexsup.c:767
 msgid "%P%F: use the --help option for usage information\n"
 msgstr ""
 
-#: lexsup.c:782
+#: lexsup.c:785
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr ""
 
-#: lexsup.c:795
+#: lexsup.c:798
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr ""
 
-#: lexsup.c:838
+#: lexsup.c:841
 msgid "%F%P: unknown demangling style `%s'"
 msgstr ""
 
-#: lexsup.c:904 lexsup.c:1335
+#: lexsup.c:907 lexsup.c:1341
 msgid "%P%F: invalid number `%s'\n"
 msgstr ""
 
-#: lexsup.c:1002
+#: lexsup.c:1005
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr ""
 
-#: lexsup.c:1065 lexsup.c:1564
-msgid "%P%F: %s: error loading plugin\n"
-msgstr ""
-
-#: lexsup.c:1070
+#: lexsup.c:1076
 msgid "%P%F: bad -plugin-opt option\n"
 msgstr ""
 
@@ -2016,105 +2008,117 @@ msgstr ""
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1087
+#: lexsup.c:1093
 msgid "%P%F: bad -rpath option\n"
 msgstr ""
 
-#: lexsup.c:1201
+#: lexsup.c:1207
 msgid "%P%F: -shared not supported\n"
 msgstr ""
 
-#: lexsup.c:1210
+#: lexsup.c:1216
 msgid "%P%F: -pie not supported\n"
 msgstr ""
 
-#: lexsup.c:1218
+#: lexsup.c:1224
 msgid "descending"
 msgstr ""
 
-#: lexsup.c:1220
+#: lexsup.c:1226
 msgid "ascending"
 msgstr ""
 
-#: lexsup.c:1223
+#: lexsup.c:1229
 msgid "%P%F: invalid common section sorting option: %s\n"
 msgstr ""
 
-#: lexsup.c:1227
+#: lexsup.c:1233
 msgid "name"
 msgstr ""
 
-#: lexsup.c:1229
+#: lexsup.c:1235
 msgid "alignment"
 msgstr ""
 
-#: lexsup.c:1232
+#: lexsup.c:1238
 msgid "%P%F: invalid section sorting option: %s\n"
 msgstr ""
 
-#: lexsup.c:1266
+#: lexsup.c:1272
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr ""
 
-#: lexsup.c:1273
+#: lexsup.c:1279
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr ""
 
-#: lexsup.c:1507
+#: lexsup.c:1513
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr ""
 
-#: lexsup.c:1535
+#: lexsup.c:1541
 msgid "%P%X: --hash-size needs a numeric argument\n"
 msgstr ""
 
-#: lexsup.c:1595 lexsup.c:1608
+#: lexsup.c:1572
+msgid "%P%F: -r and -shared may not be used together\n"
+msgstr ""
+
+#: lexsup.c:1615
+msgid "%P%F: -F may not be used without -shared\n"
+msgstr ""
+
+#: lexsup.c:1617
+msgid "%P%F: -f may not be used without -shared\n"
+msgstr ""
+
+#: lexsup.c:1661 lexsup.c:1674
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr ""
 
-#: lexsup.c:1644
+#: lexsup.c:1710
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr ""
 
-#: lexsup.c:1646
+#: lexsup.c:1712
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: lexsup.c:1724
+#: lexsup.c:1790
 #, c-format
 msgid "  @FILE"
 msgstr ""
 
-#: lexsup.c:1727
+#: lexsup.c:1793
 #, c-format
 msgid "Read options from FILE\n"
 msgstr ""
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1732
+#: lexsup.c:1798
 #, c-format
 msgid "%s: supported targets:"
 msgstr ""
 
-#: lexsup.c:1740
+#: lexsup.c:1806
 #, c-format
 msgid "%s: supported emulations: "
 msgstr ""
 
-#: lexsup.c:1745
+#: lexsup.c:1811
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr ""
 
-#: lexsup.c:1750
+#: lexsup.c:1816
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 
-#: mri.c:292
+#: mri.c:294
 msgid "%P%F: unknown format type %s\n"
 msgstr ""
 
@@ -2123,117 +2127,117 @@ msgstr ""
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr ""
 
-#: pe-dll.c:791
+#: pe-dll.c:788
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
 msgstr ""
 
-#: pe-dll.c:848
+#: pe-dll.c:845
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr ""
 
-#: pe-dll.c:855
+#: pe-dll.c:852
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr ""
 
-#: pe-dll.c:942
+#: pe-dll.c:939
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr ""
 
-#: pe-dll.c:948
+#: pe-dll.c:945
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr ""
 
-#: pe-dll.c:955
+#: pe-dll.c:952
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr ""
 
-#: pe-dll.c:1069
+#: pe-dll.c:1066
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr ""
 
-#: pe-dll.c:1450
+#: pe-dll.c:1456
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr ""
 
-#: pe-dll.c:1578
+#: pe-dll.c:1584
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr ""
 
-#: pe-dll.c:1729
+#: pe-dll.c:1735
 #, c-format
 msgid "; no contents available\n"
 msgstr ""
 
-#: pe-dll.c:2656
+#: pe-dll.c:2662
 msgid ""
 "%C: variable '%T' can't be auto-imported. Please read the documentation for "
 "ld's --enable-auto-import for details.\n"
 msgstr ""
 
-#: pe-dll.c:2686
+#: pe-dll.c:2692
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr ""
 
-#: pe-dll.c:2691
+#: pe-dll.c:2697
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr ""
 
-#: pe-dll.c:2720
+#: pe-dll.c:2726
 #, c-format
 msgid "%Xbfd_openr %s: %E\n"
 msgstr ""
 
-#: pe-dll.c:2732
+#: pe-dll.c:2738
 #, c-format
 msgid "%X%s(%s): can't find member in non-archive file"
 msgstr ""
 
-#: pe-dll.c:2744
+#: pe-dll.c:2750
 #, c-format
 msgid "%X%s(%s): can't find member in archive"
 msgstr ""
 
-#: pe-dll.c:3183
+#: pe-dll.c:3189
 #, c-format
 msgid "%XError: can't use long section names on this arch\n"
 msgstr ""
 
-#: plugin.c:176 plugin.c:210
+#: plugin.c:177 plugin.c:211
 msgid "<no plugin>"
 msgstr ""
 
-#: plugin.c:249
+#: plugin.c:250
 #, c-format
 msgid "could not create dummy IR bfd: %F%E\n"
 msgstr ""
 
-#: plugin.c:322
+#: plugin.c:343
 msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
 msgstr ""
 
-#: plugin.c:326
+#: plugin.c:347
 msgid "%P%F: unknown ELF symbol visibility: %d!\n"
 msgstr ""
 
-#: plugin.c:559
+#: plugin.c:586
 msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
 msgstr ""
 
-#: plugin.c:825
+#: plugin.c:863
 msgid "%P%F: %s: plugin reported error claiming file\n"
 msgstr ""
 
-#: plugin.c:896
+#: plugin.c:934
 msgid "%P: %s: error in plugin cleanup (ignored)\n"
 msgstr ""
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2b444ac..41212ea 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* ld-srec/srec.exp: xfail epiphany.
+	* lib/ld-lib.exp (check_shared_lib_support): Add Epiphany to list
+	of targets not supporting shared libraries.
+
 2011-10-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/13302
diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index 25dfb06..5e741e0 100644
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -270,6 +270,12 @@ proc run_srec_test { test objs } {
 	set flags "$flags --no-toc-optimize"
     }
 
+    # Epiphany needs some help too
+    if [istarget epiphany*-*-*] {
+	set flags "$flags --defsym _start=00000060"
+	setup_xfail "epiphany*-*-*"
+    }
+
     if { ![ld_simple_link $ld tmpdir/sr1 "$flags $objs"] \
 	 || ![ld_simple_link $ld tmpdir/sr2.sr "$flags --oformat srec $objs"] } {
 	fail $test
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index e764591..2c4512b 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1463,6 +1463,7 @@ proc check_shared_lib_support { } {
 	 && ![istarget d10v-*-*]
 	 && ![istarget d30v-*-*]
 	 && ![istarget dlx-*-*]
+	 && ![istarget epiphany-*-*]
 	 && ![istarget fr30-*-*]
 	 && ![istarget frv-*-*]
 	 && ![istarget h8300-*-*]