* bfd.c (bfd_get_sign_extend_vma): Add cases for pe-arm-little and pei-arm-little.

* coff-arm.c (coff_arm_rtype_to_howto) [COFF_WITH_PE]: Handle ARM_SECREL.
  (coff_arm_reloc_type_lookup): Map BFD_RELOC_32_SECREL to  ARM_SECREL.
* pe-arm.c [COFF_SECTION_ALIGNMENT_ENTRIES]: Define.
* pei-arm.c [TARGET_UNDERSCORE]: Define for ARM_WINCE like in pe-arm.c.
  [COFF_SECTION_ALIGNMENT_ENTRIES]: Define.

* config/tc-arm.c: Move "dwarf2dbg.h" inclusion out of OBJ_ELF only block.
  (pe_directive_secrel) [TE_PE]: New function.
  (md_pseudo_table) [!OBJ_ELF]: Handle 2byte, 4byte, 8byte, file, loc, loc_mark_labels.
  [TE_PE]: Handle secrel32.
  (output_relax_insn): Remove OBJ_ELF around dwarf2_emit_insn call.
  (output_inst): Remove OBJ_ELF around dwarf2_emit_insn call.
  (arm_frob_label): Remove OBJ_ELF around dwarf2_emit_label call.
  (md_section_align): Only round section sizes here for AOUT targets.
  (tc_arm_regname_to_dw2regnum): Move out for OBJ_ELF only block.
  (tc_pe_dwarf2_emit_offset): New function.
  (md_apply_fix) [TE_PE]: Handle BFD_RELOC_32_SECREL.
  (cons_fix_new_arm): Handle O_secrel.
* config/tc-arm.h : Move DWARF2_LINE_MIN_INSN_LENGTH, DWARF2_DEFAULT_RETURN_COLUMN and DWARF2_CIE_DATA_ALIGNMENT out of OBJ_ELF only block.
  [TE_PE]: Define O_secrel, TC_DWARF2_EMIT_OFFSET, and declare tc_pe_dwarf2_emit_offset.

* ld-pe/pe.exp: Enable tests on arm-wince-pe.
* ld-pe/secrel.d: Adjust test to work on arm-wince-pe too.

2 files changed, 24 insertions, 24 deletions

diff --git a/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
index ac38a70..bd25508 100644
--- a/ld/testsuite/ld-pe/pe.exp
+++ b/ld/testsuite/ld-pe/pe.exp
@@ -1,5 +1,5 @@
 # Expect script for export table in executables tests

-#   Copyright 2004

+#   Copyright 2004, 2006

 #   Free Software Foundation, Inc.

 #

 # This file is free software; you can redistribute it and/or modify

@@ -17,9 +17,9 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.

 #

  

-# This test can only be run on i386 PE/COFF platforms.

+# This test can only be run on PE/COFF platforms that support .secrel32.

 if { ![istarget i*86-*-cygwin*] && ![istarget i*86-*-pe]

-     && ![istarget i*86-*-mingw*] } {

+     && ![istarget i*86-*-mingw*] && ![istarget arm-wince-pe] } {

     return

 }

 

diff --git a/ld/testsuite/ld-pe/secrel.d b/ld/testsuite/ld-pe/secrel.d
index 93e083f..b924f54 100644
--- a/ld/testsuite/ld-pe/secrel.d
+++ b/ld/testsuite/ld-pe/secrel.d
@@ -1,27 +1,27 @@
 

-tmpdir/secrel\.x:     file format pei-i386

+tmpdir/secrel\.x: +file format pei-.*

 

 Contents of section \.text:

- 401000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

- 401010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

- 401020 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

- 401030 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

- 401040 ........ ........ ........ ........  ................

+ .*1000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

+ .*1010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

+ .*1020 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

+ .*1030 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

+ .*1040 ........ ........ ........ ........  ................

 Contents of section \.data:

- 402000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

- 402010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

- 402020 3e3e3e3e 04000000 110d0000 00111600  >>>>............

- 402030 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<

- 402040 3e3e3e3e 04000000 110d0000 00111600  >>>>............

- 402050 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<

- 402060 3e3e3e3e 04000000 110d0000 00111600  >>>>............

- 402070 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<

- 402080 3e3e3e3e 24000000 112d0000 00113600  >>>>\$....-....6.

- 402090 0000113f 00000011 3c3c3c3c 3c3c3c3c  ...\?....<<<<<<<<

+ .*2000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

+ .*2010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

+ .*2020 3e3e3e3e 04000000 110d0000 00111600  >>>>............

+ .*2030 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<

+ .*2040 3e3e3e3e 04000000 110d0000 00111600  >>>>............

+ .*2050 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<

+ .*2060 3e3e3e3e 04000000 110d0000 00111600  >>>>............

+ .*2070 0000111f 00000011 3c3c3c3c 3c3c3c3c  ........<<<<<<<<

+ .*2080 3e3e3e3e 24000000 112d0000 00113600  >>>>\$....-....6.

+ .*2090 0000113f 00000011 3c3c3c3c 3c3c3c3c  ...\?....<<<<<<<<

 Contents of section \.rdata:

- 403000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

- 403010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

- 403020 3e3e3e3e 00000000 00000000 00000000  >>>>............

+ .*3000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c  >>>><<<<>>>>><<<

+ .*3010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c  >>>>>><<>>>>>>><

+ .*3020 3e3e3e3e 00000000 00000000 00000000  >>>>............

 Contents of section \.idata:

- 404000 00000000 00000000 00000000 00000000  ................

- 404010 00000000                             ....            

+ .*4000 00000000 00000000 00000000 00000000  ................

+ .*4010 00000000                             ....