ld/testsuite/

	* ld-mips-elf/eh-frame1-n32.d: Expect a warning about .eh_frame_hdr.
	Remove duplicate CIEs.  Adjust relocation addresses and .eh_frame
	offsets accordingly.  Do not allow there to be any trailing
	R_MIPS_NONE relocations.
	* ld-mips-elf/eh-frame1-n64.d: Likewise.
	* ld-mips-elf/eh-frame2-n32.d: Likewise.
	* ld-mips-elf/eh-frame2-n64.d: Likewise.

1 files changed, 17 insertions, 104 deletions

diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index ccb77e1..f0925b9 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -4,6 +4,7 @@
 #as: -EB -64 --defsym alignment=3 --defsym fill=0x40
 #readelf: --relocs -wf
 #ld: -shared -melf64btsmip -Teh-frame1.ld
+#warning: fde encoding in.*prevents \.eh_frame_hdr table being created.
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
@@ -17,11 +18,10 @@ Relocation section '\.rel\.dyn' .*:
 000000030168  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-# Likewise CIE 0x340
-000000030368  [0-9a-f]+ R_MIPS_REL32 *
+000000030308  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030388  [0-9a-f]+ R_MIPS_REL32 *
+000000030328  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 0000000300cb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
@@ -33,16 +33,6 @@ Relocation section '\.rel\.dyn' .*:
 000000030192  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000302eb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
- *Type2: R_MIPS_64 *
- *Type3: R_MIPS_NONE *
-000000030358  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
- *Type2: R_MIPS_64 *
- *Type3: R_MIPS_NONE *
-0000000303b2  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
- *Type2: R_MIPS_64 *
- *Type3: R_MIPS_NONE *
-#...
 The section \.eh_frame contains:
 
 00000000 00000014 00000000 CIE
@@ -219,23 +209,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 00020190
   DW_CFA_advance_loc: 0 to 00020190
 
-00000200 00000014 00000000 CIE
-  Version:               1
-  Augmentation:          "zR"
-  Code alignment factor: 1
-  Data alignment factor: 4
-  Return address column: 31
-  Augmentation data:     10
-
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-
-00000218 0000001c 0000001c FDE cie=00000200 pc=000201d0..000201e0
+00000200 0000001c 00000204 FDE cie=00000000 pc=000201d0..000201e0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -245,7 +219,7 @@ The section \.eh_frame contains:
   DW_CFA_nop
 
 # basic1 removed, followed by repeat of above
-00000238 0000001c 0000003c FDE cie=00000200 pc=000201e0..000201f0
+00000220 0000001c 00000224 FDE cie=00000000 pc=000201e0..000201f0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -254,7 +228,7 @@ The section \.eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-00000258 0000001c 0000005c FDE cie=00000200 pc=000201f0..00020210
+00000240 0000001c 00000244 FDE cie=00000000 pc=000201f0..00020210
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -263,7 +237,7 @@ The section \.eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-00000278 0000001c 0000007c FDE cie=00000200 pc=00020210..00020240
+00000260 0000001c 00000264 FDE cie=00000000 pc=00020210..00020240
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -272,7 +246,7 @@ The section \.eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-00000298 0000001c 0000009c FDE cie=00000200 pc=00020240..00020280
+00000280 0000001c 00000284 FDE cie=00000000 pc=00020240..00020280
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
@@ -281,38 +255,16 @@ The section \.eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-000002b8 0000001c 000000bc FDE cie=00000200 pc=00020280..000202d0
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
+000002a0 0000001c 000002a4 FDE cie=00000000 pc=00020280..000202d0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
-
-000002d8 00000024 00000000 CIE
-  Version:               1
-  Augmentation:          "zRP"
-  Code alignment factor: 1
-  Data alignment factor: 4
-  Return address column: 31
-  Augmentation data:     10 00 00 00 00 00 00 00 00 00
-
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_nop
-  DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000300 0000001c 0000002c FDE cie=000002d8 pc=000202d0..000202e0
+000002c0 0000001c 0000020c FDE cie=000000b8 pc=000202d0..000202e0
   DW_CFA_advance_loc: 0 to 000202d0
   DW_CFA_advance_loc: 0 to 000202d0
   DW_CFA_advance_loc: 0 to 000202d0
@@ -321,7 +273,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 000202d0
   DW_CFA_advance_loc: 0 to 000202d0
 
-00000320 0000001c 0000004c FDE cie=000002d8 pc=000202e0..00020300
+000002e0 0000001c 0000022c FDE cie=000000b8 pc=000202e0..00020300
   DW_CFA_advance_loc: 0 to 000202e0
   DW_CFA_advance_loc: 0 to 000202e0
   DW_CFA_advance_loc: 0 to 000202e0
@@ -330,16 +282,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 000202e0
   DW_CFA_advance_loc: 0 to 000202e0
 
-00000340 0000001c 00000000 CIE
-  Version:               1
-  Augmentation:          "zP"
-  Code alignment factor: 1
-  Data alignment factor: 4
-  Return address column: 31
-  Augmentation data:     50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-
-
-00000360 0000001c 00000024 FDE cie=00000340 pc=00020300..00020310
+00000300 0000001c 000001e4 FDE cie=00000120 pc=00020300..00020310
   DW_CFA_advance_loc: 0 to 00020300
   DW_CFA_advance_loc: 0 to 00020300
   DW_CFA_advance_loc: 0 to 00020300
@@ -348,7 +291,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 00020300
   DW_CFA_advance_loc: 0 to 00020300
 
-00000380 0000001c 00000044 FDE cie=00000340 pc=00020310..00020330
+00000320 0000001c 00000204 FDE cie=00000120 pc=00020310..00020330
   DW_CFA_advance_loc: 0 to 00020310
   DW_CFA_advance_loc: 0 to 00020310
   DW_CFA_advance_loc: 0 to 00020310
@@ -357,21 +300,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 00020310
   DW_CFA_advance_loc: 0 to 00020310
 
-000003a0 0000001c 00000000 CIE
-  Version:               1
-  Augmentation:          "zPR"
-  Code alignment factor: 1
-  Data alignment factor: 4
-  Return address column: 31
-  Augmentation data:     00 00 00 00 00 00 00 00 00 10
-
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-
-000003c0 0000001c 00000024 FDE cie=000003a0 pc=00020330..00020340
+00000340 0000001c 000001c4 FDE cie=00000180 pc=00020330..00020340
   DW_CFA_advance_loc: 0 to 00020330
   DW_CFA_advance_loc: 0 to 00020330
   DW_CFA_advance_loc: 0 to 00020330
@@ -380,7 +309,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 00020330
   DW_CFA_advance_loc: 0 to 00020330
 
-000003e0 0000001c 00000044 FDE cie=000003a0 pc=00020340..00020370
+00000360 0000001c 000001e4 FDE cie=00000180 pc=00020340..00020370
   DW_CFA_advance_loc: 0 to 00020340
   DW_CFA_advance_loc: 0 to 00020340
   DW_CFA_advance_loc: 0 to 00020340
@@ -389,7 +318,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 00020340
   DW_CFA_advance_loc: 0 to 00020340
 
-00000400 0000001c 00000064 FDE cie=000003a0 pc=00020370..000203b0
+00000380 0000001c 00000204 FDE cie=00000180 pc=00020370..000203b0
   DW_CFA_advance_loc: 0 to 00020370
   DW_CFA_advance_loc: 0 to 00020370
   DW_CFA_advance_loc: 0 to 00020370
@@ -398,23 +327,7 @@ The section \.eh_frame contains:
   DW_CFA_advance_loc: 0 to 00020370
   DW_CFA_advance_loc: 0 to 00020370
 
-00000420 00000014 00000000 CIE
-  Version:               1
-  Augmentation:          "zR"
-  Code alignment factor: 1
-  Data alignment factor: 4
-  Return address column: 31
-  Augmentation data:     10
-
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_advance_loc: 0 to 00000000
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop
-
-00000438 0000001c 0000001c FDE cie=00000420 pc=000203b0..000203c0
+000003a0 0000001c 000003a4 FDE cie=00000000 pc=000203b0..000203c0
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop